Date: Monday, November 20, 2017 @ 16:49:32 Author: arojas Revision: 267613
archrelease: copy trunk to community-x86_64 Added: cinnamon/repos/community-x86_64/PKGBUILD (from rev 267612, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-x86_64/default-theme.patch (from rev 267612, cinnamon/trunk/default-theme.patch) cinnamon/repos/community-x86_64/set_wheel.patch (from rev 267612, cinnamon/trunk/set_wheel.patch) Deleted: cinnamon/repos/community-x86_64/PKGBUILD cinnamon/repos/community-x86_64/default-theme.patch cinnamon/repos/community-x86_64/set_wheel.patch ---------------------+ PKGBUILD | 194 +++++++++++++++++++++++++------------------------- default-theme.patch | 50 ++++++------ set_wheel.patch | 112 ++++++++++++++-------------- 3 files changed, 178 insertions(+), 178 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-11-20 16:49:06 UTC (rev 267612) +++ PKGBUILD 2017-11-20 16:49:32 UTC (rev 267613) @@ -1,97 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Contributor: M0Rf30 -# Contributor: unifiedlinux -# Contributor: CReimer - -pkgname=cinnamon -pkgver=3.6.3 -pkgrel=1 -pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" -arch=('x86_64') -url="https://github.com/linuxmint/Cinnamon" -license=('GPL2') -depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session' - 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' - 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'libkeybinder3' 'librsvg' - 'muffin' 'python2-cairo' 'python-dbus' 'python2-dbus' 'python2-pillow' - 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' - 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd' - 'network-manager-applet' 'nemo' 'polkit-gnome' 'xapps' 'python2-gobject' 'gnome-bluetooth') -makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection') -optdepends=('blueberry: Bluetooth support' - 'gnome-panel: fallback mode' - 'metacity: fallback mode' - 'system-config-printer: printer settings') -options=('!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" - "set_wheel.patch" - "default-theme.patch") -sha512sums=('18e68a6f2694812a935c987581413a9d63a7d50bd177443922562d54804f2d91ac5f3448a0ff6b80c311df17b3b6b8248472901293d90661972805cd5aa2c37e' - '55929747b9cc1bc8893717c9fef257f8f2d560dc56849f1c74f88ed636b6f9f9997f6c4713768793b115e93482543a330b70eba672d696ea8456741ed2c71237' - '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') - -prepare() { - cd ${srcdir}/Cinnamon* - - # Python2 fix - sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor - find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - - # Use wheel group instread of sudo (taken from Fedora) - patch -Np1 -i ../set_wheel.patch - - # Set default theme to 'cinnamon' - patch -Np1 -i ../default-theme.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/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py - - # Fix selected background color in Cinnamon Settings for Adwaita theme - sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ - files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py - - # GNOME Terminal desktop file was renamed in GNOME 3.20 - sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/' data/org.cinnamon.gschema.xml.in \ - files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/settings-schema.json - - # Replace MintInstall with GNOME Software - sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in - - # Remove broken symlink - rm files/etc/xdg/menus/cinnamon-applications-merged -} - -build() { - cd ${srcdir}/Cinnamon* - - ./autogen.sh --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/cinnamon \ - --localstatedir=/var \ - --disable-static \ - --disable-schemas-compile \ - --enable-compile-warnings=yes - - #https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd ${srcdir}/Cinnamon* - make DESTDIR="${pkgdir}" install -} Copied: cinnamon/repos/community-x86_64/PKGBUILD (from rev 267612, cinnamon/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-11-20 16:49:32 UTC (rev 267613) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon +pkgver=3.6.4 +pkgrel=1 +pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" +arch=('x86_64') +url="https://github.com/linuxmint/Cinnamon" +license=('GPL2') +depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session' + 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds' + 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'libkeybinder3' 'librsvg' + 'muffin' 'python2-cairo' 'python-dbus' 'python2-dbus' 'python2-pillow' + 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' + 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd' + 'network-manager-applet' 'nemo' 'polkit-gnome' 'xapps' 'python2-gobject' 'gnome-bluetooth') +makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection') +optdepends=('blueberry: Bluetooth support' + 'gnome-panel: fallback mode' + 'metacity: fallback mode' + 'system-config-printer: printer settings') +options=('!emptydirs') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" + "set_wheel.patch" + "default-theme.patch") +sha512sums=('118a69ee2fecae3ac8d8266a98ab6c78ddc763f0d09c6e4866273f473fa10d0ec1407d6b22109a820a2cf4d81667ec043f7623aa37c5e3b1061464a193184839' + '55929747b9cc1bc8893717c9fef257f8f2d560dc56849f1c74f88ed636b6f9f9997f6c4713768793b115e93482543a330b70eba672d696ea8456741ed2c71237' + '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') + +prepare() { + cd ${srcdir}/Cinnamon* + + # Python2 fix + sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor + find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + + # Use wheel group instread of sudo (taken from Fedora) + patch -Np1 -i ../set_wheel.patch + + # Set default theme to 'cinnamon' + patch -Np1 -i ../default-theme.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/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py + + # Fix selected background color in Cinnamon Settings for Adwaita theme + sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \ + files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py + + # GNOME Terminal desktop file was renamed in GNOME 3.20 + sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/' data/org.cinnamon.gschema.xml.in \ + files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/settings-schema.json + + # Replace MintInstall with GNOME Software + sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in + + # Remove broken symlink + rm files/etc/xdg/menus/cinnamon-applications-merged +} + +build() { + cd ${srcdir}/Cinnamon* + + ./autogen.sh --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/cinnamon \ + --localstatedir=/var \ + --disable-static \ + --disable-schemas-compile \ + --enable-compile-warnings=yes + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd ${srcdir}/Cinnamon* + make DESTDIR="${pkgdir}" install +} Deleted: default-theme.patch =================================================================== --- default-theme.patch 2017-11-20 16:49:06 UTC (rev 267612) +++ default-theme.patch 2017-11-20 16:49:32 UTC (rev 267613) @@ -1,25 +0,0 @@ -From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> -Date: Sat, 22 Nov 2014 22:39:39 +0100 -Subject: [PATCH] Set default theme to 'cinnamon' - ---- - data/org.cinnamon.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 91fa171..9f56e4c 100644 ---- a/data/org.cinnamon.gschema.xml.in -+++ b/data/org.cinnamon.gschema.xml.in -@@ -581,7 +581,7 @@ - <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" - gettext-domain="@GETTEXT_PACKAGE@"> - <key name="name" type="s"> -- <default>""</default> -+ <default>"cinnamon"</default> - <_summary>Theme name</_summary> - <_description> - The name of the theme --- -2.1.3 - Copied: cinnamon/repos/community-x86_64/default-theme.patch (from rev 267612, cinnamon/trunk/default-theme.patch) =================================================================== --- default-theme.patch (rev 0) +++ default-theme.patch 2017-11-20 16:49:32 UTC (rev 267613) @@ -0,0 +1,25 @@ +From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Sat, 22 Nov 2014 22:39:39 +0100 +Subject: [PATCH] Set default theme to 'cinnamon' + +--- + data/org.cinnamon.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in +index 91fa171..9f56e4c 100644 +--- a/data/org.cinnamon.gschema.xml.in ++++ b/data/org.cinnamon.gschema.xml.in +@@ -581,7 +581,7 @@ + <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/" + gettext-domain="@GETTEXT_PACKAGE@"> + <key name="name" type="s"> +- <default>""</default> ++ <default>"cinnamon"</default> + <_summary>Theme name</_summary> + <_description> + The name of the theme +-- +2.1.3 + Deleted: set_wheel.patch =================================================================== --- set_wheel.patch 2017-11-20 16:49:06 UTC (rev 267612) +++ set_wheel.patch 2017-11-20 16:49:32 UTC (rev 267613) @@ -1,56 +0,0 @@ ---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -153,12 +153,11 @@ - - class PasswordDialog(Gtk.Dialog): - -- def __init__ (self, user, password_mask, group_mask, parent = None): -+ def __init__ (self, user, password_mask, parent = None): - super(PasswordDialog, self).__init__(None, parent) - - 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 @@ - 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): -@@ -563,7 +555,7 @@ - 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, self.window) -+ dialog = PasswordDialog(user, self.password_mask, self.window) - response = dialog.run() - - def _on_groups_button_clicked(self, widget): -@@ -807,11 +799,11 @@ - 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() - Copied: cinnamon/repos/community-x86_64/set_wheel.patch (from rev 267612, cinnamon/trunk/set_wheel.patch) =================================================================== --- set_wheel.patch (rev 0) +++ set_wheel.patch 2017-11-20 16:49:32 UTC (rev 267613) @@ -0,0 +1,56 @@ +--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py ++++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +@@ -153,12 +153,11 @@ + + class PasswordDialog(Gtk.Dialog): + +- def __init__ (self, user, password_mask, group_mask, parent = None): ++ def __init__ (self, user, password_mask, parent = None): + super(PasswordDialog, self).__init__(None, parent) + + 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 @@ + 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): +@@ -563,7 +555,7 @@ + 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, self.window) ++ dialog = PasswordDialog(user, self.password_mask, self.window) + response = dialog.run() + + def _on_groups_button_clicked(self, widget): +@@ -807,11 +799,11 @@ + 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() +