[arch-commits] Commit in nemo/trunk (PKGBUILD use-terminal-config.patch)

[Balló György]

    Date: Monday, March 4, 2013 @ 05:33:58
  Author: bgyorgy
Revision: 85616

upgpkg: nemo 1.7.1-2

Read default terminal at runtime instead of build time

Added:
  nemo/trunk/use-terminal-config.patch
Modified:
  nemo/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   18 +++++++----------
 use-terminal-config.patch |   45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-04 04:01:59 UTC (rev 85615)
+++ PKGBUILD	2013-03-04 04:33:58 UTC (rev 85616)
@@ -4,8 +4,8 @@
 
 pkgname=nemo
 pkgver=1.7.1
-pkgrel=1
-pkgdesc="Cinnamon file manager (Nautilus fork), stable version"
+pkgrel=2
+pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
 license=('GPL')
@@ -19,19 +19,18 @@
 options=('!emptydirs' '!libtool')
 install=nemo.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "gnome-autogen.sh")
+        "gnome-autogen.sh"
+        "use-terminal-config.patch")
 md5sums=('b348b6e340e055bef3163555b99621bb'
-         'a925691c9b57a6a884dcf07da057fd1f')
+         'a925691c9b57a6a884dcf07da057fd1f'
+         '6cca080cc8fe3df7e725c0f8cd5fa485')
 
 build() {
   cd linuxmint-nemo-*
 
-  # Get default terminal value
-  _terminal=$(gsettings get org.gnome.desktop.default-applications.terminal exec | tr -d "'")
+  # Read the default terminal app from GSettings
+  patch -Np1 -i ../use-terminal-config.patch
 
-  # Set "Open in Terminal" to default terminal (Arch doesn't use x-terminal-emulator)
-  sed -i "s/x-terminal-emulator/$_terminal/" src/nemo-view.c
-
   cp ${srcdir}/gnome-autogen.sh .
   sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am
   sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh
@@ -40,7 +39,6 @@
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nemo \
-      --disable-nst-extension \
       --disable-update-mimedb \
       --disable-packagekit \
       --disable-gtk-doc-html \

Added: use-terminal-config.patch
===================================================================
--- use-terminal-config.patch	                        (rev 0)
+++ use-terminal-config.patch	2013-03-04 04:33:58 UTC (rev 85616)
@@ -0,0 +1,45 @@
+diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c
+--- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c	2013-02-19 17:30:18.000000000 +0100
++++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c	2013-03-04 04:05:13.472897136 +0100
+@@ -77,5 +77,6 @@
+ 	nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree");
+ 	gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown");
+ 	gnome_background_preferences = g_settings_new("org.gnome.desktop.background");
+-    gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
++	gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling");
++	gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal");
+ }
+diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h
+--- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h	2013-02-19 17:30:18.000000000 +0100
++++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h	2013-03-04 04:49:20.581767625 +0100
+@@ -211,6 +211,9 @@
+ #define GNOME_DESKTOP_MEDIA_HANDLING_AUTOMOUNT_OPEN "automount-open"
+ #define GNOME_DESKTOP_MEDIA_HANDLING_AUTORUN        "autorun-never"
+ 
++/* Terminal */
++#define GNOME_DESKTOP_TERMINAL_EXEC        "exec"
++
+ void nemo_global_preferences_init                      (void);
+ char *nemo_global_preferences_get_default_folder_viewer_preference_as_iid (void);
+ 
+@@ -224,6 +227,7 @@
+ GSettings *gnome_lockdown_preferences;
+ GSettings *gnome_background_preferences;
+ GSettings *gnome_media_handling_preferences;
++GSettings *gnome_terminal_preferences;
+ 
+ G_END_DECLS
+ 
+diff -Naur linuxmint-nemo-63f7b44.orig/src/nemo-view.c linuxmint-nemo-63f7b44/src/nemo-view.c
+--- linuxmint-nemo-63f7b44.orig/src/nemo-view.c	2013-02-19 17:30:18.000000000 +0100
++++ linuxmint-nemo-63f7b44/src/nemo-view.c	2013-03-04 04:14:47.222310992 +0100
+@@ -6716,7 +6716,8 @@
+ open_in_terminal (gchar *location)
+ {	
+     gchar *argv[2];
+-    argv[0] = "x-terminal-emulator";
++    argv[0] = g_settings_get_string (gnome_terminal_preferences,
++				     GNOME_DESKTOP_TERMINAL_EXEC);
+     argv[1] = NULL;
+     g_spawn_async(location, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
+ }