Hello community, here is the log from the commit of package cinnamon for openSUSE:Factory checked in at 2018-05-29 16:49:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon (Old) and /work/SRC/openSUSE:Factory/.cinnamon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Tue May 29 16:49:10 2018 rev:27 rq:611150 version:3.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2018-02-05 10:53:27.091070905 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2018-05-29 16:49:32.329858768 +0200 @@ -1,0 +2,311 @@ +Tue May 22 07:20:12 UTC 2018 - [email protected] + +- Update to version 3.8.3: + * Use default icon names in Online Accounts (GOA). + * Fix symbolic icons and delete obsolete. + * Cinnamon theme: window-list progress improvements. + * Settings: Fix launching mintsources/mintdrivers/lightdm-settings. + * cs_startup.py: Always have delay widgets, but hide/show them + depending on if there's a delay or not. + * extension: Fix inability to force xlet installs. +- Rebase cinnamon-settings-native.patch. + +------------------------------------------------------------------- +Thu May 8 20:40:20 UTC 2018 - [email protected] + +- Update to version 3.8.2: + * Startup settings: Fix blurry icons. + * Startup settings: Fix using the wrong variable. + * Startup settings: Use icons in button box. + * Spices.py: Use https for spices downloads. + * Startup settings: Show delay units and only show delay when it + is not 0. + * Startup settings: Fix creation of autostart files. + * notificationDaemon: Fix fallback icon names. + * Make the key binding setting for Show Desklets global. + * l10n: Rephrase a few msgids. + * Notification clearing on app focus + blacklist + limit. + * cs_default: Don't print info before checking that it's valid. + * menu applet: Wrong parent class for SystemButton (fixes focus + stealing when hovering over system buttons). + * Fix window list previews position. + * Spices.py: Refactor downloading code for better error handling. + * Spices.py: Fix file permissions during install. + * Spices.py: Handle the cinnamon proxy better regardless of + whether cinnamon is running or not. + * popupMenu: Fix menu cutoff during open/close animation. + * Fix some issues with the download refactoring in Spices.py. + * fileUtils: Fix module exporter bug, fix line numbers in stack + traces being incorrect. + * Notification close policy. + * chrome: Improve visibility conditions for panels and other + chrome. +- Add cinnamon-no-polkit-policy.patch: Use xdg-su instead of a + polkit policy due to bsc#1090963 being unresolved (boo#1091701). +- Rebase cinnamon-network-user-connections.patch. + +------------------------------------------------------------------- +Wed May 2 19:04:36 UTC 2018 - [email protected] + +- Update to version 3.8.1: + * network applet: Disconnect all signals for NMDevice when our + proxy gets destroyed. When the device became unavailable, we + would connect to "firmware-missing" to get notified when it was + available again. At some point, a change to networking caused + the NMDevice to get destroyed rather than lingering for the + firmware to "return". + * st-label.c: Remove the reference to our ClutterText when it + gets finalised during a Clutter.Actor.destroy() chain. + * Add symbolics cs-desklet and cs-backgrounds. + * network applet: Don't show unmanaged networks in the list. + * network applet: Refresh the panel icon more frequently when the + menu is open. + * network applet: Show the actual active connection's signal + strength in the AP list, rather than the strongest AP for a + given ssid, which may not be the same thing. + * cs_themes.py: Remove the setting for prefer-dark-themes. + * Fix panel tooltips position with multiple monitors. + * window-list: Update icons on panel height/orientation changed. + * Workspace switcher improvements. + * systray: Bail out if the plug window is gone. + * Allow colons in hot corners commands. + * Remove exported variable warning. + * Xlet settings: Don't show a row for "generic" settings entries. + +------------------------------------------------------------------- +Wed Apr 25 16:07:10 UTC 2018 - [email protected] + +- Update to version 3.8.0: + * Port everything from Python2 to Python3. + * Move spices settings install schema scripts to /usr/bin and + clean up/simplify the schema installation code in Spices.py. + * launcher desklet: Fix a warning. + * Simplify the look of the screensaver away message dialogue. + * Melange: Add a margin in the log tab. + * st-private: Update shadow APIs for Cogl deprecations. + * Add eslint configuration. + * overrides.js: Add Tweener and Signals patches from CJS. + * Refactor the extension system and add commonjs compatible module + importation. + * Fix issues related to Cinnamon running with cjs/mozjs52. + * St: Fix some cogl deprecations. + * St: Use G_DEFINE_TYPE_WITH_PRIVATE(). + * St: Drop vfuncs from StThemeNodeTransition. + * shell-tray-manager: Disconnect theme_widget signals on finalize. + * shell-embedded-window: Change realize to map. + * main, magnifier: Remove run-time warnings. + * dnd: Declare some js variables to avoid a warning. + * Allow column options in the xlet settings list widget. + * Fix some depreciation warnings. + * Spices: Fix update all button not updating correctly when + updates are installed. + * windows-quick-list: Fix icon allocation warnings. + * Sound applet middle click mute refinement. + * dbusMenu.js: Formatted code to allow for better readability. + * Titlebar button layout: Stop using org.cinnamon.muffin + button-layout. + * Sound: Make maximum sound volume configurable. + * Sound applet: Repaint the sound volume bar when max sound vol + changes. + * Remove needless check in compareNew. + * Theme settings: Restrict metacity selection to metacity-3 + themes. + * Speed up windows mapping. + * Power applet: truly hide label when there are no devices. + * dnd: Fix scope warning. + * popupMenu.js: PopupSubMenu: add prototype method closeAfterUnmap. + * menu-applet: fix dnd cursor icon. + * Sounds Settings: Rename Effects tab. + * Sound applet: Fix control buttons being squashed. + * Sound applet: Don't show player launcher when the option to + control players is disabled. + * Sound applet: Next/Previous track on Scroll Right/Left. + * Sound applet: Add a setting to keep aspect ratio. + * cinnamon-app: Add cinnamon_app_create_icon_texture_for_window - + allows supplying a MetaWindow to more correctly retrieve the + correct icon. + * cinnamon-app.c: Revert cinnamon_app_create_icon_texture to work + as it did prior to 8d7a875. The behaviour of the new method + (cinnamon_app_create_icon_texture_for_window) is unchanged. + * Fix a couple visual issues in Melange. + * Prevent users from editing locked settings. + * cs-sound: Fix the width of the amplification slider. + * panel-launchers: Set the default icon size to 22. + * cinnamon-settings-info: Make some labels selectable. + * window-animations: Make the animations a bit less drastic. + * cinnamon-app-system: various minor cleanups, dead code removal + etc. + * Improving a piece of code in cinnamon-settings.py. + * cinnamon-settings: Add defaults for Fedora, RHEL and CentOS. + * Notifications: Add support for a bottom position option. + * docs: Fix build with gtk-doc 1.27+. + * st-private: Fix offscreen leak if cogl_framebuffer_allocate + fails. + * st: Do not try to unref potentially NULL CoglObjects. + * st: Don't assert when corner texture creation fails. + * Add a dbus method to activate scale overview. + We already had one for expo. + * SettingsWidgets: Prevent toggling disabled switches. + * st-entry: Don't possibly allocate actors a negative size. + * cinnamon-recorder: Treat some switch compile warnings. + * Sound: Reuse cover temp file. + * Fix panel applet clearing. + * [gtk3.22] cinnamon-settings: Remove some broken and hardcoded + theming. + * window-list: preview: New style class, options, layout. + * User settings: Fix a couple of broken things in LMDE 3. + * Optimise RegExprs in ui search. + * Optimise appFavorites. + * sound applet: Configurable maximum volume fixes. + * Fix blurry switches in the default theme. + * st: Remove some cogl deprecations. + * appletManager, deskletManager: Fix change handlers. + * Ensure applets are queried by applet_id. + * Skip unnecessary panel loading in change handlers, fix + settings destruction on desklet move. + * KeybindingWidgets.py: Fix index out of range error. + * Improve label settings widget. + * Change gnome-terminal.desktop -> org.gnome.Terminal.desktop. + * Fix multi-version xlets loading twice, address metadata + availability. + * Melange fixes. + * keybindingWidgets.py: Cancel teach mode on focus-out. + Fixes issues caused by clicking out of a cell renderer + currently being edited. + * notifications: Destroy unwanted notifications explicitly, or + they linger and continue to get updates (and, not being on the + stage, cause a huge amount of warnings); + * cinnamon-settings: Make keybinding tooltip generic. + * Redirect logging output to .xsession-errors. + * cinnamon-settings-users: Clean up the use of stock icons. + * Remove deprecated .panel-launcher-add-dialog selectors. + * cinnamon-slicer: Remove some deprecations. + * st-scroll-view: Resolve some switch warnings. + * tray manager: Resolve some GdkColor deprecations. + * cinnamon-perf-helper: Resolve a function definition compile + warning. + * tray: Avoid deprecation warning by dropping use of + gdk_display_supports_composite. + * cinnamon-global: Resolve a gdk_cursor_new deprecation warning. + * Menu applet: Delegate auth responsibility to + cinnamon-remove-application. + * gtk-embed: Fix null pointer dereference. + * notifications: Close button and no fade on mouseover. + * Don't clear notifications when an application becomes focused. + * Fix resident notifications not displaying. + * tray: Remove some deprecations for gdk_window_set_composited. + * Systray: Remove the resize delay in scale mode. ++++ 114 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes ++++ and /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes Old: ---- Cinnamon-3.6.7.tar.gz New: ---- Cinnamon-3.8.3.tar.gz cinnamon-fix-cogl.patch cinnamon-no-polkit-policy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.ZxUoJ2/_old 2018-05-29 16:49:33.749806516 +0200 +++ /var/tmp/diff_new_pack.ZxUoJ2/_new 2018-05-29 16:49:33.753806370 +0200 @@ -19,14 +19,14 @@ %define __requires_exclude typelib\\((Cinnamon|St)\\) %define __provides_exclude typelib\\(.*\\) %define _name Cinnamon -%define _version 3.6.0 +%define _version 3.8.0 Name: cinnamon -Version: 3.6.7 +Version: 3.8.3 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout -License: GPL-2.0+ AND LGPL-2.1 +License: GPL-2.0-or-later AND LGPL-2.1-only Group: System/GUI/Other -Url: https://github.com/linuxmint/Cinnamon +URL: https://github.com/linuxmint/Cinnamon Source: https://github.com/linuxmint/%{_name}/archive/%{version}.tar.gz#/%{_name}-%{version}.tar.gz # Some documentation for people writing branding packages, shipped in the branding-upstream package. Source1: README.Gsettings-overrides @@ -44,8 +44,12 @@ Patch5: %{name}-favourite-applications.patch # PATCH-FIX-OPENSUSE cinnamon-fix-typelib-false-positive.patch [email protected] -- Avoid any false positives in typelib detection. Patch6: %{name}-fix-typelib-false-positive.patch +# PATCH-FIX-OPENSUSE cinnamon-fix-cogl.patch [email protected] -- Fix compilation with Cogl. +Patch7: %{name}-fix-cogl.patch # PATCH-FEATURE-OPENSUSE cinnamon-fallback-icewm.patch [email protected] -- Use IceWM as fallback. -Patch7: %{name}-fallback-icewm.patch +Patch8: %{name}-fallback-icewm.patch +# PATCH-FIX-OPENSUSE cinnamon-no-polkit-policy.patch boo#1091701 -- Use xdg-su instead of a polkit policy due to bsc#1090963 being unresolved. +Patch9: %{name}-no-polkit-policy.patch BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake @@ -60,10 +64,10 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python3-devel +BuildRequires: python3-xml BuildRequires: update-desktop-files BuildRequires: pkgconfig(cinnamon-desktop) >= %{_version} BuildRequires: pkgconfig(cjs-1.0) -BuildRequires: pkgconfig(gnome-bluetooth-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(libcinnamon-menu-3.0) @@ -94,9 +98,17 @@ Requires: nemo Requires: pkgconfig Requires: polkit-gnome +Requires: python3-Pillow +Requires: python3-cairo Requires: python3-gobject +Requires: python3-gobject-Gdk +Requires: python3-gobject-cairo +Requires: python3-pexpect +Requires: python3-pyinotify +Requires: python3-python-pam Requires: v4l-tools Requires: wget +# For cinnamon-no-polkit-policy.patch. Requires: xdg-utils Requires(post): update-alternatives Requires(postun): update-alternatives @@ -118,34 +130,7 @@ # typelib-1_0-Cinnamon-0_1 was last used in openSUSE Leap 42.1. Provides: typelib-1_0-Cinnamon-0_1 = %{version} Obsoletes: typelib-1_0-Cinnamon-0_1 < %{version} -%if 0%{?suse_version} > 1320 -BuildRequires: python2-devel -Requires: python2-Pillow -Requires: python2-cairo -Requires: python2-gobject -Requires: python2-gobject-cairo -Requires: python2-pexpect -Requires: python2-pyinotify -Requires: python2-python-pam -%else -BuildRequires: python-devel -Requires: python-Pillow -Requires: python-cairo -Requires: python-gobject -Requires: python-gobject-cairo -Requires: python-pam -Requires: python-pexpect -Requires: python-pyinotify -%endif -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 -Requires: python3-gobject-Gdk -%if 0%{?suse_version} > 1320 -Requires: python2-gobject-Gdk -%else -Requires: python-gobject-Gdk -%endif -%endif -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 Requires: NetworkManager-applet %else Requires: NetworkManager-gnome @@ -198,6 +183,8 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 cp -a %{SOURCE1} . %build @@ -223,7 +210,7 @@ dirname $(find %{buildroot}%{_datadir} -type f -name '*.py') | sort -u | while read dir; do # Compile Python bytecode. - %py_compile . + %py3_compile . done mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ @@ -247,7 +234,7 @@ /sbin/ldconfig %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ default-xsession.desktop %{_datadir}/xsessions/%{name}.desktop 20 -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %desktop_database_post %icon_theme_cache_post %endif @@ -258,12 +245,12 @@ %{_sbindir}/update-alternatives --remove default-xsession.desktop \ %{_datadir}/xsessions/%{name}.desktop fi -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %desktop_database_postun %icon_theme_cache_postun %endif -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post gschemas %glib2_gsettings_schema_post @@ -272,7 +259,12 @@ %endif %files -%doc AUTHORS COPYING README.rst debian/changelog +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS README.rst debian/changelog %dir %{_sysconfdir}/xdg/menus/ %config %{_sysconfdir}/xdg/menus/%{name}-applications.menu %config %{_sysconfdir}/xdg/menus/%{name}-applications-merged @@ -292,7 +284,7 @@ %{_datadir}/%{name}-session/ %{_datadir}/xsessions/*.desktop %{_datadir}/applications/%{name}*.desktop -%{_datadir}/icons/hicolor/*/apps/cinnamon-*.* +%{_datadir}/icons/hicolor/*/apps/*.* %{_datadir}/icons/hicolor/*/*/cs-*.* %{_datadir}/icons/hicolor/*/*/pan-*.* %{_datadir}/icons/hicolor/*/actions/*-lock-*.* ++++++ Cinnamon-3.6.7.tar.gz -> Cinnamon-3.8.3.tar.gz ++++++ ++++ 43558 lines of diff (skipped) ++++++ cinnamon-fallback-icewm.patch ++++++ --- /var/tmp/diff_new_pack.ZxUoJ2/_old 2018-05-29 16:49:34.209789591 +0200 +++ /var/tmp/diff_new_pack.ZxUoJ2/_new 2018-05-29 16:49:34.209789591 +0200 @@ -1,15 +1,14 @@ --- a/files/usr/bin/cinnamon-launcher +++ b/files/usr/bin/cinnamon-launcher -@@ -3,7 +3,7 @@ - """ Launches or restarts cinnamon - """ +@@ -11,22 +11,13 @@ import gi + gi.require_version('Gtk', '3.0') # noqa + from gi.repository import Gtk -FALLBACK_COMMAND = "metacity" +FALLBACK_COMMAND = "icewm" FALLBACK_ARGS = ("--replace",) - import os -@@ -18,15 +18,6 @@ gettext.install("cinnamon", "/usr/share/ + gettext.install("cinnamon", "/usr/share/locale") panel_process_name = None panel_cmd = None @@ -23,5 +22,5 @@ - panel_process_name = "tint2" - panel_cmd = "killall tint2; tint2 &" + def confirm_restart(): - d = Gtk.MessageDialog(parent=None, flags=0, message_type=Gtk.MessageType.WARNING, buttons=Gtk.ButtonsType.YES_NO) ++++++ cinnamon-favourite-applications.patch ++++++ --- /var/tmp/diff_new_pack.ZxUoJ2/_old 2018-05-29 16:49:34.217789296 +0200 +++ /var/tmp/diff_new_pack.ZxUoJ2/_new 2018-05-29 16:49:34.217789296 +0200 @@ -1,11 +1,11 @@ --- a/data/org.cinnamon.gschema.xml.in +++ b/data/org.cinnamon.gschema.xml.in -@@ -388,7 +388,7 @@ +@@ -412,7 +412,7 @@ </key> <key name="favorite-apps" type="as"> -- <default>[ 'firefox.desktop', 'mintinstall.desktop', 'cinnamon-settings.desktop', 'hexchat.desktop', 'gnome-terminal.desktop', 'nemo.desktop' ]</default> -+ <default>[ 'firefox.desktop', 'YaST.desktop', 'cinnamon-settings.desktop', 'pidgin.desktop', 'gnome-terminal.desktop', 'nemo.desktop' ]</default> +- <default>[ 'firefox.desktop', 'mintinstall.desktop', 'cinnamon-settings.desktop', 'hexchat.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop' ]</default> ++ <default>[ 'firefox.desktop', 'YaST.desktop', 'cinnamon-settings.desktop', 'pidgin.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop' ]</default> <_summary>List of desktop file IDs for favorite applications</_summary> <_description> The applications corresponding to these identifiers ++++++ cinnamon-fix-cogl.patch ++++++ --- a/src/Makefile.am +++ b/src/Makefile.am @@ -157,6 +157,7 @@ libcinnamon_la_SOURCES += $(cinnamon_rec noinst_PROGRAMS += test-recorder test_recorder_CPPFLAGS = $(WARN_CFLAGS) \ + $(cinnamon_cflags) \ $(TEST_CINNAMON_RECORDER_CFLAGS) \ $(ST_CFLAGS) test_recorder_LDADD = $(TEST_CINNAMON_RECORDER_LIBS) \ ++++++ cinnamon-network-user-connections.patch ++++++ --- /var/tmp/diff_new_pack.ZxUoJ2/_old 2018-05-29 16:49:34.241788413 +0200 +++ /var/tmp/diff_new_pack.ZxUoJ2/_new 2018-05-29 16:49:34.241788413 +0200 @@ -1,6 +1,6 @@ --- a/files/usr/share/cinnamon/applets/[email protected]/applet.js +++ b/files/usr/share/cinnamon/applets/[email protected]/applet.js -@@ -86,6 +86,11 @@ function NMNetworkMenuItem() { +@@ -83,6 +83,11 @@ function NMNetworkMenuItem() { this._init.apply(this, arguments); } @@ -12,7 +12,7 @@ NMNetworkMenuItem.prototype = { __proto__: PopupMenu.PopupBaseMenuItem.prototype, -@@ -912,12 +917,14 @@ NMDeviceBluetooth.prototype = { +@@ -917,12 +922,14 @@ NMDeviceBluetooth.prototype = { let connection = new NetworkManager.Connection(); connection._uuid = NetworkManager.utils_uuid_generate(); connection.add_setting(new NetworkManager.SettingBluetooth()); @@ -29,7 +29,7 @@ return connection; }, -@@ -998,6 +1005,8 @@ NMDeviceWireless.prototype = { +@@ -1003,6 +1010,8 @@ NMDeviceWireless.prototype = { this._overflowItem = null; this._networks = [ ]; @@ -38,7 +38,7 @@ // breaking the layers with this, but cannot call // this.connectionValid until I have a device this.device = device; -@@ -1537,12 +1546,27 @@ NMDeviceWireless.prototype = { +@@ -1572,12 +1581,27 @@ NMDeviceWireless.prototype = { let connection = new NetworkManager.Connection(); connection.add_setting(new NetworkManager.SettingWireless()); ++++++ cinnamon-no-gksu-requirement.patch ++++++ --- /var/tmp/diff_new_pack.ZxUoJ2/_old 2018-05-29 16:49:34.249788119 +0200 +++ /var/tmp/diff_new_pack.ZxUoJ2/_new 2018-05-29 16:49:34.249788119 +0200 @@ -1,16 +1,3 @@ ---- a/files/usr/share/cinnamon/applets/[email protected]/applet.js -+++ b/files/usr/share/cinnamon/applets/[email protected]/applet.js -@@ -162,10 +162,6 @@ ApplicationContextMenuItem.prototype = { - AppFavorites.getAppFavorites().removeFavorite(this._appButton.app.get_id()); - this._appButton.toggleMenu(); - break; -- } case "uninstall": { -- Util.spawnCommandLine("gksu -m '" + _("Please provide your password to uninstall this application") + "' /usr/bin/cinnamon-remove-application '" + this._appButton.app.get_app_info().get_filename() + "'"); -- this._appButton.appsMenuButton.menu.close(); -- break; - } case "run_with_nvidia_gpu": { - Util.spawnCommandLine("optirun gtk-launch " + this._appButton.app.get_id()); - this._appButton.appsMenuButton.menu.close(); --- a/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py +++ b/files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py @@ -205,6 +205,7 @@ class SAModule: @@ -21,32 +8,3 @@ name = name.split()[0] for path in os.environ["PATH"].split(os.pathsep): ---- a/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py -+++ b/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py -@@ -586,12 +586,12 @@ class Spice_Harvester(GObject.Object): - - schema = [filename for filename in contents if 'gschema.xml' in filename] - for filename in schema: -- if os.path.exists('/usr/bin/gksu') and os.path.exists(config.currentPath + "/bin/installSchema.py"): -+ if os.path.exists('/usr/bin/xdg-su') and os.path.exists(config.currentPath + "/bin/installSchema.py"): - message = _("Please enter your password to install the required settings schema for %s") % (uuid) - path = os.path.join(uuidfolder, filename) - tool = config.currentPath + "/bin/installSchema.py" - -- command = 'gksu --message "<b>%s</b>" %s %s' % (message, tool, path) -+ command = 'xdg-su -c %s %s' % (tool, path) - os.system(command) - else: - self.errorMessage(_("Could not install the settings schema for %s. You will have to perform this step yourself.") % (uuid)) -@@ -647,9 +647,9 @@ class Spice_Harvester(GObject.Object): - if not self.themes: - if 'schema-file' in self.meta_map[uuid]: - sentence = _("Please enter your password to remove the settings schema for %s") % (uuid) -- if os.path.exists('/usr/bin/gksu') and os.path.exists(config.currentPath + "/bin/removeSchema.py"): -+ if os.path.exists('/usr/bin/xdg-su') and os.path.exists(config.currentPath + "/bin/removeSchema.py"): - for file in self.meta_map[uuid]: -- launcher = 'gksu --message "<b>%s</b>"' % sentence -+ launcher = 'xdg-su -c' - tool = config.currentPath + "/bin/removeSchema.py %s" % (file) - command = '%s %s' % (launcher, tool) - os.system(command) ++++++ cinnamon-no-polkit-policy.patch ++++++ --- a/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py +++ b/files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py @@ -647,7 +647,7 @@ class Spice_Harvester(GObject.Object): schema = [filename for filename in contents if 'gschema.xml' in filename] for filename in schema: path = os.path.join(folder, filename) - subprocess.call(['pkexec', 'cinnamon-schema-install', path]) + subprocess.call(['xdg-su', '-c', 'cinnamon-schema-install "%s"' % path]) dest = os.path.join(self.install_folder, uuid) if os.path.exists(dest): --- a/files/usr/share/polkit-1/actions/org.cinnamon.schema-install.policy +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd";> -<policyconfig> - - <vendor>Cinnamon</vendor> - <vendor_url>https://github.com/linuxmint/cinnamon</vendor_url> - - <action id="org.cinnamon.schema-install"> - <icon_name>system-run</icon_name> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> - <allow_active>auth_admin_keep</allow_active> - </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/cinnamon-schema-install</annotate> - </action> - -</policyconfig> --- a/files/usr/share/polkit-1/actions/org.cinnamon.schema-remove.policy +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd";> -<policyconfig> - - <vendor>Cinnamon</vendor> - <vendor_url>https://github.com/linuxmint/cinnamon</vendor_url> - - <action id="org.cinnamon.schema-remove"> - <icon_name>system-run</icon_name> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> - <allow_active>auth_admin_keep</allow_active> - </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/cinnamon-schema-remove</annotate> - </action> - -</policyconfig> ++++++ cinnamon-settings-native.patch ++++++ --- /var/tmp/diff_new_pack.ZxUoJ2/_old 2018-05-29 16:49:34.269787383 +0200 +++ /var/tmp/diff_new_pack.ZxUoJ2/_new 2018-05-29 16:49:34.273787236 +0200 @@ -1,18 +1,10 @@ --- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py +++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py -@@ -79,12 +79,10 @@ 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")], -- [_("Languages"), "mintlocale", "cs-language", "prefs", _("language, install, foreign")], -- [_("Input Method"), "mintlocale im", "cs-input-method", "prefs", _("language, install, foreign, input, method, chinese, korean, japanese, typing")], -- [_("Login Window"), "gksu /usr/sbin/mdmsetup", "cs-login", "admin", _("login, mdm, gdm, manager, user, password, startup, switch")], -+ [_("Login Window"), "xdg-su -c /usr/sbin/mdmsetup", "cs-login", "admin", _("login, mdm, gdm, manager, user, password, startup, switch")], - [_("Login Window"), "lightdm-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")], -- [_("Driver Manager"), "mintdrivers", "cs-drivers", "admin", _("video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, fglrx")], -- [_("Software Sources"), "mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")], -+ [_("Login Window"), "xdg-su -c /usr/bin/lightdm-gtk-greeter-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")], -+ [_("YaST"), "xdg-su -c /sbin/yast2", "yast", "admin", _("system, admin, yast2, settings")], - [_("Users and Groups"), "cinnamon-settings-users", "cs-user-accounts", "admin", _("user, users, account, accounts, group, groups, password")], - [_("Bluetooth"), "blueberry", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")], - [_("Manage Services and Units"), "systemd-manager-pkexec", "cs-sources", "admin", _("systemd, units, services, systemctl, init")] +@@ -87,6 +87,7 @@ STANDALONE_MODULES = [ + [_("Software Sources"), "pkexec mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")], + [_("Package Management"), "dnfdragora", "cs-sources", "admin", _("update, install, repository, package, source, download")], + [_("Package Management"), "yumex-dnf", "cs-sources", "admin", _("update, install, repository, package, source, download")], ++ [_("YaST"), "xdg-su -c /sbin/yast2", "yast", "admin", _("system, admin, yast2, settings")], + [_("Users and Groups"), "cinnamon-settings-users", "cs-user-accounts", "admin", _("user, users, account, accounts, group, groups, password")], + [_("Bluetooth"), "blueberry", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")], + [_("Manage Services and Units"), "systemd-manager-pkexec", "cs-sources", "admin", _("systemd, units, services, systemctl, init")] ++++++ cinnamon-wheel-and-sbin-path.patch ++++++ --- /var/tmp/diff_new_pack.ZxUoJ2/_old 2018-05-29 16:49:34.289786646 +0200 +++ /var/tmp/diff_new_pack.ZxUoJ2/_new 2018-05-29 16:49:34.289786646 +0200 @@ -42,8 +42,8 @@ - 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.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') +- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') ++ self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') self.destroy() def set_passwords_visibility(self):
