[neon/neon-packaging/vvave/Neon/stable] debian: Revert "add patch to fix taglib"

Carlos De Maine null at kde.org
Sun Nov 17 23:28:54 GMT 2024


Git commit d756b9e5601bafe73deedb13c1312d7b30fb1fea by Carlos De Maine.
Committed on 17/11/2024 at 23:28.
Pushed by carlosdem into branch 'Neon/stable'.

Revert "add patch to fix taglib"

This reverts commit 97cffc6be6d644605424951a330e01a400a1ad04

D  +0    -26   debian/patches/fix_taglib
D  +0    -1    debian/patches/series
M  +3    -3    debian/rules

https://invent.kde.org/neon/neon-packaging/vvave/-/commit/d756b9e5601bafe73deedb13c1312d7b30fb1fea

diff --git a/debian/patches/fix_taglib b/debian/patches/fix_taglib
deleted file mode 100644
index f1f4889..0000000
--- a/debian/patches/fix_taglib
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c48974d9a1d053bdeeda6579f2610e0598b3f615..0dd279e2d2e97fc27a38c044ac8fb625f61d9a74 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ find_package(MauiKit4 REQUIRED COMPONENTS FileBrowsing)
- if(ANDROID)
-     find_package(taglib 1.4 REQUIRED)
- else()
--    find_package(TagLib 1.4 REQUIRED)
-+    find_package(Taglib 1.4 REQUIRED)
- endif()
-
- if(UNIX AND NOT ANDROID)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 72e05dd09d0e51fd79a30e4c1bcd1b7d1c4ac013..84af7ccc8d0007678b5ce592f0782572b7384f0f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -131,7 +131,7 @@ target_compile_definitions(${PROJECT_NAME}
- target_include_directories(${PROJECT_NAME} PRIVATE ${Taglib_INCLUDE_DIRS})
-
- set(Taglib_LIBRARIES
--    TagLib::tag)
-+    Taglib::Taglib)
-
- target_link_libraries(${PROJECT_NAME}
-     PRIVATE
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f3092f8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_taglib
diff --git a/debian/rules b/debian/rules
index 3d69b0d..c8b1141 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
-# SPDX-License-Identifier: LGPL-2.0-or-later
-# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
+
+export QT_SELECT=qt6
 
 %:
-	dh $@ --with kf6 --buildsystem kf6
+	dh $@ --buildsystem=cmake


More information about the Neon-commits mailing list