Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

4 files changed, 153 insertions, 0 deletions

diff --git a/imlib2/imlib2-1.1.0/autofoo.patch b/imlib2/imlib2-1.1.0/autofoo.patch
index e69de29bb2..1980d7b2c9 100644
--- a/imlib2/imlib2-1.1.0/autofoo.patch
+++ b/imlib2/imlib2-1.1.0/autofoo.patch
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/libltdl/configure.in~autofoo
++++ imlib2-1.1.0/libltdl/configure.in
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to create configure.
+ 
+ AC_INIT(ltdl.c)
++AC_CONFIG_AUX_DIR([..])
+ 
+ dnl We shouldn't be using these internal macros of autoconf,
+ dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
diff --git a/imlib2/imlib2-1.1.0/cross.patch b/imlib2/imlib2-1.1.0/cross.patch
index e69de29bb2..bb4ed1784d 100644
--- a/imlib2/imlib2-1.1.0/cross.patch
+++ b/imlib2/imlib2-1.1.0/cross.patch
@@ -0,0 +1,74 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/demo/Makefile.am~cross
++++ imlib2-1.1.0/demo/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS              = -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ bin_PROGRAMS         = imlib2_view imconvert
+ imconvert_SOURCES    = imconvert.c
+--- imlib2-1.1.0/filters/Makefile.am~cross
++++ imlib2-1.1.0/filters/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS		     = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ pkgdir		     = $(libdir)/loaders/filter
+ pkg_LTLIBRARIES	     = testfilter.la bump_map.la colormod.la
+--- imlib2-1.1.0/loaders/Makefile.am~cross
++++ imlib2-1.1.0/loaders/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS		     = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib 
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ pkgdir		     = $(libdir)/loaders/image
+ 
+--- imlib2-1.1.0/src/Makefile.am~cross
++++ imlib2-1.1.0/src/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS		     = -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(freetype_cflags) $(X_CFLAGS)
+ MMX_SRCS             = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
+ 		       asm_blend_cmod.S
+ MMX_OBJS             = $(MMX_SRCS:.S=.lo)
+@@ -42,7 +41,7 @@
+ libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
+ endif
+ 
+-SYS_LOADERS_PATH = @pkglibdir@
++SYS_LOADERS_PATH = @loadersdir@
+ image.lo: loaderpath.h
+ loaderpath.h: Makefile
+ 	@echo "#define SYS_LOADERS_PATH \"${SYS_LOADERS_PATH}\"" > $@
+--- imlib2-1.1.0/test/Makefile.am~cross
++++ imlib2-1.1.0/test/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS              = -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+ 		       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-		       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ bin_PROGRAMS         = imlib2 bumpmaptest imlib2_test polytest color_spaces
+ imlib2_SOURCES       = main.c
diff --git a/imlib2/imlib2-1.1.0/gcc34.patch b/imlib2/imlib2-1.1.0/gcc34.patch
index e69de29bb2..e96bcae759 100644
--- a/imlib2/imlib2-1.1.0/gcc34.patch
+++ b/imlib2/imlib2-1.1.0/gcc34.patch
@@ -0,0 +1,24 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/src/rgbadraw.c~gcc34
++++ imlib2-1.1.0/src/rgbadraw.c
+@@ -2357,14 +2357,14 @@
+                        /* last span on line and still not < ss->x */
+                        if (ps)
+                           ps->next = s;
+-                     nospans:
++                     nospans:;
+                     }
+                }
+              if (i == y2)
+                 goto nolines;
+              i += step;
+           }
+-      nolines:
++      nolines:;
+      }
+    for (i = 0; i < h; i++)
+      {
diff --git a/imlib2/imlib2-1.1.0/pkglibdir.patch b/imlib2/imlib2-1.1.0/pkglibdir.patch
index e69de29bb2..e19b75f9d9 100644
--- a/imlib2/imlib2-1.1.0/pkglibdir.patch
+++ b/imlib2/imlib2-1.1.0/pkglibdir.patch
@@ -0,0 +1,40 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/configure.ac~pkglibdir.patch
++++ imlib2-1.1.0/configure.ac
+@@ -59,8 +59,8 @@
+ fi
+ AM_CONDITIONAL(HAVE_MMX, test x$mmx = xyes)
+ 
+-pkglibdir='${libdir}'/loaders
+-AC_SUBST(pkglibdir)
++loadersdir='${pkglibdir}'/loaders
++AC_SUBST(loadersdir)
+ 
+ AC_C_BIGENDIAN	      
+ 
+--- imlib2-1.1.0/loaders/Makefile.am~pkglibdir.patch
++++ imlib2-1.1.0/loaders/Makefile.am
+@@ -10,7 +10,7 @@
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                        $(X_CFLAGS)
+ 
+-pkgdir		     = $(libdir)/loaders/image
++pkgdir		     = $(loadersdir)/image
+ 
+ if JPEG_LOADER
+ JPEG_L              = jpeg.la
+--- imlib2-1.1.0/filters/Makefile.am~pkglibdir.patch
++++ imlib2-1.1.0/filters/Makefile.am
+@@ -10,7 +10,7 @@
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                        $(X_CFLAGS)
+ 
+-pkgdir		     = $(libdir)/loaders/filter
++pkgdir		     = $(loadersdir)/filter
+ pkg_LTLIBRARIES	     = testfilter.la bump_map.la colormod.la
+ 
+ testfilter_la_SOURCES  = filter_test.c