commit 4e33696e45643273763522b326500ff0a351883c
Author: Jakub Bogusz <[email protected]>
Date: Thu Dec 12 19:04:20 2024 +0100
- updated to 6.4.2 (translations 6.4.1)
cinnamon.spec | 35 +++++++++++++++++++----------------
default_panal_launcher.patch | 13 ++++++-------
fix_path.patch | 15 ++++++---------
revert_25aef37.patch | 8 ++++----
4 files changed, 35 insertions(+), 36 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index c552896..7daeb90 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_without apidocs # API documentation
-%define translations_version 6.2.2
+%define translations_version 6.4.1
%define cinnamon_desktop_ver 2.4.0
%define cinnamon_menus_ver 4.8.0
%define cjs_ver 4.8.0
@@ -12,16 +12,16 @@
Summary: Window management and application launching for Cinnamon
Summary(pl.UTF-8): Zarządzanie oknami i uruchamianie aplikacji dla
środowiska Cinnamon
Name: cinnamon
-Version: 6.2.7
-Release: 2
+Version: 6.4.2
+Release: 1
License: GPL v2+ and LGPL v2+
Group: X11/Applications
#Source0Download: https://github.com/linuxmint/Cinnamon/tags
Source0:
https://github.com/linuxmint/Cinnamon/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f1096b77c0639e929690cc2f1e9505af
+# Source0-md5: 4b352396d63404a5f814558b157433a9
#Source1Download: https://github.com/linuxmint/cinnamon-translations/tags
Source1:
https://github.com/linuxmint/cinnamon-translations/archive/%{translations_version}/cinnamon-translations-%{translations_version}.tar.gz
-# Source1-md5: ca66b0eadc9416ef66384b3b278554ad
+# Source1-md5: 2d12def6818b100664081e979343d214
Source2: polkit-%{name}-authentication-agent-1.desktop
Source3: %{name}-common.gschema.override
Source4: %{name}-apps.gschema.override
@@ -34,7 +34,7 @@ Patch5: revert_25aef37.patch
Patch6: %{name}-menu.patch
Patch7: default_panal_launcher.patch
URL: https://github.com/linuxmint/Cinnamon
-BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-devel >= 2:1.10.4
BuildRequires: OpenGL-devel
BuildRequires: at-spi2-atk-devel >= 2.0
BuildRequires: cinnamon-desktop-devel >= %{cinnamon_desktop_ver}
@@ -50,6 +50,7 @@ BuildRequires: gtk+3-devel >= 3.12.0
BuildRequires: gstreamer-devel >= 1.0
BuildRequires: gtk-doc >= 1.15
BuildRequires: intltool >= 0.40
+BuildRequires: libsecret-devel >= 0.18
BuildRequires: libxml2-devel >= 2.0
BuildRequires: meson >= 0.56.0
BuildRequires: muffin-devel >= %{muffin_ver}
@@ -57,11 +58,13 @@ BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig >= 1:0.22
BuildRequires: polkit-devel >= 0.100
BuildRequires: python3 >= 1:3.2
+BuildRequires: python3-libsass
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: xapps-devel >= 2.6.0
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXfixes-devel
+Requires: NetworkManager-libs >= 2:1.10.4
Requires: glib2 >= %{glib_ver}
Requires: muffin >= %{muffin_ver}
# wrapper script uses to restart old GNOME session if run --replace
@@ -152,14 +155,14 @@ Dokumentacja API środowiska Cinnamon.
%prep
%setup -q -a1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
+%patch -P7 -p1
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -233,10 +236,8 @@ fi
%doc AUTHORS README.rst debian/changelog
%attr(755,root,root) %{_bindir}/cinnamon
%attr(755,root,root) %{_bindir}/cinnamon-calendar-server
-%attr(755,root,root) %{_bindir}/cinnamon-close-dialog
%attr(755,root,root) %{_bindir}/cinnamon-dbus-command
%attr(755,root,root) %{_bindir}/cinnamon-desktop-editor
-%attr(755,root,root) %{_bindir}/cinnamon-display-changes-dialog
%attr(755,root,root) %{_bindir}/cinnamon-file-dialog
%attr(755,root,root) %{_bindir}/cinnamon-hover-click
%attr(755,root,root) %{_bindir}/cinnamon-install-spice
@@ -327,6 +328,8 @@ fi
%{_iconsdir}/hicolor/scalable/actions/list-edit-symbolic.svg
%{_iconsdir}/hicolor/scalable/actions/pan-*-symbolic.svg
%{_iconsdir}/hicolor/scalable/actions/pan-*-symbolic-rtl.svg
+%{_iconsdir}/hicolor/scalable/actions/view-conceal-symbolic.svg
+%{_iconsdir}/hicolor/scalable/actions/view-reveal-symbolic.svg
%{_iconsdir}/hicolor/scalable/apps/cinnamon.svg
%{_iconsdir}/hicolor/scalable/apps/cinnamon-panel-launcher.svg
%{_iconsdir}/hicolor/scalable/apps/cinnamon-symbolic.svg
diff --git a/default_panal_launcher.patch b/default_panal_launcher.patch
index cebefc3..9039975 100644
--- a/default_panal_launcher.patch
+++ b/default_panal_launcher.patch
@@ -1,11 +1,10 @@
----
cinnamon-5.8.1/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json.orig
2023-06-14 06:23:56.383553556 +0200
-+++
cinnamon-5.8.1/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json
2023-06-14 06:25:47.438575265 +0200
-@@ -137,7 +137,7 @@
- },
+---
cinnamon-6.4.2/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json.orig
2024-12-08 20:43:42.905307085 +0100
++++
cinnamon-6.4.2/files/usr/share/cinnamon/applets/[email protected]/settings-schema.json
2024-12-08 20:44:44.941637672 +0100
+@@ -308,6 +308,6 @@
+
"pinned-apps": {
"type": "generic",
- "default": ["nemo.desktop", "firefox.desktop",
"org.gnome.Terminal.desktop"]
+ "default": ["nemo.desktop", "firefox.desktop", "thunderbird.desktop",
"org.gnome.Terminal.desktop"]
- },
- "group-apps": {
- "type": "checkbox",
+ }
+ }
diff --git a/fix_path.patch b/fix_path.patch
index f18633c..cb09baf 100644
--- a/fix_path.patch
+++ b/fix_path.patch
@@ -1,5 +1,5 @@
---- a/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
+--- cinnamon-6.4.2/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig
2024-12-05 12:58:41.000000000 +0100
++++ cinnamon-6.4.2/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
2024-12-08 19:46:33.273886993 +0100
@@ -15,9 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/
@@ -10,25 +10,22 @@
from gi.repository import Gio, GObject
-@@ -26,23 +24,7 @@ class CManager:
- def __init__(self):
+@@ -27,20 +25,7 @@ class CManager:
self.extension_point = Gio.io_extension_point_register
("cinnamon-control-center-1")
self.modules = []
--
-- architecture = platform.machine()
+
- # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or
'arm-linux-gnueabihf'
- # see also: https://wiki.debian.org/Python/MultiArch
- triplet = sysconfig.get_config_var('MULTIARCH')
-- paths = ["/usr/lib", f"/usr/lib/{triplet}"]
+- paths = ["/usr/lib", "/usr/lib64", f"/usr/lib/{triplet}"]
-
- # On x86 archs, iterate through multiple paths
- # For instance, on a Mint i686 box, the path is actually
/usr/lib/i386-linux-gnu
+- architecture = platform.machine()
- x86archs = ["i386", "i486", "i586", "i686"]
- if architecture in x86archs:
- for arch in x86archs:
- paths += ["/usr/lib/%s" % arch]
-- elif architecture == "x86_64":
-- paths += ["/usr/lib/x86_64", "/usr/lib64"]
- else:
- paths += ["/usr/lib/%s" % architecture]
+ paths = ["/usr/lib", "/usr/lib64", "/usr/libx32"]
diff --git a/revert_25aef37.patch b/revert_25aef37.patch
index 408e4c3..8db8f12 100644
--- a/revert_25aef37.patch
+++ b/revert_25aef37.patch
@@ -1,5 +1,5 @@
----
cinnamon-5.8.1/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig
2023-06-14 06:31:31.876936429 +0200
-+++
cinnamon-5.8.1/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
2023-06-14 06:25:14.346681196 +0200
+---
cinnamon-6.4.2/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig
2024-12-08 19:47:02.443728967 +0100
++++
cinnamon-6.4.2/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
2024-12-08 20:43:15.808787213 +0100
@@ -82,10 +82,9 @@ class GroupDialog (Gtk.Dialog):
print(detail)
@@ -13,11 +13,11 @@
self.set_response_sensitive(Gtk.ResponseType.OK, False)
else:
entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
None)
-@@ -397,9 +396,9 @@ class NewUserDialog(Gtk.Dialog):
+@@ -393,9 +392,9 @@ class NewUserDialog(Gtk.Dialog):
fullname = self.realname_entry.get_text()
username = self.username_entry.get_text()
valid = True
-- if re.search('[^a-z0-9_.-]', username):
+- if re.search('[^a-z0-9_-]', username):
+ if " " in username:
self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
"dialog-warning-symbolic")
-
self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY,
_("Invalid username"))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cinnamon.git/commitdiff/4e33696e45643273763522b326500ff0a351883c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
