diff options
Diffstat (limited to 'dev-python/thunarx-python/files')
| -rw-r--r-- | dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch | 85 | ||||
| -rw-r--r-- | dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch | 27 |
2 files changed, 112 insertions, 0 deletions
diff --git a/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch b/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch new file mode 100644 index 000000000000..21f55c0e6f8e --- /dev/null +++ b/dev-python/thunarx-python/files/thunarx-python-0.5.1-fno-common.patch @@ -0,0 +1,85 @@ +Taken from: https://git.xfce.org/bindings/thunarx-python/commit/?id=3037ebe25d5c6ed58699e56b61f657cea3e5a5a6 +Author: Mukundan Ragavan <nonamedotc@gmail.com> + +--- a/src/thunarx-python-object.c ++++ b/src/thunarx-python-object.c +@@ -24,6 +24,7 @@ + + #include <thunarx/thunarx.h> + ++#define NO_IMPORT_PYGOBJECT + #include <pygobject.h> + + #include <string.h> +--- a/src/thunarx-python.c ++++ b/src/thunarx-python.c +@@ -30,6 +30,18 @@ + #include "thunarx-python.h" + #include "thunarx-python-object.h" + ++PyTypeObject *_PyGtkWidget_Type; ++PyTypeObject *_PyThunarxFileInfo_Type; ++PyTypeObject *_PyThunarxMenuItem_Type; ++PyTypeObject *_PyThunarxMenu_Type; ++PyTypeObject *_PyThunarxMenuProvider_Type; ++PyTypeObject *_PyThunarxPreferencesProvider_Type; ++PyTypeObject *_PyThunarxPropertyPage_Type; ++PyTypeObject *_PyThunarxPropertyPageProvider_Type; ++PyTypeObject *_PyThunarxProviderPlugin_Type; ++PyTypeObject *_PyThunarxRenamer_Type; ++PyTypeObject *_PyThunarxRenamerProvider_Type; ++ + static const GDebugKey thunarx_python_debug_keys[] = { + {"all", THUNARX_PYTHON_DEBUG_ALL}, + }; +--- a/src/thunarx-python.h ++++ b/src/thunarx-python.h +@@ -43,37 +43,37 @@ extern ThunarxPythonDebug thunarx_python_debug; + #define debug_enter_args(x, y) { if (thunarx_python_debug & THUNARX_PYTHON_DEBUG_ALL) \ + g_printf("%s: entered " x "\n", __FUNCTION__, y); } + +-PyTypeObject *_PyGtkWidget_Type; ++extern PyTypeObject *_PyGtkWidget_Type; + #define PyGtkWidget_Type (*_PyGtkWidget_Type) + +-PyTypeObject *_PyThunarxFileInfo_Type; ++extern PyTypeObject *_PyThunarxFileInfo_Type; + #define PyThunarxFileInfo_Type (*_PyThunarxFileInfo_Type) + +-PyTypeObject *_PyThunarxMenuItem_Type; ++extern PyTypeObject *_PyThunarxMenuItem_Type; + #define PyThunarxMenuItem_Type (*_PyThunarxMenuItem_Type) + +-PyTypeObject *_PyThunarxMenu_Type; ++extern PyTypeObject *_PyThunarxMenu_Type; + #define PyThunarxMenu_Type (*_PyThunarxMenu_Type) + +-PyTypeObject *_PyThunarxMenuProvider_Type; ++extern PyTypeObject *_PyThunarxMenuProvider_Type; + #define PyThunarxMenuProvider_Type (*_PyThunarxMenuProvider_Type) + +-PyTypeObject *_PyThunarxPreferencesProvider_Type; ++extern PyTypeObject *_PyThunarxPreferencesProvider_Type; + #define PyThunarxPreferencesProvider_Type (*_PyThunarxPreferencesProvider_Type) + +-PyTypeObject *_PyThunarxPropertyPage_Type; ++extern PyTypeObject *_PyThunarxPropertyPage_Type; + #define PyThunarxPropertyPage_Type (*_PyThunarxPropertyPage_Type) + +-PyTypeObject *_PyThunarxPropertyPageProvider_Type; ++extern PyTypeObject *_PyThunarxPropertyPageProvider_Type; + #define PyThunarxPropertyPageProvider_Type (*_PyThunarxPropertyPageProvider_Type) + +-PyTypeObject *_PyThunarxProviderPlugin_Type; ++extern PyTypeObject *_PyThunarxProviderPlugin_Type; + #define PyThunarxProviderPlugin_Type (*_PyThunarxProviderPlugin_Type) + +-PyTypeObject *_PyThunarxRenamer_Type; ++extern PyTypeObject *_PyThunarxRenamer_Type; + #define PyThunarxRenamer_Type (*_PyThunarxRenamer_Type) + +-PyTypeObject *_PyThunarxRenamerProvider_Type; ++extern PyTypeObject *_PyThunarxRenamerProvider_Type; + #define PyThunarxRenamerProvider_Type (*_PyThunarxRenamerProvider_Type) + + #endif /* THUNARX_PYTHON_H */ diff --git a/dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch b/dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch new file mode 100644 index 000000000000..19ad0886ad52 --- /dev/null +++ b/dev-python/thunarx-python/files/thunarx-python-0.5.1-py38.patch @@ -0,0 +1,27 @@ +From 78b24f3bf34c1faafcdc5816856bc9bf1bfaed6f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Wed, 15 Jul 2020 17:19:34 +0200 +Subject: [PATCH] Fix compilation with python3.8 + +Based on upstream commit 5f4edd0b657f52619b60e9931340502fa87f49ff, +stripped off irrelevant changes, made directly in configure. +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 9fabaa0..ff2ceae 100755 +--- a/configure ++++ b/configure +@@ -13557,7 +13557,7 @@ py_lib_name=`basename $py_include_path` + if test "x$PYTHON_LIBS" = x; then + PYTHON_CONFIG=`which $PYTHON`-config + if test -x "$PYTHON_CONFIG"; then +- PYTHON_LIBS=`$PYTHON_CONFIG --ldflags 2>/dev/null` ++ PYTHON_LIBS=`$PYTHON_CONFIG --libs --embed 2>/dev/null` || PYTHON_LIBS=`$PYTHON_CONFIG --libs 2>/dev/null` + else + PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" + fi +-- +2.27.0 + |