# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1320640462 0
# Node ID 2343812827089340193ebf46965c35f97d8e668a
# Parent  53a227ffd1c437eac81b0bb4eddaa56dbb8f15a0
Down: libwebkit to 1.6.1. 1.6.1 is stable version of libwebkit that we should be using.

diff -r 53a227ffd1c4 -r 234381282708 libwebkit-dev/receipt
--- a/libwebkit-dev/receipt	Mon Nov 07 09:49:21 2011 +0300
+++ b/libwebkit-dev/receipt	Mon Nov 07 04:34:22 2011 +0000
@@ -1,9 +1,9 @@
 # SliTaz package receipt.
 
 PACKAGE="libwebkit-dev"
-VERSION="1.7.1"
-CATEGORY="network"
-SHORT_DESC="xHTML render library."
+VERSION="1.6.1"
+CATEGORY="development"
+SHORT_DESC="devel files for libwebkit"
 DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev sqlite-dev"
 SOURCE="webkit"
 WANTED="libwebkit"
@@ -17,5 +17,8 @@
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/share/gir-1.0 $fs/usr/share
+	[ -d $_pkg/usr/share/gir-1.0 ] && cp -a $_pkg/usr/share/gir-1.0 $fs/usr/share
+	if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then
+		ln -sf /usr/lib/pkgconfig/webkit-1.0.pc $fs/usr/lib/pkgconfig/webkitgtk-1.0.pc
+	fi
 }
diff -r 53a227ffd1c4 -r 234381282708 libwebkit/receipt
--- a/libwebkit/receipt	Mon Nov 07 09:49:21 2011 +0300
+++ b/libwebkit/receipt	Mon Nov 07 04:34:22 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libwebkit"
-VERSION="1.7.1"
+VERSION="1.6.1"
 CATEGORY="network"
 SHORT_DESC="xHTML render library."
 MAINTAINER="mallory@sweetpeople.org"
@@ -25,16 +25,17 @@
 compile_rules()
 {
 	cd $src
-	#patch -Np0 -i $stuff/introspection.patch &&
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		--enable-introspection=yes \
+		--enable-introspection=no \
 		--enable-video=no \
 		--enable-jit=yes \
-		--with-unicode-backend=glib &&
-	make -j1 && make -j1 DESTDIR=$DESTDIR install &&
+		--with-unicode-backend=glib \
+		--with-gtk=2.0 \
+		$CONFIGURE_ARGS &&
+	make all stamp-po && make -j1 DESTDIR=$DESTDIR install &&
 	cp -a $src/Programs/GtkLauncher $DESTDIR/usr/bin
 }
 
@@ -43,5 +44,5 @@
 {
 	mkdir -p $fs/usr/lib $fs/usr/bin
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
-	cp -a $_pkg/usr/lib/girepository-1.0 $fs/usr/lib
+	[ -d $_pkg/usr/lib/girepository-1.0 ] && cp -a $_pkg/usr/lib/girepository-1.0 $fs/usr/lib
 }
diff -r 53a227ffd1c4 -r 234381282708 libwebkit/stuff/introspection.patch
--- a/libwebkit/stuff/introspection.patch	Mon Nov 07 09:49:21 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- WebKit/gtk/JSCore-1.0.gir	2010-09-29 14:54:07.000000000 +0200
-+++ WebKit/gtk/JSCore-1.0.gir	2010-09-29 15:57:06.000000000 +0200
-@@ -1,12 +1,14 @@
- <?xml version="1.0"?>
--<repository version="1.0"
-+<repository version="1.2"
-             xmlns="http://www.gtk.org/introspection/core/1.0"
-             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-   <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
--    <alias name="GlobalContextRef"
--           target="none"
--           c:type="JSGlobalContextRef"/>
--    <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
-+    <alias name="GlobalContextRef" target="none">
-+      <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
-+    </alias>
-+    <alias name="ObjectRef" target="none">
-+      <type name="JSObjectRef" c:type="JSObjectRef"/>
-+    </alias>
-     <function name="EvaluateScript" c:identifier="JSEvaluateScript">
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
diff -r 53a227ffd1c4 -r 234381282708 webkit-web-inspector/receipt
--- a/webkit-web-inspector/receipt	Mon Nov 07 09:49:21 2011 +0300
+++ b/webkit-web-inspector/receipt	Mon Nov 07 04:34:22 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="webkit-web-inspector"
-VERSION="1.7.1"
+VERSION="1.6.1"
 CATEGORY="network"
 SHORT_DESC="Webkit development tools"
 DEPENDS="libwebkit"
@@ -15,5 +15,5 @@
 {
 	mkdir -p $fs/usr/share
 	cp -a $_pkg/usr/bin $fs/usr/
-	cp -a $_pkg/usr/share/webkit-1.0 $fs/usr/share
+	cp -a $_pkg/usr/share/webkitgtk-1.0 $fs/usr/share
 }