wok rev 11247

Down: libwebkit to 1.6.1. 1.6.1 is stable version of libwebkit that we should be using.
author Christopher Rogers <slaxemulator@gmail.com>
date Mon Nov 07 04:34:22 2011 +0000 (2011-11-07)
parents 53a227ffd1c4
children 4d55a17e5b38
files libwebkit-dev/receipt libwebkit/receipt libwebkit/stuff/introspection.patch webkit-web-inspector/receipt
line diff
     1.1 --- a/libwebkit-dev/receipt	Mon Nov 07 09:49:21 2011 +0300
     1.2 +++ b/libwebkit-dev/receipt	Mon Nov 07 04:34:22 2011 +0000
     1.3 @@ -1,9 +1,9 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="libwebkit-dev"
     1.7 -VERSION="1.7.1"
     1.8 -CATEGORY="network"
     1.9 -SHORT_DESC="xHTML render library."
    1.10 +VERSION="1.6.1"
    1.11 +CATEGORY="development"
    1.12 +SHORT_DESC="devel files for libwebkit"
    1.13  DEPENDS="libwebkit libsoup-dev enchant-dev libtasn1-dev sqlite-dev"
    1.14  SOURCE="webkit"
    1.15  WANTED="libwebkit"
    1.16 @@ -17,5 +17,8 @@
    1.17  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    1.18  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    1.19  	cp -a $_pkg/usr/include $fs/usr
    1.20 -	cp -a $_pkg/usr/share/gir-1.0 $fs/usr/share
    1.21 +	[ -d $_pkg/usr/share/gir-1.0 ] && cp -a $_pkg/usr/share/gir-1.0 $fs/usr/share
    1.22 +	if [ -f $fs/usr/lib/pkgconfig/webkit-1.0.pc ]; then
    1.23 +		ln -sf /usr/lib/pkgconfig/webkit-1.0.pc $fs/usr/lib/pkgconfig/webkitgtk-1.0.pc
    1.24 +	fi
    1.25  }
     2.1 --- a/libwebkit/receipt	Mon Nov 07 09:49:21 2011 +0300
     2.2 +++ b/libwebkit/receipt	Mon Nov 07 04:34:22 2011 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libwebkit"
     2.7 -VERSION="1.7.1"
     2.8 +VERSION="1.6.1"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="xHTML render library."
    2.11  MAINTAINER="mallory@sweetpeople.org"
    2.12 @@ -25,16 +25,17 @@
    2.13  compile_rules()
    2.14  {
    2.15  	cd $src
    2.16 -	#patch -Np0 -i $stuff/introspection.patch &&
    2.17  	./configure \
    2.18  		--prefix=/usr \
    2.19  		--infodir=/usr/share/info \
    2.20  		--mandir=/usr/share/man \
    2.21 -		--enable-introspection=yes \
    2.22 +		--enable-introspection=no \
    2.23  		--enable-video=no \
    2.24  		--enable-jit=yes \
    2.25 -		--with-unicode-backend=glib &&
    2.26 -	make -j1 && make -j1 DESTDIR=$DESTDIR install &&
    2.27 +		--with-unicode-backend=glib \
    2.28 +		--with-gtk=2.0 \
    2.29 +		$CONFIGURE_ARGS &&
    2.30 +	make all stamp-po && make -j1 DESTDIR=$DESTDIR install &&
    2.31  	cp -a $src/Programs/GtkLauncher $DESTDIR/usr/bin
    2.32  }
    2.33  
    2.34 @@ -43,5 +44,5 @@
    2.35  {
    2.36  	mkdir -p $fs/usr/lib $fs/usr/bin
    2.37  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.38 -	cp -a $_pkg/usr/lib/girepository-1.0 $fs/usr/lib
    2.39 +	[ -d $_pkg/usr/lib/girepository-1.0 ] && cp -a $_pkg/usr/lib/girepository-1.0 $fs/usr/lib
    2.40  }
     3.1 --- a/libwebkit/stuff/introspection.patch	Mon Nov 07 09:49:21 2011 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,22 +0,0 @@
     3.4 ---- WebKit/gtk/JSCore-1.0.gir	2010-09-29 14:54:07.000000000 +0200
     3.5 -+++ WebKit/gtk/JSCore-1.0.gir	2010-09-29 15:57:06.000000000 +0200
     3.6 -@@ -1,12 +1,14 @@
     3.7 - <?xml version="1.0"?>
     3.8 --<repository version="1.0"
     3.9 -+<repository version="1.2"
    3.10 -             xmlns="http://www.gtk.org/introspection/core/1.0"
    3.11 -             xmlns:c="http://www.gtk.org/introspection/c/1.0">
    3.12 -   <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
    3.13 --    <alias name="GlobalContextRef"
    3.14 --           target="none"
    3.15 --           c:type="JSGlobalContextRef"/>
    3.16 --    <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
    3.17 -+    <alias name="GlobalContextRef" target="none">
    3.18 -+      <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
    3.19 -+    </alias>
    3.20 -+    <alias name="ObjectRef" target="none">
    3.21 -+      <type name="JSObjectRef" c:type="JSObjectRef"/>
    3.22 -+    </alias>
    3.23 -     <function name="EvaluateScript" c:identifier="JSEvaluateScript">
    3.24 -       <return-value transfer-ownership="none">
    3.25 -         <type name="none" c:type="void"/>
     4.1 --- a/webkit-web-inspector/receipt	Mon Nov 07 09:49:21 2011 +0300
     4.2 +++ b/webkit-web-inspector/receipt	Mon Nov 07 04:34:22 2011 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="webkit-web-inspector"
     4.7 -VERSION="1.7.1"
     4.8 +VERSION="1.6.1"
     4.9  CATEGORY="network"
    4.10  SHORT_DESC="Webkit development tools"
    4.11  DEPENDS="libwebkit"
    4.12 @@ -15,5 +15,5 @@
    4.13  {
    4.14  	mkdir -p $fs/usr/share
    4.15  	cp -a $_pkg/usr/bin $fs/usr/
    4.16 -	cp -a $_pkg/usr/share/webkit-1.0 $fs/usr/share
    4.17 +	cp -a $_pkg/usr/share/webkitgtk-1.0 $fs/usr/share
    4.18  }