diff -Nru nautilus-python-1.2.3/debian/changelog nautilus-python-1.2.3/debian/changelog --- nautilus-python-1.2.3/debian/changelog 2020-04-24 14:23:25.000000000 +0000 +++ nautilus-python-1.2.3/debian/changelog 2020-05-12 11:54:14.000000000 +0000 @@ -1,3 +1,9 @@ +nautilus-python (1.2.3-3) unstable; urgency=high + + * Fix up debian/patches/gcc10.patch to work properly (Closes: #960079) + + -- Andreas Henriksson Tue, 12 May 2020 13:54:14 +0200 + nautilus-python (1.2.3-2) unstable; urgency=medium * Team upload. 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 2020-04-24 14:23:25.000000000 +0000 +++ nautilus-python-1.2.3/debian/patches/gcc10.patch 2020-05-12 11:52:45.000000000 +0000 @@ -1,6 +1,86 @@ ---- a/src/nautilus-python.h -+++ b/src/nautilus-python.h -@@ -43,37 +43,37 @@ +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); } @@ -49,13 +129,3 @@ #define PyNautilusOperationHandle_Type (*_PyNautilusOperationHandle_Type) #endif /* NAUTILUS_PYTHON_H */ ---- a/src/nautilus-python-object.c -+++ b/src/nautilus-python-object.c -@@ -24,6 +24,7 @@ - - #include - -+#define NO_IMPORT_PYGOBJECT - #include - - #include