[neon/backports-noble/kimageannotator-noble/Neon/release] debian: Add patches

Boyuan Yang null at kde.org
Wed Jul 3 14:54:16 BST 2024


Git commit a50304a7cf80a400af086ebfe4b3e21c3ffc4a6b by Boyuan Yang.
Committed on 20/03/2024 at 19:37.
Pushed by jriddell into branch 'Neon/release'.

Add patches

M  +3    -1    debian/changelog
A  +21   -0    debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/backports-noble/kimageannotator-noble/-/commit/a50304a7cf80a400af086ebfe4b3e21c3ffc4a6b

diff --git a/debian/changelog b/debian/changelog
index fe08c66..d3dcf00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
 kimageannotator (0.7.1-1~exp1) experimental; urgency=medium
 
   * New upstream release.
+  * debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch:
+    Add patch to make Qt5 and Qt6 libraries coinstallable.
   * Split package to support both Qt5 and Qt6.
     + libkimageannotator-qt5-0
     + libkimageannotator-qt6-0
     + libkimageannotator-qt5-dev
     + libkimageannotator-qt6-dev
 
- -- Boyuan Yang <byang at debian.org>  Wed, 20 Mar 2024 15:33:08 -0400
+ -- Boyuan Yang <byang at debian.org>  Wed, 20 Mar 2024 15:36:50 -0400
 
 kimageannotator (0.6.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch b/debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch
new file mode 100644
index 0000000..2b9c93e
--- /dev/null
+++ b/debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch
@@ -0,0 +1,21 @@
+From: Boyuan Yang <byang at debian.org>
+Date: Wed, 20 Mar 2024 15:36:10 -0400
+Subject: Make Qt5 Qt6 library coinstallable
+
+Bug: https://github.com/ksnip/kColorPicker/issues/13
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8f3516e..6a12399 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,6 +97,7 @@ set_target_properties(kImageAnnotator
+ 					  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
+ 					  VERSION ${PROJECT_VERSION}
+ 					  SOVERSION 0
++					  OUTPUT_NAME kImageAnnotator-Qt${QT_MAJOR_VERSION}
+ 					  )
+ 
+ install(TARGETS kImageAnnotator
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7e420d2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Make-Qt5-Qt6-library-coinstallable.patch



More information about the Neon-commits mailing list