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

[Balló György]

    Date: Sunday, November 23, 2014 @ 01:09:44
  Author: bgyorgy
Revision: 122969

upgpkg: cinnamon 2.4.3-3

Fix selected background color in Cinnamon Settings for Adwaita theme

Modified:
  cinnamon/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-23 00:07:04 UTC (rev 122968)
+++ PKGBUILD	2014-11-23 00:09:44 UTC (rev 122969)
@@ -6,7 +6,7 @@
 
 pkgname=cinnamon
 pkgver=2.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -55,7 +55,8 @@
   patch -Np1 -i ../default-theme.patch
 
   # Add polkit agent to required components
-  sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
+  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/lib/cinnamon-settings/modules/cs_user.py
@@ -64,11 +65,16 @@
   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
+  sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' \
+    files/usr/bin/cinnamon-settings
 
   # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
   sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
     files/usr/lib/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/lib/cinnamon-settings/cinnamon-settings.py
 }
 
 build() {