[arch-commits] Commit in cinnamon-desktop/trunk (PKGBUILD gnome-3.14.patch)

[Balló György]

    Date: Wednesday, October 1, 2014 @ 08:08:51
  Author: bgyorgy
Revision: 119916

upgpkg: cinnamon-desktop 2.2.3-2

Update configuration for GNOME 3.14

Added:
  cinnamon-desktop/trunk/gnome-3.14.patch
Modified:
  cinnamon-desktop/trunk/PKGBUILD

------------------+
 PKGBUILD         |   16 ++++++++++++----
 gnome-3.14.patch |   24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-01 06:07:45 UTC (rev 119915)
+++ PKGBUILD	2014-10-01 06:08:51 UTC (rev 119916)
@@ -4,17 +4,25 @@
 
 pkgname=cinnamon-desktop
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Library with common API for various Cinnamon modules"
 arch=(i686 x86_64)
 license=(GPL LGPL)
 depends=(gtk3 libxkbfile)
-makedepends=(intltool gobject-introspection gnome-common)
+makedepends=(intltool gobject-introspection gnome-common python2)
 url="https://github.com/linuxmint/cinnamon-desktop"
 install=cinnamon-desktop.install
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
-sha256sums=('0950bdee8671e4693bfd375f01a25fb8ef5d38d246338600083cd181400619d8')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz"
+        "gnome-3.14.patch")
+sha256sums=('0950bdee8671e4693bfd375f01a25fb8ef5d38d246338600083cd181400619d8'
+            'c4df93c49fd3f9f8bc359cbad5d5526eef80ee5c34680f8ba62c67c3dbb7eca5')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Update configuration for GNOME 3.14
+  patch -Np1 -i ../gnome-3.14.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \

Added: gnome-3.14.patch
===================================================================
--- gnome-3.14.patch	                        (rev 0)
+++ gnome-3.14.patch	2014-10-01 06:08:51 UTC (rev 119916)
@@ -0,0 +1,24 @@
+diff -Naur cinnamon-desktop-2.2.3.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in cinnamon-desktop-2.2.3/schemas/org.cinnamon.desktop.background.gschema.xml.in.in
+--- cinnamon-desktop-2.2.3.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in	2014-10-01 03:54:35.830124486 +0000
++++ cinnamon-desktop-2.2.3/schemas/org.cinnamon.desktop.background.gschema.xml.in.in	2014-10-01 03:58:31.959359594 +0000
+@@ -10,7 +10,7 @@
+       </_description>
+     </key>
+     <key name="picture-uri" type="s">
+-      <default>'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml'</default>
++      <default>'file://@datadir@/backgrounds/gnome/adwaita-timed.xml'</default>
+       <_summary>Picture URI</_summary>
+       <_description>
+         URI to use for the background image. Not that the backend only supports
+diff -Naur cinnamon-desktop-2.2.3.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in cinnamon-desktop-2.2.3/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in
+--- cinnamon-desktop-2.2.3.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in	2014-10-01 03:54:35.830124486 +0000
++++ cinnamon-desktop-2.2.3/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in	2014-10-01 03:58:35.266015393 +0000
+@@ -97,7 +97,7 @@
+       </_description>
+     </key>
+     <key name="icon-theme" type="s">
+-      <default>'gnome'</default>
++      <default>'Adwaita'</default>
+       <_summary>Icon Theme</_summary>
+       <_description>
+         Icon theme to use for the panel, nautilus etc.