[arch-commits] Commit in (4 files)

[Eli Schwartz]

    Date: Thursday, April 19, 2018 @ 04:23:25
  Author: eschwartz
Revision: 316964

cinnamon*: remove outdated deps and obsolete fixes

Modified:
  cinnamon-control-center/trunk/PKGBUILD
  cinnamon-screensaver/trunk/PKGBUILD
  cinnamon/trunk/PKGBUILD
  muffin/trunk/PKGBUILD

----------------------------------------+
 cinnamon-control-center/trunk/PKGBUILD |    5 +++--
 cinnamon-screensaver/trunk/PKGBUILD    |    3 ++-
 cinnamon/trunk/PKGBUILD                |   21 +++++++--------------
 muffin/trunk/PKGBUILD                  |    4 ++--
 4 files changed, 14 insertions(+), 19 deletions(-)

Modified: cinnamon/trunk/PKGBUILD
===================================================================
--- cinnamon/trunk/PKGBUILD	2018-04-19 04:07:48 UTC (rev 316963)
+++ cinnamon/trunk/PKGBUILD	2018-04-19 04:23:25 UTC (rev 316964)
@@ -12,14 +12,15 @@
 url="https://github.com/linuxmint/Cinnamon"
 license=('GPL2')
 depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
-         'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds'
-         'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'libkeybinder3' 'librsvg'
+         'cjs' 'clutter-gtk' 'gnome-backgrounds'
+         'gnome-themes-standard' 'gstreamer' 'libkeybinder3' 'librsvg'
          'muffin' 'python2-cairo' 'python-dbus' 'python2-dbus' 'python2-pillow'
-         'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml'
+         'python2-pam' 'python2-pexpect' 'python2-pyinotify'
          'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus' 'libgnomekbd'
-         'network-manager-applet' 'nemo' 'polkit-gnome' 'xapps' 'python2-gobject' 'gnome-bluetooth')
+         'network-manager-applet' 'nemo' 'polkit-gnome' 'xapps' 'python2-gobject')
 makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
 optdepends=('blueberry: Bluetooth support'
+            'cinnamon-translations: i18n'
             'gnome-panel: fallback mode'
             'metacity: fallback mode'
             'system-config-printer: printer settings')
@@ -30,13 +31,12 @@
 sha512sums=('446e0bbf1fcda7e193735115b4c0396e24428e102b0e74d4b1e150c279d97bbf45961fe57ac08e5828f957c390c39bf385bf29ae7549f5fead2bc59389e64add'
             '55929747b9cc1bc8893717c9fef257f8f2d560dc56849f1c74f88ed636b6f9f9997f6c4713768793b115e93482543a330b70eba672d696ea8456741ed2c71237'
             '3c460141b277df61c4546cc311fa5ecc7e7ea19a7d39a92d1d0214c37a91b4e163bc91823df7098bd2cf6fb430361cdb9839ab96abe53fe82f2a735e187de563')
-            
+
 prepare() {
   cd ${srcdir}/Cinnamon*
 
   # Python2 fix
-  sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
-  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  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
@@ -48,9 +48,6 @@
   sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
     files/usr/share/cinnamon-session/sessions/cinnamon*.session
 
-  # Use pkexec instead of gksu
-  sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
-
   # Check for the cc-panel path, not for the unneeded binary
   sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' \
     files/usr/bin/cinnamon-settings
@@ -59,10 +56,6 @@
   sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
     files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
 
-  # Fix selected background color in Cinnamon Settings for Adwaita theme
-  sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
-    files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
-
   # GNOME Terminal desktop file was renamed in GNOME 3.20
   sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/' data/org.cinnamon.gschema.xml.in \
     files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/settings-schema.json

Modified: cinnamon-control-center/trunk/PKGBUILD
===================================================================
--- cinnamon-control-center/trunk/PKGBUILD	2018-04-19 04:07:48 UTC (rev 316963)
+++ cinnamon-control-center/trunk/PKGBUILD	2018-04-19 04:23:25 UTC (rev 316964)
@@ -9,9 +9,10 @@
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('x86_64')
-depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus'
+depends=('cinnamon-settings-daemon' 'cinnamon-menus'
          'libgnomekbd'  'libmm-glib' 'nm-connection-editor' 'colord' 'gnome-online-accounts')
-optdepends=('gnome-color-manager: for color management tasks')
+optdepends=('cinnamon-translations: i18n'
+            'gnome-color-manager: for color management tasks')
 makedepends=('intltool' 'gnome-common' 'docbook-xsl')
 url="https://github.com/linuxmint/cinnamon-control-center"
 license=('GPL')

Modified: cinnamon-screensaver/trunk/PKGBUILD
===================================================================
--- cinnamon-screensaver/trunk/PKGBUILD	2018-04-19 04:07:48 UTC (rev 316963)
+++ cinnamon-screensaver/trunk/PKGBUILD	2018-04-19 04:23:25 UTC (rev 316964)
@@ -11,8 +11,9 @@
 license=('GPL')
 url="https://github.com/linuxmint/cinnamon-screensaver"
 backup=(etc/pam.d/cinnamon-screensaver)
-depends=('accountsservice' 'cinnamon-desktop' 'cinnamon-translations' 'dbus-glib' 'libgnomekbd'
+depends=('accountsservice' 'cinnamon-desktop' 'dbus-glib' 'libgnomekbd'
          'python-cairo' 'python-gobject' 'python-setproctitle' 'python-xapp' 'xapps' 'webkit2gtk')
+optdepends=('cinnamon-translations: i18n')
 makedepends=('intltool' 'gnome-common' 'gobject-introspection')
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
        cinnamon-screensaver.pam)

Modified: muffin/trunk/PKGBUILD
===================================================================
--- muffin/trunk/PKGBUILD	2018-04-19 04:07:48 UTC (rev 316963)
+++ muffin/trunk/PKGBUILD	2018-04-19 04:23:25 UTC (rev 316964)
@@ -11,8 +11,8 @@
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
 depends=('clutter' 'gobject-introspection-runtime' 'cinnamon-desktop' 'libcanberra' 'libsm'
-         'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc') 
+         'startup-notification' 'zenity')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc')
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
 sha256sums=('b343b6bf86d83dad01dcfb12d224c7eb2d4b63e1fbbe8beb3240a618ffecf737')