gtk-webcore: Tweak pkgconfig usage so it works within a sysroot

6 files changed, 35 insertions, 3 deletions

diff --git a/packages/gtk-webcore/files/path_fixes.patch b/packages/gtk-webcore/files/path_fixes.patch
new file mode 100644
index 0000000000..adb27bdd85
--- /dev/null
+++ b/packages/gtk-webcore/files/path_fixes.patch
@@ -0,0 +1,15 @@
+Index: NRCore/configure.in
+===================================================================
+--- NRCore.orig/configure.in	2008-02-29 11:01:14.000000000 +0000
++++ NRCore/configure.in	2008-02-29 12:45:18.000000000 +0000
+@@ -67,8 +67,8 @@
+       AC_MSG_RESULT([found. Using prefix $jscore_prefix])
+       JSCORE_ENABLE=yes
+       AC_SUBST(JSCORE_ENABLE)
+-      JSCORE_LIBS="-L$jscore_prefix/lib -ljscore"
+-      JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore-jscore/"
++      JSCORE_LIBS="-L$jscore_prefix/lib -lgtk_webcore_jscore"
++      JSCORE_CFLAGS="-I$jscore_prefix/include/gtk-webcore/"
+       jscore_pkgdatadir="$jscore_prefix/share/gtk-webcore-jscore"
+    else
+      AC_MSG_ERROR([JavaScriptCore not found. Use --with-javascriptcore-prefix=PREFIX])
diff --git a/packages/gtk-webcore/osb-nrcit/.mtn2git_empty b/packages/gtk-webcore/osb-nrcit/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk-webcore/osb-nrcit/.mtn2git_empty
diff --git a/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch b/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
new file mode 100644
index 0000000000..d26009bbb7
--- /dev/null
+++ b/packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
@@ -0,0 +1,13 @@
+Index: NRCit/gtk-webcore-nrcit.pc.in
+===================================================================
+--- NRCit.orig/gtk-webcore-nrcit.pc.in	2008-02-29 13:46:41.000000000 +0000
++++ NRCit/gtk-webcore-nrcit.pc.in	2008-02-29 13:46:51.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: gtk-webcore-nrcit
+ Description: Gtk+-WebCore HTML rendering engine, browser interface
+ Version: @VERSION@
+-Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0
+-Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0 @LIBCURL_LIBS@
++Requires: gtk-webcore-jscore gtk-webcore-nrcore xft fontconfig gdk-2.0 gtk+-2.0 glib-2.0 libcurl
++Libs: -L${libdir} -lgtk_webcore_nrcore -lgtk_webcore_nrcit -lgthread-2.0 -lgobject-2.0
+ Cflags: -I${includedir}/gtk-webcore/webi -I${includedir}/gtk-webcore
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index 7ea8b3b6fa..57bb096183 100644
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -5,11 +5,12 @@ PRIORITY = "optional"
 SECTION = "gpe"
 
 PV = "0.5.2+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "curl librsvg osb-nrcore pango"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
+           file://pkgconfig_fix.patch;patch=1 \
            file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
 
 inherit autotools pkgconfig
diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc
index 6fd1d22580..eca304959f 100644
--- a/packages/gtk-webcore/osb-nrcore.inc
+++ b/packages/gtk-webcore/osb-nrcore.inc
@@ -12,6 +12,8 @@ inherit autotools pkgconfig
 #/khtml/css/cssproperties.h failes to generate properly with high parallel makes
 PARALLEL_MAKE = ""
 
+EXTRA_OECONF += "--with-javascriptcore-prefix=${STAGING_EXECPREFIXDIR}"
+
 do_configure () {
 	autotools_do_configure
 	cd ${S}
diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index 8e0b4b04b6..b85c06e422 100644
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -1,11 +1,12 @@
 require osb-nrcore.inc
 
 PV = "0.5.2+svnr${SRCREV}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
            file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
-	   file://build_silence.patch;patch=0;maxdate=20070401"
+	   file://build_silence.patch;patch=0;maxdate=20070401 \
+	   file://path_fixes.patch;patch=1"
 
 S = "${WORKDIR}/NRCore"