wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-28 16:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cinnamon: update to 2.8.0.

Browse source
This commit is contained in:
Steve Prybylski 2015-11-09 00:10:51 -05:00 • committed by Juan RP
parent 6873701b3a
commit 1a8d170c42
3 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/cinnamon/patches/gnome-3.14.patch
View file

@ -10,10 +10,10 @@
} }
/* =================================================================== /* ===================================================================
--- files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-08-12 13:00:36.000000000 +0200 --- ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py.orig 2015-10-30 08:04:07.000000000 -0400
+++ files/usr/lib/cinnamon-settings/modules/cs_themes.py 2014-10-01 02:52:56.897767729 +0200 +++ ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py 2015-11-08 23:35:36.770662778 -0500
@@ -91,7 +91,7 @@ @@ -262,7 +262,7 @@
def _load_icon_themes(self): def _load_icon_themes(self):
dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons")) 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 not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))

36
srcpkgs/cinnamon/patches/set_wheel.patch
View file

@ -1,56 +1,50 @@
--- files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py --- ./files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py.orig 2015-11-08 23:37:01.916659699 -0500
+++ files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py +++ ./files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2015-11-08 23:40:33.305652057 -0500
@@ -144,12 +144,11 @@ class EditableEntry (Gtk.Notebook): @@ -147,7 +147,7 @@
class PasswordDialog(Gtk.Dialog): class PasswordDialog(Gtk.Dialog):
- def __init__ (self, user, password_mask, group_mask): - def __init__ (self, user, password_mask, group_mask):
+ def __init__ (self, user, password_mask): + def __init__ (self, user, password_mask):
super(PasswordDialog, self).__init__() super(PasswordDialog, self).__init__()
self.user = user self.user = user
self.password_mask = password_mask @@ -219,13 +219,7 @@
- self.group_mask = group_mask
self.set_modal(True)
self.set_skip_taskbar_hint(True)
@@ -218,13 +217,7 @@ class PasswordDialog(Gtk.Dialog):
newpass = self.new_password.get_text() newpass = self.new_password.get_text()
self.user.set_password(newpass, "") self.user.set_password(newpass, "")
mask = self.group_mask.get_text() mask = self.group_mask.get_text()
- if "nopasswdlogin" in mask: - if "nopasswdlogin" in mask:
- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name()) - subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
- mask = mask.split(", ") - mask = mask.split(", ")
- mask.remove("nopasswdlogin") - mask.remove("nopasswdlogin")
- mask = ", ".join(mask) - mask = ", ".join(mask)
- self.group_mask.set_text(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(u'\u2022\u2022\u2022\u2022\u2022\u2022') + self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
self.destroy() self.destroy()
def set_passwords_visibility(self): def set_passwords_visibility(self):
@@ -563,7 +557,7 @@
@@ -515,7 +508,7 @@ class Module:
model, treeiter = self.users_treeview.get_selection().get_selected() model, treeiter = self.users_treeview.get_selection().get_selected()
if treeiter != None: if treeiter != None:
user = model[treeiter][INDEX_USER_OBJECT] user = model[treeiter][INDEX_USER_OBJECT]
- dialog = PasswordDialog(user, self.password_mask, self.groups_label) - dialog = PasswordDialog(user, self.password_mask, self.groups_label)
+ dialog = PasswordDialog(user, self.password_mask) + dialog = PasswordDialog(user, self.password_mask)
response = dialog.run() response = dialog.run()
def _on_groups_button_clicked(self, widget): def _on_groups_button_clicked(self, widget):
@@ -745,11 +738,11 @@ class Module: @@ -808,11 +802,11 @@
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) 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) description = "<b>%s</b>\n%s" % (fullname, username)
piter = self.users.append(None, [new_user, pixbuf, description]) 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 sudo if Administrator was selected
+ # Add the user to his/her own group and wheel 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: if dialog.account_type_combo.get_active() == 1:
- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username)) - subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
+ os.system("usermod %s -G %s,wheel" % (username, username)) + os.system("usermod %s -G %s,wheel" % (username, username))
else: else:
- os.system("usermod %s -G %s,nopasswdlogin" % (username, username)) - subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
+ os.system("usermod %s -G %s" % (username, username)) + os.system("usermod %s -G %s" % (username, username))
self.load_groups() self.load_groups()
dialog.destroy() dialog.destroy()

10
srcpkgs/cinnamon/template
View file

@ -1,6 +1,6 @@
# Template file for 'cinnamon' # Template file for 'cinnamon'
pkgname=cinnamon pkgname=cinnamon
version=2.6.13 version=2.8.0
revision=1 revision=1
wrksrc="Cinnamon-${version}" wrksrc="Cinnamon-${version}"
short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect" short_desc="GNOME3 fork of Linux Mint with GNOME2 aspect"
@ -23,7 +23,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3" license="GPL-3"
homepage="http://cinnamon.linuxmint.com/" homepage="http://cinnamon.linuxmint.com/"
distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
checksum=f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 checksum=ef058a8a466bf20c5aa2579408db93b0e9d5b31405075b232c6277a56c2b595d
CFLAGS+="-I/usr/include/gtk-3.0" CFLAGS+="-I/usr/include/gtk-3.0"
@ -41,7 +41,7 @@ pre_configure() {
sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
# fix for the python2 PAM module # fix for the python2 PAM module
sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py sed -i 's:import PAM:import pam:' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
# Use pkexec instead of gksu # Use pkexec instead of gksu
sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
@ -51,11 +51,11 @@ pre_configure() {
# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \ sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
# Fix selected background color in Cinnamon Settings for Adwaita theme # Fix selected background color in Cinnamon Settings for Adwaita theme
sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
files/usr/lib/cinnamon-settings/cinnamon-settings.py files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }