diff options
Diffstat (limited to 'openembedded/packages')
19 files changed, 346 insertions, 16 deletions
diff --git a/openembedded/packages/libxi/files/autofoo.patch b/openembedded/packages/libxi/files/autofoo.patch new file mode 100644 index 0000000000..f1bce9ed7a --- /dev/null +++ b/openembedded/packages/libxi/files/autofoo.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: libXi-6.0.1/configure.ac | ||
2 | =================================================================== | ||
3 | --- libXi-6.0.1.orig/configure.ac 2003-11-01 04:11:49.000000000 -0500 | ||
4 | +++ libXi-6.0.1/configure.ac 2005-01-20 11:34:06.878357352 -0500 | ||
5 | @@ -8,7 +8,6 @@ | ||
6 | AM_MAINTAINER_MODE | ||
7 | |||
8 | AM_CONFIG_HEADER([config.h]) | ||
9 | -AC_CONFIG_AUX_DIR(.) | ||
10 | |||
11 | # Checks for programs. | ||
12 | AC_PROG_LIBTOOL | ||
diff --git a/openembedded/packages/libxi/libxi_6.0.1.bb b/openembedded/packages/libxi/libxi_6.0.1.bb new file mode 100644 index 0000000000..b84aef8193 --- /dev/null +++ b/openembedded/packages/libxi/libxi_6.0.1.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "X Input Extension library" | ||
2 | LICENSE = "MIT-X" | ||
3 | SECTION = "x11/libs" | ||
4 | DEPENDS = "xproto x11 xextensions" | ||
5 | PR = "r1" | ||
6 | |||
7 | SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \ | ||
8 | file://autofoo.patch;patch=1" | ||
9 | S = "${WORKDIR}/libXi-${PV}" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
13 | do_stage() { | ||
14 | oe_runmake install prefix=${STAGING_DIR} \ | ||
15 | bindir=${STAGING_BINDIR} \ | ||
16 | includedir=${STAGING_INCDIR} \ | ||
17 | libdir=${STAGING_LIBDIR} \ | ||
18 | datadir=${STAGING_DATADIR} | ||
19 | } | ||
20 | |||
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb index d2cfb356ca..7a82a69e30 100644 --- a/openembedded/packages/meta/meta-oh.bb +++ b/openembedded/packages/meta/meta-oh.bb | |||
@@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base" | |||
2 | # oh-task-base | 2 | # oh-task-base |
3 | DESCRIPTION = "Meta-package for OpenHand Palmtop Environment" | 3 | DESCRIPTION = "Meta-package for OpenHand Palmtop Environment" |
4 | MAINTAINER = "Richard Purdie <richard@openedhand.com>" | 4 | MAINTAINER = "Richard Purdie <richard@openedhand.com>" |
5 | PR = "r10" | 5 | PR = "r11" |
6 | 6 | ||
7 | ALLOW_EMPTY = "1" | 7 | ALLOW_EMPTY = "1" |
8 | 8 | ||
@@ -28,9 +28,12 @@ oh-task-base = "\ | |||
28 | xserver-kdrive-common \ | 28 | xserver-kdrive-common \ |
29 | xserver-nodm-init \ | 29 | xserver-nodm-init \ |
30 | usbinit \ | 30 | usbinit \ |
31 | minimo \ | ||
31 | gtk+ \ | 32 | gtk+ \ |
32 | gtk-clearlooks-engine \ | 33 | gtk-clearlooks-engine \ |
33 | eds-dbus \ | 34 | eds-dbus \ |
35 | contacts \ | ||
36 | dates \ | ||
34 | puzzles \ | 37 | puzzles \ |
35 | kf \ | 38 | kf \ |
36 | rxvt-unicode \ | 39 | rxvt-unicode \ |
@@ -56,7 +59,6 @@ RDEPENDS_oh-task-base := "${oh-task-base} \ | |||
56 | gdk-pixbuf-loader-jpeg \ | 59 | gdk-pixbuf-loader-jpeg \ |
57 | tslib-calibrate \ | 60 | tslib-calibrate \ |
58 | tslib-tests \ | 61 | tslib-tests \ |
59 | puzzles-desktop \ | ||
60 | pango-module-basic-x \ | 62 | pango-module-basic-x \ |
61 | pango-module-basic-fc" | 63 | pango-module-basic-fc" |
62 | 64 | ||
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb index 4fe91dcbcd..20dd7a6096 100644 --- a/openembedded/packages/meta/oh-image.bb +++ b/openembedded/packages/meta/oh-image.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | PR = "r5" | 1 | PR = "r6" |
2 | 2 | ||
3 | export IMAGE_BASENAME = "oh-image" | 3 | export IMAGE_BASENAME = "oh-image" |
4 | 4 | ||
diff --git a/openembedded/packages/mozilla/files/minimo.desktop b/openembedded/packages/mozilla/files/minimo.desktop new file mode 100644 index 0000000000..5ef0f2075a --- /dev/null +++ b/openembedded/packages/mozilla/files/minimo.desktop | |||
@@ -0,0 +1,9 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Minimo | ||
3 | Comment=Minimo web browser | ||
4 | Exec=minimo http://www.mozilla.org/projects/minimo/home.html | ||
5 | Terminal=0 | ||
6 | Type=Application | ||
7 | Icon=minimo.png | ||
8 | Categories=Application;Network; | ||
9 | StartupNotify=True | ||
diff --git a/openembedded/packages/mozilla/files/minimo.png b/openembedded/packages/mozilla/files/minimo.png new file mode 100644 index 0000000000..f8b2e2192b --- /dev/null +++ b/openembedded/packages/mozilla/files/minimo.png | |||
Binary files differ | |||
diff --git a/openembedded/packages/mozilla/files/mozilla-firefox.desktop b/openembedded/packages/mozilla/files/mozilla-firefox.desktop new file mode 100644 index 0000000000..00c0ea4fa3 --- /dev/null +++ b/openembedded/packages/mozilla/files/mozilla-firefox.desktop | |||
@@ -0,0 +1,11 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Firefox Browser | ||
3 | Comment=Firefox Web Browser | ||
4 | Exec=firefox | ||
5 | Terminal=false | ||
6 | MultipleArgs=false | ||
7 | Type=Application | ||
8 | Icon=mozilla-firefox.png | ||
9 | Categories=Application;Internet; | ||
10 | SingleInstance=true | ||
11 | |||
diff --git a/openembedded/packages/mozilla/files/mozilla-firefox.png b/openembedded/packages/mozilla/files/mozilla-firefox.png new file mode 100644 index 0000000000..f8b2e2192b --- /dev/null +++ b/openembedded/packages/mozilla/files/mozilla-firefox.png | |||
Binary files differ | |||
diff --git a/openembedded/packages/mozilla/files/mozilla-thunderbird.desktop b/openembedded/packages/mozilla/files/mozilla-thunderbird.desktop new file mode 100644 index 0000000000..61615d94c2 --- /dev/null +++ b/openembedded/packages/mozilla/files/mozilla-thunderbird.desktop | |||
@@ -0,0 +1,11 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Thunderbird Email Client | ||
3 | Comment=Thunderbird Email Client | ||
4 | Exec=thunderbird | ||
5 | Terminal=false | ||
6 | MultipleArgs=false | ||
7 | Type=Application | ||
8 | Icon=mozilla-thunderbird.png | ||
9 | Categories=Application;Internet; | ||
10 | SingleInstance=true | ||
11 | |||
diff --git a/openembedded/packages/mozilla/files/mozilla-thunderbird.png b/openembedded/packages/mozilla/files/mozilla-thunderbird.png new file mode 100644 index 0000000000..90ff395ff5 --- /dev/null +++ b/openembedded/packages/mozilla/files/mozilla-thunderbird.png | |||
Binary files differ | |||
diff --git a/openembedded/packages/mozilla/files/no-xmb.patch b/openembedded/packages/mozilla/files/no-xmb.patch new file mode 100644 index 0000000000..1b909a677c --- /dev/null +++ b/openembedded/packages/mozilla/files/no-xmb.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | --- mozilla/gfx/src/gtk/nsGdkUtils.cpp.old 2004-07-02 09:33:33.000000000 +0100 | ||
2 | +++ mozilla/gfx/src/gtk/nsGdkUtils.cpp 2004-07-02 09:33:34.000000000 +0100 | ||
3 | @@ -115,6 +115,7 @@ | ||
4 | #endif /* MOZ_WIDGET_GTK2 */ | ||
5 | } | ||
6 | } | ||
7 | +#if 0 | ||
8 | else if (font->type == GDK_FONT_FONTSET) | ||
9 | { | ||
10 | #ifdef MOZ_WIDGET_GTK | ||
11 | @@ -128,6 +129,7 @@ | ||
12 | fontset, GDK_GC_XGC(gc), x, y, text, text_length); | ||
13 | #endif /* MOZ_WIDGET_GTK2 */ | ||
14 | } | ||
15 | +#endif | ||
16 | else | ||
17 | g_error("undefined font type\n"); | ||
18 | } | ||
diff --git a/openembedded/packages/mozilla/files/xptcstubs.patch b/openembedded/packages/mozilla/files/xptcstubs.patch new file mode 100644 index 0000000000..7517acef27 --- /dev/null +++ b/openembedded/packages/mozilla/files/xptcstubs.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Index: xptcstubs_arm.cpp | ||
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v | ||
4 | retrieving revision 1.7 | ||
5 | diff -u -r1.7 xptcstubs_arm.cpp | ||
6 | --- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7 | ||
7 | +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 4 May 2004 18:36:44 -0000 | ||
8 | @@ -45,9 +45,9 @@ | ||
9 | #endif | ||
10 | |||
11 | /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ | ||
12 | -static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
13 | +nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
14 | |||
15 | -static nsresult | ||
16 | +nsresult | ||
17 | PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) | ||
18 | { | ||
19 | #define PARAM_BUFFER_COUNT 16 | ||
diff --git a/openembedded/packages/mozilla/minimo/host_ldflags_fix.patch b/openembedded/packages/mozilla/minimo/host_ldflags_fix.patch new file mode 100644 index 0000000000..888f545e9d --- /dev/null +++ b/openembedded/packages/mozilla/minimo/host_ldflags_fix.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | Index: mozilla/nsprpub/config/rules.mk | ||
2 | =================================================================== | ||
3 | --- mozilla.orig/nsprpub/config/rules.mk 2005-01-04 21:27:36.000000000 +0000 | ||
4 | +++ mozilla/nsprpub/config/rules.mk 2005-09-30 11:27:33.000000000 +0000 | ||
5 | @@ -87,6 +87,9 @@ | ||
6 | CCC=$(HOST_CXX) | ||
7 | CFLAGS=$(HOST_CFLAGS) | ||
8 | CXXFLAGS=$(HOST_CXXFLAGS) | ||
9 | +LDFLAGS=$(HOST_LDFLAGS) | ||
10 | +RANLIB=$(HOST_RANLIB) | ||
11 | +AR=$(HOST_AR) | ||
12 | endif | ||
13 | endif | ||
14 | endif | ||
15 | Index: mozilla/configure.in | ||
16 | =================================================================== | ||
17 | --- mozilla.orig/configure.in 2005-03-30 17:57:38.000000000 +0000 | ||
18 | +++ mozilla/configure.in 2005-09-30 11:36:44.000000000 +0000 | ||
19 | @@ -5612,13 +5612,18 @@ | ||
20 | fi | ||
21 | |||
22 | if test -n "$CROSS_COMPILE"; then | ||
23 | - if test -z "$HOST_LIBIDL_CONFIG"; then | ||
24 | + if test -z "$HOST_LIBIDL_CONFIG"; then | ||
25 | + AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) | ||
26 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | ||
27 | fi | ||
28 | if test -n "$HOST_LIBIDL_CONFIG"; then | ||
29 | + AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) | ||
30 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | ||
31 | + AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) | ||
32 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | ||
33 | + AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) | ||
34 | else | ||
35 | + AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS]) | ||
36 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | ||
37 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | ||
38 | fi | ||
39 | Index: mozilla/configure | ||
40 | =================================================================== | ||
41 | --- mozilla.orig/configure 2005-03-30 17:58:47.000000000 +0000 | ||
42 | +++ mozilla/configure 2005-09-30 11:38:36.000000000 +0000 | ||
43 | @@ -16572,11 +16572,18 @@ | ||
44 | |||
45 | if test -n "$CROSS_COMPILE"; then | ||
46 | if test -z "$HOST_LIBIDL_CONFIG"; then | ||
47 | + echo "HOST_LIBIDL_CONFIG nto defined" | ||
48 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | ||
49 | fi | ||
50 | - if test -n "$HOST_LIBIDL_CONFIG"; then | ||
51 | + if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then | ||
52 | + echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH" | ||
53 | + _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH | ||
54 | + PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH | ||
55 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | ||
56 | + echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" | ||
57 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | ||
58 | + echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" | ||
59 | + PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH | ||
60 | else | ||
61 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | ||
62 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | ||
diff --git a/openembedded/packages/mozilla/minimo/mozconfig b/openembedded/packages/mozilla/minimo/mozconfig new file mode 100644 index 0000000000..5a84bcf87e --- /dev/null +++ b/openembedded/packages/mozilla/minimo/mozconfig | |||
@@ -0,0 +1,76 @@ | |||
1 | # build minimo | ||
2 | MINIMO=1 | ||
3 | mk_add_options MINIMO=1 | ||
4 | |||
5 | # enable building the browser | ||
6 | ac_add_options --enable-application=browser | ||
7 | |||
8 | # use GTK+-2 widget set with XFT font rendering | ||
9 | |||
10 | MOZ_ENABLE_COREXFONTS=0 | ||
11 | mk_add_options MOZ_ENABLE_COREXFONTS=0 | ||
12 | ac_add_options --enable-default-toolkit=gtk2 | ||
13 | ac_add_options --enable-xft | ||
14 | ac_add_options --disable-freetype2 | ||
15 | |||
16 | # disable XUL support to reduce codesize | ||
17 | ac_add_options --disable-xul | ||
18 | |||
19 | # enable minimal profile support | ||
20 | ac_add_options --disable-profilesharing | ||
21 | ac_add_options --disable-profilelocking | ||
22 | ac_add_options --enable-single-profile | ||
23 | |||
24 | # disable features and skip various build steps | ||
25 | ac_add_options --disable-extensions | ||
26 | ac_add_options --disable-accessibility | ||
27 | ac_add_options --disable-composer | ||
28 | ac_add_options --disable-extensions | ||
29 | ac_add_options --disable-installer | ||
30 | ac_add_options --disable-jsd | ||
31 | ac_add_options --disable-jsloader | ||
32 | ac_add_options --disable-ldap | ||
33 | ac_add_options --disable-mailnews | ||
34 | ac_add_options --disable-mathml | ||
35 | ac_add_options --disable-necko-disk-cache | ||
36 | ac_add_options --disable-postscript | ||
37 | ac_add_options --disable-view-source | ||
38 | ac_add_options --disable-xpfe-components | ||
39 | ac_add_options --disable-xpinstall | ||
40 | ac_add_options --disable-xprint | ||
41 | ac_add_options --enable-native-uconv | ||
42 | ac_add_options --enable-plaintext-editor-only | ||
43 | ac_add_options --disable-v1-string-abi | ||
44 | ac_add_options --disable-plugins | ||
45 | |||
46 | # configure necko to allocate smaller network buffers | ||
47 | ac_add_options --enable-necko-small-buffers | ||
48 | |||
49 | # disable debug logging and tests | ||
50 | ac_add_options --disable-dtd-debug | ||
51 | ac_add_options --disable-logging | ||
52 | ac_add_options --disable-tests | ||
53 | |||
54 | # build crypto module (PSM + NSS) | ||
55 | ac_add_options --enable-crypto | ||
56 | |||
57 | # build minimal set of protocol handlers | ||
58 | ac_add_options --enable-necko-protocols=http,file,res,jar | ||
59 | |||
60 | # build minimal set of image decoders | ||
61 | ac_add_options --enable-image-decoders=png,gif,jpeg | ||
62 | |||
63 | # code generation options (optimize for size) | ||
64 | ac_add_options --enable-optimize=-Os | ||
65 | ac_add_options --enable-strip | ||
66 | ac_add_options --disable-debug | ||
67 | ac_add_options --enable-reorder | ||
68 | ac_add_options --enable-elf-dynstr-gc | ||
69 | |||
70 | # enable static build | ||
71 | ac_add_options --disable-shared | ||
72 | ac_add_options --enable-static | ||
73 | |||
74 | # remove link dependency on libstdc++.so | ||
75 | LIBS=-lsupc++ | ||
76 | |||
diff --git a/openembedded/packages/mozilla/minimo_cvs.bb b/openembedded/packages/mozilla/minimo_cvs.bb new file mode 100644 index 0000000000..a44ccd8e25 --- /dev/null +++ b/openembedded/packages/mozilla/minimo_cvs.bb | |||
@@ -0,0 +1,54 @@ | |||
1 | DESCRIPTION = "A minimal version of the Mozilla web browser" | ||
2 | HOMEPAGE="http://www.mozilla.org/projects/minimo/" | ||
3 | SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \ | ||
4 | file://xptcstubs.patch;patch=1 \ | ||
5 | file://no-xmb.patch;patch=1 \ | ||
6 | file://host_ldflags_fix.patch;patch=1 \ | ||
7 | file://minimo.png file://minimo.desktop" | ||
8 | S = "${WORKDIR}/mozilla" | ||
9 | MAINTAINER = "Phil Blundell <pb@handhelds.org>" | ||
10 | SECTION = "x11" | ||
11 | PRIORITY = "optional" | ||
12 | PV = "0.0cvs${CVSDATE}" | ||
13 | FILES_${PN} += "${libdir}/mozilla-minimo" | ||
14 | PR = "r8" | ||
15 | LICENSE = "MPL/LGPL/GPL" | ||
16 | |||
17 | inherit mozilla | ||
18 | |||
19 | EXTRA_OECONF += "--enable-application=suite --disable-native-uconv" | ||
20 | export MOZ_CO_PROJECT="suite" | ||
21 | |||
22 | export MINIMO=1 | ||
23 | export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}" | ||
24 | |||
25 | include mozilla-cvs.inc | ||
26 | |||
27 | do_compile () { | ||
28 | mozilla_do_compile | ||
29 | cd $MOZ_OBJDIR/embedding/minimo | ||
30 | oe_runmake | ||
31 | } | ||
32 | |||
33 | mozdir="${D}${libdir}/mozilla-minimo" | ||
34 | |||
35 | do_install () { | ||
36 | cd ${S}/embedding/minimo/ | ||
37 | sh ./package.sh | ||
38 | cd ${S} | ||
39 | mkdir -p ${mozdir} | ||
40 | cp -rL $MOZ_OBJDIR/dist/Embed/* ${mozdir}/ | ||
41 | rm -f ${mozdir}/TestGtkEmbed | ||
42 | mkdir -p ${D}${datadir}/applications | ||
43 | install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop | ||
44 | mkdir -p ${D}${datadir}/pixmaps | ||
45 | install -m 0644 ${WORKDIR}/minimo.png ${D}${datadir}/pixmaps/minimo.png | ||
46 | mkdir -p ${D}${bindir} | ||
47 | echo "#!/bin/sh" > ${D}${bindir}/minimo | ||
48 | cat >>${D}${bindir}/minimo << EOF | ||
49 | cd ${libdir}/mozilla-minimo | ||
50 | export LD_LIBRARY_PATH=${libdir}/mozilla-minimo | ||
51 | exec ./Minimo http://www.mozilla.org/projects/minimo/home.html | ||
52 | EOF | ||
53 | chmod 755 ${D}${bindir}/minimo | ||
54 | } | ||
diff --git a/openembedded/packages/mozilla/mozilla-cvs.inc b/openembedded/packages/mozilla/mozilla-cvs.inc new file mode 100644 index 0000000000..9f92ae5b13 --- /dev/null +++ b/openembedded/packages/mozilla/mozilla-cvs.inc | |||
@@ -0,0 +1,12 @@ | |||
1 | do_fetch () { | ||
2 | export MOZ_CO_DATE="${CVSDATE}" | ||
3 | mkdir -p ${WORKDIR} | ||
4 | cd ${WORKDIR} | ||
5 | if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz ]; then | ||
6 | cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk | ||
7 | cd mozilla | ||
8 | oe_runmake -f client.mk checkout | ||
9 | cd .. | ||
10 | tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla | ||
11 | fi | ||
12 | } | ||
diff --git a/openembedded/packages/puzzles/puzzles_r6358.bb b/openembedded/packages/puzzles/puzzles_r6358.bb index 4b4e212014..06d243380a 100644 --- a/openembedded/packages/puzzles/puzzles_r6358.bb +++ b/openembedded/packages/puzzles/puzzles_r6358.bb | |||
@@ -1,20 +1,15 @@ | |||
1 | 1 | ||
2 | DEPENDS = "gtk+" | 2 | DEPENDS = "gtk+" |
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz" | 5 | SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \ |
6 | file://game.png" | ||
6 | 7 | ||
7 | CFLAGS_prepend = " -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags` " | 8 | do_compile_prepend = " \ |
8 | do_compile_prepend = " export 'XLDFLAGS=${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; " | 9 | export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \ |
10 | export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; " | ||
9 | 11 | ||
10 | PACKAGES = "${PN} ${PN}-desktop" | 12 | FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" |
11 | |||
12 | FILES_${PN} = "${prefix}/games/*" | ||
13 | FILES_${PN}-desktop = "${datadir}/applications/*" | ||
14 | |||
15 | do_compile () { | ||
16 | CFLAGS=" -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags` " oe_runmake | ||
17 | } | ||
18 | 13 | ||
19 | do_install () { | 14 | do_install () { |
20 | export prefix=${D} | 15 | export prefix=${D} |
@@ -25,8 +20,11 @@ do_install () { | |||
25 | 20 | ||
26 | install -d ${D}/${datadir} | 21 | install -d ${D}/${datadir} |
27 | install -d ${D}/${datadir}/applications | 22 | install -d ${D}/${datadir}/applications |
28 | cd ${D}/${prefix}/games | 23 | install -d ${D}/${datadir}/pixmaps |
24 | |||
25 | install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps | ||
29 | 26 | ||
27 | cd ${D}/${prefix}/games | ||
30 | for prog in *; do | 28 | for prog in *; do |
31 | if [ -x $prog ]; then | 29 | if [ -x $prog ]; then |
32 | echo "making ${D}/${datadir}/applications/$prog.desktop" | 30 | echo "making ${D}/${datadir}/applications/$prog.desktop" |
diff --git a/openembedded/packages/zip/zip-native_2.31.bb b/openembedded/packages/zip/zip-native_2.31.bb new file mode 100644 index 0000000000..7cd0261827 --- /dev/null +++ b/openembedded/packages/zip/zip-native_2.31.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | SECTION = "console/utils" | ||
2 | inherit native | ||
3 | include zip_${PV}.bb | ||
4 | S = "${WORKDIR}/zip-${PV}" | ||
5 | |||
6 | do_stage() { | ||
7 | install -d ${STAGING_BINDIR} | ||
8 | install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} | ||
9 | } | ||
diff --git a/openembedded/packages/zip/zip_2.31.bb b/openembedded/packages/zip/zip_2.31.bb new file mode 100644 index 0000000000..6c588a55e5 --- /dev/null +++ b/openembedded/packages/zip/zip_2.31.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SECTION = "console/utils" | ||
2 | SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz" | ||
3 | LICENSE = "Info-ZIP" | ||
4 | EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ | ||
5 | 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ | ||
6 | 'BINFLAGS=0755' 'INSTALL_D=install -d'" | ||
7 | |||
8 | do_compile() { | ||
9 | oe_runmake -f unix/Makefile generic | ||
10 | } | ||
11 | |||
12 | do_install() { | ||
13 | oe_runmake -f unix/Makefile prefix=${D}${prefix} \ | ||
14 | BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ | ||
15 | install | ||
16 | } | ||
17 | |||