| 1 |
commit: c41e09e64b1ddde8c06b629e1ad4a0f2f0fdef34 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 28 13:11:24 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 28 13:11:51 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41e09e6 |
| 7 |
|
| 8 |
net-libs/signon-oauth2: avoid build failure when unused dependency is not installed |
| 9 |
|
| 10 |
Gentoo-bug: 564316 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
.../files/signon-oauth2-0.21-unused-dependency.patch | 16 ++++++++++++++++ |
| 15 |
net-libs/signon-oauth2/signon-oauth2-0.21.ebuild | 4 +++- |
| 16 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..3e6656d |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.21-unused-dependency.patch |
| 23 |
@@ -0,0 +1,16 @@ |
| 24 |
+Qt5XmlPatterns is not actually used, but build will fail if it's missing. |
| 25 |
+ |
| 26 |
+Gentoo-bug: 564316 |
| 27 |
+ |
| 28 |
+--- src/src.pro |
| 29 |
++++ src/src.pro |
| 30 |
+@@ -4,8 +4,7 @@ |
| 31 |
+ TARGET = oauth2plugin |
| 32 |
+ DESTDIR = lib/signon |
| 33 |
+ QT += core \ |
| 34 |
+- network \ |
| 35 |
+- xmlpatterns |
| 36 |
++ network |
| 37 |
+ QT -= gui |
| 38 |
+ CONFIG += plugin \ |
| 39 |
+ build_all \ |
| 40 |
|
| 41 |
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild |
| 42 |
index 2c5b49b..2bbabd6 100644 |
| 43 |
--- a/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild |
| 44 |
+++ b/net-libs/signon-oauth2/signon-oauth2-0.21.ebuild |
| 45 |
@@ -4,7 +4,7 @@ |
| 46 |
|
| 47 |
EAPI=5 |
| 48 |
|
| 49 |
-inherit qmake-utils |
| 50 |
+inherit eutils qmake-utils |
| 51 |
|
| 52 |
DESCRIPTION="OAuth2 plugin for Signon daemon" |
| 53 |
HOMEPAGE="https://01.org/gsso/" |
| 54 |
@@ -30,6 +30,8 @@ src_prepare() { |
| 55 |
else |
| 56 |
sed -i -e '/^INSTALLS.*/,+1d' tests/tests.pro || die "couldn't remove tests from install target" |
| 57 |
fi |
| 58 |
+ |
| 59 |
+ epatch "${FILESDIR}/${P}-unused-dependency.patch" |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
Archives