diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
| commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
| tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/gpe-watch | |
| parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) | |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/gpe-watch')
| -rw-r--r-- | packages/gpe-watch/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gpe-watch/gpe-watch-0.10/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gpe-watch/gpe-watch-0.10/fix_makefile.patch | 47 | ||||
| -rw-r--r-- | packages/gpe-watch/gpe-watch-0.10/no-render-h.patch | 11 |
4 files changed, 58 insertions, 0 deletions
diff --git a/packages/gpe-watch/.mtn2git_empty b/packages/gpe-watch/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-watch/.mtn2git_empty diff --git a/packages/gpe-watch/gpe-watch-0.10/.mtn2git_empty b/packages/gpe-watch/gpe-watch-0.10/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-watch/gpe-watch-0.10/.mtn2git_empty diff --git a/packages/gpe-watch/gpe-watch-0.10/fix_makefile.patch b/packages/gpe-watch/gpe-watch-0.10/fix_makefile.patch index e69de29bb2..ebea8d66e9 100644 --- a/packages/gpe-watch/gpe-watch-0.10/fix_makefile.patch +++ b/packages/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/packages/gpe-watch/gpe-watch-0.10/no-render-h.patch b/packages/gpe-watch/gpe-watch-0.10/no-render-h.patch index e69de29bb2..b2fc236e7a 100644 --- a/packages/gpe-watch/gpe-watch-0.10/no-render-h.patch +++ b/packages/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> |