diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-28 23:10:31 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-28 23:55:23 +0200 |
| commit | 8304c9b8f9c8081b86ead3a1a473c6b8fc62de7e (patch) | |
| tree | 210b9d1f29398816e2a3b106ba0d8ac428c3ef78 /net-libs | |
| parent | mail-client/trojita: Drop 0.7-r3 (diff) | |
| download | gentoo-8304c9b8f9c8081b86ead3a1a473c6b8fc62de7e.tar.gz gentoo-8304c9b8f9c8081b86ead3a1a473c6b8fc62de7e.tar.bz2 gentoo-8304c9b8f9c8081b86ead3a1a473c6b8fc62de7e.zip | |
net-libs/signond: Reshuffle patches, but no change yet
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-libs')
3 files changed, 48 insertions, 29 deletions
diff --git a/net-libs/signond/files/signond-8.60-buildsystem.patch b/net-libs/signond/files/signond-8.60-buildsystem.patch index 95c4791ac4e2..a38f8458848c 100644 --- a/net-libs/signond/files/signond-8.60-buildsystem.patch +++ b/net-libs/signond/files/signond-8.60-buildsystem.patch @@ -1,16 +1,16 @@ -From 43e953418a5a08c3492d1160e4268dbcf82e7be9 Mon Sep 17 00:00:00 2001 +From 32e001d760dc1a7f884d7dc3a6e6883bd76e2f55 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 8 Dec 2019 20:35:11 +0100 -Subject: [PATCH] Fix build system for Gentoo +Date: Sun, 28 Jun 2020 21:37:30 +0200 +Subject: [PATCH 1/3] Fix buildsystem -1) remove unused dependency Qt5Xml -2) don't install example plugin -3) don't install static libs +- Disable examples +- Disable static lib + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> --- lib/SignOn/SignOn.pro | 4 +--- src/plugins/plugins.pro | 1 - - src/signond/signond.pro | 1 - - 3 files changed, 1 insertion(+), 5 deletions(-) + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/SignOn/SignOn.pro b/lib/SignOn/SignOn.pro index f6a1d61..28af041 100644 @@ -34,18 +34,6 @@ index dfccc4a..ca1c1ae 100644 SUBDIRS = password \ - example \ test -diff --git a/src/signond/signond.pro b/src/signond/signond.pro -index 60ee5e7..211dab6 100644 ---- a/src/signond/signond.pro -+++ b/src/signond/signond.pro -@@ -4,7 +4,6 @@ TEMPLATE = app - TARGET = signond - QT += core \ - sql \ -- xml \ - network \ - dbus - -- -2.24.0 +2.27.0 diff --git a/net-libs/signond/files/signond-8.60-consistent-paths.patch b/net-libs/signond/files/signond-8.60-consistent-paths.patch index f32ac319e570..6743a92678af 100644 --- a/net-libs/signond/files/signond-8.60-consistent-paths.patch +++ b/net-libs/signond/files/signond-8.60-consistent-paths.patch @@ -1,11 +1,14 @@ -From c68f31b964f9decf323cd212282cf13d4a42ad21 Mon Sep 17 00:00:00 2001 +From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 8 Dec 2019 22:52:46 +0100 -Subject: [PATCH] Consistent overrideable install paths +Date: Sun, 28 Jun 2020 21:44:42 +0200 +Subject: [PATCH 3/3] Consistent overrideable install paths At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong. -This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath INSTALL_PREFIX. +This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath +INSTALL_PREFIX. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> --- common-installs-config.pri | 2 +- common-pkgconfig.pri | 2 +- @@ -259,5 +262,5 @@ index 2c03e74..ea2fcb2 100644 +target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon INSTALLS = target -- -2.24.0 +2.27.0 diff --git a/net-libs/signond/files/signond-8.60-unused-dep.patch b/net-libs/signond/files/signond-8.60-unused-dep.patch index dd32af041d4d..54b5ce26f4c7 100644 --- a/net-libs/signond/files/signond-8.60-unused-dep.patch +++ b/net-libs/signond/files/signond-8.60-unused-dep.patch @@ -1,6 +1,31 @@ ---- a/tests/signond-tests/signond-tests.pri 2020-06-07 10:57:19.327456979 +0200 -+++ b/tests/signond-tests/signond-tests.pri 2020-06-07 11:00:39.866322814 +0200 -@@ -6,7 +6,6 @@ +From 5814507706210031432a4ff727231bb1082576d5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 28 Jun 2020 21:43:09 +0200 +Subject: [PATCH 2/3] Drop unused Qt5Xml dependency + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/signond/signond.pro | 1 - + tests/signond-tests/signond-tests.pri | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/signond/signond.pro b/src/signond/signond.pro +index 60ee5e7..211dab6 100644 +--- a/src/signond/signond.pro ++++ b/src/signond/signond.pro +@@ -4,7 +4,6 @@ TEMPLATE = app + TARGET = signond + QT += core \ + sql \ +- xml \ + network \ + dbus + +diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri +index 1bbd5a1..950baaa 100644 +--- a/tests/signond-tests/signond-tests.pri ++++ b/tests/signond-tests/signond-tests.pri +@@ -6,7 +6,6 @@ CONFIG += \ QT += core \ sql \ testlib \ @@ -8,3 +33,6 @@ network \ dbus +-- +2.27.0 + |