Merge git://piernov.org/nutyx-extra

6 files changed, 31 insertions, 43 deletions

diff --git a/webkit/.footprint.i686 b/webkit/.footprint.i686
index 009a54c71..8ecaa9b79 100644
--- a/webkit/.footprint.i686
+++ b/webkit/.footprint.i686
@@ -157,6 +157,7 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-1.0/webkit/
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitdownload.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitenumtypes.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkiterror.h
+-rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitfavicondatabase.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitgeolocationpolicydecision.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitglobals.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkithittestresult.h
@@ -436,6 +437,7 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-3.0/webkit/
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitdownload.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitenumtypes.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkiterror.h
+-rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitfavicondatabase.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitgeolocationpolicydecision.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitglobals.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkithittestresult.h
@@ -568,21 +570,21 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-3.0.typelib
 -rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0.13.0
 -rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.la
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0.13.0
 -rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.so.0.13.0
 -rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.la
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.so.0.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-3.0.pc
diff --git a/webkit/.footprint.x86_64 b/webkit/.footprint.x86_64
index 009a54c71..8ecaa9b79 100644
--- a/webkit/.footprint.x86_64
+++ b/webkit/.footprint.x86_64
@@ -157,6 +157,7 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-1.0/webkit/
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitdownload.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitenumtypes.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkiterror.h
+-rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitfavicondatabase.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitgeolocationpolicydecision.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkitglobals.h
 -rw-r--r--	root/root	usr/include/webkitgtk-1.0/webkit/webkithittestresult.h
@@ -436,6 +437,7 @@ drwxr-xr-x	root/root	usr/include/webkitgtk-3.0/webkit/
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitdownload.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitenumtypes.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkiterror.h
+-rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitfavicondatabase.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitgeolocationpolicydecision.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkitglobals.h
 -rw-r--r--	root/root	usr/include/webkitgtk-3.0/webkit/webkithittestresult.h
@@ -568,21 +570,21 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-3.0.typelib
 -rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0.13.0
 -rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.la
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0.13.0
 -rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.so.0.13.0
 -rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.la
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.12.2
-lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.12.2
--rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.so.0.12.2
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.so.0.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-3.0.pc
diff --git a/webkit/.md5sum.i686 b/webkit/.md5sum.i686
index 05a077623..35a8b69d1 100644
--- a/webkit/.md5sum.i686
+++ b/webkit/.md5sum.i686
@@ -1,3 +1,2 @@
 f02401804eb5364378acf7bbc01c4b34  parallel-make-hack.patch
-050e0560d2a42a91c707bccdcc804b04  python.patch
-97889ccc90adbb3cff836126615b60ee  webkit-1.7.91.tar.xz
+520a421566584ea56552ee314de0b671  webkit-1.7.92.tar.xz
diff --git a/webkit/.md5sum.x86_64 b/webkit/.md5sum.x86_64
index 05a077623..35a8b69d1 100644
--- a/webkit/.md5sum.x86_64
+++ b/webkit/.md5sum.x86_64
@@ -1,3 +1,2 @@
 f02401804eb5364378acf7bbc01c4b34  parallel-make-hack.patch
-050e0560d2a42a91c707bccdcc804b04  python.patch
-97889ccc90adbb3cff836126615b60ee  webkit-1.7.91.tar.xz
+520a421566584ea56552ee314de0b671  webkit-1.7.92.tar.xz
diff --git a/webkit/Pkgfile b/webkit/Pkgfile
index c5e8e1ec0..d4a5c1362 100755
--- a/webkit/Pkgfile
+++ b/webkit/Pkgfile
@@ -6,10 +6,9 @@
 # Run on: gtk3,curl,dbus,gst-plugins-base,icu,enchant,libsoup,libxslt,xorg-libxt,geoclue
 
 name=webkit
-version=1.7.91
+version=1.7.92
 release=1
 source=(http://webkitgtk.org/$name-$version.tar.xz
-	python.patch
 	parallel-make-hack.patch)
 
 buildwebkit() {
@@ -34,7 +33,6 @@ buildwebkit() {
 
 build() {
 	cd $name-$version
-	patch -p1 < ../python.patch
 	patch -p1 < ../parallel-make-hack.patch
 	autoreconf -I Source/autotools -fi
 	mkdir build-gtk{2,3}
diff --git a/webkit/python.patch b/webkit/python.patch
deleted file mode 100644
index a04ad641c..000000000
--- a/webkit/python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur webkit-1.7.91.orig/Tools/GNUmakefile.am webkit-1.7.91/Tools/GNUmakefile.am
---- webkit-1.7.91.orig/Tools/GNUmakefile.am	2012-03-08 12:37:34.221447643 +0000
-+++ webkit-1.7.91/Tools/GNUmakefile.am	2012-03-08 12:53:28.713523074 +0000
-@@ -326,7 +326,7 @@
-	  fi; \
-	fi
- endif
--	$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-+	$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-
- uninstall-local:
-	@DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \