Add minimo (+ deps: zip, libxi). Update puzzzles to include icon. Update meta packages with new programs.

git-svn-id: https://svn.o-hand.com/repos/poky@86 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2005-09-30 14:28:18 +00:00
parent 06b04dcace
commit b86b4ae5db
20 changed files with 347 additions and 17 deletions

View File

@ -3,7 +3,7 @@
#
#work around some breakages
#CVSDATE_minimo=20050401
CVSDATE_minimo=20050401
#set some preferred providers:
#PREFERRED_PROVIDER_gconf=gconf-dbus

View File

@ -0,0 +1,12 @@
Index: libXi-6.0.1/configure.ac
===================================================================
--- libXi-6.0.1.orig/configure.ac 2003-11-01 04:11:49.000000000 -0500
+++ libXi-6.0.1/configure.ac 2005-01-20 11:34:06.878357352 -0500
@@ -8,7 +8,6 @@
AM_MAINTAINER_MODE
AM_CONFIG_HEADER([config.h])
-AC_CONFIG_AUX_DIR(.)
# Checks for programs.
AC_PROG_LIBTOOL

View File

@ -0,0 +1,20 @@
DESCRIPTION = "X Input Extension library"
LICENSE = "MIT-X"
SECTION = "x11/libs"
DEPENDS = "xproto x11 xextensions"
PR = "r1"
SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
file://autofoo.patch;patch=1"
S = "${WORKDIR}/libXi-${PV}"
inherit autotools pkgconfig
do_stage() {
oe_runmake install prefix=${STAGING_DIR} \
bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR}
}

View File

@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base"
# oh-task-base
DESCRIPTION = "Meta-package for OpenHand Palmtop Environment"
MAINTAINER = "Richard Purdie <richard@openedhand.com>"
PR = "r10"
PR = "r11"
ALLOW_EMPTY = "1"
@ -28,9 +28,12 @@ oh-task-base = "\
xserver-kdrive-common \
xserver-nodm-init \
usbinit \
minimo \
gtk+ \
gtk-clearlooks-engine \
eds-dbus \
contacts \
dates \
puzzles \
kf \
rxvt-unicode \
@ -56,7 +59,6 @@ RDEPENDS_oh-task-base := "${oh-task-base} \
gdk-pixbuf-loader-jpeg \
tslib-calibrate \
tslib-tests \
puzzles-desktop \
pango-module-basic-x \
pango-module-basic-fc"

View File

@ -1,4 +1,4 @@
PR = "r5"
PR = "r6"
export IMAGE_BASENAME = "oh-image"

View File

@ -0,0 +1,9 @@
[Desktop Entry]
Name=Minimo
Comment=Minimo web browser
Exec=minimo http://www.mozilla.org/projects/minimo/home.html
Terminal=0
Type=Application
Icon=minimo.png
Categories=Application;Network;
StartupNotify=True

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1,11 @@
[Desktop Entry]
Name=Firefox Browser
Comment=Firefox Web Browser
Exec=firefox
Terminal=false
MultipleArgs=false
Type=Application
Icon=mozilla-firefox.png
Categories=Application;Internet;
SingleInstance=true

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1,11 @@
[Desktop Entry]
Name=Thunderbird Email Client
Comment=Thunderbird Email Client
Exec=thunderbird
Terminal=false
MultipleArgs=false
Type=Application
Icon=mozilla-thunderbird.png
Categories=Application;Internet;
SingleInstance=true

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@ -0,0 +1,18 @@
--- mozilla/gfx/src/gtk/nsGdkUtils.cpp.old 2004-07-02 09:33:33.000000000 +0100
+++ mozilla/gfx/src/gtk/nsGdkUtils.cpp 2004-07-02 09:33:34.000000000 +0100
@@ -115,6 +115,7 @@
#endif /* MOZ_WIDGET_GTK2 */
}
}
+#if 0
else if (font->type == GDK_FONT_FONTSET)
{
#ifdef MOZ_WIDGET_GTK
@@ -128,6 +129,7 @@
fontset, GDK_GC_XGC(gc), x, y, text, text_length);
#endif /* MOZ_WIDGET_GTK2 */
}
+#endif
else
g_error("undefined font type\n");
}

View File

@ -0,0 +1,19 @@
Index: xptcstubs_arm.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v
retrieving revision 1.7
diff -u -r1.7 xptcstubs_arm.cpp
--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 4 May 2004 18:36:44 -0000
@@ -45,9 +45,9 @@
#endif
/* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-static nsresult
+nsresult
PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
{
#define PARAM_BUFFER_COUNT 16

View File

@ -0,0 +1,62 @@
Index: mozilla/nsprpub/config/rules.mk
===================================================================
--- mozilla.orig/nsprpub/config/rules.mk 2005-01-04 21:27:36.000000000 +0000
+++ mozilla/nsprpub/config/rules.mk 2005-09-30 11:27:33.000000000 +0000
@@ -87,6 +87,9 @@
CCC=$(HOST_CXX)
CFLAGS=$(HOST_CFLAGS)
CXXFLAGS=$(HOST_CXXFLAGS)
+LDFLAGS=$(HOST_LDFLAGS)
+RANLIB=$(HOST_RANLIB)
+AR=$(HOST_AR)
endif
endif
endif
Index: mozilla/configure.in
===================================================================
--- mozilla.orig/configure.in 2005-03-30 17:57:38.000000000 +0000
+++ mozilla/configure.in 2005-09-30 11:36:44.000000000 +0000
@@ -5612,13 +5612,18 @@
fi
if test -n "$CROSS_COMPILE"; then
- if test -z "$HOST_LIBIDL_CONFIG"; then
+ if test -z "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined])
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
if test -n "$HOST_LIBIDL_CONFIG"; then
+ AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host])
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS])
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS])
else
+ AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS])
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
fi
Index: mozilla/configure
===================================================================
--- mozilla.orig/configure 2005-03-30 17:58:47.000000000 +0000
+++ mozilla/configure 2005-09-30 11:38:36.000000000 +0000
@@ -16572,11 +16572,18 @@
if test -n "$CROSS_COMPILE"; then
if test -z "$HOST_LIBIDL_CONFIG"; then
+ echo "HOST_LIBIDL_CONFIG nto defined"
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
fi
- if test -n "$HOST_LIBIDL_CONFIG"; then
+ if test -n "$HOST_LIBIDL_CONFIG" && test -n "$HOST_PKG_CONFIG_PATH"; then
+ echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH"
+ _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH
HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags`
+ echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs`
+ echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS"
+ PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH
else
HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
HOST_LIBIDL_LIBS="$LIBIDL_LIBS"

View File

@ -0,0 +1,76 @@
# build minimo
MINIMO=1
mk_add_options MINIMO=1
# enable building the browser
ac_add_options --enable-application=browser
# use GTK+-2 widget set with XFT font rendering
MOZ_ENABLE_COREXFONTS=0
mk_add_options MOZ_ENABLE_COREXFONTS=0
ac_add_options --enable-default-toolkit=gtk2
ac_add_options --enable-xft
ac_add_options --disable-freetype2
# disable XUL support to reduce codesize
ac_add_options --disable-xul
# enable minimal profile support
ac_add_options --disable-profilesharing
ac_add_options --disable-profilelocking
ac_add_options --enable-single-profile
# disable features and skip various build steps
ac_add_options --disable-extensions
ac_add_options --disable-accessibility
ac_add_options --disable-composer
ac_add_options --disable-extensions
ac_add_options --disable-installer
ac_add_options --disable-jsd
ac_add_options --disable-jsloader
ac_add_options --disable-ldap
ac_add_options --disable-mailnews
ac_add_options --disable-mathml
ac_add_options --disable-necko-disk-cache
ac_add_options --disable-postscript
ac_add_options --disable-view-source
ac_add_options --disable-xpfe-components
ac_add_options --disable-xpinstall
ac_add_options --disable-xprint
ac_add_options --enable-native-uconv
ac_add_options --enable-plaintext-editor-only
ac_add_options --disable-v1-string-abi
ac_add_options --disable-plugins
# configure necko to allocate smaller network buffers
ac_add_options --enable-necko-small-buffers
# disable debug logging and tests
ac_add_options --disable-dtd-debug
ac_add_options --disable-logging
ac_add_options --disable-tests
# build crypto module (PSM + NSS)
ac_add_options --enable-crypto
# build minimal set of protocol handlers
ac_add_options --enable-necko-protocols=http,file,res,jar
# build minimal set of image decoders
ac_add_options --enable-image-decoders=png,gif,jpeg
# code generation options (optimize for size)
ac_add_options --enable-optimize=-Os
ac_add_options --enable-strip
ac_add_options --disable-debug
ac_add_options --enable-reorder
ac_add_options --enable-elf-dynstr-gc
# enable static build
ac_add_options --disable-shared
ac_add_options --enable-static
# remove link dependency on libstdc++.so
LIBS=-lsupc++

View File

@ -0,0 +1,54 @@
DESCRIPTION = "A minimal version of the Mozilla web browser"
HOMEPAGE="http://www.mozilla.org/projects/minimo/"
SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \
file://xptcstubs.patch;patch=1 \
file://no-xmb.patch;patch=1 \
file://host_ldflags_fix.patch;patch=1 \
file://minimo.png file://minimo.desktop"
S = "${WORKDIR}/mozilla"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11"
PRIORITY = "optional"
PV = "0.0cvs${CVSDATE}"
FILES_${PN} += "${libdir}/mozilla-minimo"
PR = "r8"
LICENSE = "MPL/LGPL/GPL"
inherit mozilla
EXTRA_OECONF += "--enable-application=suite --disable-native-uconv"
export MOZ_CO_PROJECT="suite"
export MINIMO=1
export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}"
include mozilla-cvs.inc
do_compile () {
mozilla_do_compile
cd $MOZ_OBJDIR/embedding/minimo
oe_runmake
}
mozdir="${D}${libdir}/mozilla-minimo"
do_install () {
cd ${S}/embedding/minimo/
sh ./package.sh
cd ${S}
mkdir -p ${mozdir}
cp -rL $MOZ_OBJDIR/dist/Embed/* ${mozdir}/
rm -f ${mozdir}/TestGtkEmbed
mkdir -p ${D}${datadir}/applications
install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop
mkdir -p ${D}${datadir}/pixmaps
install -m 0644 ${WORKDIR}/minimo.png ${D}${datadir}/pixmaps/minimo.png
mkdir -p ${D}${bindir}
echo "#!/bin/sh" > ${D}${bindir}/minimo
cat >>${D}${bindir}/minimo << EOF
cd ${libdir}/mozilla-minimo
export LD_LIBRARY_PATH=${libdir}/mozilla-minimo
exec ./Minimo http://www.mozilla.org/projects/minimo/home.html
EOF
chmod 755 ${D}${bindir}/minimo
}

View File

@ -0,0 +1,12 @@
do_fetch () {
export MOZ_CO_DATE="${CVSDATE}"
mkdir -p ${WORKDIR}
cd ${WORKDIR}
if [ ! -f ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz ]; then
cvs $CVSCOOPTS -d :pserver:anonymous@cvs-mirror.mozilla.org/cvsroot co mozilla/client.mk
cd mozilla
oe_runmake -f client.mk checkout
cd ..
tar czf ${DL_DIR}/mozilla_cvs-mirror.mozilla.org__${CVSDATE}.tar.gz mozilla
fi
}

View File

@ -1,20 +1,15 @@
DEPENDS = "gtk+"
PR = "r1"
PR = "r2"
SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz \
file://game.png"
CFLAGS_prepend = " -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags` "
do_compile_prepend = " export 'XLDFLAGS=${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; "
do_compile_prepend = " \
export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \
export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
PACKAGES = "${PN} ${PN}-desktop"
FILES_${PN} = "${prefix}/games/*"
FILES_${PN}-desktop = "${datadir}/applications/*"
do_compile () {
CFLAGS=" -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags` " oe_runmake
}
FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
do_install () {
export prefix=${D}
@ -25,8 +20,11 @@ do_install () {
install -d ${D}/${datadir}
install -d ${D}/${datadir}/applications
cd ${D}/${prefix}/games
install -d ${D}/${datadir}/pixmaps
install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps
cd ${D}/${prefix}/games
for prog in *; do
if [ -x $prog ]; then
echo "making ${D}/${datadir}/applications/$prog.desktop"

View File

@ -0,0 +1,9 @@
SECTION = "console/utils"
inherit native
include zip_${PV}.bb
S = "${WORKDIR}/zip-${PV}"
do_stage() {
install -d ${STAGING_BINDIR}
install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}
}

View File

@ -0,0 +1,17 @@
SECTION = "console/utils"
SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz"
LICENSE = "Info-ZIP"
EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
'BINFLAGS=0755' 'INSTALL_D=install -d'"
do_compile() {
oe_runmake -f unix/Makefile generic
}
do_install() {
oe_runmake -f unix/Makefile prefix=${D}${prefix} \
BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
install
}