[packages/cinnamon] - up to 4.4.8, updated some Fedora patches
qboosh
qboosh at pld-linux.org
Sun May 10 14:29:26 CEST 2020
commit dfa2f590e773588327e53602b25ffdc7d52e6c3f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun May 10 14:29:53 2020 +0200
- up to 4.4.8, updated some Fedora patches
autostart.patch | 22 +-
background.patch | 4 +-
cinnamon-settings-apps.patch | 11 -
cinnamon.spec | 298 +++++++++++++------------
default_panal_launcher.patch | 23 +-
polkit-cinnamon-authentication-agent-1.desktop | 2 +-
revert_25aef37.patch | 25 ++-
set_wheel.patch | 58 ++---
8 files changed, 231 insertions(+), 212 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 4ff571e..12bf7f0 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,96 +1,76 @@
-%define clutter_version 1.12.2
-%define cjs_version 2.3.1
-%define cinnamon_desktop_version 2.3.0
-%define gobject_introspection_version 1.34.2
-%define muffin_version 2.3.0
-%define json_glib_version 0.13.2
+%define cinnamon_desktop_ver 2.4.0
+%define cjs_ver 3.2.0
+%define gi_ver 1.34.2
+%define muffin_version 4.0.3
Summary: Window management and application launching for GNOME
+Summary(pl.UTF-8): Zarządzanie oknami i uruchamianie aplikacji dla GNOME
Name: cinnamon
-Version: 2.4.6
+Version: 4.4.8
Release: 0.1
License: GPL v2+ and LGPL v2+
Group: X11/Applications
Source0: https://github.com/linuxmint/Cinnamon/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 3ef4250eb889c4f8e99e85601a6d750d
+# Source0-md5: 4f7901e5f32b4641a4e1388b79821a0d
Source1: polkit-%{name}-authentication-agent-1.desktop
Source2: %{name}-fedora.gschema.override
Patch0: background.patch
Patch1: autostart.patch
-Patch2: %{name}-settings-apps.patch
Patch3: set_wheel.patch
-Patch4: network-user-connections.patch
Patch5: revert_25aef37.patch
-Patch6: %{name}-gtk-3.14.patch
Patch7: default_panal_launcher.patch
-Patch8: remove_session_bits.patch
-Patch9: show_brightness_fix.patch
-URL: http://cinnamon.linuxmint.com/
-BuildRequires: GConf2-devel
+URL: https://github.com/linuxmint/Cinnamon
BuildRequires: NetworkManager-devel
-BuildRequires: cinnamon-desktop-devel >= %{cinnamon_desktop_version}
+BuildRequires: OpenGL-devel
+BuildRequires: at-spi2-atk-devel >= 2.0
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
+BuildRequires: cinnamon-desktop-devel >= %{cinnamon_desktop_ver}
BuildRequires: cinnamon-menus-devel
-BuildRequires: cjs-devel >= %{cjs_version}
-BuildRequires: clutter-devel >= %{clutter_version}
+BuildRequires: cjs-devel >= %{cjs_ver}
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-BuildRequires: gnome-menus-devel
-BuildRequires: gobject-introspection >= %{gobject_introspection_version}
-BuildRequires: json-glib-devel >= %{json_glib_version}
-BuildRequires: polkit-devel
-BuildRequires: udev-glib-devel
-BuildRequires: upower-devel
+BuildRequires: glib2-devel >= 1:2.35.0
+BuildRequires: gobject-introspection-devel >= %{gi_ver}
+BuildRequires: gtk+3-devel >= 3.12.0
# for screencast recorder functionality
-BuildRequires: gstreamer-devel
-BuildRequires: intltool
-BuildRequires: libcanberra-devel
-BuildRequires: libcroco-devel
-BuildRequires: libgnome-keyring-devel
-BuildRequires: libsoup-devel
-# used in unused BigThemeImage
-BuildRequires: librsvg-devel
-BuildRequires: muffin-devel >= %{muffin_version}
-BuildRequires: pulseaudio-devel
-# Bootstrap requirements
-BuildRequires: gnome-common
-BuildRequires: gtk-doc
-# mediia keys
-BuildRequires: colord-devel
-BuildRequires: lcms2-devel
-BuildRequires: libnotify-devel
-BuildRequires: libwacom-devel
-BuildRequires: xorg-driver-input-wacom-devel
-BuildRequires: xorg-lib-libXtst-devel
-Requires: gnome-menus >= 3.0.0-2
-Requires: muffin >= %{muffin_version}
+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: libtool >= 2:2.2.6
+BuildRequires: libxml2-devel >= 2.0
+BuildRequires: muffin-devel >= %{muffin_ver}
+BuildRequires: pkgconfig >= 1:0.22
+BuildRequires: polkit-devel >= 0.100
+BuildRequires: startup-notification-devel >= 0.11
+BuildRequires: xorg-lib-libX11-devel
+Requires: muffin >= %{muffin_ver}
# wrapper script uses to restart old GNOME session if run --replace
# from the command line
-Requires: gobject-introspection >= %{gobject_introspection_version}
+Requires: gobject-introspection >= %{gi_ver}
# needed for loading SVG's via gdk-pixbuf
-Requires: librsvg2
-# needed as it is now split from Clutter
-Requires: json-glib >= %{json_glib_version}
+Requires: librsvg >= 2.0
Requires: polkit >= 0.100
+# through UPowerGlib typelib
Requires: upower
# needed for session files
Requires: cinnamon-session
# needed for schemas
Requires: at-spi2-atk
-# needed for on-screen keyboard
+# through Caribou typelib; needed for on-screen keyboard
Requires: caribou
# needed for the user menu
Requires: accountsservice-libs
-# needed for settings
-Requires: PyPAM
Requires: cinnamon-control-center
Requires: cinnamon-translations
Requires: mintlocale
-Requires: opencv-python
Requires: python-dbus
-Requires: python-gnome-gconf
-Requires: python-lxml
Requires: python-pexpect
Requires: python-pillow
-Requires: python-pygobject
+Requires: python-pygobject3
+# needed for settings (cinnamon-settings/modules/cs_user.py)
+Requires: python3-PyPAM
# RequiredComponents in the session files
Requires: cinnamon-screensaver
Requires: nemo
@@ -101,22 +81,18 @@ Requires: tint2
# needed for theme overrides
Requires: gnome-themes
-Requires: nimbus-icon-theme
-Requires: zukitwo-gtk2-theme
-Requires: zukitwo-gtk3-theme
# required for keyboard applet
Requires: gucharmap
# required for network applet
-Requires: network-manager-applet
+Requires: NetworkManager-applet
Requires: nm-connection-editor
# required for looking glass
Requires: python-inotify
Provides: desktop-notification-daemon
-Obsoletes: cinnamon <= 1.8.0-1
Obsoletes: cinnamon-2d
Obsoletes: cinnamon-menu-editor
Obsoletes: cinnamon-settings
@@ -130,55 +106,73 @@ forked from Gnome Shell. The emphasis is put on making users feel at
home and providing them with an easy to use and comfortable desktop
experience.
+%description -l pl.UTF-8
+Cinnamon to środowisko graficzne dla Linuksa zapewniające
+zaawansowane, innowacyjne możliwości i tradycyjną obsługę.
+
+Układ jest podobny do Gnome 2. Implementacja wywodzi się z powłoki
+Gnome Shell. Nacisk położony jest na to, aby użytkownicy czuli się jak
+w domu, oraz żeby zapewnić im łatwe w użyciu i wygodne środowisko.
+
+%package apidocs
+Summary: API documentation for Cinnamon desktop
+Summary(pl.UTF-8): Dokumentacja API środowiska Cinnamon
+Group: Documentation
+%if "%{_rpmversion}" >= "4.6"
+BuildArch: noarch
+%endif
+
+%description apidocs
+API documentation for Cinnamon desktop.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API środowiska Cinnamon.
+
%prep
-%setup -q -n Cinnamon-%{version}
+%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
-sed -i -e 's at gksu@pkexec at g' files/usr/bin/cinnamon-settings-users
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
%build
-NOCONFIGURE=1 ./autogen.sh
+install -d m4
+%{__glib_gettextize}
+%{__gtkdocize}
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
--disable-silent-rules \
--disable-static \
--disable-rpath \
--disable-schemas-compile \
- --enable-introspection=yes \
- --enable-compile-warnings=no
+ --enable-introspection \
+ --enable-compile-warnings=no \
+ --with-ca-certificates=/etc/certs/ca-certificates.crt \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# Remove shebang from files
-sed -i -e '1{\@^#!%{_bindir}/env python at d}' $RPM_BUILD_ROOT%{_prefix}/lib/cinnamon-settings/*/*.py
-
-# Fix perms
-chmod +x $RPM_BUILD_ROOT%{_prefix}/lib/cinnamon-settings/bin/{install,remove}Schema.py
-
-# Remove .la file
%{__rm} $RPM_BUILD_ROOT%{_libdir}/cinnamon/libcinnamon.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/cinnamon/libcinnamon-js.la
install -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
-# install polkik autostart desktop file
-install -D -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+# install polkit autostart desktop file
+%{__sed} -e 's, at libexecdir@,%{_libexecdir},' %{SOURCE1} >$RPM_BUILD_ROOT%{_desktopdir}/polkit-cinnamon-authentication-agent-1.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/cinnamon.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/cinnamon2d.desktop
@@ -187,8 +181,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/cinnamon-menu-editor.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/polkit-cinnamon-authentication-agent-1.desktop
# fix hardcoded path
-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
+#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
# create directory for lang files
install -d $RPM_BUILD_ROOT%{_datadir}/cinnamon/locale
@@ -214,13 +208,13 @@ fi
%files
%defattr(644,root,root,755)
-%doc COPYING README NEWS AUTHORS
-/etc/xdg/menus/cinnamon-applications-merged
-/etc/xdg/menus/cinnamon-applications.menu
+%doc AUTHORS README.rst
%attr(755,root,root) %{_bindir}/cinnamon
%attr(755,root,root) %{_bindir}/cinnamon-desktop-editor
-%attr(755,root,root) %{_bindir}/cinnamon-extension-tool
+%attr(755,root,root) %{_bindir}/cinnamon-file-dialog
+%attr(755,root,root) %{_bindir}/cinnamon-install-spice
%attr(755,root,root) %{_bindir}/cinnamon-json-makepot
+%attr(755,root,root) %{_bindir}/cinnamon-killer-daemon
%attr(755,root,root) %{_bindir}/cinnamon-launcher
%attr(755,root,root) %{_bindir}/cinnamon-looking-glass
%attr(755,root,root) %{_bindir}/cinnamon-menu-editor
@@ -231,69 +225,93 @@ fi
%attr(755,root,root) %{_bindir}/cinnamon-settings
%attr(755,root,root) %{_bindir}/cinnamon-settings-users
%attr(755,root,root) %{_bindir}/cinnamon-slideshow
+%attr(755,root,root) %{_bindir}/cinnamon-subprocess-wrapper
+%attr(755,root,root) %{_bindir}/cinnamon-xlet-makepot
%attr(755,root,root) %{_bindir}/cinnamon2d
-%{_mandir}/man1/cinnamon-extension-tool.1*
-%{_mandir}/man1/cinnamon-launcher.1*
-%{_mandir}/man1/cinnamon-menu-editor.1*
-%{_mandir}/man1/cinnamon-settings.1*
-%{_mandir}/man1/cinnamon.1*
-%{_mandir}/man1/cinnamon2d.1
-%{_mandir}/man1/gnome-session-cinnamon.1
-%{_mandir}/man1/gnome-session-cinnamon2d.1
-%{_mandir}/man1/gnome-session.1
-%{_desktopdir}/cinnamon-menu-editor.desktop
-%{_desktopdir}/cinnamon-settings*.desktop
-%{_desktopdir}/cinnamon.desktop
-%{_desktopdir}/cinnamon2d.desktop
-%{_desktopdir}/polkit-cinnamon-authentication-agent-1.desktop
-%{_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}/desktop-directories/cinnamon-*.directory
-%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
-%{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
-%{_datadir}/cinnamon-session/sessions/cinnamon.session
-%{_datadir}/cinnamon-session/sessions/cinnamon2d.session
-%{_iconsdir}/hicolor/*/categories/*.svg
-%{_iconsdir}/hicolor/*/emblems/cs-*.svg
-%{_datadir}/polkit-1/actions/org.cinnamon.settings-users.policy
-%{_datadir}/xsessions/cinnamon.desktop
-%{_datadir}/xsessions/cinnamon2d.desktop
-
+%attr(755,root,root) %{_bindir}/xlet-about-dialog
+%attr(755,root,root) %{_bindir}/xlet-settings
%dir %{_libdir}/cinnamon
+%attr(755,root,root) %{_libdir}/cinnamon/libcinnamon.so
%{_libdir}/cinnamon/Cinnamon-0.1.typelib
-%{_libdir}/cinnamon/CinnamonJS-0.1.typelib
-%{_libdir}/cinnamon/Gvc-1.0.typelib
%{_libdir}/cinnamon/St-1.0.typelib
-%{_libdir}/cinnamon/cinnamon-hotplug-sniffer
-%{_libdir}/cinnamon/cinnamon-perf-helper
-
-%attr(755,root,root) %{_libdir}/cinnamon/libcinnamon-js.so
-%attr(755,root,root) %{_libdir}/cinnamon/libcinnamon.so
-
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/cinnamon
+%endif
+%attr(755,root,root) %{_libexecdir}/cinnamon/cinnamon-hotplug-sniffer
+%attr(755,root,root) %{_libexecdir}/cinnamon/cinnamon-perf-helper
+/etc/xdg/menus/cinnamon-applications-merged
+/etc/xdg/menus/cinnamon-applications.menu
%dir %{_datadir}/cinnamon
%{_datadir}/cinnamon/applets
%{_datadir}/cinnamon/bumpmaps
+%attr(755,root,root) %{_datadir}/cinnamon/cinnamon-dbus-command
+%{_datadir}/cinnamon/cinnamon-desktop-editor
+%{_datadir}/cinnamon/cinnamon-looking-glass
+%{_datadir}/cinnamon/cinnamon-menu-editor
+%{_datadir}/cinnamon/cinnamon-screensaver-lock-dialog
+%{_datadir}/cinnamon/cinnamon-settings-users
+%dir %{_datadir}/cinnamon/cinnamon-settings
+%{_datadir}/cinnamon/cinnamon-settings/bin
+%{_datadir}/cinnamon/cinnamon-settings/modules
+%attr(755,root,root) %{_datadir}/cinnamon/cinnamon-settings/cinnamon-settings.py
+%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/*.ui
+%{_datadir}/cinnamon/cinnamon-slideshow
%{_datadir}/cinnamon/desklets
%{_datadir}/cinnamon/faces
%{_datadir}/cinnamon/icons
%{_datadir}/cinnamon/js
%{_datadir}/cinnamon/search_providers
+%{_datadir}/cinnamon/sounds
%{_datadir}/cinnamon/theme
%{_datadir}/cinnamon/thumbnails
+%{_datadir}/cinnamon-session/sessions/cinnamon.session
+%{_datadir}/cinnamon-session/sessions/cinnamon2d.session
+%{_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}/desktop-directories/cinnamon-*.directory
+%{_datadir}/glib-2.0/schemas/cinnamon-fedora.gschema.override
+%{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
+%{_datadir}/polkit-1/actions/org.cinnamon.settings-users.policy
+%{_datadir}/xsessions/cinnamon.desktop
+%{_datadir}/xsessions/cinnamon2d.desktop
+%{_desktopdir}/cinnamon-killer-daemon.desktop
+%{_desktopdir}/cinnamon-menu-editor.desktop
+%{_desktopdir}/cinnamon-onscreen-keyboard.desktop
+%{_desktopdir}/cinnamon-settings*.desktop
+%{_desktopdir}/cinnamon.desktop
+%{_desktopdir}/cinnamon2d.desktop
+%{_desktopdir}/polkit-cinnamon-authentication-agent-1.desktop
+%{_iconsdir}/hicolor/scalable/actions/caps-lock*-symbolic.svg
+%{_iconsdir}/hicolor/scalable/actions/list-edit-symbolic.svg
+%{_iconsdir}/hicolor/scalable/actions/num-lock*-symbolic.svg
+%{_iconsdir}/hicolor/scalable/actions/pan-*-symbolic.svg
+%{_iconsdir}/hicolor/scalable/actions/pan-*-symbolic-rtl.svg
+%{_iconsdir}/hicolor/scalable/apps/cinnamon.svg
+%{_iconsdir}/hicolor/scalable/apps/cinnamon-panel-launcher.svg
+%{_iconsdir}/hicolor/scalable/apps/cinnamon-symbolic.svg
+%{_iconsdir}/hicolor/scalable/apps/removable-drives.svg
+%{_iconsdir}/hicolor/scalable/categories/cs-*.svg
+%{_iconsdir}/hicolor/scalable/devices/audio-speaker-*.svg
+%{_iconsdir}/hicolor/scalable/devices/audio-subwoofer.svg
+%{_iconsdir}/hicolor/scalable/devices/bluetooth.svg
+%{_iconsdir}/hicolor/scalable/devices/cpu-symbolic.svg
+%{_iconsdir}/hicolor/scalable/emblems/cs-xlet-*.svg
+%{_mandir}/man1/cinnamon-launcher.1*
+%{_mandir}/man1/cinnamon-menu-editor.1*
+%{_mandir}/man1/cinnamon-settings.1*
+%{_mandir}/man1/cinnamon.1*
+%{_mandir}/man1/cinnamon2d.1
+%{_mandir}/man1/gnome-session-cinnamon.1
+%{_mandir}/man1/gnome-session-cinnamon2d.1
+%{_mandir}/man1/gnome-session.1
-%{_prefix}/lib/cinnamon-desktop-editor
-%{_prefix}/lib/cinnamon-json-makepot
-%{_prefix}/lib/cinnamon-looking-glass
-%{_prefix}/lib/cinnamon-menu-editor
-%{_prefix}/lib/cinnamon-screensaver-lock-dialog
-%{_prefix}/lib/cinnamon-settings-users
-%dir %{_prefix}/lib/cinnamon-settings
-%dir %{_prefix}/lib/cinnamon-settings/bin
-%{_prefix}/lib/cinnamon-settings/bin/*.ui
-%attr(755,root,root) %{_prefix}/lib/cinnamon-settings/bin/*.py
-%{_prefix}/lib/cinnamon-settings/*.ui
-%{_prefix}/lib/cinnamon-settings/*.py
-%{_prefix}/lib/cinnamon-settings/data
-%{_prefix}/lib/cinnamon-settings/modules
-%{_prefix}/lib/cinnamon-slideshow
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/cinnamon
+%{_gtkdocdir}/cinnamon-js
+%{_gtkdocdir}/cinnamon-st
+%{_gtkdocdir}/cinnamon-tutorials
diff --git a/autostart.patch b/autostart.patch
index e3ab131..6e8e35d 100644
--- a/autostart.patch
+++ b/autostart.patch
@@ -1,18 +1,20 @@
---- a/files/usr/share/cinnamon-session/sessions/cinnamon.session
-+++ b/files/usr/share/cinnamon-session/sessions/cinnamon.session
+--- a/files/cinnamon.session.in
++++ b/files/cinnamon.session.in
@@ -1,5 +1,5 @@
[Cinnamon Session]
Name=Cinnamon
--RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;nm-applet;
-+RequiredComponents=cinnamon;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;polkit-cinnamon-authentication-agent-1;
- DesktopName=GNOME
+-RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;
++RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
+ DesktopName=X-Cinnamon
---- a/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
-+++ b/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
+
+--- a/files/cinnamon2d.session.in
++++ b/files/cinnamon2d.session.in
@@ -1,5 +1,5 @@
[Cinnamon Session]
Name=Cinnamon (Software Rendering)
--RequiredComponents=cinnamon2d;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;nm-applet;
-+RequiredComponents=cinnamon2d;cinnamon-settings-daemon;cinnamon-screensaver;nemo-autostart;polkit-cinnamon-authentication-agent-1;
- DesktopName=GNOME
+-RequiredComponents=cinnamon2d;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;
++RequiredComponents=cinnamon2d;cinnamon-screensaver;nemo-autostart;cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
+ DesktopName=X-Cinnamon
+
diff --git a/background.patch b/background.patch
index 2a8164d..d3248dc 100644
--- a/background.patch
+++ b/background.patch
@@ -1,5 +1,5 @@
---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+--- cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py.orig
++++ cinnamon-4.4.8/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
@@ -198,7 +198,7 @@ class Module:
def get_system_backgrounds(self):
picture_list = []
diff --git a/cinnamon-settings-apps.patch b/cinnamon-settings-apps.patch
deleted file mode 100644
index 38b1ea8..0000000
--- a/cinnamon-settings-apps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-+++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-@@ -68,7 +68,7 @@ CONTROL_CENTER_MODULES = [
- STANDALONE_MODULES = [
- # Label Executable Icon Category Keywords for filter
- [_("Printers"), "system-config-printer", "cs-printer", "hardware", _("printers, laser, inkjet")],
-- [_("Firewall"), "gufw", "cs-firewall", "admin", _("firewall, block, filter, programs")],
-+ [_("Firewall"), "firewall-config", "cs-firewall", "admin", _("firewall, block, filter, programs")],
- [_("Languages"), "mintlocale", "cs-language", "prefs", _("language, install, foreign")],
- [_("Login Screen"), "gksu /usr/sbin/mdmsetup", "cs-login", "admin", _("login, mdm, gdm, manager, user, password, startup, switch")],
- [_("Startup Programs"), "cinnamon-session-properties", "cs-startup-programs","prefs", _("startup, programs, boot, init, session")],
diff --git a/default_panal_launcher.patch b/default_panal_launcher.patch
index f9f2f25..b6ac6c3 100644
--- a/default_panal_launcher.patch
+++ b/default_panal_launcher.patch
@@ -1,11 +1,12 @@
---- a/files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/settings-schema.json 2014-11-10 10:01:15.000000000 +0000
-+++ b/files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/settings-schema.json 2014-11-18 17:00:46.521666889 +0000
-@@ -1,7 +1,7 @@
- {
- "launcherList": {
- "type": "generic",
-- "default": ["firefox.desktop", "gnome-terminal.desktop", "nemo.desktop"]
-+ "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "gnome-terminal.desktop", "nemo.desktop"]
- },
- "allow-dragging": {
- "type": "checkbox",
+--- 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 @@
+ },
+ "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"]
+ },
+ "group-apps": {
+ "type": "checkbox",
+
diff --git a/polkit-cinnamon-authentication-agent-1.desktop b/polkit-cinnamon-authentication-agent-1.desktop
index c0cccca..6e98be1 100644
--- a/polkit-cinnamon-authentication-agent-1.desktop
+++ b/polkit-cinnamon-authentication-agent-1.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=PolicyKit Authentication Agent
Comment=PolicyKit Authentication Agent
-Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+Exec=@libexecdir@/polkit-gnome-authentication-agent-1
Terminal=false
Type=Application
Categories=
diff --git a/revert_25aef37.patch b/revert_25aef37.patch
index 031cf86..1679b54 100644
--- a/revert_25aef37.patch
+++ b/revert_25aef37.patch
@@ -1,27 +1,30 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py 2014-09-30 09:55:06.000000000 +0100
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py 2014-09-30 19:20:48.151829597 +0100
-@@ -45,10 +45,9 @@ class GroupDialog (Gtk.Dialog):
- print detail
+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 @@
+ print(detail)
def _on_entry_changed(self, entry):
- name = entry.get_text()
- if " " in name or name.lower() != name:
+ if " " in entry.get_text():
- entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
+ entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic")
- entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain upper-case or space characters"))
+ entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain space characters"))
self.set_response_sensitive(Gtk.ResponseType.OK, False)
else:
- entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, None)
-@@ -314,9 +313,9 @@ class NewUserDialog(Gtk.Dialog):
+ entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
+@@ -367,9 +366,9 @@
fullname = self.realname_entry.get_text()
username = self.username_entry.get_text()
valid = True
-- if " " in username or username.lower() != username:
+- if re.search('[^a-z0-9_.-]', username):
+ if " " in username:
- self.username_entry.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_DIALOG_WARNING)
-- self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain upper-case or space characters"))
+ 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"))
+ 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_stock(Gtk.EntryIconPosition.SECONDARY, None)
+ self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
+
diff --git a/set_wheel.patch b/set_wheel.patch
index 81c6dc4..32dae07 100644
--- a/set_wheel.patch
+++ b/set_wheel.patch
@@ -1,12 +1,14 @@
---- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook):
+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 @@
class PasswordDialog(Gtk.Dialog):
-- def __init__ (self, user, password_mask, group_mask):
-+ def __init__ (self, user, password_mask):
- super(PasswordDialog, self).__init__()
+- def __init__ (self, user, password_mask, group_mask, parent = None):
++ def __init__ (self, user, password_mask, parent = None):
+ super(PasswordDialog, self).__init__(None, parent)
self.user = user
self.password_mask = password_mask
@@ -14,40 +16,44 @@
self.set_modal(True)
self.set_skip_taskbar_hint(True)
-@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
- def change_password(self):
+@@ -224,14 +223,7 @@
+ def change_password(self):
newpass = self.new_password.get_text()
self.user.set_password(newpass, "")
-- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
- mask = self.group_mask.get_text()
-- mask = mask.split(", ")
-- mask.remove("nopasswdlogin")
-- mask = ", ".join(mask)
-- self.group_mask.set_text(mask)
- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
- self.destroy()
+- if "nopasswdlogin" in mask:
+- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
+- mask = mask.split(", ")
+- mask.remove("nopasswdlogin")
+- mask = ", ".join(mask)
+- self.group_mask.set_text(mask)
+- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022')
++ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.destroy()
-@@ -515,7 +508,7 @@ class Module:
+ def set_passwords_visibility(self):
+@@ -570,7 +562,7 @@
model, treeiter = self.users_treeview.get_selection().get_selected()
if treeiter != None:
- user = model[treeiter][INDEX_USER_OBJECT]
-- dialog = PasswordDialog(user, self.password_mask, self.groups_label)
-+ dialog = PasswordDialog(user, self.password_mask)
+ 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):
-@@ -745,11 +738,11 @@ class Module:
+ def _on_groups_button_clicked(self, widget):
+@@ -839,11 +831,11 @@
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])
- # Add the user to his/her own group and sudo if Administrator was selected
+ # Add the user to his/her own group and wheel if Administrator was selected
if dialog.account_type_combo.get_active() == 1:
-- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
-+ os.system("usermod %s -G %s,wheel" % (username, username))
+- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G", "%s,wheel" % username])
else:
-- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
-+ os.system("usermod %s -G %s" % (username, username))
+- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G", "%s" % username])
self.load_groups()
dialog.destroy()
-
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cinnamon.git/commitdiff/dfa2f590e773588327e53602b25ffdc7d52e6c3f
More information about the pld-cvs-commit
mailing list