From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denis@denix.org>
Date: Tue, 17 Mar 2009 14:32:59 -0400
Subject: rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 .../gpe-watch/gpe-watch-0.10/fix_makefile.patch    | 47 ++++++++++++++++++++++
 recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch | 11 +++++
 2 files changed, 58 insertions(+)
 create mode 100644 recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch
 create mode 100644 recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch

(limited to 'recipes/gpe-watch/gpe-watch-0.10')

diff --git a/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch b/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch
new file mode 100644
index 0000000000..ebea8d66e9
--- /dev/null
+++ b/recipes/gpe-watch/gpe-watch-0.10/fix_makefile.patch
@@ -0,0 +1,47 @@
+diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile gpe-watch-0.10/Makefile
+--- ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile	2004-08-03 15:43:54.000000000 +0100
++++ gpe-watch-0.10/Makefile	2004-08-03 16:08:52.000000000 +0100
+@@ -8,26 +8,26 @@
+ MEMBERS = gpe-watch
+ 
+ GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED
+-GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama
++GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
+ 
+-CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
++PACKAGE_CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall
+ ifeq ($(DEBUG),yes)
+ CFLAGS += -O2 -g
+-LDFLAGS = -g #-lefence
++LDFLAGS += -g #-lefence
+ else
+ CFLAGS += -Os -fomit-frame-pointer
+ endif
+-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
++PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+ 
+ ifeq ($(CVSBUILD),yes)
+-CFLAGS += -I../libgpewidget
+-LDFLAGS += -L../libgpewidget
++PACKAGE_CFLAGS += -I../libgpewidget
++PACKAGE_LDFLAGS += -L../libgpewidget
+ BUILD = ../build
+ else
+-CFLAGS += -I/usr/include/gpe
++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
+ BUILD = build
+ endif
+-LDFLAGS += -lgpewidget $(GTKLDFLAGS)
++PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS)
+ 
+ OBJS = $(patsubst %,%.o,$(MEMBERS))
+ SOURCES = $(patsubst %,%.c,$(MEMBERS))
+@@ -35,7 +35,7 @@
+ all: $(PACKAGE)
+ 
+ $(PACKAGE): $(OBJS) $(LIB)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+ 
+ install-program: all $(PACKAGE).desktop
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch b/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch
new file mode 100644
index 0000000000..b2fc236e7a
--- /dev/null
+++ b/recipes/gpe-watch/gpe-watch-0.10/no-render-h.patch
@@ -0,0 +1,11 @@
+diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/gpe-watch.c gpe-watch-0.10/gpe-watch.c
+--- ../gpe-watch-0.10-r0/gpe-watch-0.10/gpe-watch.c	2004-06-30 12:12:20 +01:00
++++ gpe-watch-0.10/gpe-watch.c	2005-04-28 12:41:33 +01:00
+@@ -24,7 +24,6 @@
+ #ifdef USE_GPE
+ #include <gpe/pixmaps.h>
+ #include <gpe/init.h>
+-#include <gpe/render.h>
+ #include <gpe/picturebutton.h>
+ #include <gpe/errorbox.h>
+ #include <gpe/gpetimesel.h>
-- 
cgit 1.2.3-korg