initial commit

5 files changed, 249 insertions, 0 deletions

diff --git a/.AURINFO b/.AURINFO
new file mode 100644
index 000000000000..72c3d3478895
--- /dev/null
+++ b/.AURINFO
@@ -0,0 +1,55 @@
+pkgbase = cinnamon-git
+	pkgdesc = A Linux desktop which provides advanced innovative features and a traditional user experience
+	pkgver = 3910.dfdcb08
+	pkgrel = 1
+	url = https://github.com/linuxmint/Cinnamon
+	install = cinnamon-git.install
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	makedepends = gnome-common
+	makedepends = intltool
+	makedepends = git
+	makedepends = patch
+	depends = cinnamon-settings-daemon-git
+	depends = cinnamon-session-git
+	depends = cinnamon-desktop-git
+	depends = cinnamon-control-center-git
+	depends = cjs-git
+	depends = cinnamon-menus-git
+	depends = cinnamon-translations-git
+	depends = muffin-git
+	depends = cinnamon-screensaver-git
+	depends = nemo-dev
+	depends = polkit-gnome
+	depends = network-manager-applet
+	depends = gnome-icon-theme
+	depends = gnome-themes-standard
+	depends = accountsservice
+	depends = caribou
+	depends = clutter-gtk
+	depends = gconf
+	depends = libgnomekbd
+	depends = gnome-themes-standard
+	depends = gstreamer
+	depends = libgnome-keyring
+	depends = librsvg
+	depends = networkmanager
+	depends = python2-dbus
+	depends = python2-pillow
+	depends = python2-pam
+	depends = python2-pexpect
+	depends = python2-pyinotify
+	depends = python2-lxml
+	depends = webkitgtk
+	depends = xorg-server
+	provides = cinnamon
+	conflicts = cinnamon
+	options = !emptydirs
+	source = cinnamon::git+https://github.com/linuxmint/cinnamon.git
+	source = set_wheel.patch
+	sha256sums = SKIP
+	sha256sums = 3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444
+
+pkgname = cinnamon-git
+
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..72c3d3478895
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,55 @@
+pkgbase = cinnamon-git
+	pkgdesc = A Linux desktop which provides advanced innovative features and a traditional user experience
+	pkgver = 3910.dfdcb08
+	pkgrel = 1
+	url = https://github.com/linuxmint/Cinnamon
+	install = cinnamon-git.install
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	makedepends = gnome-common
+	makedepends = intltool
+	makedepends = git
+	makedepends = patch
+	depends = cinnamon-settings-daemon-git
+	depends = cinnamon-session-git
+	depends = cinnamon-desktop-git
+	depends = cinnamon-control-center-git
+	depends = cjs-git
+	depends = cinnamon-menus-git
+	depends = cinnamon-translations-git
+	depends = muffin-git
+	depends = cinnamon-screensaver-git
+	depends = nemo-dev
+	depends = polkit-gnome
+	depends = network-manager-applet
+	depends = gnome-icon-theme
+	depends = gnome-themes-standard
+	depends = accountsservice
+	depends = caribou
+	depends = clutter-gtk
+	depends = gconf
+	depends = libgnomekbd
+	depends = gnome-themes-standard
+	depends = gstreamer
+	depends = libgnome-keyring
+	depends = librsvg
+	depends = networkmanager
+	depends = python2-dbus
+	depends = python2-pillow
+	depends = python2-pam
+	depends = python2-pexpect
+	depends = python2-pyinotify
+	depends = python2-lxml
+	depends = webkitgtk
+	depends = xorg-server
+	provides = cinnamon
+	conflicts = cinnamon
+	options = !emptydirs
+	source = cinnamon::git+https://github.com/linuxmint/cinnamon.git
+	source = set_wheel.patch
+	sha256sums = SKIP
+	sha256sums = 3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444
+
+pkgname = cinnamon-git
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..a9bc6126fb2d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Evan Penner <evaninrussia@gmail.com>
+# Based on cinnamon PKGBUILD
+
+_pkgname=cinnamon
+pkgname=${_pkgname}-git
+pkgver=3910.dfdcb08
+pkgrel=1
+pkgdesc="A Linux desktop which provides advanced innovative features and a traditional user experience"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/Cinnamon"
+license=('GPL2')
+depends=('cinnamon-settings-daemon-git' 'cinnamon-session-git' 'cinnamon-desktop-git' 
+         'cinnamon-control-center-git' 'cjs-git' 'cinnamon-menus-git' 
+         'cinnamon-translations-git' 'muffin-git' 'cinnamon-screensaver-git'
+         'nemo-dev' 'polkit-gnome'
+         'network-manager-applet' 'gnome-icon-theme' 'gnome-themes-standard'
+         'accountsservice' 'caribou' 'clutter-gtk' 'gconf' 'libgnomekbd' 
+         'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
+         'librsvg' 'networkmanager'  'python2-dbus' 'python2-pillow'
+         'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk' 
+	 'xorg-server')
+makedepends=('gnome-common' 'intltool' 'git')
+options=('!emptydirs')
+conflicts=("${_pkgname}")
+provides=("${_pkgname}")
+install=${pkgname}.install
+source=("${_pkgname}"::git+https://github.com/linuxmint/cinnamon.git
+        "set_wheel.patch")
+sha256sums=('SKIP'
+            '3c4c7bb65d9e3b7d5569a14a45ebf08d2326250869645511dfa18d87b8eaf444')
+
+pkgver() {
+  cd "${srcdir}/${_pkgname}"
+  echo $(git rev-list --count master).$(git rev-parse --short master)
+}
+
+prepare() {
+  cd ${srcdir}/cinnamon
+
+  # Use wheel group instread of sudo
+  patch -Np1 -i ../set_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
+
+  # Use pkexec instead of gksu
+  sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+  # Check for the cc-panel path, not for the unneeded binary
+  sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
+
+  # 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
+}
+
+build() {
+  cd ${srcdir}/cinnamon
+
+  ./autogen.sh --prefix=/usr \
+               --sysconfdir=/etc \
+               --libexecdir=/usr/lib/cinnamon \
+               --localstatedir=/var \
+               --disable-static \
+               --disable-schemas-compile \
+               --with-session-tracking=systemd
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}"
+  make DESTDIR="${pkgdir}/" install
+}
diff --git a/cinnamon-git.install b/cinnamon-git.install
new file mode 100644
index 000000000000..c0ed9a0d79f8
--- /dev/null
+++ b/cinnamon-git.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/set_wheel.patch b/set_wheel.patch
new file mode 100644
index 000000000000..81c6dc4b583f
--- /dev/null
+++ b/set_wheel.patch
@@ -0,0 +1,53 @@
+--- 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()
+