diff options
| author | Chris Lord <chris@openedhand.com> | 2004-09-14 09:30:20 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2004-09-14 09:30:20 +0000 |
| commit | 9bab0b8cdab261c18eec4676cd98b85ed15d6435 (patch) | |
| tree | ed227d26442b7a08c0add18caac08608774d83d0 /rosetta | |
| parent | a4e55364cfff5ff0895553d045c9e1795c0ef0ad (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages
2004/09/14 10:30:06+01:00 (none)!cwiiis
Semi-fix detect-stylus and miniclipboard.
Fix xmonobut.
Remove dependency on xinerama from rosetta.
Upgrade gpe-calendar (0.56) and gpe-gallery (0.95).
Add meatchbox-panel-hacks.
Prefer gtk 2.2.4 and libglade 2.0.1 in openzaurus-3.5.1.conf.
BKrev: 4146ba2cDQllTCv8TcQ9e-qKViJQ8Q
Diffstat (limited to 'rosetta')
| -rw-r--r-- | rosetta/rosetta-makefile.patch | 91 | ||||
| -rw-r--r-- | rosetta/rosetta_cvs.oe | 3 |
2 files changed, 93 insertions, 1 deletions
diff --git a/rosetta/rosetta-makefile.patch b/rosetta/rosetta-makefile.patch index e69de29bb2..7b9db522e4 100644 --- a/rosetta/rosetta-makefile.patch +++ b/rosetta/rosetta-makefile.patch @@ -0,0 +1,91 @@ +diff -u rosetta.orig/Makefile rosetta/Makefile +--- rosetta.orig/Makefile 2003-09-28 00:37:58.000000000 +1000 ++++ rosetta/Makefile 2004-04-29 13:16:23.000000000 +1000 +@@ -20,45 +20,30 @@ + PACKAGE = rosetta + GTK_PACKAGE = rosettalearn + CVSBUILD = yes +- + BUILD = build +- + VERSION = 0.01 + + DESTDIR = +-PREFIX = /usr/local ++PREFIX = /usr + OPTIONS = -DNEW_NORMALIZE_CODE -DNEW_MATCH_CODE +- +-ifeq ($(CROSSCOMPILE),yes) +- +-CC = arm-linux-gcc +-STRIP = arm-linux-strip +- +-PKG_CONFIG_PATH=/skiff/local/arm-linux/lib/pkgconfig/ +- +-LDFLAGS += -L/skiff/local/arm-linux/lib +-LDFLAGS += -L/skiff/local/arm-linux/lib/X11 +-LDFLAGS += -lX11 -lXtst -lXext -lm +- +-else +- +-CC = gcc +-STRIP = strip +- +-LDFLAGS += -L/usr/X11R6/lib -lX11 -lXtst -lm +- +-endif +- + CONTROL = control + + CFLAGS += -Os -Wall + CFLAGS += -MD $(OPTIONS) -g +-CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DGTK_PACKAGE=\"$(GTK_PACKAGE)\" -DPREFIX=\"$(PREFIX)\" +-CFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" +-CFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\" +-CFLAGS += -I$(GPE_DIR)/libgpewidget +-CFLAGS += -DENABLE_NLS +-CFLAGS += $(GPECFLAGS) ++ ++PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" ++PACKAGE_CPPFLAGS += -DGTK_PACKAGE=\"$(GTK_PACKAGE)\" ++PACKAGE_CPPFLAGS += -DPREFIX=\"$(PREFIX)\" ++PACKAGE_CPPFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++PACKAGE_CPPFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\" ++PACKAGE_CPPFLAGS += -DENABLE_NLS ++ ++PACKAGE_CFLAGS += `pkg-config --cflags gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau` ++PACKAGE_LDFLAGS += `pkg-config --libs gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau` ++PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib ++PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib/X11 ++PACKAGE_LDFLAGS += -lm ++ + #CFLAGS += -DDEBUG + + .SUFFIXES: .d .c +@@ -77,11 +62,15 @@ + all: $(PACKAGE) $(GTK_PACKAGE) + + $(PACKAGE): $(OBJS) +- $(CC) -o $@ $^ $(LDFLAGS) ++ $(CC) -o $@ $^ $(PACKAGE_LDFLAGS) $(LDFLAGS) + + $(GTK_PACKAGE): $(GTK_OBJS) +- $(CC) -o $@ $^ $(LDFLAGS) $(GPELIBS) -lXrender -lXinerama ++ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) $(GPELIBS) ++ ++.c.o:; ++ $(CC) $(PACKAGE_CPPFLAGS) $(PACKAGE_CFLAGS) -c $< -o $@ + ++install: install-program + install-program: all + install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + install -D $(GTK_PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(GTK_PACKAGE) +@@ -92,7 +81,7 @@ + mkdir -p $(DESTDIR)/etc + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + install -m 644 penwrite24.png $(DESTDIR)$(PREFIX)/share/pixmaps/penwrite24.png +- install -m 644 $(PACKAGE).pc $(DESTDIR)$(PREFIX)/share/$(PACKAGE) ++# install -m 644 $(PACKAGE).pc $(DESTDIR)$(PREFIX)/share/$(PACKAGE) + install -m 666 $(PACKAGE).db $(DESTDIR)$(PREFIX)/share/$(PACKAGE) + install -m 644 $(PACKAGE).conf $(DESTDIR)/etc + mkdir -p $(DESTDIR)$(PREFIX)/share/applications diff --git a/rosetta/rosetta_cvs.oe b/rosetta/rosetta_cvs.oe index 9449a58138..d8ffaa47e1 100644 --- a/rosetta/rosetta_cvs.oe +++ b/rosetta/rosetta_cvs.oe @@ -1,10 +1,11 @@ PV = "0.0cvs${CVSDATE}" -DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xinerama xtst xext xau" +DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xtst xext xau" DESCRIPTION = "Multistroke / full word handwriting recognition for X" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=rosetta \ file://rosetta-makefile.patch;patch=1" S = "${WORKDIR}/rosetta" +PR = "r1" inherit pkgconfig |