[oe-commits] org.oe.dev merge of '49620a480a3c8deee05068287aa90bf723508c27'

[koen commit]

merge of '49620a480a3c8deee05068287aa90bf723508c27'
     and 'b8722b34f06f673d698f22dd82b3b225392cfdfb'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 10a0cf6a4d97caba3cd2b664dac0835e6af89a86
ViewMTN: http://monotone.openembedded.org/revision.psp?id=10a0cf6a4d97caba3cd2b664dac0835e6af89a86
Files:
1
packages/networkmanager/networkmanager_svn.bb
packages/webkit/webkit/WebKit.pri
packages/webkit/webkit/WebKit.pro
packages/webkit/webkit_svn.bb
Diffs:

#
# mt diff -r49620a480a3c8deee05068287aa90bf723508c27 -r10a0cf6a4d97caba3cd2b664dac0835e6af89a86
#
# 
# 
# add_file "packages/networkmanager/networkmanager_svn.bb"
#  content [2f814773de0dcb226ef1e52335e6e32169503ef4]
# 
============================================================
--- packages/networkmanager/networkmanager_svn.bb	2f814773de0dcb226ef1e52335e6e32169503ef4
+++ packages/networkmanager/networkmanager_svn.bb	2f814773de0dcb226ef1e52335e6e32169503ef4
@@ -0,0 +1,66 @@
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
+RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
+PV = "0.6.5+svn${SRCDATE}"
+
+PR = "r0"
+
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
+	file://NetworkManager \
+	file://99_networkmanager"
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF = " \
+		--with-gnome \
+		--with-distro=debian \
+		--without-gcrypt \
+ 		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
+		--with-dhcdbd=/sbin/dhcdbd \
+		--with-ip=/sbin/ip"
+
+S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+
+inherit autotools
+
+do_staging () {
+	autotools_stage_includes
+	oe_libinstall -C libnm-util libnm-util ${STAGING_LIBDIR}
+	oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
+	oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
+
+	oe_runmake -C src DESTDIR="${D}" install
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+	install -d ${D}/etc/init.d/
+	install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
+	install -d ${D}/${datadir}/
+}
+
+pkg_postinst () {
+	/etc/init.d/populate-volatile.sh update
+}
+
+FILES_${PN} += "${datadir} \
+		${libdir}/*.so* \
+		${libdir}/*.la \
+		${sbindir} \
+		${bindir} \
+		${sysconfdir} \
+		${libexecdir}"
+
+FILES_${PN}-dev = "${incdir} \
+		   ${libdir}/*.a \
+		   ${libdir}/pkgconfig"
+
+# The networkmanager package needs to be split into app/lib/dev packages. For
+# now, silence insane.
+INSANE_SKIP_${PN} = "1"


#
# mt diff -rb8722b34f06f673d698f22dd82b3b225392cfdfb -r10a0cf6a4d97caba3cd2b664dac0835e6af89a86
#
# 
# 
# patch "packages/webkit/webkit/WebKit.pri"
#  from [94510fbc949e86f0ce4710c19900c4a6a8c163a9]
#    to [8dbdde1c26386f94aaaad0b70b380b22fe554a69]
# 
# patch "packages/webkit/webkit/WebKit.pro"
#  from [63fd1bd947de2d3abe6a011685e6173bf0a804e1]
#    to [c4db9377c267835f4ec934a4d53207e26c25b99c]
# 
# patch "packages/webkit/webkit_svn.bb"
#  from [a579828b28b3be2c2c2b36f20643de557f0778dc]
#    to [124f784a2e32f48ff79dc926a9bb0db2d47fcf66]
# 
============================================================
--- packages/webkit/webkit/WebKit.pri	94510fbc949e86f0ce4710c19900c4a6a8c163a9
+++ packages/webkit/webkit/WebKit.pri	8dbdde1c26386f94aaaad0b70b380b22fe554a69
@@ -28,7 +28,9 @@ gdk-port:INCLUDEPATH += \
     $$BASE_DIR/WebCore/platform/network/curl \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
     $$BASE_DIR/WebCore/loader/gdk \
-    $$BASE_DIR/WebCore/page/gdk
+    $$BASE_DIR/WebCore/page/gdk \
+    $$BASE_DIR/WebKit/gtk/Api \
+    $$BASE_DIR/WebKit/gtk/WebCoreSupport
 INCLUDEPATH += \
     $$BASE_DIR/JavaScriptCore/ \
     $$BASE_DIR/JavaScriptCore/kjs \
============================================================
--- packages/webkit/webkit/WebKit.pro	63fd1bd947de2d3abe6a011685e6173bf0a804e1
+++ packages/webkit/webkit/WebKit.pro	c4db9377c267835f4ec934a4d53207e26c25b99c
@@ -1,9 +1,8 @@ SUBDIRS += \
 TEMPLATE = subdirs
 CONFIG += ordered
 !gdk-port:CONFIG += qt-port
 qt-port:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
-        JavaScriptCore/pcre/dftables.pro \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro
 
============================================================
--- packages/webkit/webkit_svn.bb	a579828b28b3be2c2c2b36f20643de557f0778dc
+++ packages/webkit/webkit_svn.bb	124f784a2e32f48ff79dc926a9bb0db2d47fcf66
@@ -1,4 +1,4 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
+DEPENDS = "libpcre flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
 
 # Yes, this is wrong...
 PV = "0.0+svn${SRCDATE}"
@@ -31,7 +31,9 @@ do_compile_prepend() {
 }
 
 do_compile_prepend() {
-        cd ${S}/WebKitBuilds/Debug
+         mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+	 cp ${STAGING_BINDIR_NATIVE}/dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+         cd ${S}/WebKitBuilds/Debug
 }
 
 do_install() {