Thu Apr 25 01:16:48 PDT 2013

2 files changed, 98 insertions, 13 deletions

diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index f2b15964c..00ab3bc7f 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 88773 2013-04-22 09:44:29Z faidoc $
+# $Id: PKGBUILD 88912 2013-04-24 17:42:52Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
 pkgver=1.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
 license=('GPL')
 depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql'
-         'cinnamon')
+         'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql')
 makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
 optdepends=('gksu: Open as Root')
 options=('!emptydirs' '!libtool')
@@ -21,7 +20,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkg
         "remove-desktop-background.patch")
 md5sums=('04c021da543e2562b712107c2be9a8c2'
          '9e170cc74eee901634b3367b06a209c6'
-         '700b595dfcf06e39f9dc3bdb7c81e086')
+         'f10af52377e44e1efe8ec4934aa4d4d2')
 
 build() {
   cd linuxmint-nemo-*
diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch
index 793d5650c..0301cc820 100644
--- a/community/nemo/remove-desktop-background.patch
+++ b/community/nemo/remove-desktop-background.patch
@@ -1,7 +1,7 @@
 From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001
 From: Michael Webster <miketwebster@gmail.com>
 Date: Mon, 15 Apr 2013 18:44:35 -0400
-Subject: [PATCH 1/4] Don't render the background.  Need to fix selected icon
+Subject: [PATCH 1/6] Don't render the background.  Need to fix selected icon
  style
 
 ---
@@ -100,13 +100,13 @@ index 9c80c62..2d5c4e8 100644
  	GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget);
  
 -- 
-1.8.1.5
+1.8.1.6
 
 
 From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001
 From: Michael Webster <miketwebster@gmail.com>
 Date: Mon, 15 Apr 2013 20:03:03 -0400
-Subject: [PATCH 2/4] Remove nemo-desktop-background, the desktop window makes
+Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes
  a transparent background and just uses the existing rendered background from
  muffin/g-s-d
 
@@ -867,13 +867,13 @@ index 37cd8cb..5dec8b5 100644
  }
  
 -- 
-1.8.1.5
+1.8.1.6
 
 
 From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001
 From: Michael Webster <miketwebster@gmail.com>
 Date: Mon, 15 Apr 2013 20:14:40 -0400
-Subject: [PATCH 3/4] Forgot an include
+Subject: [PATCH 3/6] Forgot an include
 
 ---
  libnemo-private/nemo-icon-dnd.c | 1 -
@@ -892,13 +892,13 @@ index 017c6a7..2ed073c 100644
  #include <libnemo-private/nemo-file-changes-queue.h>
  #include <stdio.h>
 -- 
-1.8.1.5
+1.8.1.6
 
 
 From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001
 From: Michael Webster <miketwebster@gmail.com>
 Date: Tue, 16 Apr 2013 18:00:01 -0400
-Subject: [PATCH 4/4] Change to use cinnamon background keys
+Subject: [PATCH 4/6] Change to use cinnamon background keys
 
 ---
  libnemo-private/nemo-global-preferences.c | 2 +-
@@ -960,5 +960,91 @@ index ab03b44..3ece32a 100644
      g_free (uri);
  }
 -- 
-1.8.1.5
+1.8.1.6
+
+
+From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 22 Apr 2013 08:33:41 -0400
+Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when
+ cinnamon is not installed
+
+---
+ libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
+index 336afc3..7eb04ef 100644
+--- a/libnemo-private/nemo-global-preferences.c
++++ b/libnemo-private/nemo-global-preferences.c
+@@ -76,7 +76,25 @@
+ 	nemo_desktop_preferences = g_settings_new("org.nemo.desktop");
+ 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
+ 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
+-	cinnamon_background_preferences = g_settings_new("org.cinnamon.background");
+ 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
+ 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
++
++    const gchar * const *schema_list = g_settings_list_schemas ();
++    int i = 0;
++    gboolean has_cinnamon = FALSE;
++    if (schema_list != NULL) {
++        while (schema_list[i] != NULL) {
++            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
++                has_cinnamon = TRUE;
++                break;
++            }
++            i++;
++        }
++    }
++
++    if (has_cinnamon) {
++        cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
++    } else {
++        cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
++    }
+ }
+-- 
+1.8.1.6
+
+
+From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 22 Apr 2013 09:31:49 -0400
+Subject: [PATCH 6/6] simplify schema check
+
+---
+ libnemo-private/nemo-global-preferences.c | 17 +++--------------
+ 1 file changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c
+index 7eb04ef..0470595 100644
+--- a/libnemo-private/nemo-global-preferences.c
++++ b/libnemo-private/nemo-global-preferences.c
+@@ -79,20 +79,9 @@
+ 	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
+ 	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
+ 
+-    const gchar * const *schema_list = g_settings_list_schemas ();
+-    int i = 0;
+-    gboolean has_cinnamon = FALSE;
+-    if (schema_list != NULL) {
+-        while (schema_list[i] != NULL) {
+-            if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) {
+-                has_cinnamon = TRUE;
+-                break;
+-            }
+-            i++;
+-        }
+-    }
+-
+-    if (has_cinnamon) {
++    GSettingsSchemaSource *schema_source;
++    schema_source = g_settings_schema_source_get_default();
++    if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) {
+         cinnamon_background_preferences = g_settings_new ("org.cinnamon.background");
+     } else {
+         cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background");
+-- 
+1.8.1.6