From eb8f4066cf43a2555b8019773139324a6453eda0a6e60fdb0837a7d94c4a1121 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 3 Dec 2023 14:34:36 +0000 Subject: [PATCH 1/3] Accepting request 1130593 from home:MargueriteSu:branches:X11:Cinnamon:Factory - update to version 6.0.0 * build and example fixes - drop nemo-share-prevent-privilege-escalation.patch, upstreamed - drop FTBFS-setuptools-61.0.patch, that extension disappeared OBS-URL: https://build.opensuse.org/request/show/1130593 OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=75 --- FTBFS-setuptools-61.0.patch | 12 -------- fix-hwcaps.patch | 21 +++++++------- nemo-extensions-5.2.0.tar.gz | 3 -- nemo-extensions-6.0.0.tar.gz | 3 ++ nemo-extensions.changes | 8 +++++ nemo-extensions.spec | 29 +++++++++---------- nemo-share-prevent-privilege-escalation.patch | 18 ------------ 7 files changed, 34 insertions(+), 60 deletions(-) delete mode 100644 FTBFS-setuptools-61.0.patch delete mode 100644 nemo-extensions-5.2.0.tar.gz create mode 100644 nemo-extensions-6.0.0.tar.gz delete mode 100644 nemo-share-prevent-privilege-escalation.patch diff --git a/FTBFS-setuptools-61.0.patch b/FTBFS-setuptools-61.0.patch deleted file mode 100644 index 50c26a0..0000000 --- a/FTBFS-setuptools-61.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: nemo-extensions-5.2.0/nemo-emblems/setup.py -=================================================================== ---- nemo-extensions-5.2.0.orig/nemo-emblems/setup.py -+++ nemo-extensions-5.2.0/nemo-emblems/setup.py -@@ -22,6 +22,7 @@ from setuptools import setup - - # Setup stage - setup( -+ packages = [], - name = "nemo-emblems", - version = "5.2.0", - description = "Change your folder and file emblems", diff --git a/fix-hwcaps.patch b/fix-hwcaps.patch index d80f935..80cb49d 100644 --- a/fix-hwcaps.patch +++ b/fix-hwcaps.patch @@ -1,28 +1,27 @@ -Index: nemo-extensions-5.2.0/nemo-python/meson.build +Index: nemo-extensions-6.0.0/nemo-python/meson.build =================================================================== ---- nemo-extensions-5.2.0.orig/nemo-python/meson.build -+++ nemo-extensions-5.2.0/nemo-python/meson.build -@@ -39,6 +39,8 @@ pyextdir = join_paths(get_option('prefix +--- nemo-extensions-6.0.0.orig/nemo-python/meson.build ++++ nemo-extensions-6.0.0/nemo-python/meson.build +@@ -40,6 +40,7 @@ pyextdir = join_paths(get_option('prefix - cdata.set_quoted('NEMO_EXTENSION_DIR', nemo.get_pkgconfig_variable('extensiondir')) + cdata.set_quoted('NEMO_EXTENSION_DIR', nemo.get_variable(pkgconfig: 'extensiondir')) cdata.set_quoted('PYTHON_LIBPATH', libpath) +cdata.set_quoted('PYTHON_LIBNAME', python3.get_variable('INSTSONAME')) -+ cdata.set('PYGOBJECT_MAJOR_VERSION', 3) cdata.set('PYGOBJECT_MINOR_VERSION', 0) cdata.set('PYGOBJECT_MICRO_VERSION', 0) -Index: nemo-extensions-5.2.0/nemo-python/src/nemo-python.c +Index: nemo-extensions-6.0.0/nemo-python/src/nemo-python.c =================================================================== ---- nemo-extensions-5.2.0.orig/nemo-python/src/nemo-python.c -+++ nemo-extensions-5.2.0/nemo-python/src/nemo-python.c +--- nemo-extensions-6.0.0.orig/nemo-python/src/nemo-python.c ++++ nemo-extensions-6.0.0/nemo-python/src/nemo-python.c @@ -175,8 +175,8 @@ nemo_python_init_python (void) if (Py_IsInitialized()) return TRUE; - debug("g_module_open " PYTHON_LIBPATH); - libpython = g_module_open(PYTHON_LIBPATH, 0); -+ debug("g_module_open " PYTHON_LIBNAME); -+ libpython = g_module_open (PYTHON_LIBNAME, 0); ++ debug("g_module_open " PYTHON_LIBNAME); ++ libpython = g_module_open(PYTHON_LIBNAME, 0); if (!libpython) g_warning("g_module_open libpython failed: %s", g_module_error()); diff --git a/nemo-extensions-5.2.0.tar.gz b/nemo-extensions-5.2.0.tar.gz deleted file mode 100644 index 6e6f61c..0000000 --- a/nemo-extensions-5.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92364ac03be3458d3cdfa39ebd4061babd3926c280459e66f8814a6acc42a6a5 -size 533607 diff --git a/nemo-extensions-6.0.0.tar.gz b/nemo-extensions-6.0.0.tar.gz new file mode 100644 index 0000000..19c0aa4 --- /dev/null +++ b/nemo-extensions-6.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e87ab3fc803c2d0f7bee4bbbbf9074382469352774caeafc88a10b969097cf82 +size 536418 diff --git a/nemo-extensions.changes b/nemo-extensions.changes index 21684f0..5626cef 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 2 04:18:40 UTC 2023 - Marguerite Su + +- update to version 6.0.0 + * build and example fixes +- drop nemo-share-prevent-privilege-escalation.patch, upstreamed +- drop FTBFS-setuptools-61.0.patch, that extension disappeared + ------------------------------------------------------------------- Tue Jul 11 06:10:53 UTC 2023 - Daniel Garcia diff --git a/nemo-extensions.spec b/nemo-extensions.spec index e5b3f39..4c0c95b 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -19,21 +19,18 @@ # Do not package nemo-extension-media-columns for now: slows Nemo down. # nemo-extension-terminal 'requires' two versions, confusing typelib finder. %define __requires_exclude typelib\\((Vte))\ = -%define _version 5.0.0 +%define _version 6.0.0 Name: nemo-extensions -Version: 5.2.0 +Version: 6.0.0 Release: 0 Summary: Set of extensions for Nemo, the Cinnamon file manager License: GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later Group: System/GUI/Other URL: https://github.com/linuxmint/nemo-extensions Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM nemo-share-prevent-privilege-escalation.patch bsc#1084703 -- Prevent unprivileged users from adding other users to sambashare (commit a831e7b). -Patch4: nemo-share-prevent-privilege-escalation.patch -# PATCH-FIX-UPSTREAM FTBFS-setuptools-61.0.patch -- fix build with setuptools 61.0 -Patch5: FTBFS-setuptools-61.0.patch # PATCH-FIX-OPENSUSE fix-hwcaps.patch bsc#1212482 -Patch6: fix-hwcaps.patch +#Patch6: fix-hwcaps.patch +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gettext-runtime BuildRequires: gnome-common @@ -68,7 +65,7 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(nettle) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(pygobject-3.0) -BuildRequires: pkgconfig(webkit2gtk-4.0) +BuildRequires: pkgconfig(webkit2gtk-4.1) BuildRequires: pkgconfig(xreader-document-1.5) BuildRequires: pkgconfig(xreader-view-1.5) %if 0%{?suse_version} >= 1500 @@ -487,8 +484,8 @@ rm -r %{buildroot}%{_datadir}/nemo-share/install-samba rm -r %{buildroot}%{_datadir}/licenses/nemo-dropbox/COPYING %python_compileall -rm -rf %{buildroot}%{_datadir}/nemo-compare/utils.py -ln -sf %{python3_sitelib}/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py +#rm -rf %{buildroot}%{_datadir}/nemo-compare/utils.py +#ln -sf %{python3_sitelib}/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py %if 0%{?suse_version} >= 1500 %post -n python3-nemo -p /sbin/ldconfig @@ -555,9 +552,9 @@ ln -sf %{python3_sitelib}/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py %{_datadir}/nemo-compare/ %{python3_sitelib}/nemo_compare-%{version}-py?.*.egg-info %{_datadir}/nemo-python/extensions/nemo-compare.py -%{python3_sitelib}/utils.py -%{python3_sitelib}/__pycache__/utils.cpython-%{python_version_nodots}.opt-1.pyc -%{python3_sitelib}/__pycache__/utils.cpython-%{python_version_nodots}.pyc +#%{python3_sitelib}/utils.py +#%{python3_sitelib}/__pycache__/utils.cpython-%{python_version_nodots}.opt-1.pyc +#%{python3_sitelib}/__pycache__/utils.cpython-%{python_version_nodots}.pyc %files -n nemo-extension-dropbox %license nemo-dropbox/COPYING @@ -636,8 +633,8 @@ ln -sf %{python3_sitelib}/utils.py %{buildroot}%{_datadir}/nemo-compare/utils.py %{_datadir}/nemo-python/extensions/nemo_terminal.py %{_datadir}/glib-2.0/schemas/org.nemo.extensions.nemo-terminal.gschema.xml %{python3_sitelib}/nemo_terminal-%{version}-py?.*.egg-info -%{python3_sitelib}/nemo_terminal.py -%{python3_sitelib}/__pycache__/nemo_terminal.cpython-%{python_version_nodots}.opt-1.pyc -%{python3_sitelib}/__pycache__/nemo_terminal.cpython-%{python_version_nodots}.pyc +#%{python3_sitelib}/nemo_terminal.py +#%{python3_sitelib}/__pycache__/nemo_terminal.cpython-%{python_version_nodots}.opt-1.pyc +#%{python3_sitelib}/__pycache__/nemo_terminal.cpython-%{python_version_nodots}.pyc %changelog diff --git a/nemo-share-prevent-privilege-escalation.patch b/nemo-share-prevent-privilege-escalation.patch deleted file mode 100644 index e3f718c..0000000 --- a/nemo-share-prevent-privilege-escalation.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/nemo-share/src/install-samba 2019-02-08 16:11:14.000000000 +0600 -+++ b/nemo-share/src/install-samba 2019-04-29 09:16:24.571726203 +0600 -@@ -42,6 +42,15 @@ - uid = int(uid) - passwd = pwd.getpwuid(uid) - user = passwd[0] -+ # prefer using the uid provided by pkexec to the command line argument. if -+ # a user authenticated via pkexec then he should only be able to add -+ # himself to the group. -+ uid = os.getenv("PKEXEC_UID", None) -+ -+ if uid != None: -+ uid = int(uid) -+ passwd = pwd.getpwuid(uid) -+ user = passwd[0] - elif len(sys.argv) == 2: - user = sys.argv[1] - else: From 99318aaa86ef01201113e568b90d864256fefd96bd42ac0d43e6fc9cf60e9a8d Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 7 Dec 2023 11:41:25 +0000 Subject: [PATCH 2/3] Accepting request 1131594 from home:anag:branches:X11:Cinnamon:Factory - refresh fix-hwcaps.patch OBS-URL: https://build.opensuse.org/request/show/1131594 OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo-extensions?expand=0&rev=76 --- nemo-extensions.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/nemo-extensions.changes b/nemo-extensions.changes index 5626cef..5609021 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -5,6 +5,7 @@ Sat Dec 2 04:18:40 UTC 2023 - Marguerite Su * build and example fixes - drop nemo-share-prevent-privilege-escalation.patch, upstreamed - drop FTBFS-setuptools-61.0.patch, that extension disappeared +- refresh fix-hwcaps.patch ------------------------------------------------------------------- Tue Jul 11 06:10:53 UTC 2023 - Daniel Garcia From 36d564be9531836bafb6fb11f90ef2de9a28af17b76946288d5ca8f63c284934 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Tue, 12 Dec 2023 11:08:13 +0000 Subject: [PATCH 3/3] Accepting request 1132640 from home:dgarcia:branches:X11:Cinnamon:Factory - 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 --- fix-hwcaps.patch | 12 ++++++++++-- nemo-extensions.changes | 6 ++++++ nemo-extensions.spec | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/fix-hwcaps.patch b/fix-hwcaps.patch index 80cb49d..a105302 100644 --- a/fix-hwcaps.patch +++ b/fix-hwcaps.patch @@ -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('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_MINOR_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 =================================================================== --- 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); - 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); if (!libpython) g_warning("g_module_open libpython failed: %s", g_module_error()); diff --git a/nemo-extensions.changes b/nemo-extensions.changes index 5609021..0143465 100644 --- a/nemo-extensions.changes +++ b/nemo-extensions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 12 10:27:02 UTC 2023 - Daniel Garcia + +- 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 diff --git a/nemo-extensions.spec b/nemo-extensions.spec index 4c0c95b..edd814a 100644 --- a/nemo-extensions.spec +++ b/nemo-extensions.spec @@ -29,7 +29,7 @@ Group: System/GUI/Other URL: https://github.com/linuxmint/nemo-extensions Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE fix-hwcaps.patch bsc#1212482 -#Patch6: fix-hwcaps.patch +Patch6: fix-hwcaps.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gettext-runtime