diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-09-13 15:49:02 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-09-13 15:49:02 +0000 |
| commit | 28a2d9a7f8223fda51a54ea8d7f32f47c01abc76 (patch) | |
| tree | f98b6a8948cd4beacdfc05c29953213ddb75ff2a /x11-fm/nautilus-python/files/patch-src_nautilus-python.c | |
| parent | Add net/py-tacacs_plus: Client for TACACS+ authentication (diff) | |
x11-fm/nautilus-python: fix build on current
- fixes build with -fcommon
Backport of patch from Debian:
From: Andreas Henriksson <andreas@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
Obtained from: https://sources.debian.org/src/nautilus-python/1.2.3-3/debian/patches/gcc10.patch/
Notes
Notes:
svn path=/head/; revision=548482
Diffstat (limited to 'x11-fm/nautilus-python/files/patch-src_nautilus-python.c')
| -rw-r--r-- | x11-fm/nautilus-python/files/patch-src_nautilus-python.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/x11-fm/nautilus-python/files/patch-src_nautilus-python.c b/x11-fm/nautilus-python/files/patch-src_nautilus-python.c new file mode 100644 index 000000000000..0b37b505b560 --- /dev/null +++ b/x11-fm/nautilus-python/files/patch-src_nautilus-python.c @@ -0,0 +1,28 @@ +--- src/nautilus-python.c.orig 2020-09-13 15:42:41 UTC ++++ 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> +@@ -41,6 +42,17 @@ 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) { |