1 |
commit: 8372206ee884128f2891bdb37ce06b03c452ac47 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Feb 1 10:22:02 2021 +0000 |
4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 9 16:59:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8372206e |
7 |
|
8 |
x11-plugins/pidgin-musictracker: Port to EAPI 7 |
9 |
|
10 |
* Fix build with gcc-10 |
11 |
|
12 |
Closes: https://bugs.gentoo.org/717424 |
13 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
14 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
15 |
|
16 |
.../files/pidgin-musictracker-0.4.22-fno-common.patch | 12 ++++++++++++ |
17 |
.../pidgin-musictracker-0.4.22.ebuild | 17 ++++++++++------- |
18 |
2 files changed, 22 insertions(+), 7 deletions(-) |
19 |
|
20 |
diff --git a/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.22-fno-common.patch b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.22-fno-common.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..0378523c346 |
23 |
--- /dev/null |
24 |
+++ b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.22-fno-common.patch |
25 |
@@ -0,0 +1,12 @@ |
26 |
+https://bugs.gentoo.org/717424 |
27 |
+--- a/src/utils.h |
28 |
++++ b/src/utils.h |
29 |
+@@ -21,7 +21,7 @@ pcre* regex(const char* pattern, int options); |
30 |
+ int capture(pcre* re, const char *text, int len, ...); |
31 |
+ |
32 |
+ #ifndef WIN32 |
33 |
+-DBusGConnection *connection; |
34 |
++extern DBusGConnection *connection; |
35 |
+ gboolean dbus_g_init_connection(void); |
36 |
+ gboolean dbus_g_running(const char *name); |
37 |
+ #endif |
38 |
|
39 |
diff --git a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild |
40 |
index e576da2c7f0..4b562484649 100644 |
41 |
--- a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild |
42 |
+++ b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild |
43 |
@@ -1,7 +1,7 @@ |
44 |
-# Copyright 1999-2018 Gentoo Foundation |
45 |
+# Copyright 1999-2021 Gentoo Authors |
46 |
# Distributed under the terms of the GNU General Public License v2 |
47 |
|
48 |
-EAPI=6 |
49 |
+EAPI=7 |
50 |
|
51 |
inherit autotools |
52 |
|
53 |
@@ -14,15 +14,18 @@ SLOT="0" |
54 |
KEYWORDS="amd64 ppc x86" |
55 |
IUSE="debug" |
56 |
|
57 |
-DEPEND=">=net-im/pidgin-2.0.0[gtk] |
58 |
- >=dev-libs/dbus-glib-0.73 |
59 |
+DEPEND=" |
60 |
+ dev-libs/dbus-glib |
61 |
dev-libs/libpcre |
62 |
- >=sys-devel/gettext-0.17" |
63 |
+ net-im/pidgin[gtk]" |
64 |
RDEPEND="${DEPEND}" |
65 |
+BDEPEND="sys-devel/gettext" |
66 |
+ |
67 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
68 |
|
69 |
src_prepare() { |
70 |
default |
71 |
- sed -i -e "s/DOMAIN/PACKAGE/g" po/Makefile.in.in || die "sed failed" |
72 |
+ sed -i -e "s/DOMAIN/PACKAGE/g" po/Makefile.in.in || die |
73 |
eautoreconf |
74 |
} |
75 |
|
76 |
@@ -34,5 +37,5 @@ src_configure() { |
77 |
|
78 |
src_install() { |
79 |
default |
80 |
- find "${D}" -name "*.la" -delete || die "error cleaning la file." |
81 |
+ find "${ED}" -name '*.la' -delete || die |
82 |
} |