[neon/backports-jammy/zxing-cpp-jammy/Neon/release] debian/patches: drop 0001-CMakeLists.txt-Use-top-level-GNUInstallDirs.patch (bit-by-bit identical results independent of its inclusion)

Carlos De Maine null at kde.org
Mon Jan 16 11:56:17 GMT 2023


Git commit 08eed1977610caf0763232a5b7aacd7d7996eaa0 by Carlos De Maine.
Committed on 16/01/2023 at 11:52.
Pushed by carlosdem into branch 'Neon/release'.

drop 0001-CMakeLists.txt-Use-top-level-GNUInstallDirs.patch (bit-by-bit identical results independent of its inclusion)

A  +37   -0    debian/patches/0004-Bump-SONAME-to-2.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/backports-jammy/zxing-cpp-jammy/commit/08eed1977610caf0763232a5b7aacd7d7996eaa0

diff --git a/debian/patches/0004-Bump-SONAME-to-2.patch b/debian/patches/0004-Bump-SONAME-to-2.patch
new file mode 100644
index 0000000..a18bb63
--- /dev/null
+++ b/debian/patches/0004-Bump-SONAME-to-2.patch
@@ -0,0 +1,37 @@
+From: Boyuan Yang <byang at debian.org>
+Date: Wed, 13 Jul 2022 16:30:48 -0400
+Subject: Bump SONAME to 2
+
+Prepare for future transition due to SONAME change.
+
+See: https://github.com/nu-book/zxing-cpp/issues/333
+---
+ CMakeLists.txt      | 1 +
+ core/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 513f8c4..58a6d1a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required (VERSION 3.14)
+ 
+ project (ZXing VERSION "1.4.0" LANGUAGES CXX)
++set (ZXING_SONAME 2)
+ 
+ option (BUILD_WRITERS "Build with writer support (encoders)" ON)
+ option (BUILD_READERS "Build with reader support (decoders)" ON)
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 7382bca..b4cd63a 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -486,7 +486,7 @@ set_target_properties(ZXing PROPERTIES EXPORT_NAME ZXing)
+ set_target_properties(ZXing PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ if (PROJECT_VERSION)
+     set_target_properties(ZXing PROPERTIES VERSION ${PROJECT_VERSION})
+-    set_target_properties(ZXing PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})
++    set_target_properties(ZXing PROPERTIES SOVERSION ${ZXING_SONAME})
+ endif()
+ 
+ set_target_properties(ZXing PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
diff --git a/debian/patches/series b/debian/patches/series
index c8c5f4f..01506a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-CMakeLists.txt-Use-top-level-GNUInstallDirs.patch
 0002-fix-python-wrapper-build.patch
 0003-Disable-tests-without-test-file.patch
 0004-Bump-SONAME-to-2.patch



More information about the Neon-commits mailing list