[neon/qt/qbs/Neon/release] debian: Remove patches that are not relevant since switch to CMake.

Dmitry Shachnev null at kde.org
Thu May 5 12:48:33 BST 2022


Git commit f9ef7e85154dfa93900649f67c1606b1d8d5d1d3 by Dmitry Shachnev.
Committed on 02/04/2022 at 16:02.
Pushed by jriddell into branch 'Neon/release'.

Remove patches that are not relevant since switch to CMake.

M  +1    -0    debian/changelog
D  +0    -16   debian/patches/kfreebsd_soname.diff
D  +0    -16   debian/patches/processlauncher_destdir.diff
D  +0    -20   debian/patches/remove_rpaths.diff
M  +0    -3    debian/patches/series

https://invent.kde.org/neon/qt/qbs/commit/f9ef7e85154dfa93900649f67c1606b1d8d5d1d3

diff --git a/debian/changelog b/debian/changelog
index 8b75960..6629d9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ qbs (1.22.0-1) UNRELEASED; urgency=medium
   * Update debian/qbs-common.install and add debian/not-installed.
   * Update symbols files from the current build logs.
   * Update debian/copyright.
+  * Remove patches that are not relevant since switch to CMake.
 
  -- Marius Gripsgard <marius at ubports.com>  Tue, 28 Dec 2021 17:30:52 +0100
 
diff --git a/debian/patches/kfreebsd_soname.diff b/debian/patches/kfreebsd_soname.diff
deleted file mode 100644
index a5e8a83..0000000
--- a/debian/patches/kfreebsd_soname.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: use the same SONAME scheme on kfreebsd as on Linux
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-yet
-Last-Update: 2017-01-04
-
---- a/src/lib/library.pri
-+++ b/src/lib/library.pri
-@@ -12,7 +12,7 @@ qbs_disable_rpath {
-     osx:QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/
- }
- 
--linux {
-+!win32 {
-     # Turn off absurd qmake's soname "logic" and directly add the linker flag.
-     QMAKE_LFLAGS_SONAME =
-     QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${QBS_VERSION_MAJ}.$${QBS_VERSION_MIN}
diff --git a/debian/patches/processlauncher_destdir.diff b/debian/patches/processlauncher_destdir.diff
deleted file mode 100644
index b571e84..0000000
--- a/debian/patches/processlauncher_destdir.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix DESTDIR for qbs_processlauncher
-Author: Alexander Volkov <a.volkov at rusbitech.ru>
-Forwarded: no
-Last-Update: 2018-04-04
-
---- a/src/libexec/libexec.pri
-+++ b/src/libexec/libexec.pri
-@@ -3,7 +3,7 @@ include(../install_prefix.pri)
- win32:LIBEXEC_BASE_DIR=bin
- else:LIBEXEC_BASE_DIR=libexec/qbs
- 
--!isEmpty(QBS_LIBEXEC_DESTDIR):DESTDIR=$${QBS_LIBEXEC_DESTDIR}
-+!isEmpty(QBS_LIBEXEC_DESTDIR):DESTDIR=../../../$${QBS_LIBEXEC_DESTDIR}
- else:DESTDIR=../../../$$LIBEXEC_BASE_DIR
- 
- !isEmpty(QBS_LIBEXEC_INSTALL_DIR):target.path = $${QBS_LIBEXEC_INSTALL_DIR}
diff --git a/debian/patches/remove_rpaths.diff b/debian/patches/remove_rpaths.diff
deleted file mode 100644
index bf186f9..0000000
--- a/debian/patches/remove_rpaths.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: do not pass wrong -L flag when linking with libqbscore
-Author: Adam Majer <adamm at zombino.com>
-Forwarded: not-needed
-Last-Update: 2015-03-13
-
---- a/src/lib/corelib/use_installed_corelib.pri
-+++ b/src/lib/corelib/use_installed_corelib.pri
-@@ -2,11 +2,9 @@ include(qbs_version.pri)
- 
- QBSLIBDIR=$${PWD}/../../lib
- unix {
--    LIBS += -L$$QBSLIBDIR -lqbscore
-+    LIBS += -lqbscore
- }
- 
--!qbs_disable_rpath:unix:QMAKE_LFLAGS += -Wl,-rpath,$${QBSLIBDIR}
--
- !CONFIG(static, static|shared) {
-     QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ
- }
diff --git a/debian/patches/series b/debian/patches/series
index 32dc11a..e7f0684 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
-remove_rpaths.diff
 disable_tests_qtscript.diff
 skip_test_concurrent.diff
-kfreebsd_soname.diff
-processlauncher_destdir.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff



More information about the Neon-commits mailing list