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

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

4 files changed, 102 insertions, 0 deletions

diff --git a/gpe-package/gpe-package-0.0.10/fix_interface_c.patch b/gpe-package/gpe-package-0.0.10/fix_interface_c.patch
index e69de29bb2..56764a646a 100644
--- a/gpe-package/gpe-package-0.0.10/fix_interface_c.patch
+++ b/gpe-package/gpe-package-0.0.10/fix_interface_c.patch
@@ -0,0 +1,14 @@
+diff -urNd ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c gpe-package-0.0.9-1/interface.c
+--- ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c	2004-03-12 12:00:46.000000000 +0000
++++ gpe-package-0.0.9-1/interface.c	2004-07-27 14:40:06.000000000 +0100
+@@ -61,8 +61,8 @@
+ #define TREE_SHOW_INST		0x01
+ #define TREE_SHOW_NOTINST	0x02
+ 
+-#define HELPMESSAGE "GPE-Package\nVersion " VERSION \
+-		"\nGPE frontend for ipkg\n\nflorian@handhelds.org"
++#define HELPMESSAGE "GPE-Package\nVersion "
++#define VERSION "\nGPE frontend for ipkg\n\nflorian@handhelds.org"
+ 
+ #define NOHELPMESSAGE N_("Displaying help failed.")
+ 
diff --git a/gpe-package/gpe-package-0.0.10/fix_makefile.patch b/gpe-package/gpe-package-0.0.10/fix_makefile.patch
index e69de29bb2..73ae52867c 100644
--- a/gpe-package/gpe-package-0.0.10/fix_makefile.patch
+++ b/gpe-package/gpe-package-0.0.10/fix_makefile.patch
@@ -0,0 +1,37 @@
+diff -urNd ../gpe-package-0.0.10-r0/gpe-package-0.0.10/Makefile gpe-package-0.0.10/Makefile
+--- ../gpe-package-0.0.10-r0/gpe-package-0.0.10/Makefile	2004-07-29 14:44:24.000000000 +0100
++++ gpe-package-0.0.10/Makefile	2004-08-03 14:02:56.000000000 +0100
+@@ -3,7 +3,6 @@
+ CVSBUILD = no
+ DEBUG = no
+ INSTALL = install
+-STRIP = strip
+ PREFIX = /usr/local
+ DESTDIR = /
+ 
+@@ -28,13 +27,13 @@
+ 
+ PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
+ PACKAGE_CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+-PACKAGE_CFLAGS += -DIPKG_LIB  -I/skiff/local/arm-linux/include/libipkg
++PACKAGE_CFLAGS += -DIPKG_LIB  -I$(STAGING_INCDIR)/libipkg
+ 
+ GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 libipkg` 
+ GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0 libipkg`
+ 
+ PACKAGE_CFLAGS += $(GPECFLAGS) $(GTKCFLAGS) $(STANDARD_CFLAGS) 
+-PACKAGE_LDFLAGS += $(GPELIBS) $(GTKLDFLAGS) $(STANDARD_LDFLAGS)
++PACKAGE_LDFLAGS += $(GPELIBS) $(GTKLDFLAGS) $(STANDARD_LDFLAGS) -lipkg
+ 
+ OBJS = $(patsubst %,%.o,$(MEMBERS))
+ DEPS = $(patsubst %,%.d,$(MEMBERS))
+@@ -53,8 +52,7 @@
+ 	sed -e s/VERSION/$(VERSION)/ < familiar/control > $(DESTDIR)/CONTROL/control
+ 	mkdir -p $(DESTDIR)/etc/gpe
+ 	mkdir -p $(DESTDIR)/$(PREFIX)/bin
+-	$(INSTALL) $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
+-	$(STRIP) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
++	$(INSTALL) -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
+ 	for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/gpe-package/gpe-package-0.0.12/use-filesel.patch b/gpe-package/gpe-package-0.0.12/use-filesel.patch
index e69de29bb2..e15df6e199 100644
--- a/gpe-package/gpe-package-0.0.12/use-filesel.patch
+++ b/gpe-package/gpe-package-0.0.12/use-filesel.patch
@@ -0,0 +1,37 @@
+diff -urNd ../gpe-package-0.0.12-r1/gpe-package-0.0.12/interface.c gpe-package-0.0.12/interface.c
+--- ../gpe-package-0.0.12-r1/gpe-package-0.0.12/interface.c	2004-08-25 16:00:59.000000000 +0100
++++ gpe-package-0.0.12/interface.c	2004-09-13 21:05:18.000000000 +0100
+@@ -42,8 +42,8 @@
+ #include "packages.h"
+ #include "interface.h"
+ #include "main.h"
+-//#include "filesel.h"
+-#include "filechooser.h"
++#include "filesel.h"
++//#include "filechooser.h"
+ 
+ #define N_(x) (x)
+ 
+@@ -730,8 +730,8 @@
+ 
+ void on_select_local(GtkButton *button, gpointer user_data)
+ {
+-	//ask_user_a_file("/tmp",_("Select package file"),do_local_install,NULL,NULL);
+-	package_choose(fMain, do_local_install);
++	ask_user_a_file("/tmp",_("Select package file"),do_local_install,NULL,NULL);
++	//package_choose(fMain, do_local_install);
+ }
+ 
+ 
+diff -urNd ../gpe-package-0.0.12-r1/gpe-package-0.0.12/Makefile gpe-package-0.0.12/Makefile
+--- ../gpe-package-0.0.12-r1/gpe-package-0.0.12/Makefile	2004-08-25 19:10:54.000000000 +0100
++++ gpe-package-0.0.12/Makefile	2004-09-13 21:22:44.000000000 +0100
+@@ -18,7 +18,7 @@
+ BUILD = build
+ endif
+ 
+-MEMBERS  = main interface packages filechooser
++MEMBERS  = main interface packages filesel
+ 
+ ifeq ($(DEBUG),yes)
+ CFLAGS += -g -DDEBUG
diff --git a/gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch b/gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch
index e69de29bb2..56764a646a 100644
--- a/gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch
+++ b/gpe-package/gpe-package-0.0.9-1/fix_interface_c.patch
@@ -0,0 +1,14 @@
+diff -urNd ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c gpe-package-0.0.9-1/interface.c
+--- ../gpe-package-0.0.9-1-r0/gpe-package-0.0.9-1/interface.c	2004-03-12 12:00:46.000000000 +0000
++++ gpe-package-0.0.9-1/interface.c	2004-07-27 14:40:06.000000000 +0100
+@@ -61,8 +61,8 @@
+ #define TREE_SHOW_INST		0x01
+ #define TREE_SHOW_NOTINST	0x02
+ 
+-#define HELPMESSAGE "GPE-Package\nVersion " VERSION \
+-		"\nGPE frontend for ipkg\n\nflorian@handhelds.org"
++#define HELPMESSAGE "GPE-Package\nVersion "
++#define VERSION "\nGPE frontend for ipkg\n\nflorian@handhelds.org"
+ 
+ #define NOHELPMESSAGE N_("Displaying help failed.")
+