summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Böhmwalder2017-05-25 02:33:19 +0200
committerChristoph Böhmwalder2017-05-25 02:35:20 +0200
commite3b4e9befa7f2becc6c928e4f91ccc84d8d861ce (patch)
treefa98b9db81dc521029c8079330fa77fb5f103bb4
parent79831ed8332697266025e75d916ee9ca0cf58fcf (diff)
downloadaur-e3b4e9befa7f2becc6c928e4f91ccc84d8d861ce.tar.gz
fix PKGBUILD (using suggestions from comments)
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD12
-rw-r--r--set_wheel.patch53
-rw-r--r--use-wheel.patch56
4 files changed, 65 insertions, 63 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 72c3d347889..073123f860f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cinnamon-git
pkgdesc = A Linux desktop which provides advanced innovative features and a traditional user experience
- pkgver = 3910.dfdcb08
+ pkgver = 6157.e9905a09
pkgrel = 1
url = https://github.com/linuxmint/Cinnamon
install = cinnamon-git.install
@@ -10,7 +10,6 @@ pkgbase = cinnamon-git
makedepends = gnome-common
makedepends = intltool
makedepends = git
- makedepends = patch
depends = cinnamon-settings-daemon-git
depends = cinnamon-session-git
depends = cinnamon-desktop-git
@@ -47,9 +46,9 @@ pkgbase = cinnamon-git
conflicts = cinnamon
options = !emptydirs
source = cinnamon::git+https://github.com/linuxmint/cinnamon.git
- source = set_wheel.patch
+ source = use-wheel.patch
sha256sums = SKIP
- sha256sums = 3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444
+ sha256sums = f2d86a98fa27e90030bc152c5a591f118acd1fa6a506bfbbffd7a5896e2e49cb
pkgname = cinnamon-git
diff --git a/PKGBUILD b/PKGBUILD
index a9bc6126fb2..d71d8d5f993 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# $Id$
-# Maintainer: Evan Penner <evaninrussia@gmail.com>
+# Maintainer: Christoph Böhmwalder <christoph@boehmwalder.at>
# Based on cinnamon PKGBUILD
_pkgname=cinnamon
pkgname=${_pkgname}-git
-pkgver=3910.dfdcb08
+pkgver=6157.e9905a09
pkgrel=1
pkgdesc="A Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64')
@@ -26,9 +26,9 @@ conflicts=("${_pkgname}")
provides=("${_pkgname}")
install=${pkgname}.install
source=("${_pkgname}"::git+https://github.com/linuxmint/cinnamon.git
- "set_wheel.patch")
+ "use-wheel.patch")
sha256sums=('SKIP'
- '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444')
+ 'f2d86a98fa27e90030bc152c5a591f118acd1fa6a506bfbbffd7a5896e2e49cb')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -39,7 +39,7 @@ prepare() {
cd ${srcdir}/cinnamon
# Use wheel group instread of sudo
- patch -Np1 -i ../set_wheel.patch
+ patch -Np1 -i ../use-wheel.patch
# Add polkit agent to required components
sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
@@ -52,7 +52,7 @@ prepare() {
# Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
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
}
build() {
diff --git a/set_wheel.patch b/set_wheel.patch
deleted file mode 100644
index 81c6dc4b583..00000000000
--- a/set_wheel.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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()
-
diff --git a/use-wheel.patch b/use-wheel.patch
new file mode 100644
index 00000000000..b878202dc15
--- /dev/null
+++ b/use-wheel.patch
@@ -0,0 +1,56 @@
+--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2016-12-23 16:59:40.005754000 +1300
++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py 2016-12-23 16:57:46.775035000 +1300
+@@ -153,12 +153,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)
+@@ -224,14 +223,7 @@ class PasswordDialog(Gtk.Dialog):
+ def change_password(self):
+ newpass = self.new_password.get_text()
+ self.user.set_password(newpass, "")
+- mask = self.group_mask.get_text()
+- if "nopasswdlogin" in mask:
+- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
+- 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.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.destroy()
+
+ def set_passwords_visibility(self):
+@@ -569,7 +561,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):
+@@ -814,11 +806,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:
+- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G", "%s,wheel" % username])
+ else:
+- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
++ subprocess.call(["usermod", username, "-G", "%s" % username])
+ self.load_groups()
+ dialog.destroy()
+ \ No newline at end of file