[packages/cinnamon/DEVEL-5: 2/2] - updated to 5.8.2 (translations 5.8.1) - updated Fedora overrides and patches; added fix_path and m
qboosh
qboosh at pld-linux.org
Sun Jun 18 14:12:17 CEST 2023
commit 4a6ca7d998de528c159ec3ce725e40aff05309a5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 18 13:22:59 2023 +0200
- updated to 5.8.2 (translations 5.8.1)
- updated Fedora overrides and patches; added fix_path and menu patches (the latter without RH-specific parts)
autostart.patch | 4 +-
cinnamon-apps.gschema.override | 2 +
cinnamon-common.gschema.override | 87 ++++++++++++++++++++++++++++++++++++++++
cinnamon-fedora.gschema.override | 69 -------------------------------
cinnamon-gtkdoc.patch | 9 +++++
cinnamon-menu.patch | 39 ++++++++++++++++++
cinnamon.spec | 75 ++++++++++++++++++++++------------
default_panal_launcher.patch | 11 +++--
fix_path.patch | 37 +++++++++++++++++
revert_25aef37.patch | 15 +++----
set_wheel.patch | 17 ++++----
11 files changed, 243 insertions(+), 122 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 417f589..799912e 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,32 +2,36 @@
# Conditional build:
%bcond_without apidocs # API documentation
-%define translations_version 5.0.2
+%define translations_version 5.8.1
%define cinnamon_desktop_ver 2.4.0
%define cinnamon_menus_ver 4.8.0
%define cjs_ver 4.8.0
%define gi_ver 1.34.2
%define glib_ver 1:2.52.0
-%define muffin_version 4.0.3
+%define muffin_ver 5.2.0
Summary: Window management and application launching for Cinnamon
Summary(pl.UTF-8): Zarządzanie oknami i uruchamianie aplikacji dla środowiska Cinnamon
Name: cinnamon
-Version: 5.0.5
+Version: 5.8.2
Release: 0.1
License: GPL v2+ and LGPL v2+
Group: X11/Applications
-#Source0Download: https://github.com/linuxmint/Cinnamon/releases
+#Source0Download: https://github.com/linuxmint/Cinnamon/tags
Source0: https://github.com/linuxmint/Cinnamon/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: ca117de8cf689eb5dfa8b3f052a2bc70
-#Source1Download: https://github.com/linuxmint/cinnamon-translations/releases
+# Source0-md5: 671eebd8bd27441ddd98b6438794c906
+#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: 6e40b7f545138907148af3377e628d63
+# Source1-md5: b9ea707443c81e4340b0cb219d289130
Source2: polkit-%{name}-authentication-agent-1.desktop
-Source3: %{name}-fedora.gschema.override
+Source3: %{name}-common.gschema.override
+Source4: %{name}-apps.gschema.override
Patch0: background.patch
Patch1: autostart.patch
+Patch2: %{name}-gtkdoc.patch
Patch3: set_wheel.patch
+Patch4: fix_path.patch
Patch5: revert_25aef37.patch
+Patch6: %{name}-menu.patch
Patch7: default_panal_launcher.patch
URL: https://github.com/linuxmint/Cinnamon
BuildRequires: NetworkManager-devel
@@ -46,10 +50,8 @@ BuildRequires: gtk+3-devel >= 3.12.0
BuildRequires: gstreamer-devel >= 1.0
BuildRequires: gtk-doc >= 1.15
BuildRequires: intltool >= 0.40
-BuildRequires: libcroco-devel >= 0.6.2
-BuildRequires: libsoup-devel >= 2.4
BuildRequires: libxml2-devel >= 2.0
-BuildRequires: meson >= 0.46.0
+BuildRequires: meson >= 0.47.0
BuildRequires: muffin-devel >= %{muffin_ver}
BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig >= 1:0.22
@@ -57,7 +59,7 @@ BuildRequires: polkit-devel >= 0.100
BuildRequires: python3 >= 1:3.2
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.736
-BuildRequires: startup-notification-devel >= 0.11
+BuildRequires: xapps-devel >= 2.6.0
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXfixes-devel
Requires: glib2 >= %{glib_ver}
@@ -68,6 +70,8 @@ Requires: gobject-introspection >= %{gi_ver}
# needed for loading SVG's via gdk-pixbuf
Requires: librsvg >= 2.0
Requires: polkit >= 0.100
+# required by polkit-cinnamon-authentication-agent-1.desktop
+Requires: polkit-gnome
# through UPowerGlib typelib
Requires: upower
# needed for session files
@@ -91,7 +95,7 @@ Requires: python3-PyPAM
Requires: cinnamon-screensaver
# needed for theme overrides
-Requires: gnome-themes
+Requires: gnome-backgrounds
# required for keyboard applet
Requires: gucharmap
@@ -149,8 +153,11 @@ Dokumentacja API środowiska Cinnamon.
%setup -q -a1
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%patch3 -p1
+%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch7 -p1
# cleanup backups after patching
@@ -170,7 +177,8 @@ rm -rf $RPM_BUILD_ROOT
%ninja_install -C build
-install -D %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
+install -Dp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/cinnamon-common.gschema.override
+install -Dp %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/cinnamon-apps.gschema.override
# install polkit autostart desktop file
%{__sed} -e 's, at libexecdir@,%{_libexecdir},' %{SOURCE2} >$RPM_BUILD_ROOT%{_desktopdir}/polkit-cinnamon-authentication-agent-1.desktop
@@ -185,18 +193,21 @@ desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/polkit-cinnamon-authenticati
#sed -i -e 's@/usr/lib/cinnamon-control-center@%{_libdir}/cinnamon-control-center at g' \
# $RPM_BUILD_ROOT%{_prefix}/lib/cinnamon-settings/bin/capi.py
-# to fix man page brp check
-touch $RPM_BUILD_ROOT%{_mandir}/man1/gnome-session.1
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/cinnamon
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/cinnamon
+
+# no headers
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gir-1.0/{Cinnamon-0.1,St-1.0}.gir
+
+# to fix man page brp check (note: do not package)
+touch $RPM_BUILD_ROOT%{_mandir}/man1/cinnamon-session.1
cd cinnamon-translations-%{translations_version}
for f in usr/share/locale/*/LC_MESSAGES/%{name}.mo ; do
- install -D "$f" "$RPM_BUILD_ROOT/$f"
+ install -Dp "$f" "$RPM_BUILD_ROOT/$f"
done
cd ..
-%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/cinnamon
-%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/cinnamon
-
# not supported by glibc
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ie,frp,jv,ksw,nap,rue,sco}
# almost empty version of nb(?) under withdrawn code
@@ -224,9 +235,13 @@ fi
%defattr(644,root,root,755)
%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
%attr(755,root,root) %{_bindir}/cinnamon-json-makepot
%attr(755,root,root) %{_bindir}/cinnamon-killer-daemon
@@ -251,9 +266,10 @@ fi
%attr(755,root,root) %{_libdir}/cinnamon/libst.so
%{_libdir}/cinnamon/Cinnamon-0.1.typelib
%{_libdir}/cinnamon/St-1.0.typelib
+%attr(755,root,root) %{_libexecdir}/cinnamon-calendar-server.py
%attr(755,root,root) %{_libexecdir}/cinnamon-hotplug-sniffer
%attr(755,root,root) %{_libexecdir}/cinnamon-perf-helper
-%{py3_sitedir}/cinnamon
+%{py3_sitescriptdir}/cinnamon
/etc/xdg/menus/cinnamon-applications-merged
/etc/xdg/menus/cinnamon-applications.menu
%dir %{_datadir}/cinnamon
@@ -271,6 +287,7 @@ fi
%attr(755,root,root) %{_datadir}/cinnamon/cinnamon-settings/xlet-settings.py
%{_datadir}/cinnamon/cinnamon-settings/config.py
%{_datadir}/cinnamon/cinnamon-settings/icons
+%{_datadir}/cinnamon/cinnamon-settings/*.svg
%{_datadir}/cinnamon/cinnamon-settings/*.ui
%{_datadir}/cinnamon/cinnamon-slideshow
%{_datadir}/cinnamon/desklets
@@ -279,6 +296,7 @@ fi
%{_datadir}/cinnamon/js
%{_datadir}/cinnamon/search_providers
%{_datadir}/cinnamon/sounds
+%{_datadir}/cinnamon/styles.d
%{_datadir}/cinnamon/theme
%{_datadir}/cinnamon/thumbnails
%{_datadir}/cinnamon-session/sessions/cinnamon.session
@@ -286,8 +304,11 @@ fi
%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
%{_datadir}/dbus-1/services/org.Cinnamon.Melange.service
%{_datadir}/dbus-1/services/org.Cinnamon.Slideshow.service
+%{_datadir}/dbus-1/services/org.cinnamon.CalendarServer.service
%{_datadir}/desktop-directories/cinnamon-*.directory
-%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
+%{_datadir}/glib-2.0/schemas/cinnamon-apps.gschema.override
+%{_datadir}/glib-2.0/schemas/cinnamon-common.gschema.override
+%{_datadir}/glib-2.0/schemas/org.cinnamon.gestures.gschema.xml
%{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
%{_datadir}/polkit-1/actions/org.cinnamon.settings-users.policy
%{_datadir}/xsessions/cinnamon.desktop
@@ -299,6 +320,7 @@ fi
%{_desktopdir}/cinnamon.desktop
%{_desktopdir}/cinnamon2d.desktop
%{_desktopdir}/polkit-cinnamon-authentication-agent-1.desktop
+%{_iconsdir}/hicolor/24x24/actions/cinnamon-hc-*-click.png
%{_iconsdir}/hicolor/scalable/actions/cinnamon-caps-lock-*symbolic.svg
%{_iconsdir}/hicolor/scalable/actions/cinnamon-num-lock-*symbolic.svg
%{_iconsdir}/hicolor/scalable/actions/list-edit-symbolic.svg
@@ -309,6 +331,7 @@ fi
%{_iconsdir}/hicolor/scalable/apps/cinnamon-symbolic.svg
%{_iconsdir}/hicolor/scalable/apps/cinnamon-virtual-keyboard.svg
%{_iconsdir}/hicolor/scalable/apps/removable-drives.svg
+%{_iconsdir}/hicolor/scalable/categories/cinnamon-all-applications-symbolic.svg
%{_iconsdir}/hicolor/scalable/categories/cs-*.svg
%{_iconsdir}/hicolor/scalable/devices/audio-speaker-*.svg
%{_iconsdir}/hicolor/scalable/devices/audio-subwoofer.svg
@@ -321,10 +344,10 @@ fi
%{_mandir}/man1/cinnamon-menu-editor.1*
%{_mandir}/man1/cinnamon-screensaver-lock-dialog.1*
%{_mandir}/man1/cinnamon-settings.1*
-%{_mandir}/man1/cinnamon2d.1
-%{_mandir}/man1/gnome-session-cinnamon.1
-%{_mandir}/man1/gnome-session-cinnamon2d.1
-%{_mandir}/man1/gnome-session.1
+%{_mandir}/man1/cinnamon-session-cinnamon.1*
+%{_mandir}/man1/cinnamon-session-cinnamon2d.1*
+%{_mandir}/man1/cinnamon2d.1*
+%exclude %{_mandir}/man1/cinnamon-session.1
%if %{with apidocs}
%files apidocs
diff --git a/autostart.patch b/autostart.patch
index 12b746e..753c133 100644
--- a/autostart.patch
+++ b/autostart.patch
@@ -4,7 +4,7 @@
[Cinnamon Session]
Name=Cinnamon
-RequiredComponents=cinnamon;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED at cinnamon-killer-daemon;
-+RequiredComponents=cinnamon;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED at cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
++RequiredComponents=cinnamon;org.cinnamon.ScreenSaver;polkit-cinnamon-authentication-agent-1;nemo-autostart;@REQUIRED at cinnamon-killer-daemon;
DesktopName=X-Cinnamon
@@ -14,7 +14,7 @@
[Cinnamon Session]
Name=Cinnamon (Software Rendering)
-RequiredComponents=cinnamon2d;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED at cinnamon-killer-daemon;
-+RequiredComponents=cinnamon2d;org.cinnamon.ScreenSaver;nemo-autostart;@REQUIRED at cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
++RequiredComponents=cinnamon2d;org.cinnamon.ScreenSaver;polkit-cinnamon-authentication-agent-1;nemo-autostart;@REQUIRED at cinnamon-killer-daemon;
DesktopName=X-Cinnamon
diff --git a/cinnamon-apps.gschema.override b/cinnamon-apps.gschema.override
new file mode 100644
index 0000000..e1c37a2
--- /dev/null
+++ b/cinnamon-apps.gschema.override
@@ -0,0 +1,2 @@
+[org.cinnamon]
+favorite-apps=['firefox.desktop', 'org.gnome.Packages.desktop', 'cinnamon-settings.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop']
diff --git a/cinnamon-common.gschema.override b/cinnamon-common.gschema.override
new file mode 100644
index 0000000..90b74b7
--- /dev/null
+++ b/cinnamon-common.gschema.override
@@ -0,0 +1,87 @@
+[org.cinnamon]
+desktop-effects=false
+desktop-effects-minimize-effect='traditional'
+number-workspaces=4
+startup-animation=true
+workspace-expo-view-as-grid=true
+enable-indicators=false
+enabled-applets=['panel1:left:0:menu at cinnamon.org', 'panel1:left:1:show-desktop at cinnamon.org', 'panel1:left:2:grouped-window-list at cinnamon.org', 'panel1:right:0:keyboard at cinnamon.org','panel1:right:1:systray at cinnamon.org','panel1:right:2:xapp-status at cinnamon.org', 'panel1:right:3:notifications at cinnamon.org', 'panel1:right:4:printers at cinnamon.org', 'panel1:right:5:removable-drives at cinnamon.org', 'panel1:right:6:network at cinnamon.org', 'panel1:right:7:power at cinnamon.org', 'panel1:right:8:calendar at cinnamon.org', 'panel1:right:9:sound at cinnamon.org']
+app-menu-label='Menu'
+app-menu-icon-name='fedora-logo-sprite'
+panels-height=['1:26']
+system-icon='fedora-logo-sprite'
+
+[org.cinnamon.sounds]
+login-enabled=true
+login-file='/usr/share/cinnamon-control-center/sounds/login.oga'
+logout-enabled=true
+logout-file='/usr/share/cinnamon-control-center/sounds/logout.ogg'
+switch-enabled=true
+switch-file='/usr/share/cinnamon-control-center/sounds/switch.oga'
+close-enabled=true
+close-file='/usr/share/cinnamon-control-center/sounds/close.oga'
+map-enabled=true
+map-file='/usr/share/cinnamon-control-center/sounds/map.oga'
+minimize-enabled=true
+minimize-file='/usr/share/cinnamon-control-center/sounds/minimize.oga'
+maximize-enabled=true
+maximize-file='/usr/share/cinnamon-control-center/sounds/maximize.oga'
+notification-enabled=true
+notification-file='/usr/share/cinnamon-control-center/sounds/notification.oga'
+unmaximize-enabled=true
+unmaximize-file='/usr/share/cinnamon-control-center/sounds/unmaximize.oga'
+tile-enabled=true
+tile-file='/usr/share/cinnamon-control-center/sounds/tile.oga'
+plug-enabled=true
+plug-file='/usr/share/cinnamon-control-center/sounds/plug.oga'
+unplug-enabled=true
+unplug-file='/usr/share/cinnamon-control-center/sounds/unplug.oga'
+
+[org.cinnamon.desktop.sound]
+event-sounds=true
+input-feedback-sounds=false
+volume-sound-enabled=true
+volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'
+
+[org.cinnamon.desktop.screensaver]
+ask-for-away-message=false
+font-date='Noto Sans 24'
+font-message='Noto Sans 14'
+show-clock=true
+font-time='Noto Sans 64'
+
+[org.cinnamon.settings-daemon.peripherals.keyboard]
+input-sources-switcher='alt-shift'
+bell-mode='off'
+
+[org.cinnamon.desktop.background]
+primary-color='#023c88'
+secondary-color='#5789ca'
+
+[org.cinnamon.desktop.interface]
+menus-have-icons=true
+font-name='Noto Sans 9'
+gtk-overlay-scrollbars=false
+gtk-theme='Mint-Y-Dark-Aqua'
+icon-theme='Mint-Y-Aqua'
+
+[org.cinnamon.desktop.wm.preferences]
+button-layout=':minimize,maximize,close'
+titlebar-font='Noto Sans Bold 10'
+
+[org.cinnamon.SessionManager]
+quit-delay-toggle=true
+prefer-hybrid-sleep=false
+
+[org.cinnamon.settings-daemon.plugins.xsettings]
+hinting='slight'
+menus-have-icons=true
+
+[org.cinnamon.settings-daemon.plugins.power]
+lock-on-suspend=true
+
+[org.cinnamon.theme]
+name='Mint-Y-Dark-Aqua'
+
+[org.gnome.desktop.interface]
+monospace-font-name='Monospace 10'
diff --git a/cinnamon-fedora.gschema.override b/cinnamon-fedora.gschema.override
deleted file mode 100644
index 5b98dbd..0000000
--- a/cinnamon-fedora.gschema.override
+++ /dev/null
@@ -1,69 +0,0 @@
-[org.cinnamon]
-desktop-effects-minimize-effect="traditional"
-enabled-applets=['panel1:left:0:menu at cinnamon.org', 'panel1:left:1:show-desktop at cinnamon.org', 'panel1:left:2:panel-launchers at cinnamon.org', 'panel1:left:3:window-list at cinnamon.org', 'panel1:right:0:notifications at cinnamon.org', 'panel1:right:1:user at cinnamon.org', 'panel1:right:2:removable-drives at cinnamon.org', 'panel1:right:3:keyboard at cinnamon.org', 'panel1:right:4:network at cinnamon.org', 'panel1:right:5:sound at cinnamon.org', 'panel1:right:6:power at cinnamon.org', 'panel1:right:7:systray at cinnamon.org', 'panel1:right:8:calendar at cinnamon.org', 'panel1:right:9:windows-quick-list at cinnamon.org']
-favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'gnome-terminal.desktop', 'nemo.desktop']
-number-workspaces=4
-startup-animation=false
-workspace-expo-view-as-grid=true
-
-[org.cinnamon.sounds]
-login-enabled=true
-login-file="/usr/share/cinnamon-control-center/sounds/login.oga"
-logout-enabled=true
-logout-file="/usr/share/cinnamon-control-center/sounds/logout.ogg"
-switch-enabled=true
-switch-file="/usr/share/cinnamon-control-center/sounds/switch.oga"
-close-enabled=true
-close-file="/usr/share/cinnamon-control-center/sounds/close.oga"
-map-enabled=true
-map-file="/usr/share/cinnamon-control-center/sounds/map.oga"
-minimize-enabled=true
-minimize-file="/usr/share/cinnamon-control-center/sounds/minimize.oga"
-maximize-enabled=true
-maximize-file="/usr/share/cinnamon-control-center/sounds/maximize.oga"
-unmaximize-enabled=true
-unmaximize-file="/usr/share/cinnamon-control-center/sounds/unmaximize.oga"
-tile-enabled=true
-tile-file="/usr/share/cinnamon-control-center/sounds/tile.oga"
-plug-enabled=true
-plug-file="/usr/share/cinnamon-control-center/sounds/plug.oga"
-unplug-enabled=true
-unplug-file="/usr/share/cinnamon-control-center/sounds/unplug.oga"
-
-[org.cinnamon.desktop.sound]
-event-sounds=false
-input-feedback-sounds=false
-volume-sound-enabled=true
-volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'
-
-[org.cinnamon.screensaver]
-ask-for-away-message=false
-
-[org.cinnamon.settings-daemon.peripherals.keyboard]
-input-sources-switcher='alt-shift'
-
-[org.cinnamon.desktop.background]
-picture-uri='file:///usr/share/backgrounds/images/default.png'
-primary-color='#023c88'
-secondary-color='#5789ca'
-
-[org.cinnamon.desktop.interface]
-menus-have-icons=true
-font-name='Cantarell 11'
-gtk-theme='Zukitwo'
-icon-theme='nimbus'
-
-[org.cinnamon.desktop.wm.preferences]
-button-layout=':minimize,maximize,close'
-titlebar-font='Cantarell Bold 11'
-theme='Clearlooks'
-
-[org.cinnamon.settings-daemon.plugins.xsettings]
-hinting="slight"
-menus-have-icons=true
-
-[org.cinnamon.settings-daemon.plugins.power]
-lock-on-suspend=true
-
-[org.cinnamon.theme]
-name="cinnamon"
diff --git a/cinnamon-gtkdoc.patch b/cinnamon-gtkdoc.patch
new file mode 100644
index 0000000..6f0cb77
--- /dev/null
+++ b/cinnamon-gtkdoc.patch
@@ -0,0 +1,9 @@
+--- cinnamon-5.8.2/docs/reference/cinnamon/meson.build.orig 2023-06-14 09:28:16.000000000 +0200
++++ cinnamon-5.8.2/docs/reference/cinnamon/meson.build 2023-06-17 19:57:50.497306746 +0200
+@@ -1,6 +1,5 @@
+ ignore = [
+ 'cinnamon-recorder-src.h',
+- 'cinnamon-recorder.h',
+ st_headers,
+ st_private_headers,
+ tray_headers,
diff --git a/cinnamon-menu.patch b/cinnamon-menu.patch
new file mode 100644
index 0000000..7e75c8d
--- /dev/null
+++ b/cinnamon-menu.patch
@@ -0,0 +1,39 @@
+Index: Cinnamon-3.6.6/files/etc/xdg/menus/cinnamon-applications.menu
+===================================================================
+--- Cinnamon-3.6.6.orig/files/etc/xdg/menus/cinnamon-applications.menu
++++ Cinnamon-3.6.6/files/etc/xdg/menus/cinnamon-applications.menu
+@@ -26,6 +26,8 @@
+ applications here -->
+ <Not><Category>Accessibility</Category></Not>
+ <Not><Category>System</Category></Not>
++ <Not><Filename>org.gnome.Nautilus.desktop</Filename></Not>
++ <Not><Filename>yelp.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Accessories -->
+@@ -136,6 +139,7 @@
+ <Not><Category>Core</Category></Not>
+ <Not><Category>Settings</Category></Not>
+ <Not><Category>Screensaver</Category></Not>
++ <Not><Filename>onboard.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Other -->
+@@ -158,6 +164,9 @@
+ <And>
+ <Category>Settings</Category>
+ <Not><Category>System</Category></Not>
++ <Not><Filename>onboard-settings.desktop</Filename></Not>
++ <Not><Filename>system-config-users.desktop</Filename></Not>
++ <Not><Filename>xscreensaver-properties.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu>
+@@ -176,6 +187,7 @@
+ <And>
+ <Category>System</Category>
+ <Not><Category>Settings</Category></Not>
++ <Not><Filename>system-config-users.desktop</Filename></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End System Settings -->
diff --git a/default_panal_launcher.patch b/default_panal_launcher.patch
index b6ac6c3..cebefc3 100644
--- a/default_panal_launcher.patch
+++ b/default_panal_launcher.patch
@@ -1,12 +1,11 @@
---- a/files/usr/share/cinnamon/applets/grouped-window-list at cinnamon.org/settings-schema.json
-+++ b/files/usr/share/cinnamon/applets/grouped-window-list at cinnamon.org/settings-schema.json
-@@ -142,7 +142,7 @@
+--- cinnamon-5.8.1/files/usr/share/cinnamon/applets/grouped-window-list at cinnamon.org/settings-schema.json.orig 2023-06-14 06:23:56.383553556 +0200
++++ cinnamon-5.8.1/files/usr/share/cinnamon/applets/grouped-window-list at cinnamon.org/settings-schema.json 2023-06-14 06:25:47.438575265 +0200
+@@ -137,7 +137,7 @@
},
"pinned-apps": {
"type": "generic",
-- "default": ["firefox.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"]
-+ "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"]
+- "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
new file mode 100644
index 0000000..24ff5dc
--- /dev/null
+++ b/fix_path.patch
@@ -0,0 +1,37 @@
+--- a/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
++++ b/files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
+@@ -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/
+
+-import platform
+ import os
+-import sysconfig
+
+ from gi.repository import Gio, GObject
+
+@@ -26,23 +24,7 @@ class CManager:
+ def __init__(self):
+ 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}"]
+-
+- # On x86 archs, iterate through multiple paths
+- # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
+- 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"]
+
+ for path in paths:
+ if not os.path.islink(path):
diff --git a/revert_25aef37.patch b/revert_25aef37.patch
index 1679b54..408e4c3 100644
--- a/revert_25aef37.patch
+++ b/revert_25aef37.patch
@@ -1,8 +1,6 @@
-Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-===================================================================
---- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -53,10 +53,9 @@
+--- 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
+@@ -82,10 +82,9 @@ class GroupDialog (Gtk.Dialog):
print(detail)
def _on_entry_changed(self, entry):
@@ -15,7 +13,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
self.set_response_sensitive(Gtk.ResponseType.OK, False)
else:
entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
-@@ -367,9 +366,9 @@
+@@ -397,9 +396,9 @@ class NewUserDialog(Gtk.Dialog):
fullname = self.realname_entry.get_text()
username = self.username_entry.get_text()
valid = True
@@ -25,6 +23,5 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
- self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Invalid username"))
+ self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain space characters"))
valid = False
- else:
- self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
-
+ elif self.user_exists(username):
+ self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic")
diff --git a/set_wheel.patch b/set_wheel.patch
index 32dae07..8516814 100644
--- a/set_wheel.patch
+++ b/set_wheel.patch
@@ -1,8 +1,6 @@
-Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-===================================================================
---- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -153,12 +153,11 @@
+--- cinnamon-5.8.1/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2023-06-08 13:57:26.000000000 +0200
++++ cinnamon-5.8.1/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2023-06-14 06:23:45.924341829 +0200
+@@ -182,12 +182,11 @@ class EditableEntry (Gtk.Notebook):
class PasswordDialog(Gtk.Dialog):
@@ -16,7 +14,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
self.set_modal(True)
self.set_skip_taskbar_hint(True)
-@@ -224,14 +223,7 @@
+@@ -253,14 +252,7 @@ class PasswordDialog(Gtk.Dialog):
def change_password(self):
newpass = self.new_password.get_text()
self.user.set_password(newpass, "")
@@ -32,16 +30,16 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
self.destroy()
def set_passwords_visibility(self):
-@@ -570,7 +562,7 @@
+@@ -613,7 +605,7 @@ class Module:
model, treeiter = self.users_treeview.get_selection().get_selected()
- if treeiter != None:
+ if treeiter is not None:
user = model[treeiter][INDEX_USER_OBJECT]
- dialog = PasswordDialog(user, self.password_mask, self.groups_label, self.window)
+ dialog = PasswordDialog(user, self.password_mask, self.window)
response = dialog.run()
def _on_groups_button_clicked(self, widget):
-@@ -839,11 +831,11 @@
+@@ -899,11 +891,11 @@ class Module:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
description = "<b>%s</b>\n%s" % (fullname, username)
piter = self.users.append(None, [new_user, pixbuf, description])
@@ -56,4 +54,3 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-
self.load_groups()
dialog.destroy()
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cinnamon.git/commitdiff/4a6ca7d998de528c159ec3ce725e40aff05309a5
More information about the pld-cvs-commit
mailing list