rpm/nemo-extensions
SHA256
1
0
Fork 0
forked from pool/nemo-extensions
Code Pull Requests Activity

Accepting request 1132640 from home:dgarcia:branches:X11:Cinnamon:Factory

Browse Source 
- Update fix-hwcaps.patch, needed to work correctly with
  libpython3_11-1_0-x86-64-v3

OBS-URL: https://build.opensuse.org/request/show/1132640
OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=77
This commit is contained in:
Ana Guerrero 2023-12-12 11:08:13 +00:00 committed by Git OBS Bridge
parent 6bb2073ac0
commit 3a925ebb7d
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fix-hwcaps.patch
View File

@ -6,10 +6,18 @@ Index: nemo-extensions-6.0.0/nemo-python/meson.build
cdata.set_quoted('NEMO_EXTENSION_DIR', nemo.get_variable(pkgconfig: 'extensiondir')) cdata.set_quoted('NEMO_EXTENSION_DIR', nemo.get_variable(pkgconfig: 'extensiondir'))
cdata.set_quoted('PYTHON_LIBPATH', libpath) cdata.set_quoted('PYTHON_LIBPATH', libpath)
+cdata.set_quoted('PYTHON_LIBNAME', python3.get_variable('INSTSONAME')) +cdata.set_quoted('PYTHON_LIBNAME', py_so_filename)
cdata.set('PYGOBJECT_MAJOR_VERSION', 3) cdata.set('PYGOBJECT_MAJOR_VERSION', 3)
cdata.set('PYGOBJECT_MINOR_VERSION', 0) cdata.set('PYGOBJECT_MINOR_VERSION', 0)
cdata.set('PYGOBJECT_MICRO_VERSION', 0) cdata.set('PYGOBJECT_MICRO_VERSION', 0)
@@ -77,6 +78,7 @@ message('|')
message('| nemo-python version: @0@'.format(meson.project_version()))
message('|')
message('| python version: @0@'.format(python3.version()))
+message('| python libname: @0@'.format(py_so_filename))
message('| targeting lib: @0@'.format(libpath))
message('|')
message('| build docs: @0@'.format(gtkdoc_enabled))
Index: nemo-extensions-6.0.0/nemo-python/src/nemo-python.c Index: nemo-extensions-6.0.0/nemo-python/src/nemo-python.c
=================================================================== ===================================================================
--- nemo-extensions-6.0.0.orig/nemo-python/src/nemo-python.c --- nemo-extensions-6.0.0.orig/nemo-python/src/nemo-python.c
@ -20,7 +28,7 @@ Index: nemo-extensions-6.0.0/nemo-python/src/nemo-python.c
- debug("g_module_open " PYTHON_LIBPATH); - debug("g_module_open " PYTHON_LIBPATH);
- libpython = g_module_open(PYTHON_LIBPATH, 0); - libpython = g_module_open(PYTHON_LIBPATH, 0);
+ debug("g_module_open " PYTHON_LIBNAME); + debug("g_module_open " PYTHON_LIBNAME);
+ libpython = g_module_open(PYTHON_LIBNAME, 0); + libpython = g_module_open(PYTHON_LIBNAME, 0);
if (!libpython) if (!libpython)
g_warning("g_module_open libpython failed: %s", g_module_error()); g_warning("g_module_open libpython failed: %s", g_module_error());

6
nemo-extensions.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 12 10:27:02 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
- Update fix-hwcaps.patch, needed to work correctly with
libpython3_11-1_0-x86-64-v3
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Dec 2 04:18:40 UTC 2023 - Marguerite Su <i@marguerite.su> Sat Dec 2 04:18:40 UTC 2023 - Marguerite Su <i@marguerite.su>

2
nemo-extensions.spec
View File

@ -29,7 +29,7 @@ Group: System/GUI/Other
URL: https://github.com/linuxmint/nemo-extensions URL: https://github.com/linuxmint/nemo-extensions
Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE fix-hwcaps.patch bsc#1212482 # PATCH-FIX-OPENSUSE fix-hwcaps.patch bsc#1212482
#Patch6: fix-hwcaps.patch Patch6: fix-hwcaps.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gettext-runtime BuildRequires: gettext-runtime