Hello community, here is the log from the commit of package python-nautilus for openSUSE:Factory checked in at 2020-06-05 20:22:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-nautilus (Old) and /work/SRC/openSUSE:Factory/.python-nautilus.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-nautilus" Fri Jun 5 20:22:29 2020 rev:28 rq:811858 version:1.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-nautilus/python-nautilus.changes 2019-12-09 21:34:32.578114230 +0100 +++ /work/SRC/openSUSE:Factory/.python-nautilus.new.3606/python-nautilus.changes 2020-06-05 20:28:46.253270264 +0200 @@ -1,0 +2,5 @@ +Thu Jun 4 19:31:20 UTC 2020 - Bjørn Lie <bjorn....@gmail.com> + +- Add python-nautilus-gcc10-buildfix.patch: Fix build with gcc 10. + +------------------------------------------------------------------- New: ---- python-nautilus-gcc10-buildfix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-nautilus.spec ++++++ --- /var/tmp/diff_new_pack.Sp0NJh/_old 2020-06-05 20:28:46.873272095 +0200 +++ /var/tmp/diff_new_pack.Sp0NJh/_new 2020-06-05 20:28:46.877272107 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-nautilus # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ Group: Development/Libraries/Python URL: https://wiki.gnome.org/Projects/NautilusPython Source: http://download.gnome.org/sources/nautilus-python/1.2/%{_name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM python-nautilus-gcc10-buildfix.patch -- Fix build with gcc 10 +Patch0: python-nautilus-gcc10-buildfix.patch BuildRequires: %{python_module devel} BuildRequires: gtk-doc ++++++ python-nautilus-gcc10-buildfix.patch ++++++ From: Andreas Henriksson <andr...@fatal.se> 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 <Python.h> +#define NO_IMPORT_PYGOBJECT //To avoid a multiple definition, nautilus-python-object.c also includes and does the import. #include <pygobject.h> #include <gmodule.h> #include <gtk/gtk.h> @@ -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 */