summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/base.bbclass7
-rw-r--r--classes/openmoko2.bbclass3
-rw-r--r--conf/bitbake.conf2
-rw-r--r--conf/distro/openmoko.conf9
-rwxr-xr-xcontrib/mtn2cl/mtn2cl.sh19
-rw-r--r--packages/e17/edje-editor_cvs.bb2
-rw-r--r--packages/e17/edje-viewer_cvs.bb2
-rw-r--r--packages/file/file-native_4.21.bb2
-rw-r--r--packages/gaim/pidgin_2.1.0.bb9
-rw-r--r--packages/gettext/gettext-native_0.14.1.bb1
-rw-r--r--packages/gtk-engines/gtk-sato-engine_0.1.bb26
-rw-r--r--packages/gtk-engines/gtk-sato-engine_svn.bb17
-rw-r--r--packages/gtkhtml2/gtkhtml2_svn.bb (renamed from packages/gtkhtml2/gtkhtml2_cvs.bb)0
-rw-r--r--packages/images/openmoko-image.bb2
-rw-r--r--packages/libowl/.mtn2git_empty0
-rw-r--r--packages/libowl/libowl_svn.bb48
-rw-r--r--packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb13
-rw-r--r--packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb7
-rw-r--r--packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb3
-rw-r--r--packages/matchbox-wm/matchbox-wm_1.2.bb3
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb12
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb2
-rw-r--r--packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb2
-rw-r--r--packages/openmoko2/libmokogsmd2_svn.bb2
-rw-r--r--packages/openmoko2/libmokojournal2_svn.bb2
-rw-r--r--packages/openmoko2/libmokopanelui2_svn.bb2
-rw-r--r--packages/openmoko2/libmokoui2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-calculator2_svn.bb7
-rw-r--r--packages/openmoko2/openmoko-contacts2_svn.bb4
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-feedreader2_svn.bb8
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2_svn.bb18
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard_svn.bb19
-rw-r--r--packages/openmoko2/openmoko-theme-standard2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-today2_svn.bb3
-rw-r--r--packages/puzzles/oh-puzzles_svn.bb43
-rw-r--r--packages/raw-tools/.mtn2git_empty0
-rw-r--r--packages/raw-tools/exiv2_0.15.bb14
-rw-r--r--packages/raw-tools/gtkimageview_1.3.0.bb19
-rw-r--r--packages/raw-tools/libopenraw.inc10
-rw-r--r--packages/raw-tools/libopenraw_0.0.2.bb4
-rw-r--r--packages/raw-tools/ufraw_0.12.bb16
-rw-r--r--packages/sato-icon-theme/.mtn2git_empty0
-rw-r--r--packages/sato-icon-theme/sato-icon-theme_0.1.bb20
-rw-r--r--packages/starling/starling_0.2.bb3
-rw-r--r--packages/starling/starling_svn.bb3
-rw-r--r--packages/tasks/task-openmoko.bb23
-rw-r--r--packages/uboot/u-boot-mkimage-gta01-native_oe.bb1
-rw-r--r--packages/uboot/uboot-gta01_svn.bb6
-rw-r--r--packages/webkit/webkit_svn.bb63
54 files changed, 372 insertions, 123 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index fec7622f18..5381d43e7b 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -892,6 +892,13 @@ python () {
base_after_parse(d)
}
+# Remove me when we switch to bitbake 1.8.8
+def base_get_srcrev(d):
+ import bb
+
+ if bb.fetch.get_srcrev:
+ return bb.fetch.get_srcrev(d)
+ return "NOT IMPLEMENTED"
# Patch handling
inherit patch
diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass
index 4675b6a10e..bf5e1da6b8 100644
--- a/classes/openmoko2.bbclass
+++ b/classes/openmoko2.bbclass
@@ -26,3 +26,6 @@ SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=$
S = "${WORKDIR}/${PN}"
FILES_${PN} += "${datadir}/icons"
+
+# until we have SRCREV computing
+SRCREV ?= "0${SRCDATE}"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 38a716af00..19910d32e7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -365,7 +365,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug"
UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
SRCDATE = "${DATE}"
-SRCREV = "${@bb.fetch.get_srcrev(d)}"
+SRCREV = "${@base_get_srcrev(d)}"
SRC_URI = "file://${FILE}"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index bd4e2076ca..5d63676343 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -15,3 +15,12 @@ DISTRO_NAME = "OpenMoko"
DISTRO_VERSION = ".dev-snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
+
+CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
+
+PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
+
+FEED_URIS = "\
+ all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \
+ armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \
+ fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01"
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index a6c042333f..f404def82d 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -1,9 +1,8 @@
#/bin/sh
-# This script takes the last 1000 revs and writes a ChangeLog
-
mkdir logs
+export LOGNAME=Changelog.`date -u "+%Y%m%d"`
export REV_NOW=`mtn automate heads |head -n1`
for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
@@ -17,9 +16,9 @@ done
cd logs
for i in * ; do \
- echo $i: >> ../ChangeLog
- cat $i >> ../ChangeLog
- echo >> ../ChangeLog
+ echo $i: >> ../${LOGNAME}
+ cat $i >> ../${LOGNAME}
+ echo >> ../${LOGNAME}
done
cd ..
@@ -30,13 +29,13 @@ wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=a
NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`"
RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`"
-echo -e "\n\nBugs fixed:" >> ChangeLog
-cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
+echo -e "\n\nBugs fixed:" >> ${LOGNAME}
+cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME}
-echo -e "\n\nBugs opened:" >> ChangeLog
-cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
+echo -e "\n\nBugs opened:" >> ${LOGNAME}
+cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME}
-echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ChangeLog
+echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ${LOGNAME}
rm -Rf logs
diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb
index 72c83dc56e..b2483f2bfb 100644
--- a/packages/e17/edje-editor_cvs.bb
+++ b/packages/e17/edje-editor_cvs.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Edje-Editor is just that."
LICENSE = "MIT"
DEPENDS = "etk"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb
index 9b21c042a0..1a15746ca4 100644
--- a/packages/e17/edje-viewer_cvs.bb
+++ b/packages/e17/edje-viewer_cvs.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Edje_Viewer is just that."
DEPENDS = "etk"
LICENSE = "MIT"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
diff --git a/packages/file/file-native_4.21.bb b/packages/file/file-native_4.21.bb
index 59535dd518..734891d18d 100644
--- a/packages/file/file-native_4.21.bb
+++ b/packages/file/file-native_4.21.bb
@@ -1,6 +1,6 @@
require file_${PV}.bb
inherit native
-DEPENDS = ""
+DEPENDS = "zlib-native"
PR = "r0"
SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/packages/gaim/pidgin_2.1.0.bb b/packages/gaim/pidgin_2.1.0.bb
new file mode 100644
index 0000000000..e0f865722e
--- /dev/null
+++ b/packages/gaim/pidgin_2.1.0.bb
@@ -0,0 +1,9 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ "
+
+PR = "r0"
diff --git a/packages/gettext/gettext-native_0.14.1.bb b/packages/gettext/gettext-native_0.14.1.bb
index efc43ac4d3..6203b1f9d7 100644
--- a/packages/gettext/gettext-native_0.14.1.bb
+++ b/packages/gettext/gettext-native_0.14.1.bb
@@ -2,7 +2,6 @@ require gettext_${PV}.bb
S = "${WORKDIR}/gettext-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
inherit native
-DEPENDS = "zlib-native"
PROVIDES = ""
M4 = "\
diff --git a/packages/gtk-engines/gtk-sato-engine_0.1.bb b/packages/gtk-engines/gtk-sato-engine_0.1.bb
new file mode 100644
index 0000000000..4429b21cc9
--- /dev/null
+++ b/packages/gtk-engines/gtk-sato-engine_0.1.bb
@@ -0,0 +1,26 @@
+SECTION = "x11/base"
+DESCRIPTION = "Sato theme engine for GTK"
+LICENSE = "LGPL"
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-0.1.tar.gz"
+S = "${WORKDIR}/sato-engine-0.1"
+
+inherit autotools pkgconfig
+
+do_configure_prepend() {
+ for i in `ls gtk-common`; do
+ ln -sf ../gtk-common/$i gtk2-engine/$i
+ done
+}
+
+PACKAGES += "gtk-theme-sato"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
+
+RDEPENDS_gtk-theme-sato = "${PN}"
+
+
diff --git a/packages/gtk-engines/gtk-sato-engine_svn.bb b/packages/gtk-engines/gtk-sato-engine_svn.bb
index 2a96cf2ef6..c3d760c829 100644
--- a/packages/gtk-engines/gtk-sato-engine_svn.bb
+++ b/packages/gtk-engines/gtk-sato-engine_svn.bb
@@ -3,16 +3,23 @@ SECTION = "x11/base"
DESCRIPTION = "GTK theme engine SATO from O-Hand"
DEPENDS = "gtk+"
-PV = "0.0.1+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.1+svn${SRCDATE}"
PR = "r0"
+S = "${WORKDIR}/gtk-engine"
+
+SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
+
+inherit autotools pkgconfig
+
PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
-S = "${WORKDIR}/gtk-engine"
+RDEPENDS_gtk-theme-sato = "${PN}"
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
-inherit autotools pkgconfig
diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_svn.bb
index 1f19550c90..1f19550c90 100644
--- a/packages/gtkhtml2/gtkhtml2_cvs.bb
+++ b/packages/gtkhtml2/gtkhtml2_svn.bb
diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 0f1359fb19..65158f679b 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -12,7 +12,7 @@ export PACKAGE_INSTALL = "\
task-openmoko-ui \
task-openmoko-base \
task-openmoko-phone \
- task-openmoko-finger \
+ task-openmoko-games \
task-openmoko-pim \
"
diff --git a/packages/libowl/.mtn2git_empty b/packages/libowl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libowl/.mtn2git_empty
diff --git a/packages/libowl/libowl_svn.bb b/packages/libowl/libowl_svn.bb
new file mode 100644
index 0000000000..2126e3d4d0
--- /dev/null
+++ b/packages/libowl/libowl_svn.bb
@@ -0,0 +1,48 @@
+# This recipe builds libowl and then stages the header and static lib;
+# it intentionally does not stage the shared lib and create a package.
+#
+# Libowl is currently a 'cut and paste' library; this package makes our
+# life a touch easier by not having to patch the source directly into
+# applications; instead we add -lowl to the linker cmdline. Also, when
+# we eventually make libowl into a normal shared library, this package
+# will make that transition rather simple.
+
+DESCRIPTION = "OpenedHand Widget Library"
+HOMEPAGE = "http://www.o-hand.com"
+LICENSE = "LGPL"
+SECTION = "libs"
+PR = "r3"
+PV = "0.0+svn${SRCDATE}"
+
+DEPENDS = "gtk+ glib-2.0"
+PACKAGES = ""
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+ # have to unstage the library first so that the tests build
+ rm -f ${STAGING_LIBDIR}/libowl*
+ rm -f ${STAGING_INCDIR}/owl*
+}
+
+do_stage() {
+ headers=`eval ls libowl/owl*.h`
+ for header in $headers; do
+ hdr_base=`eval basename $header`
+ install -m 644 $header ${STAGING_INCDIR}/$hdr_base
+ done
+ install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
+}
+
+do_install() {
+}
+
+do_package() {
+}
+
+do_package_write() {
+}
diff --git a/packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb b/packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb
new file mode 100644
index 0000000000..9e4774efd7
--- /dev/null
+++ b/packages/matchbox-themes-extra/matchbox-theme-sato_0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Matchbox window manager Sato themes"
+LICENSE = "CC-BY-SA3"
+DEPENDS = "matchbox-wm"
+SECTION = "x11/wm"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/themes"
+
diff --git a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
index 5d91a47984..39b035bc7a 100644
--- a/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
+++ b/packages/matchbox-themes-extra/matchbox-theme-sato_svn.bb
@@ -3,13 +3,16 @@ LICENSE = "GPL"
DEPENDS = "matchbox-wm"
SECTION = "x11/wm"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1+svn${SRCDATE}"
PR = "r0"
+PACKAGE_ARCH = "all"
+
SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
S = "${WORKDIR}/matchbox-sato"
-FILES_${PN} = "${datadir}/themes/Sato"
inherit autotools pkgconfig
+FILES_${PN} = "${datadir}/themes/Sato"
+
diff --git a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index fb91f03b12..c695388780 100644
--- a/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -6,6 +6,9 @@ SECTION = "x11/wm"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-themes-extra/${PV}/matchbox-themes-extra-${PV}.tar.bz2"
S = "${WORKDIR}/matchbox-themes-extra-${PV}"
+PR = "r1"
+PACKAGE_ARCH = "all"
+
inherit autotools pkgconfig
# split into several packages plus one meta package
diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb
index ad7c31d3ed..83eb403c5f 100644
--- a/packages/matchbox-wm/matchbox-wm_1.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_1.2.bb
@@ -3,7 +3,7 @@ require matchbox-wm.inc
DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native matchbox-common"
RDEPENDS = "matchbox-common"
-PR="r0"
+PR="r1"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
file://gconf-2.m4 \
@@ -16,6 +16,7 @@ inherit autotools pkgconfig update-alternatives
FILES_${PN} = "${bindir}/* \
${datadir}/matchbox \
${sysconfdir}/matchbox \
+ ${sysconfdir}/gconf/ \
${datadir}/themes/blondie/matchbox \
${datadir}/themes/Default/matchbox \
${datadir}/themes/MBOpus/matchbox"
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
index c9dd8c4817..0ec2f1e448 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel"
DEPENDS = "apmd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
index 786c2de657..97667159b5 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Shows the bluetooth status in the OpenMoko panel"
DEPENDS = "bluez-libs"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
index 389a6f2691..578c85d2a7 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-clock_svn.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Shows the current time in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
index 8002a05fc4..4ca9543424 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gps_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Shows the GPS status in the OpenMoko panel"
DEPENDS = "gpsd"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
index 6170da7c0c..e6888ee39b 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -1,10 +1,6 @@
-DESCRIPTION = "Shows the GSM status in the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
-
-DEPENDS_append = " libgsmd"
+DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
+DEPENDS = "libgsmd"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
inherit openmoko-panel-plugin
-
-FILES_${PN} += "${bindir}/${PN}"
-
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
index cc5d6c48d3..bc5c60a381 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Main menu applet for the OpenMoko panel"
DEPENDS += "pulseaudio startup-notification"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
index 8dc478c40b..cd7fbe1c46 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-usb_svn.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "USB applet for the OpenMoko panel"
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko-panel-plugin
diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
index 8fe54f3348..8e547b3663 100644
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,6 +1,6 @@
SECTION = "openmoko/libs"
DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko2
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index e5a1fe74f8..90f93074ac 100644
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,6 +1,6 @@
SECTION = "openmoko/libs"
DEPENDS = "eds-dbus"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko2
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index c76729e619..54fe73c6bd 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,6 +1,6 @@
SECTION = "openmoko/libs"
DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko2
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
index f818578c21..6042f67e0a 100644
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -1,6 +1,6 @@
SECTION = "openmoko/libs"
DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko2
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
new file mode 100644
index 0000000000..8e0c9ad6da
--- /dev/null
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "A Calculator for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index e44f387fc7..72bbc8517c 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,12 +1,12 @@
DESCRIPTION = "The OpenMoko address book"
SECTION = "openmoko/pim"
RDEPENDS = "libedata-book"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r2"
inherit openmoko2
-SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
S = "${WORKDIR}/hito/"
EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index ccbd6f8775..08ef166ee1 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "The OpenMoko Dialer"
SECTION = "openmoko/pim"
DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
PR = "r1"
inherit openmoko2
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index 41f28ed6a1..eed51d1cd6 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -1,9 +1,7 @@
-DESCRIPTION = "The OpenMoko RSS Reader"
-SECTION = "openmoko/applications"
+DESCRIPTION = "The OpenMoko Feed Reader"
+SECTION = "openmoko/apps"
DEPENDS += "libmrss check webkit"
-
-PV = "0.0.1+svn${SRCDATE}"
+PV = "0.0.1+svnr${SRCREV}"
PR = "r0"
inherit openmoko2
-
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
new file mode 100644
index 0000000000..c14a6e7a1b
--- /dev/null
+++ b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1.0+svn${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+pkg_postinst_${PN} () {
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
deleted file mode 100644
index 8029e1fbc9..0000000000
--- a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
-SECTION = "openmoko/base"
-PV = "0.1.0+svn${SRCDATE}"
-PR = "r1"
-
-inherit openmoko-base autotools
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
-S = "${WORKDIR}/icons"
-
-PACKAGE_ARCH = "all"
-
-pkg_postinst_${PN} () {
- if [ "x$D" != "x" ]; then
- exit 1
- fi
- gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
-}
-
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index ed707a9617..a5f3108093 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
SECTION = "openmoko/base"
RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCDATE}"
PR = "r1"
inherit openmoko2
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index a38be614f4..94ea147b87 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,7 +1,6 @@
DESCRIPTION = "The OpenMoko Application Launcher"
SECTION = "openmoko/pim"
DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
-
-PV = "0.1.0+srvn${SRCDATE}"
+PV = "0.1.0+svnr${SRCREV}"
inherit openmoko2 gtk-icon-cache
diff --git a/packages/puzzles/oh-puzzles_svn.bb b/packages/puzzles/oh-puzzles_svn.bb
new file mode 100644
index 0000000000..67643cb281
--- /dev/null
+++ b/packages/puzzles/oh-puzzles_svn.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "Portable Puzzle Collection"
+LICENSE = "MIT"
+SECTION = "x11"
+DEPENDS = "gtk+ gconf intltool-native librsvg libowl"
+PV = "0.1+svn${SRCDATE}"
+PR = "r5"
+
+inherit autotools pkgconfig
+
+SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
+S = "${WORKDIR}/${PN}"
+
+do_install_append() {
+ mv ${D}${bindir} ${D}/usr/games
+
+ install -d ${D}/${datadir}/applications/
+
+ cd ${D}/${prefix}/games
+ for prog in *; do
+ if [ -x $prog ]; then
+ # Convert prog to Title Case
+ title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
+ echo "making ${D}/${datadir}/applications/$prog.desktop"
+ cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=$title
+Exec=${prefix}/games/$prog
+Icon=applications-games
+Terminal=false
+Type=Application
+Categories=Game
+StartupNotify=true
+SingleInstance=true
+Comment=Play $title.
+STOP
+ fi
+ done
+}
+
+FILES_${PN} += "${prefix}/games/*"
+FILES_${PN}-dbg += "${prefix}/games/.debug/*"
+
diff --git a/packages/raw-tools/.mtn2git_empty b/packages/raw-tools/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/raw-tools/.mtn2git_empty
diff --git a/packages/raw-tools/exiv2_0.15.bb b/packages/raw-tools/exiv2_0.15.bb
new file mode 100644
index 0000000000..894abce114
--- /dev/null
+++ b/packages/raw-tools/exiv2_0.15.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Exiv2 is a C++ library and a command line utility to access image metadata."
+LICENSE = "GPL"
+DEPENDS = "tiff zlib"
+
+SRC_URI = "http://www.exiv2.org/exiv2-${PV}.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+
+do_stage() {
+ autotools_stage_all
+}
+
+
diff --git a/packages/raw-tools/gtkimageview_1.3.0.bb b/packages/raw-tools/gtkimageview_1.3.0.bb
new file mode 100644
index 0000000000..aa45fe09b0
--- /dev/null
+++ b/packages/raw-tools/gtkimageview_1.3.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GtkImageView is a simple image viewer widget for GTK."
+DEPENDS = "gtk+"
+
+SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/gtkimageview-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+
diff --git a/packages/raw-tools/libopenraw.inc b/packages/raw-tools/libopenraw.inc
new file mode 100644
index 0000000000..1f39c2b667
--- /dev/null
+++ b/packages/raw-tools/libopenraw.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "libopenraw is an ongoing project to provide a free software implementation for camera RAW files decoding. "
+LICENSE = "GPLv2"
+DEPENDS = "boost jpeg gtk+"
+
+inherit autotools pkgconfig lib_package
+
+PACKAGES =+ "libopenrawgnome"
+
+FILES_libopenrawgnome = "${libdir}/libopenrawgnome.so.*"
+
diff --git a/packages/raw-tools/libopenraw_0.0.2.bb b/packages/raw-tools/libopenraw_0.0.2.bb
new file mode 100644
index 0000000000..7a19c63bbc
--- /dev/null
+++ b/packages/raw-tools/libopenraw_0.0.2.bb
@@ -0,0 +1,4 @@
+require libopenraw.inc
+
+SRC_URI = "http://libopenraw.freedesktop.org/download/libopenraw-${PV}.tar.gz"
+
diff --git a/packages/raw-tools/ufraw_0.12.bb b/packages/raw-tools/ufraw_0.12.bb
new file mode 100644
index 0000000000..b9e06a3bc5
--- /dev/null
+++ b/packages/raw-tools/ufraw_0.12.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The Unidentified Flying Raw (UFRaw) is a utility to read and manipulate raw images from digital cameras. "
+LICENSE = "GPL"
+
+DEPENDS = "gtk+ gtkimageview lcms exiv2 tiff"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ufraw/ufraw-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-extras "
+
+PACKAGES =+ "dcraw dcraw-dbg"
+FILES_dcraw = "${bindir}/dcraw"
+FILES_dcraw-bdg = "${bindir}/.debug/dcraw"
+
+
diff --git a/packages/sato-icon-theme/.mtn2git_empty b/packages/sato-icon-theme/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sato-icon-theme/.mtn2git_empty
diff --git a/packages/sato-icon-theme/sato-icon-theme_0.1.bb b/packages/sato-icon-theme/sato-icon-theme_0.1.bb
new file mode 100644
index 0000000000..0919f5dde6
--- /dev/null
+++ b/packages/sato-icon-theme/sato-icon-theme_0.1.bb
@@ -0,0 +1,20 @@
+SECTION = "x11"
+DESCRIPTION = "Sato Icon Theme"
+LICENSE = "CC-BY-SA3"
+DEPENDS = ""
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://pokylinux.org/releases/sato/sato-icon-theme-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+pkg_postinst_${PN} () {
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ gtk-update-icon-cache -q /usr/share/icons/Sato
+}
+
+FILES_${PN} += "${datadir}"
+
diff --git a/packages/starling/starling_0.2.bb b/packages/starling/starling_0.2.bb
index 9b389c53cc..6080491cb2 100644
--- a/packages/starling/starling_0.2.bb
+++ b/packages/starling/starling_0.2.bb
@@ -3,7 +3,8 @@ SECTION = "gpe/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
-RDEPENDS = "pulseaudio-bin \
+
+RDEPENDS = "esd \
gst-plugin-audioconvert \
gst-plugin-esd \
gst-plugin-typefindfunctions \
diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb
index 25d445f6ee..67d98dbd60 100644
--- a/packages/starling/starling_svn.bb
+++ b/packages/starling/starling_svn.bb
@@ -14,8 +14,7 @@ RRECOMMENDS = "gst-plugin-mad \
gst-plugin-ivorbis \
gst-plugin-tcp"
-PV = "0.1+svn${SRCDATE}"
-
+PV = "0.2+svn${SRCDATE}"
inherit gpe autotools
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 6ac888c55a..814f4948ba 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r50"
+PR = "r52"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "all"
@@ -12,11 +12,10 @@ PACKAGES = "\
task-openmoko-ui \
task-openmoko-base \
task-openmoko-phone \
- task-openmoko-finger \
task-openmoko-pim \
task-openmoko-net \
\
- task-openmoko-demo \
+ task-openmoko-games \
task-openmoko-examples \
task-openmoko-debug \
task-openmoko-native-sdk \
@@ -86,6 +85,7 @@ RDEPENDS_task-openmoko-base = "\
matchbox-keyboard \
matchbox-stroke \
openmoko-keyboard \
+# openmoko-panel-mainmenu \
openmoko-panel-battery \
openmoko-panel-bt \
openmoko-panel-clock \
@@ -106,19 +106,12 @@ RDEPENDS_task-openmoko-phone = "\
"
#
-# task-openmoko-finger
-#
-DESCRIPTION_task-openmoko-finger = "OpenMoko: Finger UI Applications"
-RDEPENDS_task-openmoko-finger = "\
-# openmoko-calculator \
-"
-
-#
# task-openmoko-pim
#
DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
RDEPENDS_task-openmoko-pim = "\
eds-dbus \
+ openmoko-calculator2 \
openmoko-contacts2 \
openmoko-today2 \
# openmoko-messages \
@@ -135,6 +128,14 @@ RDEPENDS_task-openmoko-net = "\
"
#
+# task-openmoko-games
+#
+DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
+RDEPENDS_task-openmoko-games = "\
+ oh-puzzles \
+"
+
+#
# task-openmoko-debug
#
DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
diff --git a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb b/packages/uboot/u-boot-mkimage-gta01-native_oe.bb
index 2eafac668f..5946be9c3f 100644
--- a/packages/uboot/u-boot-mkimage-gta01-native_oe.bb
+++ b/packages/uboot/u-boot-mkimage-gta01-native_oe.bb
@@ -5,7 +5,6 @@ PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238"
SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
file://uboot-machtypes.patch;patch=1 \
file://ext2load_hex.patch;patch=1 \
-file://uboot-mokoversion.patch;patch=1 \
file://uboot-s3c2410-warnings-fix.patch;patch=1 \
file://uboot-strtoul.patch;patch=1 \
file://uboot-cramfs_but_no_jffs2.patch;patch=1 \
diff --git a/packages/uboot/uboot-gta01_svn.bb b/packages/uboot/uboot-gta01_svn.bb
index 2cf50c78bd..98622fe408 100644
--- a/packages/uboot/uboot-gta01_svn.bb
+++ b/packages/uboot/uboot-gta01_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
PV = "1.2.0+svn${SRCDATE}"
-PR = "r10"
+PR = "r11"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
@@ -66,10 +66,10 @@ do_deploy () {
install -d ${DEPLOY_DIR_IMAGE}
for mach in ${UBOOT_MACHINES}
do
- install ${S}/u-boot_${mach}.bin \
+ install -m 0644 ${S}/u-boot_${mach}.bin \
${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PR}.bin
if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
- install ${S}/lowlevel_foo_${mach}.bin \
+ install -m 0644 ${S}/lowlevel_foo_${mach}.bin \
${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PR}.bin
fi
done
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb
index c5f5dcafa7..8a6480d54f 100644
--- a/packages/webkit/webkit_svn.bb
+++ b/packages/webkit/webkit_svn.bb
@@ -4,38 +4,37 @@ DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qm
PV = "0.0+svn${SRCDATE}"
PR = "r1"
-inherit qmake pkgconfig
+inherit qmake qt4x11 pkgconfig
SRC_URI = "\
- svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
-# svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
- file://Makefile \
- file://Makefile.shared \
- file://WebKit.pri \
- file://WebKit.pro \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
+# svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
+ file://Makefile \
+ file://Makefile.shared \
+ file://WebKit.pri \
+ file://WebKit.pro \
"
-
S = "${WORKDIR}/"
-
do_configure_append() {
- qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
+ qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
mkdir -p WebKitBuilds/Debug
cd WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
+ PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+ WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
}
do_compile_prepend() {
- mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
- cd ${S}/JavaScriptCore/pcre
- ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
- cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
- cd ${S}/WebKitBuilds/Debug
+ mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/JavaScriptCore/pcre
+ ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+ cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/WebKitBuilds/Debug
}
do_install() {
@@ -44,24 +43,22 @@ do_install() {
install -d ${D}${libdir}/pkgconfig
install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
- cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
- oe_runmake install
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+ WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+ oe_runmake install
}
-
do_stage() {
- install -d ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}
- cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
- oe_runmake install
+ install -d ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+ WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
+ oe_runmake install
}
PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"
FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher"
-
-
-