summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/sane-srcrevs.inc5
-rw-r--r--packages/gnome/epiphany_2.19.6.bb14
-rw-r--r--packages/gnome/epiphany_svn.bb21
-rw-r--r--packages/gpephone/libchenabler/.mtn2git_empty0
-rw-r--r--packages/gpephone/libchenabler/po.patch9
-rw-r--r--packages/gpephone/libchenabler_0.1.bb8
-rw-r--r--packages/icu/icu_3.6.bb5
7 files changed, 44 insertions, 18 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7c42165401..d6cc495ef0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -18,7 +18,8 @@ SRCREV_pn-eglibc ?= "3531"
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-libmokopanelui2 ?= "3226"
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"
diff --git a/packages/gnome/epiphany_2.19.6.bb b/packages/gnome/epiphany_2.19.6.bb
deleted file mode 100644
index 570f8ba4f5..0000000000
--- a/packages/gnome/epiphany_2.19.6.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "GNOME default webbrowser"
-DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes libstartup-notification"
-RDEPENDS = "gnome-vfs-plugin-http"
-
-PR = "r1"
-
-inherit gnome
-
-EXTRA_OECONF = "--with-engine=webkit"
-
-
-FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
-
-
diff --git a/packages/gnome/epiphany_svn.bb b/packages/gnome/epiphany_svn.bb
new file mode 100644
index 0000000000..97fd82b653
--- /dev/null
+++ b/packages/gnome/epiphany_svn.bb
@@ -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"
+
+
diff --git a/packages/gpephone/libchenabler/.mtn2git_empty b/packages/gpephone/libchenabler/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/libchenabler/.mtn2git_empty
diff --git a/packages/gpephone/libchenabler/po.patch b/packages/gpephone/libchenabler/po.patch
new file mode 100644
index 0000000000..0f880f5f49
--- /dev/null
+++ b/packages/gpephone/libchenabler/po.patch
@@ -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
diff --git a/packages/gpephone/libchenabler_0.1.bb b/packages/gpephone/libchenabler_0.1.bb
index 740ed21c65..4c06e2fbd3 100644
--- a/packages/gpephone/libchenabler_0.1.bb
+++ b/packages/gpephone/libchenabler_0.1.bb
@@ -3,14 +3,20 @@ 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
}
diff --git a/packages/icu/icu_3.6.bb b/packages/icu/icu_3.6.bb
index 39162d2179..2e8dca925e 100644
--- a/packages/icu/icu_3.6.bb
+++ b/packages/icu/icu_3.6.bb
@@ -2,7 +2,7 @@ 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"