diff -Nru nautilus-python-1.2.3/debian/changelog nautilus-python-1.2.3/debian/changelog --- nautilus-python-1.2.3/debian/changelog 2020-01-28 06:28:50.000000000 +0000 +++ nautilus-python-1.2.3/debian/changelog 2020-05-12 11:54:14.000000000 +0000 @@ -1,14 +1,24 @@ -nautilus-python (1.2.3-1ubuntu1) focal; urgency=medium +nautilus-python (1.2.3-3) unstable; urgency=high - * Build-depend on python-all-dev. + * Fix up debian/patches/gcc10.patch to work properly (Closes: #960079) - -- Matthias Klose Tue, 28 Jan 2020 07:28:50 +0100 + -- Andreas Henriksson Tue, 12 May 2020 13:54:14 +0200 -nautilus-python (1.2.3-1build1) focal; urgency=medium +nautilus-python (1.2.3-2) unstable; urgency=medium - * No-change rebuild to build with python3.8. + * Team upload. - -- Matthias Klose Sat, 25 Jan 2020 04:37:31 +0000 + [ Laurent Bigonville ] + * debian/control.in: Bump libnautilus-extension-dev build-dependency to + 3.27.90, this is the release that starts to ship nautilus-extension.h + + [ Moritz Mühlenhoff ] + * Drop python-nautilus binary package (Python2) (Closes: #937115) + + [ Andreas Henriksson ] + * Add debian/patches/gcc10.patch (Closes: #957578) + + -- Andreas Henriksson Fri, 24 Apr 2020 16:23:25 +0200 nautilus-python (1.2.3-1) unstable; urgency=medium diff -Nru nautilus-python-1.2.3/debian/control nautilus-python-1.2.3/debian/control --- nautilus-python-1.2.3/debian/control 2020-01-28 06:28:50.000000000 +0000 +++ nautilus-python-1.2.3/debian/control 2020-05-12 11:54:14.000000000 +0000 @@ -11,30 +11,14 @@ dh-python, gnome-pkg-tools, pkg-config, - python-all-dev, python-gi-dev, - python-gi, python3-dev, python3-gi, - libnautilus-extension-dev (>= 3.0) + libnautilus-extension-dev (>= 3.27.90) Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/gnome-team/nautilus-python Vcs-Git: https://salsa.debian.org/gnome-team/nautilus-python.git -Package: python-nautilus -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${python:Depends}, - python-gi (>= 3.0), - gir1.2-nautilus-3.0 -Conflicts: python3-nautilus -Description: Python binding for Nautilus components (DEPRECATED Python 2 version) - Python binding for Nautilus, to allow Nautilus property page and menu item - extensions to be written in Python. - . - This package contains the DEPRECATED Python 2 version of the library. - Package: python3-nautilus Architecture: any Depends: ${shlibs:Depends}, diff -Nru nautilus-python-1.2.3/debian/control.in nautilus-python-1.2.3/debian/control.in --- nautilus-python-1.2.3/debian/control.in 2020-01-28 06:28:22.000000000 +0000 +++ nautilus-python-1.2.3/debian/control.in 2020-05-12 11:52:23.000000000 +0000 @@ -7,30 +7,14 @@ dh-python, gnome-pkg-tools, pkg-config, - python-all-dev, python-gi-dev, - python-gi, python3-dev, python3-gi, - libnautilus-extension-dev (>= 3.0) + libnautilus-extension-dev (>= 3.27.90) Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/gnome-team/nautilus-python Vcs-Git: https://salsa.debian.org/gnome-team/nautilus-python.git -Package: python-nautilus -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${python:Depends}, - python-gi (>= 3.0), - gir1.2-nautilus-3.0 -Conflicts: python3-nautilus -Description: Python binding for Nautilus components (DEPRECATED Python 2 version) - Python binding for Nautilus, to allow Nautilus property page and menu item - extensions to be written in Python. - . - This package contains the DEPRECATED Python 2 version of the library. - Package: python3-nautilus Architecture: any Depends: ${shlibs:Depends}, diff -Nru nautilus-python-1.2.3/debian/patches/gcc10.patch nautilus-python-1.2.3/debian/patches/gcc10.patch --- nautilus-python-1.2.3/debian/patches/gcc10.patch 1970-01-01 00:00:00.000000000 +0000 +++ nautilus-python-1.2.3/debian/patches/gcc10.patch 2020-05-12 11:52:45.000000000 +0000 @@ -0,0 +1,131 @@ +From: Andreas Henriksson +Subject: 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 + +--- nautilus-python-1.2.3.orig/src/nautilus-python-object.c ++++ nautilus-python-1.2.3/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 + 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 + #endif + + beach: +- free_pygobject_data(file, NULL); ++ free_pygobject_data(file_info, NULL); + Py_XDECREF(py_ret); + pyg_gil_state_release(state); + return ret; +--- nautilus-python-1.2.3.orig/src/nautilus-python.c ++++ nautilus-python-1.2.3/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_pyt + 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); +--- nautilus-python-1.2.3.orig/src/nautilus-python.h ++++ nautilus-python-1.2.3/src/nautilus-python.h +@@ -43,37 +43,37 @@ extern NautilusPythonDebug nautilus_pyth + #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 */ diff -Nru nautilus-python-1.2.3/debian/patches/series nautilus-python-1.2.3/debian/patches/series --- nautilus-python-1.2.3/debian/patches/series 2019-11-19 00:21:40.000000000 +0000 +++ nautilus-python-1.2.3/debian/patches/series 2020-05-12 11:52:23.000000000 +0000 @@ -0,0 +1 @@ +gcc10.patch diff -Nru nautilus-python-1.2.3/debian/python-nautilus.dirs nautilus-python-1.2.3/debian/python-nautilus.dirs --- nautilus-python-1.2.3/debian/python-nautilus.dirs 2019-11-19 00:21:40.000000000 +0000 +++ nautilus-python-1.2.3/debian/python-nautilus.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/nautilus-python/extensions diff -Nru nautilus-python-1.2.3/debian/python-nautilus.docs nautilus-python-1.2.3/debian/python-nautilus.docs --- nautilus-python-1.2.3/debian/python-nautilus.docs 2019-11-19 00:21:40.000000000 +0000 +++ nautilus-python-1.2.3/debian/python-nautilus.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -AUTHORS -NEWS -README diff -Nru nautilus-python-1.2.3/debian/python-nautilus.lintian-overrides nautilus-python-1.2.3/debian/python-nautilus.lintian-overrides --- nautilus-python-1.2.3/debian/python-nautilus.lintian-overrides 2019-11-19 00:21:40.000000000 +0000 +++ nautilus-python-1.2.3/debian/python-nautilus.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# System-wide directory where extensions must be added -python-nautilus: package-contains-empty-directory usr/share/nautilus-python/extensions/ diff -Nru nautilus-python-1.2.3/debian/rules nautilus-python-1.2.3/debian/rules --- nautilus-python-1.2.3/debian/rules 2019-11-19 00:21:40.000000000 +0000 +++ nautilus-python-1.2.3/debian/rules 2020-05-12 11:52:23.000000000 +0000 @@ -4,48 +4,27 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed %: - dh $@ --with gnome,python2,python3 + dh $@ --with gnome,python3 override_dh_auto_configure: - # configure for Python 2 - PYTHON_VERSION="$(shell pyversions -vd)" PYTHON="$(shell pyversions -d)" \ - dh_auto_configure --builddirectory=debian/python-nautilus-build - # configure for Python 3 - PYTHON_VERSION="$(shell py3versions -vd)" PYTHON="$(shell py3versions -d)" \ - dh_auto_configure --builddirectory=debian/python3-nautilus-build + PYTHON_VERSION="$(shell py3versions -vd)" \ + PYTHON="$(shell py3versions -d)" \ + dh_auto_configure override_dh_auto_build: - # build for Python 2 - PYTHON_VERSION="$(shell pyversions -vd)" PYTHON="$(shell pyversions -d)" \ - dh_auto_build --builddirectory=debian/python-nautilus-build - # build for Python 3 - PYTHON_VERSION="$(shell py3versions -vd)" PYTHON="$(shell py3versions -d)" \ - dh_auto_build --builddirectory=debian/python3-nautilus-build - -override_dh_auto_install: - # install for Python 2 - dh_auto_install --destdir="$(CURDIR)/debian/python-nautilus" --builddirectory=debian/python-nautilus-build - # install for Python 3 - dh_auto_install --destdir="$(CURDIR)/debian/python3-nautilus" --builddirectory=debian/python3-nautilus-build - -override_dh_python2: - dh_python2 -p python-nautilus - -override_dh_python3: - dh_python3 -p python3-nautilus + PYTHON_VERSION="$(shell py3versions -vd)" \ + PYTHON="$(shell py3versions -d)" \ + dh_auto_build override_dh_gnome: dh_gnome --no-gnome-versions override_dh_install: dh_install - rm -rf debian/python-nautilus/usr/share/doc/nautilus-python/ - rm -f debian/python-nautilus/usr/lib/*/nautilus/extensions-3.0/*.la rm -f debian/python3-nautilus/usr/lib/*/nautilus/extensions-3.0/*.la override_dh_installexamples: dh_installexamples -A examples/*.py examples/README override_dh_makeshlibs: - dh_makeshlibs -ppython-nautilus --no-act dh_makeshlibs -ppython3-nautilus --no-act