Date: Friday, November 20, 2015 @ 20:08:54 Author: bgyorgy Revision: 147242
upgpkg: cinnamon-desktop 2.8.0-1 Update to new version Added: cinnamon-desktop/trunk/config.patch Modified: cinnamon-desktop/trunk/PKGBUILD Deleted: cinnamon-desktop/trunk/gnome-3.14.patch ------------------+ PKGBUILD | 16 ++++++---------- config.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ gnome-3.14.patch | 24 ------------------------ 3 files changed, 54 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-11-20 18:58:12 UTC (rev 147241) +++ PKGBUILD 2015-11-20 19:08:54 UTC (rev 147242) @@ -3,7 +3,7 @@ # Contributor: Jan de Groot <j...@archlinux.org> pkgname=cinnamon-desktop -pkgver=2.6.5 +pkgver=2.8.0 pkgrel=1 pkgdesc="Library with common API for various Cinnamon modules" arch=(i686 x86_64) @@ -13,18 +13,14 @@ 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" - "gnome-3.14.patch") -sha256sums=('a004790f46d1960592f9462cbf6d394d9a5c66b31bb13cc295ed8acb1135924a' - 'c4df93c49fd3f9f8bc359cbad5d5526eef80ee5c34680f8ba62c67c3dbb7eca5') + "config.patch") +sha256sums=('39c2800d882f2970afbd8e4552f99ba591429fdd66dbeafffe66957053995872' + 'e2c20c35df78aaedcd2d2e4965369bc519f51072ab88d4ac9b01be9a48cf8cfd') prepare() { cd $pkgname-$pkgver - # Update configuration for GNOME 3.14 - patch -Np1 -i ../gnome-3.14.patch - # Arch uses systemd - sed -i 's|false|true|g' schemas/org.cinnamon.desktop.session.gschema.xml.in.in - # Fix build failure - sed -i 's|subdir-objects||g' configure.ac + # Adjust configuration + patch -Np1 -i ../config.patch } build() { Added: config.patch =================================================================== --- config.patch (rev 0) +++ config.patch 2015-11-20 19:08:54 UTC (rev 147242) @@ -0,0 +1,48 @@ +diff -Naur cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.background.gschema.xml.in.in +--- cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2015-10-16 13:00:30.000000000 +0000 ++++ cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.background.gschema.xml.in.in 2015-11-20 19:04:16.543027956 +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.8.0.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in +--- cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2015-10-16 13:00:30.000000000 +0000 ++++ cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.interface.gschema.xml.in.in 2015-11-20 19:04:16.543027956 +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. +diff -Naur cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.session.gschema.xml.in.in cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.session.gschema.xml.in.in +--- cinnamon-desktop-2.8.0.orig/schemas/org.cinnamon.desktop.session.gschema.xml.in.in 2015-10-16 13:00:30.000000000 +0000 ++++ cinnamon-desktop-2.8.0/schemas/org.cinnamon.desktop.session.gschema.xml.in.in 2015-11-20 19:04:16.546361273 +0000 +@@ -12,17 +12,17 @@ + "gnome" and "gnome-fallback".</description> + </key> + <key name="screensaver-uses-logind" type="b"> +- <default>false</default> ++ <default>true</default> + <_summary>Whether or not cinnamon-screensaver listens to logind to lock/unlock itself</_summary> + <_description>If true, it listens to logind. Otherwise it listens to consolekit.</_description> + </key> + <key name="session-manager-uses-logind" type="b"> +- <default>false</default> ++ <default>true</default> + <_summary>Whether or not cinnamon-session uses logind to suspend/hibernate/shutdown/restart (usually from the shutdown dialog)</_summary> + <_description>If true, it uses logind. Otherwise it uses consolekit to shutdown/restart and upower to suspend/hibernate. It is only compatible with upower 0.9 and lower versions (not 0.99 or later).</_description> + </key> + <key name="settings-daemon-uses-logind" type="b"> +- <default>false</default> ++ <default>true</default> + <_summary>Whether or not cinnamon-settings-daemon uses logind to suspend/hibernate/shutdown (either from media-keys or power-manager)</_summary> + <_description>If true, it uses logind for all three actions. Otherwise it uses consolekit for shutdown and upower for suspend/hibernate.</_description> + </key> Deleted: gnome-3.14.patch =================================================================== --- gnome-3.14.patch 2015-11-20 18:58:12 UTC (rev 147241) +++ gnome-3.14.patch 2015-11-20 19:08:54 UTC (rev 147242) @@ -1,24 +0,0 @@ -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.