blow away some old versions of gpe-conf

BKrev: 41a3297aK1WMpdb6N7VF6f3gE_k1-g

16 files changed, 0 insertions, 755 deletions

diff --git a/gpe-conf/gpe-conf-0.1.10/gpe-conf-infofixes.patch b/gpe-conf/gpe-conf-0.1.10/gpe-conf-infofixes.patch
deleted file mode 100644
index 3b0b16770b..0000000000
--- a/gpe-conf/gpe-conf-0.1.10/gpe-conf-infofixes.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-===================================================================
-RCS file: /cvs/gpe/base/gpe-conf/ChangeLog,v
-retrieving revision 1.179
-diff -u -r1.179 ChangeLog
---- ChangeLog	10 Jun 2004 10:18:04 -0000	1.179
-+++ ChangeLog	11 Jun 2004 17:19:02 -0000
-@@ -1,3 +1,8 @@
-+2004-06-11	Florian Boor  	<florian.boor@kernelconcepts.de>
-+	* logread.c: Fixed missing setup of scrollbars.
-+	* sysinfo.c: Fixed multiple sources of segfaults on non-iPaq platforms.
-+	* sysinfo.c, Makefile: Improved information on several platforms.
-+	
- 2004-06-10	Florian Boor  	<florian.boor@kernelconcepts.de>
- 	* Released V 0.1.10
- 	* Removed obsolete file.
-Index: Makefile
-===================================================================
-RCS file: /cvs/gpe/base/gpe-conf/Makefile,v
-retrieving revision 1.110
-diff -u -r1.110 Makefile
---- Makefile	10 Jun 2004 10:18:04 -0000	1.110
-+++ Makefile	11 Jun 2004 17:19:02 -0000
-@@ -8,7 +8,7 @@
- DESTDIR = /
- PACKAGETOOL = no
- STRIP = strip
--MACHINE = other
-+MACHINE = unknown
- 
- 
- LINGUAS = pt ro de fr cs nl sv sk ru
-@@ -50,7 +50,7 @@
- GTKCFLAGS = `pkg-config --cflags gtk+-2.0` 
- GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0` 
- 
--PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -I.
-+PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -I. 
- PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS) -I.
- PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GTKLDFLAGS) $(GPELIBS) -lXsettings -lXsettings-client -lcrypt -L/usr/X11R6/lib -lXrandr
- 
-@@ -60,7 +60,7 @@
- PACKAGE_CFLAGS += -Os -fomit-frame-pointer
- endif
- 
--PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE 
-+PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE -DMACHINE=\"$(MACHINE)\"
- PACKAGE_CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
- 
- 
-Index: logread.c
-===================================================================
-RCS file: /cvs/gpe/base/gpe-conf/logread.c,v
-retrieving revision 1.10
-diff -u -r1.10 logread.c
---- logread.c	12 Jan 2004 16:07:59 -0000	1.10
-+++ logread.c	11 Jun 2004 17:19:02 -0000
-@@ -227,6 +227,8 @@
- 
-   tc = gtk_scrolled_window_new(NULL,NULL);
-   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tc),GTK_SHADOW_IN);
-+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tc),
-+		GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
-   gtk_box_pack_start(GTK_BOX(vbox),tc,TRUE,TRUE,0);
- 
-   tw = gtk_text_view_new();	
-Index: sysinfo.c
-===================================================================
-RCS file: /cvs/gpe/base/gpe-conf/sysinfo.c,v
-retrieving revision 1.10
-diff -u -r1.10 sysinfo.c
---- sysinfo.c	4 Jun 2004 12:55:42 -0000	1.10
-+++ sysinfo.c	11 Jun 2004 17:19:02 -0000
-@@ -170,6 +170,24 @@
- 		}
- 		g_strfreev(strv);
- 	}
-+#else
-+#ifdef __arm__
-+	result.cpu = g_strdup(_("ARM"));
-+#endif
-+#ifdef __i386__
-+	result.cpu = g_strdup(_("Intel x86 or compatible"));
-+#endif
-+#ifdef __mips__
-+	result.cpu = g_strdup(_("Mips"));
-+	#ifdef __sgi__
-+		result.model = g_strdup(_("Silicon Graphics Machine"));
-+	#endif
-+#endif
-+#ifdef _POWER
-+	result.cpu = g_strdup(_("IBM Power or PowerPC"));
-+#endif
-+	if (!result.model)
-+		result.model = g_strdup(MACHINE);
- #endif
- 	
- 	/* memory and flash size */
-@@ -191,8 +209,9 @@
- 	{
- 		if (strchr(result,'\n'))
- 			strchr(result,'\n')[0] = 0;
-+	 	return g_strstrip(result);
- 	}
--	return g_strstrip(result);
-+	return result;
- }
- 
- 
-@@ -207,8 +226,9 @@
- 	{
- 		if (strchr(result,'\n'))
- 			strchr(result,'\n')[0] = 0;
-+		return g_strstrip(result);
- 	}
--	return g_strstrip(result);
-+	return result;
- }
- 
- 
-@@ -427,7 +447,7 @@
- 		gtk_table_attach(GTK_TABLE(table),tw,0,1,4,7,GTK_FILL | GTK_EXPAND,
- 						 GTK_FILL,0,0);
- 		tw = gtk_label_new(NULL);
--    /*TRANSLATORS: "Familiar" is the name of the linux disrtribution.*/
-+    /*TRANSLATORS: "Familiar" is the name of the linux distribution.*/
- 		ts = g_strdup_printf("<i>%s</i>",_("Familiar Version"));
- 		gtk_label_set_markup(GTK_LABEL(tw),ts);
- 		gtk_misc_set_alignment(GTK_MISC(tw),0.0,0.8);
-Index: users/interface.h
-===================================================================
-RCS file: /cvs/gpe/base/gpe-conf/users/interface.h,v
-retrieving revision 1.7
-diff -u -r1.7 interface.h
---- users/interface.h	3 Jun 2004 17:35:23 -0000	1.7
-+++ users/interface.h	11 Jun 2004 17:19:02 -0000
-@@ -1,9 +1,6 @@
- #include <pwd.h>
- #include <sys/types.h>
- 
--#if MACHINE == ipaq
--#endif
--
- #ifndef __arm__
- #define MINUSERUID 500
- #else
diff --git a/gpe-conf/gpe-conf-0.1.11/desktop.patch b/gpe-conf/gpe-conf-0.1.11/desktop.patch
deleted file mode 100644
index fd253e2072..0000000000
--- a/gpe-conf/gpe-conf-0.1.11/desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gpe-conf-0.1.11/gpe-conf.desktop.in.old	2004-08-03 15:57:42.000000000 +0100
-+++ gpe-conf-0.1.11/gpe-conf.desktop.in	2004-08-03 15:57:56.000000000 +0100
-@@ -4,7 +4,7 @@
- Exec=gpe-appmgr -g Settings -D /usr/share/applications/gpe-conf.desktop
- Terminal=0
- Type=Application
--Icon=gpe-conf.png
--Categories=Application;SystemSettings;GPE
-+Icon=gpe-config.png
-+Categories=Application;GPE
- StartupNotify=True
- SingleInstance=True
diff --git a/gpe-conf/gpe-conf-0.1.12/desktop.patch b/gpe-conf/gpe-conf-0.1.12/desktop.patch
deleted file mode 100644
index 992de0b1f1..0000000000
--- a/gpe-conf/gpe-conf-0.1.12/desktop.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gpe-conf-0.1.12/gpe-conf.desktop.in.old	2004-08-06 11:44:59.000000000 +0100
-+++ gpe-conf-0.1.12/gpe-conf.desktop.in	2004-08-06 11:45:07.000000000 +0100
-@@ -5,6 +5,6 @@
- Terminal=0
- Type=Application
- Icon=gpe-config.png
--Categories=Application;SystemSettings;GPE
-+Categories=Application;GPE;
- StartupNotify=True
- SingleInstance=True
diff --git a/gpe-conf/gpe-conf-0.1.8/applets-dialog.patch b/gpe-conf/gpe-conf-0.1.8/applets-dialog.patch
deleted file mode 100644
index 744ee966c5..0000000000
--- a/gpe-conf/gpe-conf-0.1.8/applets-dialog.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 23c65336c3..0000000000
--- a/gpe-conf/gpe-conf-0.1.8/battery.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index b3f169fd87..0000000000
--- a/gpe-conf/gpe-conf-0.1.8/brightness.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index ffb24a9825..0000000000
--- a/gpe-conf/gpe-conf-0.1.8/cardinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 7f1017de64..0000000000
--- a/gpe-conf/gpe-conf-0.1.8/gpe-conf_makefile.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-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
deleted file mode 100644
index 5a62d60f91..0000000000
--- a/gpe-conf/gpe-conf-0.1.8/makefile.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-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
deleted file mode 100644
index b0396bece1..0000000000
--- a/gpe-conf/gpe-conf-0.1.8/sysinfo-segfault.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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;
diff --git a/gpe-conf/gpe-conf_0.1.10.oe b/gpe-conf/gpe-conf_0.1.10.oe
deleted file mode 100644
index 3e6d9f7cf5..0000000000
--- a/gpe-conf/gpe-conf_0.1.10.oe
+++ /dev/null
@@ -1,24 +0,0 @@
-PR = "r2"
-
-inherit gpe pkgconfig
-
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client libdotdesktop pcmcia-cs xst"
-RDEPENDS = "xst"
-SECTION = "gpe"
-PRIORITY = "optional"
-FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \
-	   file://${FILESDIR}/gpe-conf-infofixes.patch;patch=1;pnum=0"
-
-
-do_compile () {
-	oe_runmake
-	oe_runmake all-desktop
-}
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
diff --git a/gpe-conf/gpe-conf_0.1.11.oe b/gpe-conf/gpe-conf_0.1.11.oe
deleted file mode 100644
index 848431984a..0000000000
--- a/gpe-conf/gpe-conf_0.1.11.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-PR = "r2"
-
-inherit gpe pkgconfig
-
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client libdotdesktop pcmcia-cs xst"
-RDEPENDS = "xst"
-SECTION = "gpe"
-PRIORITY = "optional"
-FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \
-	file://desktop.patch;patch=1"
-
-do_compile () {
-	oe_runmake
-	oe_runmake all-desktop
-}
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
diff --git a/gpe-conf/gpe-conf_0.1.12.oe b/gpe-conf/gpe-conf_0.1.12.oe
deleted file mode 100644
index bf35551567..0000000000
--- a/gpe-conf/gpe-conf_0.1.12.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-PR = "r2"
-
-inherit gpe pkgconfig
-
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset"
-RDEPENDS = "xset xst"
-SECTION = "gpe"
-PRIORITY = "optional"
-FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \
-	file://desktop.patch;patch=1"
-
-do_compile () {
-	oe_runmake
-	oe_runmake all-desktop
-}
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
diff --git a/gpe-conf/gpe-conf_0.1.7.oe b/gpe-conf/gpe-conf_0.1.7.oe
deleted file mode 100644
index ef1ae973a3..0000000000
--- a/gpe-conf/gpe-conf_0.1.7.oe
+++ /dev/null
@@ -1,19 +0,0 @@
-inherit gpe
-
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client libdotdesktop"
-SECTION = "gpe"
-PRIORITY = "optional"
-FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
-
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-conf-${PV}.tar.gz \
-	file://gpe-conf_makefile.patch;patch=1"
-
-do_compile () {
-	oe_runmake
-	oe_runmake all-desktop
-}
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
diff --git a/gpe-conf/gpe-conf_0.1.8.oe b/gpe-conf/gpe-conf_0.1.8.oe
deleted file mode 100644
index a373fd40b2..0000000000
--- a/gpe-conf/gpe-conf_0.1.8.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-PR = "r1"
-
-inherit gpe pkgconfig
-
-DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs"
-SECTION = "gpe"
-PRIORITY = "optional"
-FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \
-	file://makefile.patch;patch=1;pnum=0 \
-        file://cardinfo.patch;patch=1;pnum=0 \
-        file://applets-dialog.patch;patch=1;pnum=0 \
-        file://battery.patch;patch=1;pnum=0 \
-        file://brightness.patch;patch=1;pnum=0" 
-
-do_compile () {
-	oe_runmake
-	oe_runmake all-desktop
-}
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
diff --git a/gpe-conf/gpe-conf_makefile.patch b/gpe-conf/gpe-conf_makefile.patch
deleted file mode 100644
index 7f1017de64..0000000000
--- a/gpe-conf/gpe-conf_makefile.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-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