summaryrefslogtreecommitdiff
path: root/feh/feh-1.2.6
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /feh/feh-1.2.6
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'feh/feh-1.2.6')
-rw-r--r--feh/feh-1.2.6/cross.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/feh/feh-1.2.6/cross.patch b/feh/feh-1.2.6/cross.patch
index e69de29bb2..0117ced81d 100644
--- a/feh/feh-1.2.6/cross.patch
+++ b/feh/feh-1.2.6/cross.patch
@@ -0,0 +1,31 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- feh-1.2.6/./src/Makefile.am~cross
++++ feh-1.2.6/./src/Makefile.am
+@@ -2,8 +2,7 @@
+ MAINTAINERCLEANFILES = Makefile.in
+
+ LDFLAGS = -L/usr/X11R6/lib
+-INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) \
+- -I$(prefix)/include -I$(includedir) \
++INCLUDES = $(X_CFLAGS) \
+ -I. -I$(top_srcdir)/src \
+ -DPREFIX=\""$(prefix)"\" \
+ @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
+--- feh-1.2.6/./Makefile.am~cross
++++ feh-1.2.6/./Makefile.am
+@@ -5,9 +5,8 @@
+ # A list of all the files in the current directory which can be regenerated
+ MAINTAINERCLEANFILES = Makefile.in feh.spec
+
+-LDFLAGS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
+-INCLUDES = -I/usr/X11R6/include \
+-$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.
++LDFLAGS = -L/usr/X11R6/lib
++INCLUDES = $(X_CFLAGS) -I.
+
+ man_MANS = feh.1
+