[arch-commits] Commit in cinnamon/repos/community-x86_64 (8 files)
Eli Schwartz
eschwartz at archlinux.org
Mon Nov 25 05:15:26 UTC 2019
Date: Monday, November 25, 2019 @ 05:15:25
Author: eschwartz
Revision: 533179
archrelease: copy trunk to community-x86_64
Added:
cinnamon/repos/community-x86_64/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
(from rev 533178, cinnamon/trunk/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch)
cinnamon/repos/community-x86_64/PKGBUILD
(from rev 533178, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-x86_64/default-theme.patch
(from rev 533178, cinnamon/trunk/default-theme.patch)
cinnamon/repos/community-x86_64/set_wheel.patch
(from rev 533178, cinnamon/trunk/set_wheel.patch)
Deleted:
cinnamon/repos/community-x86_64/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
cinnamon/repos/community-x86_64/PKGBUILD
cinnamon/repos/community-x86_64/default-theme.patch
cinnamon/repos/community-x86_64/set_wheel.patch
-----------------------------------------------------------------+
0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch | 76 +--
PKGBUILD | 197 ++++------
default-theme.patch | 50 +-
set_wheel.patch | 110 ++---
4 files changed, 208 insertions(+), 225 deletions(-)
Deleted: 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
===================================================================
--- 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2019-11-25 05:15:03 UTC (rev 533178)
+++ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2019-11-25 05:15:25 UTC (rev 533179)
@@ -1,38 +0,0 @@
-From ac4d2fc9fafb38ebb02615a41b23cceca304e73a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93 at gmail.com>
-Date: Tue, 20 Mar 2018 14:11:02 -0400
-Subject: [PATCH] cinnamon-settings: don't rely on the presence of
- cinnamon-control-center
-
-The existence of the cinnamon-control-center binary does not even tell
-us what control center libraries are available. So instead, do the same
-thing we did for cinnamon-settings modules, and check if the library
-exists.
----
- files/usr/bin/cinnamon-settings | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings
-index 9fbdbecd2..98ca454a5 100755
---- a/files/usr/bin/cinnamon-settings
-+++ b/files/usr/bin/cinnamon-settings
-@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers:
- import getopt
- import os
- import sys
-+import sysconfig
-
- def usage():
- print("""Usage:
-@@ -119,7 +120,7 @@ if len(sys.argv) > 1:
- os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
- elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module):
- os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
-- elif os.path.exists("/usr/bin/cinnamon-control-center"):
-+ elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)):
- os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
- elif os.path.exists("/usr/bin/gnome-control-center"):
- print ("Unknown module %s, calling gnome-control-center" % module)
---
-2.22.0
-
Copied: cinnamon/repos/community-x86_64/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch (from rev 533178, cinnamon/trunk/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch)
===================================================================
--- 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch (rev 0)
+++ 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch 2019-11-25 05:15:25 UTC (rev 533179)
@@ -0,0 +1,38 @@
+From ac4d2fc9fafb38ebb02615a41b23cceca304e73a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93 at gmail.com>
+Date: Tue, 20 Mar 2018 14:11:02 -0400
+Subject: [PATCH] cinnamon-settings: don't rely on the presence of
+ cinnamon-control-center
+
+The existence of the cinnamon-control-center binary does not even tell
+us what control center libraries are available. So instead, do the same
+thing we did for cinnamon-settings modules, and check if the library
+exists.
+---
+ files/usr/bin/cinnamon-settings | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/files/usr/bin/cinnamon-settings b/files/usr/bin/cinnamon-settings
+index 9fbdbecd2..98ca454a5 100755
+--- a/files/usr/bin/cinnamon-settings
++++ b/files/usr/bin/cinnamon-settings
+@@ -58,6 +58,7 @@ Available types of sort, and corresponding numbers:
+ import getopt
+ import os
+ import sys
++import sysconfig
+
+ def usage():
+ print("""Usage:
+@@ -119,7 +120,7 @@ if len(sys.argv) > 1:
+ os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
+ elif os.path.exists("/usr/share/cinnamon/cinnamon-settings/modules/cs_%s.py" % module):
+ os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
+- elif os.path.exists("/usr/bin/cinnamon-control-center"):
++ elif os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "cinnamon-control-center-1/panels/lib%s.so" % module)):
+ os.execvp("/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py", (" ",) + tuple(sys.argv[1:]))
+ elif os.path.exists("/usr/bin/gnome-control-center"):
+ print ("Unknown module %s, calling gnome-control-center" % module)
+--
+2.22.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-25 05:15:03 UTC (rev 533178)
+++ PKGBUILD 2019-11-25 05:15:25 UTC (rev 533179)
@@ -1,107 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=4.2.4
-pkgrel=3
-pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
-arch=('x86_64')
-url="https://github.com/linuxmint/${pkgname}"
-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'
- 'network-manager-applet' 'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus'
- 'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify'
- 'python-tinycss' '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"
- "${url}/commit/6e7ea0640ddb97d54febfbb76ac0e5cd0c0349d4.patch"
- "${url}/commit/058e3a1e7dd26eca4bacb37b7c20c1e9d430de6a.patch"
- "${url}/pull/8964/commits/568064ce7ec056118a69275232c0e7e4ba93b056.patch"
- "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch"
- "set_wheel.patch"
- "default-theme.patch")
-sha512sums=('6ba5a760253ece582c2b6cc037d92b9d51a1ae397312d852c4e08c5ab6e64e1f01f88f58e87bb5eaffc9e26c2a3ebcddbf0292449d5b95404deed59ad48edf38'
- '4339ceebabdf087b31141f1b2edafb34b064ceb549ccdabcb101c02aa2a5d0f6e4cc4976d6f3d119c11f7662469d4e716cc23ab777dead398843398710e22821'
- '3b0adefccfcac1c3fd99efdbfd8768cd0940749c06e53ce25a23f43a9bc8ae80c695cf841b70450f58c544aae771446b70dd74d092540804986961545dc8a114'
- '68433d69b421212966c9086050a1776cd98adfd63e4dad21863a1db0cc30ded062f6f1536008c1ec266b03d207e23abb46bba958b73abf485a436322ecb13e77'
- '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374'
- 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
- '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
-b2sums=('92018afef197066765c9c3ea8e82528f77519aed60b463727b845a557ac6a8990cd509891123a63384ae5e95f39b77ff66ec1a85c42877dc7209d02a9c492a96'
- 'cd51f0a3d1f9594f8bca62b58db0e8f1a5db760d86c4d2f6d30c077280a6c0c9e24b5d385ff2d2ebf196997b948bb1c5da7f4f343405a7dc9298c134af0846a0'
- '4af32c1cfcbaf70e29d57ebaa7c46e567435cc46e7f5817ab72e1c04de7b270d280ca3cd44bc38770c8953e8cc5dd8dc50fbc7cb19939418891ea77ad01fd1d3'
- 'fbebc287959c684ad475c9e15f8c8664f31674e7720b119ddb8cc1e8f85b04ff74e34e016c273baa5e3efb95c6be7f50e3a0632aac2245af79ab4a7996c9eef4'
- '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008'
- '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160'
- '3a7515cc7b0ca1549289be62f6d5cbd79f4b076892194f4b6264555322d430a3d6474db9ec62439f3ba41d43d1017dc39a4c44add2e5e5c09f32012b772a7041')
-
-prepare() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- # backport fix for crash in cinnamon-settings' "Preferred Applications"
- # https://github.com/linuxmint/cinnamon/issues/8853
- patch -p1 -i ../6e7ea0640ddb97d54febfbb76ac0e5cd0c0349d4.patch
- # python 3.8 backport
- patch --no-backup-if-mismatch -p1 -i ../058e3a1e7dd26eca4bacb37b7c20c1e9d430de6a.patch
- # this gettext call never worked: https://bugs.archlinux.org/task/64543
- patch -p1 -i ../568064ce7ec056118a69275232c0e7e4ba93b056.patch
-
- # Check for the cc-panel module path, not for the irrelevant binary
- # https://github.com/linuxmint/cinnamon/pull/7382
- patch -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
-
- # 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}"/${pkgname}-${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}"/${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
Copied: cinnamon/repos/community-x86_64/PKGBUILD (from rev 533178, cinnamon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-25 05:15:25 UTC (rev 533179)
@@ -0,0 +1,90 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=4.4.0
+pkgrel=1
+pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
+arch=('x86_64')
+url="https://github.com/linuxmint/${pkgname}"
+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'
+ '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')
+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-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch"
+ "set_wheel.patch"
+ "default-theme.patch")
+sha512sums=('2b172f9111a69da8cb0cc59fc2e1de4255afc1b4a740b5eb2be1df2a58cbfa0f71a4f84c29325e57d21797011e4b04a950e95a9650e4e5d973b157e3328794d6'
+ '77c2229d350bb1445375d206af769f1dde9329ce3575e40e9c1d5fea3ec0f49c0a7ef36d78caf895d9224147947bd102bab924b5579dc8dc5f8d3269e0c76374'
+ 'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
+ '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
+b2sums=('00f0e34277abf7744d241fc31df2dd0ecb8c38d01beab6bc8fb756958a5ab38a34afa12012872cb38c643ca44ac477496a3956f9a546585e69e129451aa53ad4'
+ '1d873efa0d17e358f834c4374f39bbf3f74340849f9c28a0950c0a064772083798aba3435e564acdf43a94665389917788e295073d4a65cc18600d71b7a9f008'
+ '3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160'
+ '3a7515cc7b0ca1549289be62f6d5cbd79f4b076892194f4b6264555322d430a3d6474db9ec62439f3ba41d43d1017dc39a4c44add2e5e5c09f32012b772a7041')
+
+prepare() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # Check for the cc-panel module path, not for the irrelevant binary
+ # https://github.com/linuxmint/cinnamon/pull/7382
+ 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
+
+ # 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/cinnamon*.session.in
+
+ # 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}"/${pkgname}-${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}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
Deleted: default-theme.patch
===================================================================
--- default-theme.patch 2019-11-25 05:15:03 UTC (rev 533178)
+++ default-theme.patch 2019-11-25 05:15:25 UTC (rev 533179)
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at 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 533178, cinnamon/trunk/default-theme.patch)
===================================================================
--- default-theme.patch (rev 0)
+++ default-theme.patch 2019-11-25 05:15:25 UTC (rev 533179)
@@ -0,0 +1,25 @@
+From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at 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 2019-11-25 05:15:03 UTC (rev 533178)
+++ set_wheel.patch 2019-11-25 05:15:25 UTC (rev 533179)
@@ -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 533178, cinnamon/trunk/set_wheel.patch)
===================================================================
--- set_wheel.patch (rev 0)
+++ set_wheel.patch 2019-11-25 05:15:25 UTC (rev 533179)
@@ -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()
More information about the arch-commits
mailing list