| 1 |
opfer 08/05/09 20:25:38 |
| 2 |
|
| 3 |
Modified: gnuplot-4.2.3-app-defaults.patch |
| 4 |
Log: |
| 5 |
reworked patch for X application file by ulm |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: gnuplot-4.2.3-app-defaults.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- gnuplot-4.2.3-app-defaults.patch 28 Apr 2008 23:42:54 -0000 1.1 |
| 22 |
+++ gnuplot-4.2.3-app-defaults.patch 9 May 2008 20:25:37 -0000 1.2 |
| 23 |
@@ -1,33 +1,50 @@ |
| 24 |
+--- gnuplot-4.2.3-orig/configure.in 2008-03-04 19:36:53.000000000 +0100 |
| 25 |
++++ gnuplot-4.2.3/configure.in 2008-04-26 11:44:59.000000000 +0200 |
| 26 |
+@@ -1024,6 +1024,10 @@ |
| 27 |
+ fi |
| 28 |
+ AC_SUBST(LISPDIR) |
| 29 |
+ |
| 30 |
++dnl Location of application defaults |
| 31 |
++AC_ARG_VAR(appdefaultdir,[Directory for application defaults]) |
| 32 |
++test -z "$appdefaultdir" && appdefaultdir='${sysconfdir}/X11/app-defaults' |
| 33 |
++ |
| 34 |
+ dnl Substitute variables |
| 35 |
+ AC_SUBST(PACKAGE) |
| 36 |
+ AC_SUBST(VERSION_MAJOR) |
| 37 |
--- gnuplot-4.2.3-orig/share/Makefile.am 2008-03-05 04:38:59.000000000 +0100 |
| 38 |
+++ gnuplot-4.2.3/share/Makefile.am 2008-04-26 11:44:59.000000000 +0200 |
| 39 |
-@@ -5,7 +5,7 @@ |
| 40 |
+@@ -5,8 +5,6 @@ |
| 41 |
|
| 42 |
SUBDIRS = LaTeX |
| 43 |
|
| 44 |
-appdefaultdir = $(libdir)/X11/app-defaults |
| 45 |
-+appdefaultdir = /etc/X11/app-defaults |
| 46 |
- |
| 47 |
+- |
| 48 |
APPDEFAULTFILES = Gnuplot |
| 49 |
|
| 50 |
---- gnuplot-4.2.3-orig/share/Makefile.in 2008-03-08 21:06:28.000000000 +0100 |
| 51 |
-+++ gnuplot-4.2.3/share/Makefile.in 2008-04-26 11:45:11.000000000 +0200 |
| 52 |
-@@ -190,7 +190,7 @@ |
| 53 |
- AUTOMAKE_OPTIONS = foreign 1.2h |
| 54 |
- EXTRA_DIST = Gnuplot.app-defaults |
| 55 |
- SUBDIRS = LaTeX |
| 56 |
--appdefaultdir = $(libdir)/X11/app-defaults |
| 57 |
-+appdefaultdir = /etc/X11/app-defaults |
| 58 |
- APPDEFAULTFILES = Gnuplot |
| 59 |
appdefault_DATA = $(APPDEFAULTFILES) |
| 60 |
- CLEANFILES = $(APPDEFAULTFILES) |
| 61 |
+--- gnuplot-4.2.3-orig/src/Makefile.am 2007-08-26 19:50:20.000000000 +0200 |
| 62 |
++++ gnuplot-4.2.3/src/Makefile.am 2008-04-26 11:44:59.000000000 +0200 |
| 63 |
+@@ -25,7 +25,10 @@ |
| 64 |
+ noinst_PROGRAMS = bf_test |
| 65 |
+ |
| 66 |
+ XLIBS = @LIBRARIES_FOR_X@ |
| 67 |
+-AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" |
| 68 |
++AM_CPPFLAGS = -I../term -I$(top_srcdir)/term \ |
| 69 |
++ -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" \ |
| 70 |
++ -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DAppDefDir=\"$(appdefaultdir)\" \ |
| 71 |
++ -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" |
| 72 |
+ |
| 73 |
+ gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h \ |
| 74 |
+ breaders.c breaders.h bitmap.c bitmap.h color.c color.h command.c \ |
| 75 |
--- gnuplot-4.2.3-orig/src/gplt_x11.c 2007-12-10 00:55:27.000000000 +0100 |
| 76 |
+++ gnuplot-4.2.3/src/gplt_x11.c 2008-04-26 11:45:18.000000000 +0200 |
| 77 |
-@@ -4787,7 +4787,7 @@ |
| 78 |
+@@ -4787,7 +4787,9 @@ |
| 79 |
*/ |
| 80 |
#define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) ) |
| 81 |
|
| 82 |
--#define AppDefDir "/usr/lib/X11/app-defaults" |
| 83 |
-+#define AppDefDir "/etc/X11/app-defaults" |
| 84 |
++#ifndef AppDefDir |
| 85 |
+ #define AppDefDir "/usr/lib/X11/app-defaults" |
| 86 |
++#endif |
| 87 |
#ifndef MAXHOSTNAMELEN |
| 88 |
#define MAXHOSTNAMELEN 64 |
| 89 |
#endif |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
-- |
| 94 |
gentoo-commits@l.g.o mailing list |
Archives