dcallagh-exheres

commit 23d2dc27a64b0cdce36a27697bf3c8c9c995746a
parent 36d1223780f82d1c58137c7c0b87ae809d4db21f
Author: Dan Callaghan <djc@djc.id.au>
Date:   Sat,  9 Oct 2010 15:58:54 +1000

gmrun-0.9.2-sysconfdir.patch from Gentoo

Diffstat:
A
packages/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
 | 
49
+++++++++++++++++++++++++++++++++++++++++++++++++
M
packages/x11-misc/gmrun/gmrun-0.9.2.exheres-0
 | 
2
++

2 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/packages/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch b/packages/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
@@ -0,0 +1,49 @@
+From: Łukasz Stelmach <stlman@poczta.fm>
+Source: http://bugs.gentoo.org/292856
+Upstream: TODO
+
+keep config in /etc rather than /usr/share
+
+diff -ur gmrun-0.9.2.orig/config/Makefile.am gmrun-0.9.2/config/Makefile.am
+--- gmrun-0.9.2.orig/config/Makefile.am	2001-05-17 09:58:07.000000000 +0300
++++ gmrun-0.9.2/config/Makefile.am	2010-06-06 16:05:16.000000000 +0300
+@@ -1,6 +1,6 @@
+ # $Id: gmrun-0.9.2-sysconfdir.patch,v 1.1 2010/06/06 13:13:11 ssuominen Exp $
+ 
+-myrcdir = @PACKAGE_DATA_DIR@
++myrcdir = $(sysconfdir)
+ myrc_DATA = gmrunrc
+ 
+ EXTRA_DIST = gmrunrc
+diff -ur gmrun-0.9.2.orig/config.h.in gmrun-0.9.2/config.h.in
+--- gmrun-0.9.2.orig/config.h.in	2003-11-16 12:47:07.000000000 +0200
++++ gmrun-0.9.2/config.h.in	2010-06-06 16:07:14.000000000 +0300
+@@ -10,7 +10,6 @@
+ #undef HAVE_STPCPY
+ #undef HAVE_LIBSM
+ #undef PACKAGE_LOCALE_DIR
+-#undef PACKAGE_DATA_DIR
+ #undef PACKAGE_SOURCE_DIR
+ 
+ /* Define if you have the <dirent.h> header file.  */
+diff -ur gmrun-0.9.2.orig/src/Makefile.am gmrun-0.9.2/src/Makefile.am
+--- gmrun-0.9.2.orig/src/Makefile.am	2002-06-05 22:39:18.000000000 +0300
++++ gmrun-0.9.2/src/Makefile.am	2010-06-06 16:09:11.000000000 +0300
+@@ -15,3 +15,5 @@
+ 
+ gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
+ 
++AM_CPPFLAGS = \
++	-DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
+diff -ur gmrun-0.9.2.orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
+--- gmrun-0.9.2.orig/src/prefs.cc	2002-08-16 13:48:22.000000000 +0300
++++ gmrun-0.9.2/src/prefs.cc	2010-06-06 16:07:14.000000000 +0300
+@@ -30,7 +30,7 @@
+ 
+ Prefs::Prefs()
+ {
+-  string file_name = PACKAGE_DATA_DIR"/";
++  string file_name = PACKAGE_SYSCONF_DIR"/";
+   file_name += GMRUNRC;
+   init(file_name);
+ 
diff --git a/packages/x11-misc/gmrun/gmrun-0.9.2.exheres-0 b/packages/x11-misc/gmrun/gmrun-0.9.2.exheres-0
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require sourceforge [ suffix=tar.gz ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.4 ] ]
 
 SUMMARY="Simple replacement for gnome-run, with tab completion and history"
 
@@ -21,6 +22,7 @@ DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}/missing-headers.patch"
     "${FILES}/scandir-compar-prototype.patch"
     "${FILES}/strncasecmp.patch"
+    "${FILES}/gmrun-0.9.2-sysconfdir.patch"
 )
 
 src_configure() {