[oe-commits] org.oe.dev gtk-webcore: Tweak pkgconfig usage so it works within a sysroot

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 6d9979f4d29d1dff2350a558f25813ce7f2c8c9e
ViewMTN: http://monotone.openembedded.org/revision/info/6d9979f4d29d1dff2350a558f25813ce7f2c8c9e
Files:
1
packages/gtk-webcore/osb-nrcit
packages/gtk-webcore/files/path_fixes.patch
packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore.inc
packages/gtk-webcore/osb-nrcore_svn.bb
Diffs:

#
# mt diff -r359194a930f327ef6cc4ea89ad8bec6cfbbfc5a3 -r6d9979f4d29d1dff2350a558f25813ce7f2c8c9e
#
# 
# 
# add_dir "packages/gtk-webcore/osb-nrcit"
# 
# add_file "packages/gtk-webcore/files/path_fixes.patch"
#  content [716a0950c604514677a0eae118da7da04d070344]
# 
# add_file "packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch"
#  content [0edb164c34530db60d690707bef73b3594b510aa]
# 
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
#  from [d70113c981456053b3eb81fb001830ff3a66089b]
#    to [f392ca94c652f0b2e0199720b3ca1891caa1e84d]
# 
# patch "packages/gtk-webcore/osb-nrcore.inc"
#  from [a81dab6970cf3f620379e415339da87027c19963]
#    to [a2d1b24a35197d99ed9f2238f7e7694386f7ba8e]
# 
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
#  from [ab839622392a9399df985a1c3d43b212da7e0e56]
#    to [6b4a5f5331023113b0b94f5a20f172c0144f3b20]
# 
============================================================
--- packages/gtk-webcore/files/path_fixes.patch	716a0950c604514677a0eae118da7da04d070344
+++ packages/gtk-webcore/files/path_fixes.patch	716a0950c604514677a0eae118da7da04d070344
@@ -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])
============================================================
--- packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch	0edb164c34530db60d690707bef73b3594b510aa
+++ packages/gtk-webcore/osb-nrcit/pkgconfig_fix.patch	0edb164c34530db60d690707bef73b3594b510aa
@@ -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
============================================================
--- packages/gtk-webcore/osb-nrcit_svn.bb	d70113c981456053b3eb81fb001830ff3a66089b
+++ packages/gtk-webcore/osb-nrcit_svn.bb	f392ca94c652f0b2e0199720b3ca1891caa1e84d
@@ -5,11 +5,12 @@ PV = "0.5.2+svnr${SRCREV}"
 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
============================================================
--- packages/gtk-webcore/osb-nrcore.inc	a81dab6970cf3f620379e415339da87027c19963
+++ packages/gtk-webcore/osb-nrcore.inc	a2d1b24a35197d99ed9f2238f7e7694386f7ba8e
@@ -12,6 +12,8 @@ PARALLEL_MAKE = ""
 #/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}
============================================================
--- packages/gtk-webcore/osb-nrcore_svn.bb	ab839622392a9399df985a1c3d43b212da7e0e56
+++ packages/gtk-webcore/osb-nrcore_svn.bb	6b4a5f5331023113b0b94f5a20f172c0144f3b20
@@ -1,11 +1,12 @@ PV = "0.5.2+svnr${SRCREV}"
 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"