[arch-commits] Commit in cinnamon/trunk (PKGBUILD set_wheel.diff set_wheel.patch)

Eli Schwartz eschwartz at archlinux.org
Thu May 14 05:17:33 UTC 2020


    Date: Thursday, May 14, 2020 @ 05:17:33
  Author: eschwartz
Revision: 627825

upgpkg: cinnamon 4.6.0-1: upstream release

This ports from tinycss to tinycss2, which fixes some bugs and also means we
can drop the former from the repos.

Also libcroco is a somewhat obscure dependency and its indirect use in
base->gettext is not really so nice; hoist it up directly here.

set_wheel.patch has been renamed to .diff because it's more proper, but is
otherwise inconsequential.

Added:
  cinnamon/trunk/set_wheel.diff
    (from rev 627824, cinnamon/trunk/set_wheel.patch)
Modified:
  cinnamon/trunk/PKGBUILD
Deleted:
  cinnamon/trunk/set_wheel.patch

-----------------+
 PKGBUILD        |   14 ++++++-------
 set_wheel.diff  |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 set_wheel.patch |   55 ------------------------------------------------------
 3 files changed, 62 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-14 04:43:37 UTC (rev 627824)
+++ PKGBUILD	2020-05-14 05:17:33 UTC (rev 627825)
@@ -5,7 +5,7 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=4.4.8
+pkgver=4.6.0
 pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('x86_64')
@@ -13,10 +13,10 @@
 license=('GPL2')
 depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver'
          'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'gnome-backgrounds'
-         'gnome-themes-extra' 'gstreamer' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin'
+         'gnome-themes-extra' 'gstreamer' 'libcroco' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin'
          'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus'
          'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify'
-         'python-pytz' 'python-tinycss' 'python-xapp' 'timezonemap' 'xapps')
+         'python-pytz' 'python-tinycss2' 'python-xapp' 'timezonemap' 'xapps')
 optdepends=('blueberry: Bluetooth support'
             'cinnamon-translations: i18n'
             'gnome-panel: fallback mode'
@@ -26,13 +26,13 @@
 options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
         "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch"
-        "set_wheel.patch"
+        "set_wheel.diff"
         "default-theme.patch")
-sha512sums=('aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978'
+sha512sums=('e0a1203e1b6a1c6a81474d6f03a77fd5913a4ade2315d3c9b72271e9b128c98e439c9db12cffdd077f0dbdf967795f8bb0bcb0940af62f724d0e3c2414645e98'
             '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374'
             'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
             '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
-b2sums=('8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3'
+b2sums=('59493f7335399096fa0f8614bd3c1a8e7f4155b3c5f1c656de66ad06d3775c3c9bdd20e334dd575ea757c7bf0e5ecd01ef9f554bb468341025697de004c76d65'
         '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008'
         '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160'
         '3a7515cc7b0ca1549289be62f6d5cbd79f4b076892194f4b6264555322d430a3d6474db9ec62439f3ba41d43d1017dc39a4c44add2e5e5c09f32012b772a7041')
@@ -45,7 +45,7 @@
     patch --no-backup-if-mismatch -p1 -i ../0001-cinnamon-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
+    patch -Np1 -i ../set_wheel.diff
 
     # Set default theme to 'cinnamon'
     patch -Np1 -i ../default-theme.patch

Copied: cinnamon/trunk/set_wheel.diff (from rev 627824, cinnamon/trunk/set_wheel.patch)
===================================================================
--- set_wheel.diff	                        (rev 0)
+++ set_wheel.diff	2020-05-14 05:17:33 UTC (rev 627825)
@@ -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()

Deleted: set_wheel.patch
===================================================================
--- set_wheel.patch	2020-05-14 04:43:37 UTC (rev 627824)
+++ set_wheel.patch	2020-05-14 05:17:33 UTC (rev 627825)
@@ -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()


More information about the arch-commits mailing list