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

[Balló György]

    Date: Sunday, November 22, 2015 @ 02:10:44
  Author: bgyorgy
Revision: 147355

upgpkg: cinnamon 2.8.5-2

Fix missing icons

Modified:
  cinnamon/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-21 20:17:46 UTC (rev 147354)
+++ PKGBUILD	2015-11-22 01:10:44 UTC (rev 147355)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=2.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/Cinnamon"
@@ -57,9 +57,6 @@
   sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
     files/usr/share/cinnamon-session/sessions/cinnamon*.session
 
-  # Fix for the python2 PAM module  
-  sed -i 's:import PAM:import pam:' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
-
   # Use pkexec instead of gksu
   sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
 
@@ -76,9 +73,9 @@
     files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
 
   # Fix missing icons with the Adwaita theme
-  sed -i 's/"gtk-file"/"text-x-generic"/' docs/applets-examples/finder at cinnamon.org/applet.js  src/cinnamon-util.c
-  sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-apply'/
-          s/SECONDARY, 'stop'/SECONDARY, 'dialog-error'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+  sed -i 's/"gtk-file"/"text-x-preview"/' docs/applets-examples/finder at cinnamon.org/applet.js  src/cinnamon-util.c
+  sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-ok'/
+          s/SECONDARY, 'stop'/SECONDARY, 'process-stop'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
   sed -i "s/'gnome-panel-launcher'/'system-run'/" files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
   sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/' files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
   sed -i 's/"reload"/"view-refresh"/' files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
@@ -87,10 +84,11 @@
   sed -i 's/"display"/"video-display"/
           s/"access"/"preferences-desktop-accessibility"/
           s/"gnome-panel-launcher"/"system-run"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
+  sed -i 's/"reload"/"view-refresh"/' files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
   sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/applets/calendar at cinnamon.org/metadata.json
   sed -i 's/"keyboard"/"input-keyboard"/' files/usr/share/cinnamon/applets/keyboard at cinnamon.org/metadata.json
   sed -i 's/"desktop"/"user-desktop"/' files/usr/share/cinnamon/applets/show-desktop at cinnamon.org/metadata.json
-  sed -i 's/"stock_volume"/"multimedia-volume-control"/' files/usr/share/cinnamon/applets/sound at cinnamon.org/metadata.json
+  sed -i 's/"stock_volume"/"audio-volume-high"/' files/usr/share/cinnamon/applets/sound at cinnamon.org/metadata.json
   sed -i 's/"stock_calendar"/"x-office-calendar"/' files/usr/share/cinnamon/desklets/clock at cinnamon.org/metadata.json
 
   # Remove broken symlink