pacho 14/10/07 11:38:11
Added: polkit-cinnamon-authentication-agent-1.desktop
cinnamon-2.2.16-set-wheel.patch
cinnamon-2.2.16-gnome-3.14.patch
cinnamon-2.2.16-calendar-upower.patch
Log:
Apply patches from Fedora and Arch to fix various bugs, fix compatibility
with gnome-3.14, ensure authentication-agent is run, stop using gksu, don't
rely on sudo, fix compat with latest upower.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.1
gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop?rev=1.1&content-type=text/plain
Index: polkit-cinnamon-authentication-agent-1.desktop
===================================================================
[Desktop Entry]
Name=PolicyKit Authentication Agent
Comment=PolicyKit Authentication Agent
Exec=/usr/libexec/polkit-gnome-authentication-agent-1
Terminal=false
Type=Application
Categories=
NoDisplay=true
OnlyShowIn=X-Cinnamon;
X-GNOME-AutoRestart=true
1.1 gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.16-set-wheel.patch?rev=1.1&content-type=text/plain
Index: cinnamon-2.2.16-set-wheel.patch
===================================================================
--- 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):
class PasswordDialog(Gtk.Dialog):
- def __init__ (self, user, password_mask, group_mask):
+ def __init__ (self, user, password_mask):
super(PasswordDialog, self).__init__()
self.user = user
self.password_mask = password_mask
- self.group_mask = group_mask
self.set_modal(True)
self.set_skip_taskbar_hint(True)
@@ -215,12 +214,6 @@ class PasswordDialog(Gtk.Dialog):
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()
@@ -515,7 +508,7 @@ class Module:
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)
response = dialog.run()
def _on_groups_button_clicked(self, widget):
@@ -745,11 +738,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])
- # 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))
else:
- os.system("usermod %s -G %s,nopasswdlogin" % (username,
username))
+ os.system("usermod %s -G %s" % (username, username))
self.load_groups()
dialog.destroy()
1.1 gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.16-gnome-3.14.patch?rev=1.1&content-type=text/plain
Index: cinnamon-2.2.16-gnome-3.14.patch
===================================================================
--- a/data/theme/cinnamon.css
+++ b/data/theme/cinnamon.css
@@ -1445,7 +1445,8 @@
.applet-icon:hover,
.applet-box:hover > .applet-icon {
color: #fff;
- icon-shadow: white 0px 0px 3px;
+/* Broken with GNOME 3.14 (icon-size is not honoured)
+ * icon-shadow: white 0px 0px 3px;*/
}
/* ===================================================================
--- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
@@ -91,7 +91,7 @@
def _load_icon_themes(self):
dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"),
".icons"))
- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not
os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d,
"index.theme")))
+ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and
os.path.exists(os.path.join(d, "index.theme")))
valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
res = []
for i in valid:
1.1
gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/files/cinnamon-2.2.16-calendar-upower.patch?rev=1.1&content-type=text/plain
Index: cinnamon-2.2.16-calendar-upower.patch
===================================================================
Index: cinnamon/files/usr/share/cinnamon/applets/[email protected]/applet.js
===================================================================
---
cinnamon.orig/files/usr/share/cinnamon/applets/[email protected]/applet.js
2014-04-27 11:56:10.582581808 +0200
+++ cinnamon/files/usr/share/cinnamon/applets/[email protected]/applet.js
2014-07-14 00:44:37.882215797 +0200
@@ -94,7 +94,11 @@
// https://bugzilla.gnome.org/show_bug.cgi?id=655129
this._upClient = new UPowerGlib.Client();
- this._upClient.connect('notify-resume', this._updateClockAndDate);
+ try {
+ this._upClient.connect('notify-resume',
this._updateClockAndDate);
+ } catch (e) {
+ this._upClient.connect('notify::resume',
this._updateClockAndDate);
+ }
// Start the clock
this.on_settings_changed();
