1 |
commit: 31417f07a98effb61b2dc51f9ce9da0b0d3360b5 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Nov 30 21:39:45 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 30 21:39:45 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31417f07 |
7 |
|
8 |
dev-python/thunarx-python: port to EAPI 7 |
9 |
|
10 |
* Fix build with gcc-10. Thanks to Sam James for providing the patch |
11 |
link |
12 |
|
13 |
Closes: https://bugs.gentoo.org/710948 |
14 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
15 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
16 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
17 |
|
18 |
.../files/thunarx-python-0.5.1-fno-common.patch | 85 ++++++++++++++++++++++ |
19 |
.../thunarx-python/thunarx-python-0.5.1-r1.ebuild | 15 ++-- |
20 |
2 files changed, 93 insertions(+), 7 deletions(-) |
21 |
|
22 |
diff --git a/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch b/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..21f55c0e6f8 |
25 |
--- /dev/null |
26 |
+++ b/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch |
27 |
@@ -0,0 +1,85 @@ |
28 |
+Taken from: https://git.xfce.org/bindings/thunarx-python/commit/?id=3037ebe25d5c6ed58699e56b61f657cea3e5a5a6 |
29 |
+Author: Mukundan Ragavan <nonamedotc@×××××.com> |
30 |
+ |
31 |
+--- a/src/thunarx-python-object.c |
32 |
++++ b/src/thunarx-python-object.c |
33 |
+@@ -24,6 +24,7 @@ |
34 |
+ |
35 |
+ #include <thunarx/thunarx.h> |
36 |
+ |
37 |
++#define NO_IMPORT_PYGOBJECT |
38 |
+ #include <pygobject.h> |
39 |
+ |
40 |
+ #include <string.h> |
41 |
+--- a/src/thunarx-python.c |
42 |
++++ b/src/thunarx-python.c |
43 |
+@@ -30,6 +30,18 @@ |
44 |
+ #include "thunarx-python.h" |
45 |
+ #include "thunarx-python-object.h" |
46 |
+ |
47 |
++PyTypeObject *_PyGtkWidget_Type; |
48 |
++PyTypeObject *_PyThunarxFileInfo_Type; |
49 |
++PyTypeObject *_PyThunarxMenuItem_Type; |
50 |
++PyTypeObject *_PyThunarxMenu_Type; |
51 |
++PyTypeObject *_PyThunarxMenuProvider_Type; |
52 |
++PyTypeObject *_PyThunarxPreferencesProvider_Type; |
53 |
++PyTypeObject *_PyThunarxPropertyPage_Type; |
54 |
++PyTypeObject *_PyThunarxPropertyPageProvider_Type; |
55 |
++PyTypeObject *_PyThunarxProviderPlugin_Type; |
56 |
++PyTypeObject *_PyThunarxRenamer_Type; |
57 |
++PyTypeObject *_PyThunarxRenamerProvider_Type; |
58 |
++ |
59 |
+ static const GDebugKey thunarx_python_debug_keys[] = { |
60 |
+ {"all", THUNARX_PYTHON_DEBUG_ALL}, |
61 |
+ }; |
62 |
+--- a/src/thunarx-python.h |
63 |
++++ b/src/thunarx-python.h |
64 |
+@@ -43,37 +43,37 @@ extern ThunarxPythonDebug thunarx_python_debug; |
65 |
+ #define debug_enter_args(x, y) { if (thunarx_python_debug & THUNARX_PYTHON_DEBUG_ALL) \ |
66 |
+ g_printf("%s: entered " x "\n", __FUNCTION__, y); } |
67 |
+ |
68 |
+-PyTypeObject *_PyGtkWidget_Type; |
69 |
++extern PyTypeObject *_PyGtkWidget_Type; |
70 |
+ #define PyGtkWidget_Type (*_PyGtkWidget_Type) |
71 |
+ |
72 |
+-PyTypeObject *_PyThunarxFileInfo_Type; |
73 |
++extern PyTypeObject *_PyThunarxFileInfo_Type; |
74 |
+ #define PyThunarxFileInfo_Type (*_PyThunarxFileInfo_Type) |
75 |
+ |
76 |
+-PyTypeObject *_PyThunarxMenuItem_Type; |
77 |
++extern PyTypeObject *_PyThunarxMenuItem_Type; |
78 |
+ #define PyThunarxMenuItem_Type (*_PyThunarxMenuItem_Type) |
79 |
+ |
80 |
+-PyTypeObject *_PyThunarxMenu_Type; |
81 |
++extern PyTypeObject *_PyThunarxMenu_Type; |
82 |
+ #define PyThunarxMenu_Type (*_PyThunarxMenu_Type) |
83 |
+ |
84 |
+-PyTypeObject *_PyThunarxMenuProvider_Type; |
85 |
++extern PyTypeObject *_PyThunarxMenuProvider_Type; |
86 |
+ #define PyThunarxMenuProvider_Type (*_PyThunarxMenuProvider_Type) |
87 |
+ |
88 |
+-PyTypeObject *_PyThunarxPreferencesProvider_Type; |
89 |
++extern PyTypeObject *_PyThunarxPreferencesProvider_Type; |
90 |
+ #define PyThunarxPreferencesProvider_Type (*_PyThunarxPreferencesProvider_Type) |
91 |
+ |
92 |
+-PyTypeObject *_PyThunarxPropertyPage_Type; |
93 |
++extern PyTypeObject *_PyThunarxPropertyPage_Type; |
94 |
+ #define PyThunarxPropertyPage_Type (*_PyThunarxPropertyPage_Type) |
95 |
+ |
96 |
+-PyTypeObject *_PyThunarxPropertyPageProvider_Type; |
97 |
++extern PyTypeObject *_PyThunarxPropertyPageProvider_Type; |
98 |
+ #define PyThunarxPropertyPageProvider_Type (*_PyThunarxPropertyPageProvider_Type) |
99 |
+ |
100 |
+-PyTypeObject *_PyThunarxProviderPlugin_Type; |
101 |
++extern PyTypeObject *_PyThunarxProviderPlugin_Type; |
102 |
+ #define PyThunarxProviderPlugin_Type (*_PyThunarxProviderPlugin_Type) |
103 |
+ |
104 |
+-PyTypeObject *_PyThunarxRenamer_Type; |
105 |
++extern PyTypeObject *_PyThunarxRenamer_Type; |
106 |
+ #define PyThunarxRenamer_Type (*_PyThunarxRenamer_Type) |
107 |
+ |
108 |
+-PyTypeObject *_PyThunarxRenamerProvider_Type; |
109 |
++extern PyTypeObject *_PyThunarxRenamerProvider_Type; |
110 |
+ #define PyThunarxRenamerProvider_Type (*_PyThunarxRenamerProvider_Type) |
111 |
+ |
112 |
+ #endif /* THUNARX_PYTHON_H */ |
113 |
|
114 |
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild |
115 |
index d2bb115a4a8..08d8b303c2d 100644 |
116 |
--- a/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild |
117 |
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild |
118 |
@@ -1,7 +1,7 @@ |
119 |
# Copyright 1999-2020 Gentoo Authors |
120 |
# Distributed under the terms of the GNU General Public License v2 |
121 |
|
122 |
-EAPI=6 |
123 |
+EAPI=7 |
124 |
PYTHON_COMPAT=( python3_{6..9} ) |
125 |
|
126 |
inherit python-single-r1 |
127 |
@@ -13,21 +13,22 @@ SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2" |
128 |
LICENSE="GPL-3" |
129 |
SLOT="0" |
130 |
KEYWORDS="amd64 x86" |
131 |
-IUSE="" |
132 |
|
133 |
RDEPEND="${PYTHON_DEPS} |
134 |
- >=x11-libs/gtk+-3.20:3 |
135 |
>=dev-libs/glib-2.30:2 |
136 |
+ >=x11-libs/gtk+-3.20:3 |
137 |
+ >=xfce-base/thunar-1.7.0 |
138 |
$(python_gen_cond_dep ' |
139 |
>=dev-python/pygobject-3.20:3[${PYTHON_MULTI_USEDEP}] |
140 |
- ') |
141 |
- >=xfce-base/thunar-1.7.0" |
142 |
-DEPEND="${RDEPEND} |
143 |
- virtual/pkgconfig" |
144 |
+ ')" |
145 |
+DEPEND="${RDEPEND}" |
146 |
+BDEPEND="virtual/pkgconfig" |
147 |
+ |
148 |
REQUIRED_USE=${PYTHON_REQUIRED_USE} |
149 |
|
150 |
PATCHES=( |
151 |
"${FILESDIR}"/${P}-py38.patch |
152 |
+ "${FILESDIR}"/${P}-fno-common.patch |
153 |
) |
154 |
|
155 |
src_install() { |