Really new version

5 files changed, 18 insertions, 199 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd654d8c3727..ebca84eaf6ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,10 @@
 pkgbase = cinnamon-slim
-	pkgdesc = Innovative Linux desktop. Slim version.
+	pkgdesc = Linux desktop which provides advanced innovative features and a traditional user experience
 	pkgver = 4.8.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/linuxmint/cinnamon
 	arch = x86_64
 	license = GPL2
-	makedepends = git
-	makedepends = intltool
-	makedepends = gtk-doc
-	makedepends = gobject-introspection
 	depends = accountsservice
 	depends = caribou
 	depends = cinnamon-control-center
@@ -48,13 +44,7 @@ pkgbase = cinnamon-slim
 	conflicts = cinnamon
 	replaces = cinnamon
 	options = !emptydirs
-	source = git+https://github.com/linuxmint/cinnamon.git#commit=7dcb5e73ba4aeb41ece18680515f8a3466b4d076
-	source = 0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
-	source = set_wheel.diff
-	source = default-theme.patch
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = SKIP
+	source = https://archive.archlinux.org/packages/c/cinnamon/cinnamon-4.8.0-1-x86_64.pkg.tar.zst
 	sha512sums = SKIP
 
 pkgname = cinnamon-slim
diff --git a/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch b/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
deleted file mode 100644
index 39b41ada1ab4..000000000000
--- a/0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ad1e03d6b652b4c7ce0bd9469087b40989824f5c Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@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 fcd1fee9e..e20ba0b78 100755
---- a/files/usr/bin/cinnamon-settings
-+++ b/files/usr/bin/cinnamon-settings
-@@ -7,6 +7,7 @@ Usage:  cinnamon-settings [optional module name]
- 
- import os
- import sys
-+import sysconfig
- 
- if len(sys.argv) > 1:
-     module = sys.argv[1]
-@@ -14,7 +15,7 @@ if len(sys.argv) > 1:
-         os.execvp("/usr/share/cinnamon/cinnamon-settings/xlet-settings.py", (" ", module[0:-1]) + tuple(sys.argv[2:]))
-     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.20.0
-
diff --git a/PKGBUILD b/PKGBUILD
index dabaa594c2cc..b77fe494cb85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,88 +1,35 @@
-# Based on the file created for Arch Linux by:
-# Eli Schwartz <eschwartz@archlinux.org>
-# Maintainer: Andrey Vetrov <vetrov at mail dot ru>
-
 pkgname=cinnamon-slim
 pkgver=4.8.0
-pkgrel=1
-_commit=7dcb5e73ba4aeb41ece18680515f8a3466b4d076 # tags/4.6.6^0
-pkgdesc="Innovative Linux desktop. Slim version."
+pkgrel=2
+pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('x86_64')
 url="https://github.com/linuxmint/${pkgname%-slim}"
 license=('GPL2')
 provides=("cinnamon=$pkgver")
 conflicts=('cinnamon')
 replaces=('cinnamon')
-
 depends=('accountsservice' 'caribou' 'cinnamon-control-center' 'cinnamon-menus' 'cinnamon-screensaver'
          'cinnamon-session' 'cinnamon-settings-daemon' 'cjs' 'gnome-backgrounds'
          'gnome-themes-extra' 'gstreamer' 'libcroco' 'libgnomekbd' 'libkeybinder3' 'librsvg' 'muffin'
-         'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus' 'python-gobject' 'python-pam'
-         'python-pexpect' 'python-pillow' 'python-pyinotify' 'python-pytz' 'python-tinycss2'
-         'python-xapp' 'timezonemap' 'xapps')
+         'nemo' 'polkit-gnome' 'python-cairo' 'python-dbus'
+         'python-gobject' 'python-pam' 'python-pexpect' 'python-pillow' 'python-pyinotify'
+         'python-pytz' 'python-tinycss2' 'python-xapp' 'timezonemap' 'xapps')
 optdepends=('blueberry: Bluetooth support'
             'cinnamon-translations: i18n'
             'gnome-panel: fallback mode'
             'metacity: fallback mode'
             'system-config-printer: printer settings')
-makedepends=('git' 'intltool' 'gtk-doc' 'gobject-introspection')
+makedepends=()
 options=('!emptydirs')
-source=("git+${url}.git#commit=${_commit}"
-        "0001-cinnamon-settings-don-t-rely-on-the-presence-of-cinn.patch"
-        "set_wheel.diff"
-        "default-theme.patch")
-
-sha512sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
-
-prepare() {
-    cd "${srcdir}"/${pkgname%-slim}
-
-    # 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.diff
-
-    # 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%-slim}
-
-    ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --libexecdir=/usr/lib/cinnamon \
-                --localstatedir=/var \
-                --disable-static \
-                --disable-gtk-doc \
-                --disable-schemas-compile \
-                --disable-networkmanager \
-                --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
-}
+source=("https://archive.archlinux.org/packages/c/cinnamon/cinnamon-$pkgver-1-x86_64.pkg.tar.zst")
+sha512sums=('SKIP')
 
 package() {
-    cd "${srcdir}"/${pkgname%-slim}
-
-    make DESTDIR="${pkgdir}" install
+    cp -R "${srcdir}/etc" "${pkgdir}/etc"
+    cp -R "${srcdir}/usr" "${pkgdir}/usr"
+    sed --in-place 's/nm-applet;//g' "${pkgdir}/usr/share/cinnamon-session/sessions/cinnamon.session"
+    sed --in-place 's/nm-applet;//g' "${pkgdir}/usr/share/cinnamon-session/sessions/cinnamon2d.session"
+    sed --in-place '/nm-applet/d' "${pkgdir}/usr/share/cinnamon/js/ui/statusIconDispatcher.js"
+    rm -rf "${pkgdir}/usr/share/cinnamon/applets/network@cinnamon.org"
 }
+
diff --git a/default-theme.patch b/default-theme.patch
deleted file mode 100644
index 8817710f0ee4..000000000000
--- a/default-theme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@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
-
diff --git a/set_wheel.diff b/set_wheel.diff
deleted file mode 100644
index bd436174d3ad..000000000000
--- a/set_wheel.diff
+++ /dev/null
@@ -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()