From f96441b9faf769c9ecdd4d338b605ea3d0cc4010 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 9 Nov 2004 00:36:47 +0000
Subject: Disable bk EOLN_NATIVE conversions on all files in packages
 FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
---
 feh/feh-1.2.6/cross.patch | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'feh')

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
+ 
-- 
cgit v1.2.3