1 |
commit: 988c0ffb4c868eb82efc0a37169b96c3548dbd5e |
2 |
Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 9 02:08:11 2019 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 9 02:08:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988c0ffb |
7 |
|
8 |
media-sound/playerctl: fix gdbus-codegen handling in configure.ac |
9 |
|
10 |
In configure.ac, the **absolute** path of gdbus-codegen (as obtained |
11 |
by pkg-config) is passed to AC_PATH_PROG. The macro then appends this |
12 |
path to the directories in PATH and tests if the result is |
13 |
executable. This internally results in checking for |
14 |
'/usr/bin/usr/bin/gdbus-codegen'. The macro is redundant because the |
15 |
value returned by pkg-config is sufficient. |
16 |
|
17 |
Closes: https://bugs.gentoo.org/682788 |
18 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
19 |
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org> |
20 |
|
21 |
.../playerctl/files/playerctl-gdbus-codegen-fix.patch | 15 +++++++++++++++ |
22 |
media-sound/playerctl/playerctl-0.5.0.ebuild | 4 +++- |
23 |
media-sound/playerctl/playerctl-0.6.0.ebuild | 4 +++- |
24 |
3 files changed, 21 insertions(+), 2 deletions(-) |
25 |
|
26 |
diff --git a/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch b/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..06c073aa276 |
29 |
--- /dev/null |
30 |
+++ b/media-sound/playerctl/files/playerctl-gdbus-codegen-fix.patch |
31 |
@@ -0,0 +1,15 @@ |
32 |
+--- a/configure.ac |
33 |
++++ b/configure.ac |
34 |
+@@ -21,10 +21,11 @@ |
35 |
+ PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.38]) |
36 |
+ PKG_CHECK_MODULES([GIO], [gio-unix-2.0]) |
37 |
+ |
38 |
+-AC_PATH_PROG([GDBUS_CODEGEN], [`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`]) |
39 |
++GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` |
40 |
+ if test -z "$GDBUS_CODEGEN"; then |
41 |
+ AC_MSG_ERROR([*** gdbus-codegen is required to build playerctl]) |
42 |
+ fi |
43 |
++AC_SUBST(GDBUS_CODEGEN) |
44 |
+ |
45 |
+ # Checks for typedefs, structures, and compiler characteristics |
46 |
+ AC_PROG_CC_STDC |
47 |
|
48 |
diff --git a/media-sound/playerctl/playerctl-0.5.0.ebuild b/media-sound/playerctl/playerctl-0.5.0.ebuild |
49 |
index a06816f38bd..0a05e650f20 100644 |
50 |
--- a/media-sound/playerctl/playerctl-0.5.0.ebuild |
51 |
+++ b/media-sound/playerctl/playerctl-0.5.0.ebuild |
52 |
@@ -1,4 +1,4 @@ |
53 |
-# Copyright 1999-2017 Gentoo Foundation |
54 |
+# Copyright 1999-2019 Gentoo Authors |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=6 |
58 |
@@ -29,6 +29,8 @@ src_prepare() { |
59 |
echo 'EXTRA_DIST = ' > gtk-doc.make || die |
60 |
fi |
61 |
|
62 |
+ eapply "${FILESDIR}"/"${PN}"-gdbus-codegen-fix.patch |
63 |
+ |
64 |
default |
65 |
eautoreconf |
66 |
} |
67 |
|
68 |
diff --git a/media-sound/playerctl/playerctl-0.6.0.ebuild b/media-sound/playerctl/playerctl-0.6.0.ebuild |
69 |
index 8741ea6e29e..4effb5f74a6 100644 |
70 |
--- a/media-sound/playerctl/playerctl-0.6.0.ebuild |
71 |
+++ b/media-sound/playerctl/playerctl-0.6.0.ebuild |
72 |
@@ -1,4 +1,4 @@ |
73 |
-# Copyright 1999-2018 Gentoo Foundation |
74 |
+# Copyright 1999-2019 Gentoo Authors |
75 |
# Distributed under the terms of the GNU General Public License v2 |
76 |
|
77 |
EAPI=6 |
78 |
@@ -29,6 +29,8 @@ src_prepare() { |
79 |
echo 'EXTRA_DIST = ' > gtk-doc.make || die |
80 |
fi |
81 |
|
82 |
+ eapply "${FILESDIR}"/"${PN}"-gdbus-codegen-fix.patch |
83 |
+ |
84 |
default |
85 |
eautoreconf |
86 |
} |