diff --git a/.gitignore b/.gitignore index dfec4a8..14988b2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cinnamon-3.4.2.tar.gz /cinnamon-3.4.4.tar.gz /cinnamon-3.4.6.tar.gz +/cinnamon-3.6.0.tar.gz diff --git a/cinnamon-3.4.6-cs_add_online_account.patch b/cinnamon-3.4.6-cs_add_online_account.patch deleted file mode 100644 index d9cb313..0000000 --- a/cinnamon-3.4.6-cs_add_online_account.patch +++ /dev/null @@ -1,23 +0,0 @@ -From aae8d96abac7b1c53ae2d568efab0ca37136ec4c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 7 Sep 2017 17:41:57 +0200 -Subject: [PATCH] cinnamon-settings: Add online-accounts - ---- - files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py -index 5367579a0..6c86bfba1 100755 ---- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py -+++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py -@@ -72,7 +72,8 @@ - [_("Network"), "network", "cs-network", "hardware", _("network, wireless, wifi, ethernet, broadband, internet")], - [_("Display"), "display", "cs-display", "hardware", _("display, screen, monitor, layout, resolution, dual, lcd")], - [_("Color"), "color", "cs-color", "hardware", _("color, profile, display, printer, output")], -- [_("Graphics Tablet"), "wacom", "cs-tablet", "hardware", _("wacom, digitize, tablet, graphics, calibrate, stylus")] -+ [_("Graphics Tablet"), "wacom", "cs-tablet", "hardware", _("wacom, digitize, tablet, graphics, calibrate, stylus")], -+ [_("Online Accounts"), "online-accounts", "cs-online-accounts", "prefs", _("Google, Facebook, Twitter, Yahoo, Web, Online, Chat, Calendar, Mail, Contact, ownCloud, Kerberos, IMAP, SMTP, Pocket, ReadItLater")], - ] - - STANDALONE_MODULES = [ diff --git a/cinnamon-settings-apps-dnfdragora.patch b/cinnamon-settings-apps-dnfdragora.patch index 6bd8add..40869f8 100644 --- a/cinnamon-settings-apps-dnfdragora.patch +++ b/cinnamon-settings-apps-dnfdragora.patch @@ -1,8 +1,8 @@ --- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py +++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py -@@ -76,13 +76,11 @@ +@@ -78,13 +78,11 @@ STANDALONE_MODULES = [ - # Label Executable Icon Category Keywords for filter + # 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")], @@ -14,7 +14,7 @@ - [_("Software Sources"), "mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")], + [_("Login Window"), "lightdm-settings", "cs-login", "admin", _("login, lightdm, manager, settings, editor")], + [_("Nvidia Settings"), "nvidia-settings", "cs-drivers", "admin", _("video, driver, proprietary, nvidia, settings")], -+ [_("Package Management"), "dnfdragora", "cs-sources", "admin", _("update, install, repository, package, source, download")], ++ [_("Package Management"), "dnfdragora", "cs-sources", "admin", _("update, install, repository, package, source, download")], [_("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")] diff --git a/cinnamon.spec b/cinnamon.spec index 85c92f9..e6666a3 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,15 +1,15 @@ %global __requires_exclude ^libcinnamon.so|^libcinnamon-js.so %global clutter_version 1.12.2 -%global cjs_version 3.4.0 -%global cinnamon_desktop_version 3.4.0 +%global cjs_version 3.6.0 +%global cinnamon_desktop_version 3.6.0 %global gobject_introspection_version 1.38.0 -%global muffin_version 3.4.0 +%global muffin_version 3.6.0 %global json_glib_version 0.13.2 Name: cinnamon -Version: 3.4.6 -Release: 16%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/ @@ -44,9 +44,6 @@ Patch7: remove_crap_from_menu.patch Patch8: replace-metacity-with-openbox.patch Patch9: menu-use-fedora-icon-as-default.patch -# From upstream. -Patch10: %url/%{name}/pull/6881.patch#/%{name}-3.4.6-cs_add_online_account.patch - BuildRequires: gcc-c++ BuildRequires: pkgconfig(clutter-1.0) >= %{clutter_version} BuildRequires: pkgconfig(dbus-glib-1) @@ -288,6 +285,9 @@ fi %doc %{_datadir}/gtk-doc/html/*/ %changelog +* Tue Oct 24 2017 Leigh Scott - 3.6.0-1 +- update to 3.6.0 release + * Tue Sep 19 2017 Björn Esser - 3.4.6-16 - Update for F27 backgrounds diff --git a/network-user-connections.patch b/network-user-connections.patch index d8837b5..6c10ed4 100644 --- a/network-user-connections.patch +++ b/network-user-connections.patch @@ -10,45 +10,45 @@ diff --git a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js b/f index daddebf..12643af 100644 --- a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js +++ b/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js -@@ -100,6 +100,11 @@ function NMNetworkMenuItem() { - this._init.apply(this, arguments); - } +@@ -84,6 +84,11 @@ + function NMNetworkMenuItem() { + this._init.apply(this, arguments); ++} ++ +function default_to_private_connections(client) { + let perms = client.get_permission_result (NMClient.ClientPermission.SETTINGS_MODIFY_SYSTEM); + return (perms != NMClient.ClientPermissionResult.YES); -+} -+ - NMNetworkMenuItem.prototype = { - __proto__: PopupMenu.PopupBaseMenuItem.prototype, + } -@@ -926,12 +931,14 @@ NMDeviceBluetooth.prototype = { - let connection = new NetworkManager.Connection; + NMNetworkMenuItem.prototype = { +@@ -743,12 +748,14 @@ + let connection = new NetworkManager.Connection(); connection._uuid = NetworkManager.utils_uuid_generate(); - connection.add_setting(new NetworkManager.SettingBluetooth); + connection.add_setting(new NetworkManager.SettingWired()); - connection.add_setting(new NetworkManager.SettingConnection({ + let setting_conn = new NetworkManager.SettingConnection({ uuid: connection._uuid, id: this._autoConnectionName, - type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME, - autoconnect: false + type: NetworkManager.SETTING_WIRED_SETTING_NAME, + autoconnect: true - })); + }); + setting_conn.add_permission('user', GLib.get_user_name(), null); + connection.add_setting(setting_conn); return connection; - }, + } + }; +@@ -997,6 +1004,8 @@ -@@ -1012,6 +1019,8 @@ NMDeviceWireless.prototype = { this._overflowItem = null; this._networks = [ ]; - -+ this._client = client; + ++ this._client = client; + // breaking the layers with this, but cannot call // this.connectionValid until I have a device - this.device = device; -@@ -1555,12 +1564,27 @@ NMDeviceWireless.prototype = { +@@ -1537,12 +1546,27 @@ let connection = new NetworkManager.Connection(); connection.add_setting(new NetworkManager.SettingWireless()); @@ -77,4 +77,4 @@ index daddebf..12643af 100644 + connection.add_setting(setting_conn); return connection; }, - + diff --git a/sources b/sources index aff4bf6..820f259 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-3.4.6.tar.gz) = b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd +SHA512 (cinnamon-3.6.0.tar.gz) = 4d4a35a2c7b03858693947389f4830e98261069142649f9e8acaba21f8eb3c847f6051ae508a896e0c836de357fd55af8eadee1aefe406f35964a6eb3353163b