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

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

7 files changed, 355 insertions, 0 deletions

diff --git a/gpe-conf/gpe-conf-0.1.8/applets-dialog.patch b/gpe-conf/gpe-conf-0.1.8/applets-dialog.patch
index e69de29bb2..744ee966c5 100644
--- a/gpe-conf/gpe-conf-0.1.8/applets-dialog.patch
+++ b/gpe-conf/gpe-conf-0.1.8/applets-dialog.patch
@@ -0,0 +1,25 @@
+Index: applets.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/applets.c,v
+retrieving revision 1.24
+diff -r1.24 applets.c
+345c345
+< 	GtkWidget *hbox;
+---
+> 	GtkWidget *hbox, *btn;
+365,366d364
+< 						      GTK_STOCK_OK,
+< 						      GTK_RESPONSE_ACCEPT,
+368,369c366,374
+< 		label = gtk_label_new (_
+< 				       ("Some options are only\naccessible for user root.\nPlease enter password."));
+---
+> 		btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
+> 				GTK_STOCK_OK,
+> 				GTK_RESPONSE_ACCEPT);
+> 		GTK_WIDGET_SET_FLAGS (btn, GTK_CAN_DEFAULT);
+> 		gtk_widget_grab_default(btn);
+> 
+> 		
+> 		label = gtk_label_new (_ ("Some options are only\n"\
+> 			"accessible for user root.\nPlease enter password."));
diff --git a/gpe-conf/gpe-conf-0.1.8/battery.patch b/gpe-conf/gpe-conf-0.1.8/battery.patch
index e69de29bb2..23c65336c3 100644
--- a/gpe-conf/gpe-conf-0.1.8/battery.patch
+++ b/gpe-conf/gpe-conf-0.1.8/battery.patch
@@ -0,0 +1,13 @@
+Index: battery.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/battery.c,v
+retrieving revision 1.9
+diff -r1.9 battery.c
+29c29
+< #ifdef __arm__
+---
+> #ifdef MACH_IPAQ
+91c91
+< #ifdef __arm__
+---
+> #ifdef MACH_IPAQ
diff --git a/gpe-conf/gpe-conf-0.1.8/brightness.patch b/gpe-conf/gpe-conf-0.1.8/brightness.patch
index e69de29bb2..b3f169fd87 100644
--- a/gpe-conf/gpe-conf-0.1.8/brightness.patch
+++ b/gpe-conf/gpe-conf-0.1.8/brightness.patch
@@ -0,0 +1,53 @@
+Index: ipaqscreen/brightness.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/ipaqscreen/brightness.c,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- ipaqscreen/brightness.c	13 Jul 2003 08:40:13 -0000	1.13
++++ ipaqscreen/brightness.c	3 Jun 2004 17:35:23 -0000	1.14
+@@ -23,7 +23,7 @@
+ #include "../parser.h"
+ 
+ #include <fcntl.h>
+-#ifdef __arm__
++#ifdef MACH_IPAQ
+ #include <sys/ioctl.h>
+ #include <linux/h3600_ts.h>
+ #define TS_DEV "/dev/touchscreen/0"
+@@ -32,7 +32,7 @@
+ 
+ void turn_light(int status)
+ {
+-#ifdef __arm__
++#ifdef MACH_IPAQ
+   int fd;
+   bl.mode=1;
+   bl.pwr=status;
+@@ -46,7 +46,7 @@
+ 
+ int get_light_state ()
+ {
+-#ifndef __arm__
++#ifndef MACH_IPAQ
+   return 10; // bl doesnt exit on i386 dev machines!
+ #else
+   struct h3600_ts_backlight tsbl;
+@@ -83,7 +83,7 @@
+ 
+ void set_brightness (int brightness)
+ {
+-#ifdef __arm__
++#ifdef MACH_IPAQ
+   int fd;
+ 	
+   if (brightness) 
+@@ -102,7 +102,7 @@
+ 
+ int get_brightness ()
+ {
+-#ifndef __arm__
++#ifndef MACH_IPAQ
+   return 10; // bl doesnt exit on i386 dev machines!
+ #else
+   struct h3600_ts_backlight tsbl;
diff --git a/gpe-conf/gpe-conf-0.1.8/cardinfo.patch b/gpe-conf/gpe-conf-0.1.8/cardinfo.patch
index e69de29bb2..ffb24a9825 100644
--- a/gpe-conf/gpe-conf-0.1.8/cardinfo.patch
+++ b/gpe-conf/gpe-conf-0.1.8/cardinfo.patch
@@ -0,0 +1,24 @@
+Index: cardinfo.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/cardinfo.c,v
+retrieving revision 1.27
+diff -u -r1.27 cardinfo.c
+--- cardinfo.c	4 Apr 2004 09:52:46 -0000	1.27
++++ cardinfo.c	4 Jun 2004 09:29:41 -0000
+@@ -34,11 +34,11 @@
+ #include <poll.h>
+ #include <time.h>
+ 
+-#include <pcmcia/version.h>
+-#include <pcmcia/cs_types.h>
+-#include <pcmcia/cs.h>
+-#include <pcmcia/cistpl.h>
+-#include <pcmcia/ds.h>
++#include "pcmcia/version.h"
++#include "pcmcia/cs_types.h"
++#include "pcmcia/cs.h"
++#include "pcmcia/cistpl.h"
++#include "pcmcia/ds.h"
+ 
+ #include <gtk/gtk.h>
+ 
diff --git a/gpe-conf/gpe-conf-0.1.8/gpe-conf_makefile.patch b/gpe-conf/gpe-conf-0.1.8/gpe-conf_makefile.patch
index e69de29bb2..7f1017de64 100644
--- a/gpe-conf/gpe-conf-0.1.8/gpe-conf_makefile.patch
+++ b/gpe-conf/gpe-conf-0.1.8/gpe-conf_makefile.patch
@@ -0,0 +1,118 @@
+diff -urN gpe-conf-0.1.7.orig/Makefile gpe-conf-0.1.7/Makefile
+--- gpe-conf-0.1.7.orig/Makefile	2004-03-19 20:38:33.000000000 +1100
++++ gpe-conf-0.1.7/Makefile	2004-04-30 12:39:59.000000000 +1000
+@@ -25,27 +25,28 @@
+ 	gpe-conf-users.desktop.in \
+ 	gpe-conf-sysinfo.desktop.in	
+ 
++PACKAGE_CFLAGS = `pkg-config --cflags gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0 libgpewidget x11 xrandr xext xft xau xrandr`
++PACKAGE_LDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0 libgpewidget x11 xrandr xext xft xau xrandr`
++PACKAGE_LDFLAGS += -lexpat
++
+ ifeq ($(CVSBUILD),yes)
+-LIBS += -L../libgpewidget -L../libxsettings  -L../libxsettings-client -L../libdotdesktop  -L.
+-CFLAGS += -Wall -I../libgpewidget -I../libxsettings-client -I../libxsettings -I../libdotdesktop
++PACKAGE_LDFLAGS += -L../libxsettings  -L../libxsettings-client -L../libdotdesktop  -L.
++PACKAGE_CFLAGS += -Wall -I../libxsettings-client -I../libxsettings -I../libdotdesktop
+ BUILD = ../build
+ else
+-CFLAGS += -I/usr/local/include/gpe -Wall
++PACKAGE_CFLAGS += -I/usr/local/include/gpe -Wall
+ BUILD = build
+ endif
+ 
+ ifeq ($(DEBUG),yes)
+-CFLAGS += -g -DDEBUG
++PACKAGE_CFLAGS += -g -DDEBUG
+ else
+-CFLAGS += -Os -fomit-frame-pointer
++PACKAGE_CFLAGS += -Os -fomit-frame-pointer
+ endif
+ 
+-LIBS += -lXsettings -lXsettings-client -lcrypt
+-CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
+-CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+-
+-GTKCFLAGS = `pkg-config --cflags gtk+-2.0` 
+-GTKLDFLAGS += `pkg-config --libs gtk+-2.0 gdk-2.0` 
++PACKAGE_LDFLAGS += -lXsettings -lXsettings-client -lcrypt
++PACKAGE_CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
++PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+ 
+ # setup how to compile
+ ifeq ($(NATIVE),yes)
+@@ -53,21 +54,19 @@
+ STRIP=strip
+ CC=gcc
+ 
+-CFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -Wall
+-LIBS += -lgpewidget `pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0` -ldotdesktop 
+-
+ else # we do cross-compile...
+ 
+ CC=arm-linux-gcc
+ STRIP=arm-linux-strip
+ 
+-CFLAGS += -march=armv4 -mtune=strongarm
+-CFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -Wall 
+-LIBS += -L/skiff/local/arm-linux/lib -L/skiff/local/arm-linux/lib/X11  
+-LIBS += -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoxft-1.0 
+-LIBS += -lpangox-1.0 -lpango-1.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 
+-LIBS += -lgmodule-2.0 -ldl -lglib-2.0 -ldotdesktop -lXinerama
+-LIBS += -lX11 -lXext -lXrender -lgdk-x11-2.0
++# PACKAGE_CFLAGS += -march=armv4 -mtune=strongarm
++PACKAGE_CFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -Wall 
++
++PACKAGE_LDFLAGS += -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0
++PACKAGE_LDFLAGS += -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgdk_pixbuf-2.0
++PACKAGE_LDFLAGS += -lm -lgobject-2.0  -lgmodule-2.0 -ldl -lglib-2.0
++PACKAGE_LDFLAGS += -ldotdesktop -lXinerama  -lX11 -lXext -lXrender
++PACKAGE_LDFLAGS += -lgdk-x11-2.0
+ 
+ endif #native or cross-compile
+ 
+@@ -77,21 +76,17 @@
+ MEMBERS += misc
+ MEMBERS += unimplemented
+ MEMBERS += timeanddate
+-MEMBERS += appmgr_setup ../gpe-appmgr/package 
+-MEMBERS += ipaqscreen/main ipaqscreen/brightness  ipaqscreen/rotation ipaqscreen/calibrate ipaqscreen/callbacks ipaqscreen/xset 
+ MEMBERS += kbd
+ MEMBERS += network
+ MEMBERS += theme
+ MEMBERS += keyctl
+ MEMBERS += ownerinfo
+ MEMBERS += login-setup
+-MEMBERS += sleep/main sleep/interface sleep/callbacks sleep/conf sleep/confGUI 
+ MEMBERS += users/interface users/callbacks  
+ MEMBERS += cfgfile
+ MEMBERS += gpe-admin
+ MEMBERS += widgets/sp-color-slider
+ MEMBERS += serial
+-MEMBERS += cardinfo
+ MEMBERS += tools/interface
+ MEMBERS += tasks
+ 
+@@ -99,7 +94,6 @@
+ MEMBERS_INFO += storage
+ MEMBERS_INFO += logread
+ MEMBERS_INFO += tools/interface
+-MEMBERS_INFO += battery
+ MEMBERS_INFO += sysinfo
+ MEMBERS_INFO += parser
+ 
+@@ -167,12 +161,12 @@
+ all: $(PACKAGE) gpe-info
+ 
+ $(PACKAGE): $(OBJS)
+-	$(CC) -g -o $@ $(OBJS) $(LIBS)
++	$(CC) -g -o $@ $(OBJS) ${PACKAGE_LDFLAGS} $(LIBS)
+ 	cp $(PACKAGE) gpe-conf.pc
+ 	$(STRIP) $(PACKAGE)
+ 
+ gpe-info: $(OBJS_INFO)
+-	$(CC) -g -o $@ $(OBJS_INFO) $(LIBS)
++	$(CC) -g -o $@ $(OBJS_INFO) ${PACKAGE_LDFLAGS} $(LIBS)
+ 	$(STRIP) gpe-info
+ 	
+ install-program: all all-desktop
diff --git a/gpe-conf/gpe-conf-0.1.8/makefile.patch b/gpe-conf/gpe-conf-0.1.8/makefile.patch
index e69de29bb2..5a62d60f91 100644
--- a/gpe-conf/gpe-conf-0.1.8/makefile.patch
+++ b/gpe-conf/gpe-conf-0.1.8/makefile.patch
@@ -0,0 +1,101 @@
+Index: Makefile
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/Makefile,v
+retrieving revision 1.103
+diff -r1.103 Makefile
+9a10
+> MACHINE = other
+11a13,23
+> 
+> ifeq ($(MACHINE),ipaq)
+> PACKAGE_CPPFLAGS += -DMACH_IPAQ
+> PACKAGE_CFLAGS += -DMACH_IPAQ
+> endif
+> 
+> ifeq ($(MACHINE),simpad)
+> PACKAGE_CPPFLAGS += -DMACH_SIMPAD
+> PACKAGE_CFLAGS += -DMACH_SIMPAD
+> endif
+> 
+29,30c41,42
+< LIBS += -L../libgpewidget -L../libxsettings  -L../libxsettings-client -L.
+< CFLAGS += -Wall -I../libgpewidget -I../libxsettings-client -I../libxsettings 
+---
+> PACKAGE_CPPFLAGS += -I../libxsettings -I../libxsettings-client
+> PACKAGE_LDFLAGS += -L../libxsettings -L../libxsettings-client
+33d44
+< CFLAGS += -I/usr/local/include/gpe -Wall
+36a48,54
+> GTKCFLAGS = `pkg-config --cflags gtk+-2.0` 
+> GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0` 
+> 
+> PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -I.
+> PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS) -I.
+> PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GTKLDFLAGS) $(GPELIBS) -lXsettings -lXsettings-client -lcrypt
+> 
+38c56
+< CFLAGS += -g -DDEBUG
+---
+> PACKAGE_CFLAGS += -g -DDEBUG
+40c58
+< CFLAGS += -Os -fomit-frame-pointer
+---
+> PACKAGE_CFLAGS += -Os -fomit-frame-pointer
+43,45c61,62
+< LIBS += -lXsettings -lXsettings-client -lcrypt
+< CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
+< CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+---
+> PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE 
+> PACKAGE_CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+47,48d63
+< GTKCFLAGS = `pkg-config --cflags gtk+-2.0` 
+< GTKLDFLAGS += `pkg-config --libs gtk+-2.0 gdk-2.0` 
+53,54c68,69
+< STRIP=strip
+< CC=gcc
+---
+> #STRIP=strip
+> #CC=gcc
+56,57c71,72
+< CFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -Wall
+< LIBS += -lgpewidget `pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0`
+---
+> #CFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -Wall
+> #LIBS += -lgpewidget `pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0`
+61,62c76,77
+< CC=arm-linux-gcc
+< STRIP=arm-linux-strip
+---
+> #CC=arm-linux-gcc
+> #STRIP=arm-linux-strip
+64,70c79,85
+< CFLAGS += -march=armv4 -mtune=strongarm
+< CFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -Wall 
+< LIBS += -L/skiff/local/arm-linux/lib -L/skiff/local/arm-linux/lib/X11  
+< LIBS += -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoxft-1.0 
+< LIBS += -lpangox-1.0 -lpango-1.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 
+< LIBS += -lgmodule-2.0 -ldl -lglib-2.0 -lXinerama
+< LIBS += -lX11 -lXext -lXrender -lgdk-x11-2.0
+---
+> #CFLAGS += -march=armv4 -mtune=strongarm
+> #CFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -Wall 
+> #LIBS += -L/skiff/local/arm-linux/lib -L/skiff/local/arm-linux/lib/X11  
+> #LIBS += -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoxft-1.0 
+> #LIBS += -lpangox-1.0 -lpango-1.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 
+> #LIBS += -lgmodule-2.0 -ldl -lglib-2.0 -lXinerama
+> #LIBS += -lX11 -lXext -lXrender -lgdk-x11-2.0
+74d88
+< CPPFLAGS += -I.
+111c125
+< CFLAGS += -D PACKAGETOOL
+---
+> PACKAGE_CFLAGS += -D PACKAGETOOL
+170c184
+< 	$(CC) -g -o $@ $(OBJS) $(LIBS)
+---
+> 	$(CC) -g -o $@ $(OBJS) $(LDFLAGS) $(PACKAGE_LDFLAGS)
+175c189
+< 	$(CC) -g -o $@ $(OBJS_INFO) $(LIBS)
+---
+> 	$(CC) -g -o $@ $(OBJS_INFO) $(LDFLAGS) $(PACKAGE_LDFLAGS)
diff --git a/gpe-conf/gpe-conf-0.1.8/sysinfo-segfault.patch b/gpe-conf/gpe-conf-0.1.8/sysinfo-segfault.patch
index e69de29bb2..b0396bece1 100644
--- a/gpe-conf/gpe-conf-0.1.8/sysinfo-segfault.patch
+++ b/gpe-conf/gpe-conf-0.1.8/sysinfo-segfault.patch
@@ -0,0 +1,21 @@
+Index: sysinfo.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-conf/sysinfo.c,v
+retrieving revision 1.9
+diff -r1.9 sysinfo.c
+91c91
+< 	GError *err;
+---
+> 	GError *err = NULL;
+126c126
+< 	GError *err;
+---
+> 	GError *err = NULL;
+188c188
+< 	GError *err;
+---
+> 	GError *err = NULL;
+204c204
+< 	GError *err;
+---
+> 	GError *err = NULL;