Hello community,
here is the log from the commit of package cinnamon for openSUSE:Factory
checked in at 2017-11-14 12:57:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon"
Tue Nov 14 12:57:03 2017 rev:21 rq:541127 version:3.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon/cinnamon.changes 2017-08-22
11:11:12.427039277 +0200
+++ /work/SRC/openSUSE:Factory/.cinnamon.new/cinnamon.changes 2017-11-14
12:57:09.575085779 +0100
@@ -1,0 +2,30 @@
+Sun Nov 12 21:00:18 UTC 2017 - sor.ale...@meowr.ru
+
+- Update to version 3.6.2:
+ * st-texture-cache: Avoid potential null pointer dereference.
+- Rebase cinnamon-no-gksu-requirement.patch.
+
+-------------------------------------------------------------------
+Thu Nov 9 18:24:42 UTC 2017 - sor.ale...@meowr.ru
+
+- Update to version 3.6.1:
+ * Fix blurry and off-centred arrow in pop up submenus.
+ * cinnamon-settings: Remove an ui file that is no longer used
+ since the extension-settings-rework.
+ * Spices.py: Fix xlets not installing if a file without an
+ extension is in the po directory.
+ * TreeListWidgets.py: Edit elements with double click.
+ * Fix Gtk-Message when running a dialogue.
+ * window-list: Account for hidden items during DnD repositioning.
+ * Spices: Don't fail if the spice directory is missing.
+- Rebase cinnamon-wheel-and-sbin-path.patch.
+
+-------------------------------------------------------------------
+Sat Oct 28 19:57:36 UTC 2017 - sor.ale...@meowr.ru
+
+- Update to version 3.6.0:
+ * See /usr/share/doc/packages/cinnamon/changelog
+- Rebase cinnamon-network-user-connections.patch,
+ cinnamon-settings-native.patch, cinnamon-no-gksu-requirement.patch.
+
+-------------------------------------------------------------------
Old:
----
Cinnamon-3.4.6.tar.gz
New:
----
Cinnamon-3.6.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon.spec ++++++
--- /var/tmp/diff_new_pack.DXVBcp/_old 2017-11-14 12:57:10.343057699 +0100
+++ /var/tmp/diff_new_pack.DXVBcp/_new 2017-11-14 12:57:10.343057699 +0100
@@ -19,9 +19,9 @@
%define __requires_exclude typelib\\((Cinnamon|St)\\)
%define __provides_exclude typelib\\(.*\\)
%define _name Cinnamon
-%define _version 3.4.0
+%define _version 3.6.0
Name: cinnamon
-Version: 3.4.6
+Version: 3.6.2
Release: 0
Summary: GNU/Linux Desktop featuring a traditional layout
License: GPL-2.0+ AND LGPL-2.1
@@ -65,7 +65,6 @@
BuildRequires: pkgconfig(cinnamon-desktop) >= %{_version}
BuildRequires: pkgconfig(cjs-1.0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0)
-BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(libcinnamon-menu-3.0)
@@ -78,7 +77,6 @@
BuildRequires: pkgconfig(polkit-agent-1)
Requires: %{name}-gschemas = %{version}
Requires: adwaita-icon-theme
-Requires: caribou
Requires: cinnamon-control-center-common >= %{_version}
Requires: cinnamon-screensaver >= %{_version}
Requires: cinnamon-session >= %{_version}
@@ -87,6 +85,7 @@
Requires: cups-pk-helper
Requires: dbus-1-python
Requires: dbus-1-python3
+Requires: gettext-runtime
Requires: glib2-tools
Requires: iso-country-flags-png
Requires: libcinnamon-desktop-data >= %{_version}
@@ -109,9 +108,9 @@
Requires: xdg-utils
Requires(post): update-alternatives
Requires(postun): update-alternatives
+Recommends: %{name}-lang
Recommends: blueberry
Recommends: cinnamon-themes
-Recommends: cinnamon-translations >= %{_version}
Recommends: gnome-terminal
Recommends: gnome-themes-standard
Recommends: icewm
@@ -231,25 +230,31 @@
%post
/sbin/ldconfig
-%desktop_database_post
-%icon_theme_cache_post
%{_sbindir}/update-alternatives --install
%{_datadir}/xsessions/default.desktop \
default-xsession.desktop %{_datadir}/xsessions/%{name}.desktop 20
+%if 0%{?suse_version} <= 1320
+%desktop_database_post
+%icon_theme_cache_post
+%endif
%postun
/sbin/ldconfig
-%desktop_database_postun
-%icon_theme_cache_postun
if [ ! -f %{_datadir}/xsessions/%{name}.desktop ]; then
%{_sbindir}/update-alternatives --remove default-xsession.desktop \
%{_datadir}/xsessions/%{name}.desktop
fi
+%if 0%{?suse_version} <= 1320
+%desktop_database_postun
+%icon_theme_cache_postun
+%endif
+%if 0%{?suse_version} <= 1320
%post gschemas
%glib2_gsettings_schema_post
%postun gschemas
%glib2_gsettings_schema_postun
+%endif
%files
%doc AUTHORS COPYING README.rst debian/changelog
++++++ Cinnamon-3.4.6.tar.gz -> Cinnamon-3.6.2.tar.gz ++++++
++++ 24666 lines of diff (skipped)
++++++ cinnamon-network-user-connections.patch ++++++
--- /var/tmp/diff_new_pack.DXVBcp/_old 2017-11-14 12:57:10.775041903 +0100
+++ /var/tmp/diff_new_pack.DXVBcp/_new 2017-11-14 12:57:10.775041903 +0100
@@ -1,6 +1,6 @@
--- a/files/usr/share/cinnamon/applets/netw...@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/netw...@cinnamon.org/applet.js
-@@ -100,6 +100,11 @@ function NMNetworkMenuItem() {
+@@ -86,6 +86,11 @@ function NMNetworkMenuItem() {
this._init.apply(this, arguments);
}
@@ -12,10 +12,10 @@
NMNetworkMenuItem.prototype = {
__proto__: PopupMenu.PopupBaseMenuItem.prototype,
-@@ -926,12 +931,14 @@ NMDeviceBluetooth.prototype = {
- let connection = new NetworkManager.Connection;
+@@ -912,12 +917,14 @@ NMDeviceBluetooth.prototype = {
+ let connection = new NetworkManager.Connection();
connection._uuid = NetworkManager.utils_uuid_generate();
- connection.add_setting(new NetworkManager.SettingBluetooth);
+ connection.add_setting(new NetworkManager.SettingBluetooth());
- connection.add_setting(new NetworkManager.SettingConnection({
+ let setting_conn = new NetworkManager.SettingConnection({
uuid: connection._uuid,
@@ -29,7 +29,7 @@
return connection;
},
-@@ -1012,6 +1019,8 @@ NMDeviceWireless.prototype = {
+@@ -998,6 +1005,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;
-@@ -1554,12 +1563,27 @@ NMDeviceWireless.prototype = {
+@@ -1537,12 +1546,27 @@ NMDeviceWireless.prototype = {
let connection = new NetworkManager.Connection();
connection.add_setting(new NetworkManager.SettingWireless());
++++++ cinnamon-no-gksu-requirement.patch ++++++
--- /var/tmp/diff_new_pack.DXVBcp/_old 2017-11-14 12:57:10.783041611 +0100
+++ /var/tmp/diff_new_pack.DXVBcp/_new 2017-11-14 12:57:10.783041611 +0100
@@ -1,22 +1,14 @@
---- a/files/usr/bin/cinnamon-settings-users
-+++ b/files/usr/bin/cinnamon-settings-users
-@@ -5,4 +5,4 @@
-
- import os
-
--os.system("gksu
/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py")
-+os.system("xdg-su -c
'/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py'")
--- a/files/usr/share/cinnamon/applets/m...@cinnamon.org/applet.js
+++ b/files/usr/share/cinnamon/applets/m...@cinnamon.org/applet.js
-@@ -165,10 +165,6 @@ ApplicationContextMenuItem.prototype = {
+@@ -162,10 +162,6 @@ ApplicationContextMenuItem.prototype = {
AppFavorites.getAppFavorites().removeFavorite(this._appButton.app.get_id());
this._appButton.toggleMenu();
break;
-- case "uninstall":
+- } 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":
+ } 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
@@ -31,27 +23,30 @@
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
-@@ -449,9 +449,8 @@ class Spice_Harvester:
- subprocess.call(["msgfmt", "-c",
os.path.join(dirname, file.filename), "-o", os.path.join(this_locale_dir,
'%s.mo' % uuid)])
- ui_thread_do(self.progresslabel.set_text,
_("Installing %s...") % title)
- elif "gschema.xml" in file.filename:
-- sentence = _("Please enter your password to install
the required settings schema for %s") % (uuid)
-- if os.path.exists("/usr/bin/gksu") and
os.path.exists("/usr/share/cinnamon/cinnamon-settings/bin/installSchema.py"):
-- launcher = "gksu --message \"<b>%s</b>\"" %
sentence
-+ if os.path.exists("/usr/bin/xdg-su") and
os.path.exists("/usr/share/cinnamon/cinnamon-settings/bin/installSchema.py"):
-+ launcher = "xdg-su -c"
- tool =
"/usr/share/cinnamon/cinnamon-settings/bin/installSchema.py %s" %
(os.path.join(dirname, file.filename))
- command = "%s %s" % (launcher, tool)
- os.system(command)
-@@ -551,9 +550,8 @@ class Spice_Harvester:
- try:
- if not self.themes:
- if schema_filename != "":
-- sentence = _("Please enter your password to remove the
settings schema for %s") % (uuid)
-- if os.path.exists("/usr/bin/gksu") and
os.path.exists("/usr/share/cinnamon/cinnamon-settings/bin/removeSchema.py"):
-- launcher = "gksu --message \"<b>%s</b>\"" % sentence
-+ if os.path.exists("/usr/bin/xdg-su") and
os.path.exists("/usr/share/cinnamon/cinnamon-settings/bin/removeSchema.py"):
-+ launcher = "xdg-su -c"
- tool =
"/usr/share/cinnamon/cinnamon-settings/bin/removeSchema.py %s" %
(schema_filename)
- command = "%s %s" % (launcher, tool)
+@@ -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-settings-native.patch ++++++
--- /var/tmp/diff_new_pack.DXVBcp/_old 2017-11-14 12:57:10.791041319 +0100
+++ /var/tmp/diff_new_pack.DXVBcp/_new 2017-11-14 12:57:10.791041319 +0100
@@ -1,7 +1,7 @@
--- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
-@@ -77,12 +77,10 @@ STANDALONE_MODULES = [
- # Label Executable
Icon Category Keywords for filter
+@@ -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")],
++++++ cinnamon-wheel-and-sbin-path.patch ++++++
--- /var/tmp/diff_new_pack.DXVBcp/_old 2017-11-14 12:57:10.803040880 +0100
+++ /var/tmp/diff_new_pack.DXVBcp/_new 2017-11-14 12:57:10.803040880 +0100
@@ -21,9 +21,9 @@
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
@@ -51,8 +51,8 @@
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)
+- 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):
@@ -90,7 +90,7 @@
d.destroy()
@@ -896,7 +888,7 @@ class Module:
- dialog = GroupDialog(_("Group Name"), "")
+ dialog = GroupDialog(_("Group Name"), "", self.window)
response = dialog.run()
if response == Gtk.ResponseType.OK:
- subprocess.call(["groupadd", dialog.entry.get_text().lower()])
@@ -99,7 +99,7 @@
dialog.destroy()
@@ -907,7 +899,7 @@ class Module:
- dialog = GroupDialog(_("Group Name"), group)
+ dialog = GroupDialog(_("Group Name"), group, self.window)
response = dialog.run()
if response == Gtk.ResponseType.OK:
- subprocess.call(["groupmod", group, "-n",
dialog.entry.get_text().lower()])
