From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- dev-python/nautilus-python/Manifest | 5 +- .../nautilus-python-1.2.3-gcc10-fnocommon.patch | 147 +++++++++++++++++++++ .../nautilus-python-1.2.2-r1.ebuild | 39 ------ .../nautilus-python/nautilus-python-1.2.3.ebuild | 5 +- 4 files changed, 153 insertions(+), 43 deletions(-) create mode 100644 dev-python/nautilus-python/files/nautilus-python-1.2.3-gcc10-fnocommon.patch delete mode 100644 dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild (limited to 'dev-python/nautilus-python') diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest index 2108a670a9d2..d03a56454ed4 100644 --- a/dev-python/nautilus-python/Manifest +++ b/dev-python/nautilus-python/Manifest @@ -1,5 +1,4 @@ -DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc +AUX nautilus-python-1.2.3-gcc10-fnocommon.patch 6095 BLAKE2B ca0f7c2f46d3fc265cf2649c3f9f58d8bcf88212cd62065cb6f30adf2094e206eafb48354bc25bcc1afb887703b8d05d2a83020ff6382021edef130d5509ef38 SHA512 267171aadd5fcc825ca42e91f94dba72260017cc0aa4bc12874fef4773d46c6b47c1fc093e5043b3c77161cf2a51b78e6882ac8cc60c800c870d325108ce15c4 DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443 -EBUILD nautilus-python-1.2.2-r1.ebuild 946 BLAKE2B 52f4f4077034a671568e4de1337a7464e62718ea2ce9db39aaaeb7ed53af42acd6c3c4870596ed14c648b8c2ed39c5c145d85599d184df6d3e049a8f09e504cc SHA512 6ea8233389a35c5114a9c73b29586d37c64974b3ab8589378a6d94466375eecea712f3dbe87cfa251f1eae6531ff43302de23b609984a1e5442b56756a68e059 -EBUILD nautilus-python-1.2.3.ebuild 950 BLAKE2B 2d627aa0ba9d3849551fc3c8c0d14ec0f0dfdbc34c726d12804934360f61977bf28476f8d48af7b2a69b814e8880a282ff813fb59697ff10cbd6e79ab669bff6 SHA512 a8bf41cb4c593e089e7f81268f982cb7a50ec269c79b127fe6548abd2239b344c944a1942dff3aa79ec74f361835aebb98fe15189bf90b8ad7a4f8504caea4fd +EBUILD nautilus-python-1.2.3.ebuild 1074 BLAKE2B 0ba6eef9e27f28f2e09b27db6c140c8fdabd3f4d53dd1badc8792ac7ae7a34ca4e2631b87a50d4439271f27e1a771d4e0539d9d4b955a1b92b3cabf3498209b5 SHA512 c32e16959742d9b7380b7cacc2df7dbab8906adf6eb16a7002205907175a4aeeaa5696d66bb564936b7f6871804e9c8a1c43157e0ab6b0d2d19083e3ce6ab19b MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/dev-python/nautilus-python/files/nautilus-python-1.2.3-gcc10-fnocommon.patch b/dev-python/nautilus-python/files/nautilus-python-1.2.3-gcc10-fnocommon.patch new file mode 100644 index 000000000000..7e0f760aca2e --- /dev/null +++ b/dev-python/nautilus-python/files/nautilus-python-1.2.3-gcc10-fnocommon.patch @@ -0,0 +1,147 @@ +From bd4820186751034c6b5acb9c71b1aeab03c56523 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Mon, 11 May 2020 14:57:45 +0200 +Subject: [PATCH] Fix build with gcc 10 + +Bug-Debian: https://bugs.debian.org/957578 +Forwarded: https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7 +Last-Update: 2020-05-11 +--- + src/nautilus-python-object.c | 10 +++++----- + src/nautilus-python.c | 13 +++++++++++++ + src/nautilus-python.h | 22 +++++++++++----------- + 3 files changed, 29 insertions(+), 16 deletions(-) + +diff --git a/src/nautilus-python-object.c b/src/nautilus-python-object.c +index f343070..da185ad 100644 +--- a/src/nautilus-python-object.c ++++ b/src/nautilus-python-object.c +@@ -40,7 +40,7 @@ int __PyString_Check(PyObject *obj) { + #endif + } + +-char* __PyString_AsString(PyObject *obj) { ++const char* __PyString_AsString(PyObject *obj) { + #if PY_MAJOR_VERSION >= 3 + return PyUnicode_AsUTF8(obj); + #else +@@ -389,7 +389,7 @@ beach: + #define METHOD_NAME "update_file_info" + static NautilusOperationResult + nautilus_python_object_update_file_info (NautilusInfoProvider *provider, +- NautilusFile *file, ++ NautilusFileInfo *file_info, + GClosure *update_complete, + NautilusOperationHandle **handle) { + NautilusPythonObject *object = (NautilusPythonObject*)provider; +@@ -408,12 +408,12 @@ nautilus_python_object_update_file_info (NautilusInfoProvider *provider, + pygobject_new((GObject*)provider), + py_handle, + pyg_boxed_new(G_TYPE_CLOSURE, update_complete, TRUE, TRUE), +- pygobject_new((GObject*)file)); ++ pygobject_new((GObject*)file_info)); + } + else if (PyObject_HasAttrString(object->instance, "update_file_info")) { + py_ret = PyObject_CallMethod(object->instance, + METHOD_PREFIX METHOD_NAME, "(N)", +- pygobject_new((GObject*)file)); ++ pygobject_new((GObject*)file_info)); + } + else { + goto beach; +@@ -434,7 +434,7 @@ nautilus_python_object_update_file_info (NautilusInfoProvider *provider, + #endif + + beach: +- free_pygobject_data(file, NULL); ++ free_pygobject_data(file_info, NULL); + Py_XDECREF(py_ret); + pyg_gil_state_release(state); + return ret; +diff --git a/src/nautilus-python.c b/src/nautilus-python.c +index 843e3c6..510cdfb 100644 +--- a/src/nautilus-python.c ++++ b/src/nautilus-python.c +@@ -22,6 +22,7 @@ + #endif + + #include ++#define NO_IMPORT_PYGOBJECT //To avoid a multiple definition, nautilus-python-object.c also includes and does the import. + #include + #include + #include +@@ -42,6 +43,18 @@ static gboolean nautilus_python_init_python(void); + static GArray *all_types = NULL; + + ++PyTypeObject *_PyGtkWidget_Type; ++PyTypeObject *_PyNautilusColumn_Type; ++PyTypeObject *_PyNautilusColumnProvider_Type; ++PyTypeObject *_PyNautilusInfoProvider_Type; ++PyTypeObject *_PyNautilusLocationWidgetProvider_Type; ++PyTypeObject *_PyNautilusMenu_Type; ++PyTypeObject *_PyNautilusMenuItem_Type; ++PyTypeObject *_PyNautilusMenuProvider_Type; ++PyTypeObject *_PyNautilusPropertyPage_Type; ++PyTypeObject *_PyNautilusPropertyPageProvider_Type; ++PyTypeObject *_PyNautilusOperationHandle_Type; ++ + static inline gboolean + np_init_pygobject(void) { + PyObject *gobject = pygobject_init (PYGOBJECT_MAJOR_VERSION, PYGOBJECT_MINOR_VERSION, PYGOBJECT_MICRO_VERSION); +diff --git a/src/nautilus-python.h b/src/nautilus-python.h +index 4c181f8..c940a06 100644 +--- a/src/nautilus-python.h ++++ b/src/nautilus-python.h +@@ -43,37 +43,37 @@ extern NautilusPythonDebug nautilus_python_debug; + #define debug_enter_args(x, y) { if (nautilus_python_debug & NAUTILUS_PYTHON_DEBUG_MISC) \ + g_printf("%s: entered " x "\n", __FUNCTION__, y); } + +-PyTypeObject *_PyGtkWidget_Type; ++extern PyTypeObject *_PyGtkWidget_Type; + #define PyGtkWidget_Type (*_PyGtkWidget_Type) + +-PyTypeObject *_PyNautilusColumn_Type; ++extern PyTypeObject *_PyNautilusColumn_Type; + #define PyNautilusColumn_Type (*_PyNautilusColumn_Type) + +-PyTypeObject *_PyNautilusColumnProvider_Type; ++extern PyTypeObject *_PyNautilusColumnProvider_Type; + #define PyNautilusColumnProvider_Type (*_PyNautilusColumnProvider_Type) + +-PyTypeObject *_PyNautilusInfoProvider_Type; ++extern PyTypeObject *_PyNautilusInfoProvider_Type; + #define PyNautilusInfoProvider_Type (*_PyNautilusInfoProvider_Type) + +-PyTypeObject *_PyNautilusLocationWidgetProvider_Type; ++extern PyTypeObject *_PyNautilusLocationWidgetProvider_Type; + #define PyNautilusLocationWidgetProvider_Type (*_PyNautilusLocationWidgetProvider_Type) + +-PyTypeObject *_PyNautilusMenu_Type; ++extern PyTypeObject *_PyNautilusMenu_Type; + #define PyNautilusMenu_Type (*_PyNautilusMenu_Type) + +-PyTypeObject *_PyNautilusMenuItem_Type; ++extern PyTypeObject *_PyNautilusMenuItem_Type; + #define PyNautilusMenuItem_Type (*_PyNautilusMenuItem_Type) + +-PyTypeObject *_PyNautilusMenuProvider_Type; ++extern PyTypeObject *_PyNautilusMenuProvider_Type; + #define PyNautilusMenuProvider_Type (*_PyNautilusMenuProvider_Type) + +-PyTypeObject *_PyNautilusPropertyPage_Type; ++extern PyTypeObject *_PyNautilusPropertyPage_Type; + #define PyNautilusPropertyPage_Type (*_PyNautilusPropertyPage_Type) + +-PyTypeObject *_PyNautilusPropertyPageProvider_Type; ++extern PyTypeObject *_PyNautilusPropertyPageProvider_Type; + #define PyNautilusPropertyPageProvider_Type (*_PyNautilusPropertyPageProvider_Type) + +-PyTypeObject *_PyNautilusOperationHandle_Type; ++extern PyTypeObject *_PyNautilusOperationHandle_Type; + #define PyNautilusOperationHandle_Type (*_PyNautilusOperationHandle_Type) + + #endif /* NAUTILUS_PYTHON_H */ +-- +2.26.2 + diff --git a/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild deleted file mode 100644 index 1938ff3e5975..000000000000 --- a/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-single-r1 - -DESCRIPTION="Python bindings for the Nautilus file manager" -HOMEPAGE="https://projects.gnome.org/nautilus-python/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Require pygobject:3 and USE=introspection on nautilus for sanity, -# because no (user) plugins could work without them; configure itself -# requires pygobject:3 or :2 and >=nautilus-2.32 -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - ') - >=gnome-base/nautilus-3[introspection] - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.14 - virtual/pkgconfig -" - -src_install() { - gnome2_src_install - # Directory for systemwide extensions - keepdir /usr/share/nautilus-python/extensions -} diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild index 8258df11b31a..a393d5a236b7 100644 --- a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild +++ b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild @@ -4,7 +4,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} ) inherit gnome2 python-single-r1 @@ -31,6 +31,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +# https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7 +PATCHES=( "${FILESDIR}"/${P}-gcc10-fnocommon.patch ) + src_install() { gnome2_src_install # Directory for systemwide extensions -- cgit v1.2.3