Date: Sunday, June 24, 2018 @ 16:53:27 Author: eschwartz Revision: 345243
archrelease: copy trunk to community-x86_64 Added: cinnamon/repos/community-x86_64/PKGBUILD (from rev 345242, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-x86_64/default-theme.patch (from rev 345242, cinnamon/trunk/default-theme.patch) cinnamon/repos/community-x86_64/set_wheel.patch (from rev 345242, 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 | 170 +++++++++++++++++++++++++------------------------- default-theme.patch | 50 +++++++------- set_wheel.patch | 110 ++++++++++++++++---------------- 3 files changed, 165 insertions(+), 165 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-24 16:53:10 UTC (rev 345242) +++ PKGBUILD 2018-06-24 16:53:27 UTC (rev 345243) @@ -1,85 +0,0 @@ -# $Id$ -# Maintainer: Eli Schwartz <eschwa...@archlinux.org> -# Contributor: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Contributor: M0Rf30 -# Contributor: unifiedlinux -# Contributor: CReimer - -pkgname=cinnamon -pkgver=3.8.5 -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-control-center' 'cinnamon-menus' 'cinnamon-screensaver' - 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'clutter-gtk' 'gnome-backgrounds' - 'gnome-themes-standard' 'gstreamer' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin' - 'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus' - 'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify' 'xapps') -optdepends=('blueberry: Bluetooth support' - 'cinnamon-translations: i18n' - 'gnome-panel: fallback mode' - 'metacity: fallback mode' - 'system-config-printer: printer settings') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection') -options=('!emptydirs') -source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" - "0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch::${url}/pull/7382.patch" - "set_wheel.patch" - "default-theme.patch") -sha512sums=('a86630279a3d18476608813a19ba3624a0b351ca988a4d812ef34be9f669b3b628c4f9ac42e10d7a25e5362105a01435c1204400a2014fef07a5e974cb7a25b6' - 'a0a9f4d25053fe96f9b1495394adb829252367099931d3f0e9bdfd2371093b4e86ff13fc945301b3a59691bbb7ee14da89e68c4ef3d8e7a1b5ec6bdedccb9137' - 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c' - '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') - -prepare() { - cd "${srcdir}"/Cinnamon-${pkgver} - - # Check for the cc-panel module path, not for the irrelevant binary - patch -p1 -i ../0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch - - # 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 - - # Replace MintInstall with GNOME Software - sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in - - # Add polkit agent to required components - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ - files/usr/share/cinnamon-session/sessions/cinnamon*.session - - # https://github.com/linuxmint/Cinnamon/issues/3575#issuecomment-374887122 - # 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 - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd "${srcdir}"/Cinnamon-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/cinnamon \ - --localstatedir=/var \ - --disable-static \ - --disable-gtk-doc \ - --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-${pkgver} - - make DESTDIR="${pkgdir}" install -} Copied: cinnamon/repos/community-x86_64/PKGBUILD (from rev 345242, cinnamon/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-24 16:53:27 UTC (rev 345243) @@ -0,0 +1,85 @@ +# $Id$ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Contributor: M0Rf30 +# Contributor: unifiedlinux +# Contributor: CReimer + +pkgname=cinnamon +pkgver=3.8.6 +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-control-center' 'cinnamon-menus' 'cinnamon-screensaver' + 'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'clutter-gtk' 'gnome-backgrounds' + 'gnome-themes-standard' 'gstreamer' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin' + 'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus' + 'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify' 'xapps') +optdepends=('blueberry: Bluetooth support' + 'cinnamon-translations: i18n' + 'gnome-panel: fallback mode' + 'metacity: fallback mode' + 'system-config-printer: printer settings') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +options=('!emptydirs') +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" + "0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch::${url}/pull/7382.patch" + "set_wheel.patch" + "default-theme.patch") +sha512sums=('6f3cf8e4a989533c4007c91f1846de911d17a8609d5aebcd653ee6b2725241f32a7088cc88702f6f9e60aa150e9ccaa3ccc84625f41660dfe3dc7b7c02405cbe' + 'a0a9f4d25053fe96f9b1495394adb829252367099931d3f0e9bdfd2371093b4e86ff13fc945301b3a59691bbb7ee14da89e68c4ef3d8e7a1b5ec6bdedccb9137' + 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c' + '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563') + +prepare() { + cd "${srcdir}"/Cinnamon-${pkgver} + + # Check for the cc-panel module path, not for the irrelevant binary + patch -p1 -i ../0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch + + # 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 + + # Replace MintInstall with GNOME Software + sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml.in + + # Add polkit agent to required components + sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ + files/usr/share/cinnamon-session/sessions/cinnamon*.session + + # https://github.com/linuxmint/Cinnamon/issues/3575#issuecomment-374887122 + # 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 + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}"/Cinnamon-${pkgver} + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/cinnamon \ + --localstatedir=/var \ + --disable-static \ + --disable-gtk-doc \ + --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-${pkgver} + + make DESTDIR="${pkgdir}" install +} Deleted: default-theme.patch =================================================================== --- default-theme.patch 2018-06-24 16:53:10 UTC (rev 345242) +++ default-theme.patch 2018-06-24 16:53:27 UTC (rev 345243) @@ -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 345242, cinnamon/trunk/default-theme.patch) =================================================================== --- default-theme.patch (rev 0) +++ default-theme.patch 2018-06-24 16:53:27 UTC (rev 345243) @@ -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 2018-06-24 16:53:10 UTC (rev 345242) +++ set_wheel.patch 2018-06-24 16:53:27 UTC (rev 345243) @@ -1,55 +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('\u2022\u2022\u2022\u2022\u2022\u2022') -+ self.password_mask.set_text('\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 345242, cinnamon/trunk/set_wheel.patch) =================================================================== --- set_wheel.patch (rev 0) +++ set_wheel.patch 2018-06-24 16:53:27 UTC (rev 345243) @@ -0,0 +1,55 @@ +--- 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('\u2022\u2022\u2022\u2022\u2022\u2022') ++ self.password_mask.set_text('\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()