[oe-commits] org.oe.dev merge of '43591068998de05cfdac737237e45e3cd0260ea3'

Thu Nov 8 12:04:40 UTC 2007

merge of '43591068998de05cfdac737237e45e3cd0260ea3'
     and 'd1a492aecc2679b803ca6d8013a5391c4a281f9f'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 650e2e3bdfac43ce21fc12085a892d66b94155ab
ViewMTN: http://monotone.openembedded.org/revision/info/650e2e3bdfac43ce21fc12085a892d66b94155ab
Files:
1
packages/quasar
packages/quasar/files
packages/quasar/files/cross-compile.patch
packages/quasar/quasar_0.9beta3.bb
packages/uicmoc/uicmoc3-native_3.3.5.bb
packages/gnome/epiphany_2.19.6.bb
packages/gpephone/libchenabler
packages/gnome/epiphany_svn.bb
packages/gpephone/libchenabler/po.patch
conf/distro/include/sane-srcrevs.inc
packages/gpephone/libchenabler_0.1.bb
packages/icu/icu_3.6.bb
Diffs:

#
# mt diff -r43591068998de05cfdac737237e45e3cd0260ea3 -r650e2e3bdfac43ce21fc12085a892d66b94155ab
#
# 
# 
# add_dir "packages/quasar"
# 
# add_dir "packages/quasar/files"
# 
# add_file "packages/quasar/files/cross-compile.patch"
#  content [7731ba4a41d73862d99a509af26090ea6deb9729]
# 
# add_file "packages/quasar/quasar_0.9beta3.bb"
#  content [b0d3c95c0dd2fb1acaa26e90cfaa029ee55e7003]
# 
# patch "packages/uicmoc/uicmoc3-native_3.3.5.bb"
#  from [f5fb5daae8ef66f9b2d4df4f8372d83f7815347c]
#    to [da5a5f21332c7ab3148a8aa41459222db849913b]
# 
============================================================

--- packages/quasar/files/cross-compile.patch	7731ba4a41d73862d99a509af26090ea6deb9729
+++ packages/quasar/files/cross-compile.patch	7731ba4a41d73862d99a509af26090ea6deb9729
@@ -0,0 +1,31 @@
+--- tmp/quasar-qt.pro	2007-10-29 00:18:03.000000000 +0100
++++ quasar-qt.pro	2007-11-04 09:11:58.000000000 +0100
+@@ -3,13 +3,13 @@
+ TARGET		= quasar
+ TEMPLATE	= app
+ 
+-#CONFIG		= qt warn_on
+-CONFIG		= qt warn_on debug
++CONFIG		= qt warn_on release
++#CONFIG		= qt warn_on debug
+ 
+ # for native compilation with ccache:
+-TMAKE_CC	= ccache gcc
+-TMAKE_CXX	= ccache g++
+-TMAKE_LINK	= ccache g++
++#TMAKE_CC	= ccache gcc
++#TMAKE_CXX	= ccache g++
++#TMAKE_LINK	= ccache g++
+ 
+ # for native compilation with pdaxii13's zgcc:
+ #TMAKE_CC	= gcc
+@@ -26,7 +26,8 @@
+ TMAKE_CFLAGS	= $$TMAKE_CFLAGS $$SQLITE_FLAGS -DQUASAR -O3
+ TMAKE_CXXFLAGS  = $$TMAKE_CXXFLAGS $$SQLITE_FLAGS -DQUASAR -O3
+ 
+-LIBS		= -liconv -lz -lstdc++
++#LIBS		= -liconv -lz -lstdc++
++LIBS           = -lz
+ 
+ INCLUDEPATH	= \
+ 		. \
============================================================
--- packages/quasar/quasar_0.9beta3.bb	b0d3c95c0dd2fb1acaa26e90cfaa029ee55e7003
+++ packages/quasar/quasar_0.9beta3.bb	b0d3c95c0dd2fb1acaa26e90cfaa029ee55e7003
@@ -0,0 +1,28 @@
+DESCRIPTION = "Quasar mediaplayer"
+HOMEPAGE = "http://katastrophos.net/andre/blog/software/quasar-media-player/"
+AUTHOR = "Andre Beckedorf"
+LICENSE = "GPL"
+SECTION = "multimedia"
+RDEPENDS = "mplayer"
+PV = "0.8+0.9beta3"
+S = "${WORKDIR}/v0.9_beta3"
+
+SRC_URI = "http://katastrophos.net/zaurus/sources/quasar/quasar_0.9_beta3_sources.tar.bz2\
+	   file://cross-compile.patch;patch=1"
+
+inherit qmake qt3x11
+
+QMAKE_PROFILES = "quasar-qt.pro"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 quasar ${D}${bindir}
+	install -d ${D}${datadir}/applications
+	install -m 0755 ${S}/distro/skeletons/pdaXrom/usr/share/applications/quasar.desktop ${D}${datadir}/applications/
+	install -d ${D}${datadir}/pixmaps
+        install -m 0755 ${S}/distro/images/quasar.png ${D}${datadir}/pixmaps/
+	install -d ${D}${datadir}/quasar/skins
+        install -d ${D}${datadir}/quasar/skins/default
+	install -m 0755 ${S}/distro/skins/default/* ${D}${datadir}/quasar/skins/default/
+}
+
============================================================
--- packages/uicmoc/uicmoc3-native_3.3.5.bb	f5fb5daae8ef66f9b2d4df4f8372d83f7815347c
+++ packages/uicmoc/uicmoc3-native_3.3.5.bb	da5a5f21332c7ab3148a8aa41459222db849913b
@@ -1,8 +1,9 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
+DEPENDS = "qmake-native"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \


#
# mt diff -rd1a492aecc2679b803ca6d8013a5391c4a281f9f -r650e2e3bdfac43ce21fc12085a892d66b94155ab
#
# 
# 
# delete "packages/gnome/epiphany_2.19.6.bb"
# 
# add_dir "packages/gpephone/libchenabler"
# 
# add_file "packages/gnome/epiphany_svn.bb"
#  content [bb3c68a8ba38d098a4e6b2bea9e92930820db03c]
# 
# add_file "packages/gpephone/libchenabler/po.patch"
#  content [5cf30dbc059ff5f7a210dd529b34a19c7404feee]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [aba02b4341afbe8e50d5993e64a67d6d7d800d09]
#    to [f77e245ef0b0121bd27da5a99090503b3e4bd658]
# 
# patch "packages/gpephone/libchenabler_0.1.bb"
#  from [c70ec4111d1d8104ec435b5030b356fecf383f06]
#    to [ba17069c8fb66316a30ce37bac1598aaa51aefb2]
# 
# patch "packages/icu/icu_3.6.bb"
#  from [abeb7fae2e0e0539af931224bce531674ef4fe6a]
#    to [5b44aed3810d59f100f97954c8497ac92521c5b7]
# 
============================================================
--- packages/gnome/epiphany_svn.bb	bb3c68a8ba38d098a4e6b2bea9e92930820db03c
+++ packages/gnome/epiphany_svn.bb	bb3c68a8ba38d098a4e6b2bea9e92930820db03c
@@ -0,0 +1,21 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+PV = "2.20.1+svnr${SRCREV}"
+PR = "r0"
+
+inherit gnome
+
+SRC_URI = "svn://svn.gnome.org/svn/epiphany;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
+
+do_configure_prepend() {
+        touch ${S}/gnome-doc-utils.make
+}
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
============================================================
--- packages/gpephone/libchenabler/po.patch	5cf30dbc059ff5f7a210dd529b34a19c7404feee
+++ packages/gpephone/libchenabler/po.patch	5cf30dbc059ff5f7a210dd529b34a19c7404feee
@@ -0,0 +1,9 @@
+--- libchenabler-0.1/configure.ac~	2007-11-08 12:01:26.000000000 +0100
++++ libchenabler-0.1/configure.ac	2007-11-08 12:01:26.000000000 +0100
+@@ -31,5 +31,6 @@
+ src/Makefile 
+ database/Makefile
+ libvochenabler.pc
++po/Makefile.in
+ ])
+ AC_OUTPUT
============================================================
--- conf/distro/include/sane-srcrevs.inc	aba02b4341afbe8e50d5993e64a67d6d7d800d09
+++ conf/distro/include/sane-srcrevs.inc	f77e245ef0b0121bd27da5a99090503b3e4bd658
@@ -18,7 +18,8 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-eglibc-initial ?= "3531"
 SRCREV_pn-eglibc-intermediate ?= "3531"
 SRCREV_pn-ezxd ?= "2074"
-SRCREV_pn-elf2flt="1786"
+SRCREV_pn-elf2flt ?= "1786"
+SRCREV_pn-epiphany ?= "7650"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
@@ -37,7 +38,7 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-libmokoui2 ?= "3229"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-linux-bfin ?= "3745"
+SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-openmoko ?= "2937"
 SRCREV_pn-llvm-gcc4 ?= "374"
============================================================
--- packages/gpephone/libchenabler_0.1.bb	c70ec4111d1d8104ec435b5030b356fecf383f06
+++ packages/gpephone/libchenabler_0.1.bb	ba17069c8fb66316a30ce37bac1598aaa51aefb2
@@ -1,16 +1,22 @@ DEPENDS     = "glib-2.0 sqlite3 librecor
 LICENSE     = "LiPS"
 DESCRIPTION = "LiPS voice call library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 sqlite3 librecord"
-PR          = "r0"
+PR          = "r1"
 
 GPE_TARBALL_SUFFIX = "gz"
 
 inherit gpephone pkgconfig autotools
 
+SRC_URI += "file://po.patch;patch=1"
 FILES_${PN} += " ${datadir}/vochistory"
 
+do_configure_prepend () {
+	mkdir "${S}/po"
+	touch "${S}/po/POTFILES.in"
+}
+
 do_stage () {
 	autotools_stage_all
 }
============================================================
--- packages/icu/icu_3.6.bb	abeb7fae2e0e0539af931224bce531674ef4fe6a
+++ packages/icu/icu_3.6.bb	5b44aed3810d59f100f97954c8497ac92521c5b7
@@ -1,8 +1,8 @@ DEPENDS += "icu-native"
 require icu-3.6.inc
 
 DEPENDS += "icu-native"
 
-PR = "r1"
+PR = "r2"
 
 do_configure_append() {
         for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do
@@ -13,6 +13,9 @@ do_configure_append() {
 	sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true
 }
 
+do_install_append() {
+        chmod +x ${D}${libdir}/lib*
+}
 
 PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
 




