Date: Thursday, March 16, 2023 @ 17:20:31
Author: arojas
Revision: 1421117
archrelease: copy trunk to community-x86_64
Added:
cinnamon/repos/community-x86_64/PKGBUILD
(from rev 1421116, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-x86_64/default-theme.patch
(from rev 1421116, cinnamon/trunk/default-theme.patch)
cinnamon/repos/community-x86_64/set_wheel.diff
(from rev 1421116, cinnamon/trunk/set_wheel.diff)
Deleted:
cinnamon/repos/community-x86_64/PKGBUILD
cinnamon/repos/community-x86_64/default-theme.patch
cinnamon/repos/community-x86_64/set_wheel.diff
---------------------+
PKGBUILD | 136 +++++++++++++++++++++++++-------------------------
default-theme.patch | 50 +++++++++---------
set_wheel.diff | 110 ++++++++++++++++++++--------------------
3 files changed, 148 insertions(+), 148 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-16 17:20:18 UTC (rev 1421116)
+++ PKGBUILD 2023-03-16 17:20:31 UTC (rev 1421117)
@@ -1,68 +0,0 @@
-# Maintainer: Bruno Pagani <[email protected]>
-# Contributor: Eli Schwartz <[email protected]>
-# Contributor: Alexandre Filgueira <[email protected]>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=5.6.7
-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 gnome-backgrounds gsound
- 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-tinycss2 python-xapp python-requests timezonemap
xapps)
-optdepends=('blueman: Bluetooth support'
- 'cinnamon-translations: i18n'
- 'gnome-panel: fallback mode'
- 'metacity: fallback mode'
- 'system-config-printer: printer settings'
- 'wget: cover download support in audio applet')
-makedepends=(meson samurai gobject-introspection intltool)
-options=('!emptydirs')
-source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz
- set_wheel.diff
- default-theme.patch)
-sha512sums=('f68e9d1d85b5b7df53482d6de8625863095263766ef5aa3e82884cf574900b689bcf3afb5d5828ab46a47e5580e05b397f74311f4dfeeba460e21b0ab43ea0dd'
-
'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
-
'ee7dedd59ea370cf81d75def49060f9a29b22e7b025ca7d5db87a0102d50f138c79aa562b0d36a748c4b1c59a37f600ba1f60ff6caf303cf5b6fc4d110d051b4')
-b2sums=('ed8ec11d3eb296cf860ccf33744521d92ae941f1d7c282f85a22c0f0ed6d885ac29ec8e0ad57c0949923400e13bde6009040df37ea035658c49c95ab79cd2386'
-
'3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160'
-
'86c3a29acd132ca321f08fd81dd5a45707accdc035b2aeec95bf358b29072ff1eedb77b2566cf48d7253d1d791599f0f44938c4600761d711cb18b59019f1c62')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Use wheel group instread of sudo (taken from Fedora)
- patch -p1 < ../set_wheel.diff
-
- # Set default theme to 'cinnamon'
- patch -p1 < ../default-theme.patch
-
- # Replace MintInstall with GNOME Software
- sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/'
data/org.cinnamon.gschema.xml
-
- # Add polkit agent to required components
- sed -i
's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/'
\
- 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
-}
-
-build() {
- arch-meson --libexecdir=lib/cinnamon ${pkgname}-${pkgver} build
- samu -C build
-}
-
-package() {
- DESTDIR="${pkgdir}" samu -C build install
-}
Copied: cinnamon/repos/community-x86_64/PKGBUILD (from rev 1421116,
cinnamon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-16 17:20:31 UTC (rev 1421117)
@@ -0,0 +1,68 @@
+# Maintainer: Bruno Pagani <[email protected]>
+# Contributor: Eli Schwartz <[email protected]>
+# Contributor: Alexandre Filgueira <[email protected]>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=5.6.8
+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 gnome-backgrounds gsound
+ 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-tinycss2 python-xapp python-requests timezonemap
xapps)
+optdepends=('blueman: Bluetooth support'
+ 'cinnamon-translations: i18n'
+ 'gnome-panel: fallback mode'
+ 'metacity: fallback mode'
+ 'system-config-printer: printer settings'
+ 'wget: cover download support in audio applet')
+makedepends=(meson samurai gobject-introspection intltool)
+options=('!emptydirs')
+source=(${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz
+ set_wheel.diff
+ default-theme.patch)
+sha512sums=('33f7766f8d5df070cca7d4001be6a01dcb5cc57e60a320b0b2d14968af7bc0060575284f885de640ebe9297ea2bf9a6b97cb32dfb50fac37bb6d851d5f5d2237'
+
'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
+
'ee7dedd59ea370cf81d75def49060f9a29b22e7b025ca7d5db87a0102d50f138c79aa562b0d36a748c4b1c59a37f600ba1f60ff6caf303cf5b6fc4d110d051b4')
+b2sums=('0876bf097bbdb2b15b543a09d7d659995624d880a4c32a0d6bf580def4a72d33363c03525cd8072a238c624382c20bb66ce5ad5c05f8c21bbe5c06742209ca2b'
+
'3becf1f40068fc629109e6e7d464c3c484296afacc9ab6328b2ccbb3c9735bcbfa9550f9f73b430ede178ae668e37c660ce322b5b4d1873526de3d3d41185160'
+
'86c3a29acd132ca321f08fd81dd5a45707accdc035b2aeec95bf358b29072ff1eedb77b2566cf48d7253d1d791599f0f44938c4600761d711cb18b59019f1c62')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Use wheel group instread of sudo (taken from Fedora)
+ patch -p1 < ../set_wheel.diff
+
+ # Set default theme to 'cinnamon'
+ patch -p1 < ../default-theme.patch
+
+ # Replace MintInstall with GNOME Software
+ sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/'
data/org.cinnamon.gschema.xml
+
+ # Add polkit agent to required components
+ sed -i
's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/'
\
+ 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
+}
+
+build() {
+ arch-meson --libexecdir=lib/cinnamon ${pkgname}-${pkgver} build
+ samu -C build
+}
+
+package() {
+ DESTDIR="${pkgdir}" samu -C build install
+}
Deleted: default-theme.patch
===================================================================
--- default-theme.patch 2023-03-16 17:20:18 UTC (rev 1421116)
+++ default-theme.patch 2023-03-16 17:20:31 UTC (rev 1421117)
@@ -1,25 +0,0 @@
-From b1f277d53ccd79bba9ba4cd1c0c2683d4f41068c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
-Date: Sat, 22 Nov 2014 22:39:39 +0100
-Subject: [PATCH] Set default theme to 'cinnamon'
-
----
- data/org.cinnamon.gschema.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml
-index 86b14e26c..93c3e14c5 100644
---- a/data/org.cinnamon.gschema.xml
-+++ b/data/org.cinnamon.gschema.xml
-@@ -645,7 +645,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.29.2
-
Copied: cinnamon/repos/community-x86_64/default-theme.patch (from rev 1421116,
cinnamon/trunk/default-theme.patch)
===================================================================
--- default-theme.patch (rev 0)
+++ default-theme.patch 2023-03-16 17:20:31 UTC (rev 1421117)
@@ -0,0 +1,25 @@
+From b1f277d53ccd79bba9ba4cd1c0c2683d4f41068c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
+Date: Sat, 22 Nov 2014 22:39:39 +0100
+Subject: [PATCH] Set default theme to 'cinnamon'
+
+---
+ data/org.cinnamon.gschema.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml b/data/org.cinnamon.gschema.xml
+index 86b14e26c..93c3e14c5 100644
+--- a/data/org.cinnamon.gschema.xml
++++ b/data/org.cinnamon.gschema.xml
+@@ -645,7 +645,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.29.2
+
Deleted: set_wheel.diff
===================================================================
--- set_wheel.diff 2023-03-16 17:20:18 UTC (rev 1421116)
+++ set_wheel.diff 2023-03-16 17:20:31 UTC (rev 1421117)
@@ -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.diff (from rev 1421116,
cinnamon/trunk/set_wheel.diff)
===================================================================
--- set_wheel.diff (rev 0)
+++ set_wheel.diff 2023-03-16 17:20:31 UTC (rev 1421117)
@@ -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()
