[neon/neon-packaging/maui-clip/Neon/release] debian/patches: link properly

[Carlos De Maine]

Git commit a4cd86311a045fee0a6168067c816cd7b760f28e by Carlos De Maine.
Committed on 15/11/2024 at 02:43.
Pushed by carlosdem into branch 'Neon/release'.

link properly

M  +15   -2    debian/patches/link_properly
D  +0    -13   debian/patches/no_taglib_version
D  +0    -28   debian/patches/no_version_variable
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/neon-packaging/maui-clip/-/commit/a4cd86311a045fee0a6168067c816cd7b760f28e

diff --git a/debian/patches/link_properly b/debian/patches/link_properly
index db98566..fabb9d0 100644
--- a/debian/patches/link_properly
+++ b/debian/patches/link_properly
@@ -1,5 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c46d030b4ea855869eecc25cac51179ef2656467..5491fb6bb45be61896a5ecff2e8c1700cea18701 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,7 +39,7 @@ find_package(FFmpeg COMPONENTS REQUIRED AVCODEC AVFORMAT SWSCALE)
+ if(ANDROID)
+     find_package(taglib 1.4 REQUIRED)
+ else()
+-    find_package(TagLib 1.4 REQUIRED)
++    find_package(Taglib 1.4 REQUIRED)
+ endif()
+ if(ANDROID)
+     find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS QuickControls2)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index df2196b5ec732caec22bd016d277b6e63fab170d..f832de4912932b95a07373851df840894d1e890d 100644
+index df2196b5ec732caec22bd016d277b6e63fab170d..430757ab0e742a3cf93c9cb2f67c73e391282282 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -112,7 +112,7 @@ if(MPV_AVAILABLE)
@@ -7,7 +20,7 @@ index df2196b5ec732caec22bd016d277b6e63fab170d..f832de4912932b95a07373851df84089
  
  set(Taglib_LIBRARIES
 -    TagLib::tag)
-+    TagLib::TagLib)
++    Taglib::Taglib)
  
  target_link_libraries(${PROJECT_NAME}
      PRIVATE
\ No newline at end of file
diff --git a/debian/patches/no_taglib_version b/debian/patches/no_taglib_version
deleted file mode 100644
index 4d98cb6..0000000
--- a/debian/patches/no_taglib_version
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 86156a78818f901c1a5ca204696f80f00588b1b0..2d75b8a16cc39e76f1b4764c74ee52a49e9c7f12 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@ find_package(FFmpeg COMPONENTS REQUIRED AVCODEC AVFORMAT SWSCALE)
- if(ANDROID)
-     find_package(taglib 1.4 REQUIRED)
- else()
--    find_package(TagLib 1.4 REQUIRED)
-+    find_package(TagLib REQUIRED)
- endif()
- if(ANDROID)
-     find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS QuickControls2)
diff --git a/debian/patches/no_version_variable b/debian/patches/no_version_variable
deleted file mode 100644
index a1904f5..0000000
--- a/debian/patches/no_version_variable
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f832de4912932b95a07373851df840894d1e890d..c04fea65892341f3f02f923809391fe4debeeb1f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -111,9 +111,6 @@ if(MPV_AVAILABLE)
-     target_compile_definitions(${PROJECT_NAME} PUBLIC MPV_AVAILABLE)
- endif()
- 
--set(Taglib_LIBRARIES
--    TagLib::TagLib)
--
- target_link_libraries(${PROJECT_NAME}
-     PRIVATE
-     MauiKit4
-@@ -125,12 +122,12 @@ target_link_libraries(${PROJECT_NAME}
-     Qt6::Multimedia
-     KF6::CoreAddons
-     KF6::I18n
-+    TagLib::TagLib
-     ${AVUTIL_LIBRARIES}
-     ${AVFILTER_LIBRARIES}
-     ${AVFORMAT_LIBRARIES}
-     ${AVCODEC_LIBRARIES}
-     ${SWSCALE_LIBRARIES}
--    ${Taglib_LIBRARIES})
- 
- if(UNIX AND NOT APPLE AND NOT ANDROID)
-     install (TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 6bcb137..425200d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 no_taglib_version
-link_properly
-no_version_variable
\ No newline at end of file