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

[Eli Schwartz]

    Date: Tuesday, April 24, 2018 @ 18:12:55
  Author: eschwartz
Revision: 317609

upgpkg: cinnamon 3.8.0-1

upstream release
everything is ported to python3
disable docs

Modified:
  cinnamon/trunk/PKGBUILD
  cinnamon/trunk/set_wheel.patch

-----------------+
 PKGBUILD        |   35 +++++++++--------------------------
 set_wheel.patch |   17 ++++++++---------
 2 files changed, 17 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-24 18:06:47 UTC (rev 317608)
+++ PKGBUILD	2018-04-24 18:12:55 UTC (rev 317609)
@@ -6,8 +6,8 @@
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=3.6.7
-pkgrel=3
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('x86_64')
 url="https://github.com/linuxmint/Cinnamon"
@@ -14,10 +14,9 @@
 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' 'python2-cairo' 'python-dbus' 'python2-dbus'
-         'polkit-gnome' 'python2-gobject' 'python2-pam' 'python2-pexpect' 'python2-pillow'
-         'python2-pyinotify' 'xapps')
+         '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'
@@ -26,37 +25,20 @@
 makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
 options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
-        "${url}/commit/2dc04b8a26fa7a672c579ed62a70dca6c6e4b295.patch"
-        "${url}/commit/5c9848a48da3387825f627117ad58521474e0b2e.patch"
-        "0001-cs_user.py-Add-compatibility-for-multiple-pam-module.patch"
         "0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch::${url}/pull/7382.patch"
         "set_wheel.patch"
         "default-theme.patch")
-sha512sums=('446e0bbf1fcda7e193735115b4c0396e24428e102b0e74d4b1e150c279d97bbf45961fe57ac08e5828f957c390c39bf385bf29ae7549f5fead2bc59389e64add'
-            '9cc53e23f7a11b97cb3e03802fdece1dda77a1f809e751dd513e61436e656c1083c63304334b3b7f5c1615752f3d630e5d40b7aa7360710e86778625f480f5e6'
-            'c7bf90025271b82c80a7dd4fb67a5ce67d982aa5b15d95fe825f741460e1d8e5e12c00318b09a2302b4dd31266aa8071e136761784075b721f142fad3855409c'
-            '6759926ba7e4c9d7f0cef54298107fe569fe3799d0ae78ac423c504d7f93e4577d3448caf5f3f8bacb3baaa03e8f6c6c77ad8ac06acf4fd36fd73e31a84051d5'
+sha512sums=('5b5129a71e650470935f3bdabf3052a47d4673c31927308d311e638ccff5073e7ab9aee526f66b90b8b77de0a66e91eaaad9033d716379c680cc524851694e82'
             'a0a9f4d25053fe96f9b1495394adb829252367099931d3f0e9bdfd2371093b4e86ff13fc945301b3a59691bbb7ee14da89e68c4ef3d8e7a1b5ec6bdedccb9137'
-            '55929747b9cc1bc8893717c9fef257f8f2d560dc56849f1c74f88ed636b6f9f9997f6c4713768793b115e93482543a330b70eba672d696ea8456741ed2c71237'
+            'fd7e117054996ed1c3dfd0f968c2bf98ca4fcee9a100221f8839a232147745ec0140e1f68eeffba58a3c44f66f26e05d433648a7a28858ec669524f7266ba04c'
             '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
 
 prepare() {
     cd "${srcdir}"/Cinnamon-${pkgver}
 
-    # GNOME Terminal desktop file was renamed in GNOME 3.20
-    patch -p1 < ../2dc04b8a26fa7a672c579ed62a70dca6c6e4b295.patch
-    # https://github.com/linuxmint/Cinnamon/issues/7497 Work with muffin 3.8
-    patch -p1 < ../5c9848a48da3387825f627117ad58521474e0b2e.patch
-
-    # Backport https://github.com/linuxmint/Cinnamon/pull/7327
-    patch -p1 < ../0001-cs_user.py-Add-compatibility-for-multiple-pam-module.patch
-
     # Check for the cc-panel module path, not for the irrelevant binary
-    patch -p1 < ../0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch
+    patch -p1 -i ../0001-cinanmon-settings-don-t-rely-on-the-presence-of-cinn.patch
 
-    # Python2 fix
-    sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/share/cinnamon/cinnamon-settings/bin/TreeListWidgets.py
-
     # Use wheel group instread of sudo (taken from Fedora)
     patch -Np1 -i ../set_wheel.patch
 
@@ -86,6 +68,7 @@
                 --libexecdir=/usr/lib/cinnamon \
                 --localstatedir=/var \
                 --disable-static \
+                --disable-gtk-doc \
                 --disable-schemas-compile \
                 --enable-compile-warnings=yes
 

Modified: set_wheel.patch
===================================================================
--- set_wheel.patch	2018-04-24 18:06:47 UTC (rev 317608)
+++ set_wheel.patch	2018-04-24 18:12:55 UTC (rev 317609)
@@ -1,17 +1,17 @@
 --- 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 @@
@@ -25,10 +25,10 @@
 -            mask.remove("nopasswdlogin")
 -            mask = ", ".join(mask)
 -            self.group_mask.set_text(mask)
--            self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
-+        self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+-            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()
@@ -37,7 +37,7 @@
 -            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)
@@ -53,4 +53,3 @@
 +                subprocess.call(["usermod", username, "-G", "%s" % username])
              self.load_groups()
          dialog.destroy()
-