Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

11 files changed, 13 insertions, 151 deletions

diff --git a/extra/gtk-doc/.footprint.i686 b/extra/gtk-doc/.footprint.i686
index a2d9d5c5e..3f9c0d8af 100644
--- a/extra/gtk-doc/.footprint.i686
+++ b/extra/gtk-doc/.footprint.i686
@@ -36,6 +36,8 @@ drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/fr/
 -rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/gu/
 -rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml
+drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/sl/
+-rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/sv/
 -rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/ta/
@@ -48,7 +50,9 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/data/
 -rw-r--r--	root/root	usr/share/gtk-doc/data/devhelp2.xsl
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.dcl
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.dsl
+-rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.flat.make
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.make
+-rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.notmpl-flat.make
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.notmpl.make
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.xsl
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtkdoc-common.pl
@@ -68,6 +72,7 @@ drwxr-xr-x	root/root	usr/share/omf/gtk-doc-manual/
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-es.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf
+-rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-te.omf
diff --git a/extra/gtk-doc/.footprint.x86_64 b/extra/gtk-doc/.footprint.x86_64
index a2d9d5c5e..3f9c0d8af 100644
--- a/extra/gtk-doc/.footprint.x86_64
+++ b/extra/gtk-doc/.footprint.x86_64
@@ -36,6 +36,8 @@ drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/fr/
 -rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/gu/
 -rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml
+drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/sl/
+-rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/sv/
 -rw-r--r--	root/root	usr/share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml
 drwxr-xr-x	root/root	usr/share/gnome/help/gtk-doc-manual/ta/
@@ -48,7 +50,9 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/data/
 -rw-r--r--	root/root	usr/share/gtk-doc/data/devhelp2.xsl
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.dcl
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.dsl
+-rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.flat.make
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.make
+-rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.notmpl-flat.make
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.notmpl.make
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtk-doc.xsl
 -rw-r--r--	root/root	usr/share/gtk-doc/data/gtkdoc-common.pl
@@ -68,6 +72,7 @@ drwxr-xr-x	root/root	usr/share/omf/gtk-doc-manual/
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-es.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf
+-rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf
 -rw-r--r--	root/root	usr/share/omf/gtk-doc-manual/gtk-doc-manual-te.omf
diff --git a/extra/gtk-doc/.md5sum.i686 b/extra/gtk-doc/.md5sum.i686
index 31f3a9064..e9d098cba 100644
--- a/extra/gtk-doc/.md5sum.i686
+++ b/extra/gtk-doc/.md5sum.i686
@@ -1 +1 @@
-7aa8a1262c70692ebbdf33395fddd5c4  gtk-doc-1.14.tar.bz2
+216c52563f2ffcc7f765f5a735664606  gtk-doc-1.16.tar.bz2
diff --git a/extra/gtk-doc/.md5sum.x86_64 b/extra/gtk-doc/.md5sum.x86_64
index 31f3a9064..e9d098cba 100644
--- a/extra/gtk-doc/.md5sum.x86_64
+++ b/extra/gtk-doc/.md5sum.x86_64
@@ -1 +1 @@
-7aa8a1262c70692ebbdf33395fddd5c4  gtk-doc-1.14.tar.bz2
+216c52563f2ffcc7f765f5a735664606  gtk-doc-1.16.tar.bz2
diff --git a/extra/gtk-doc/Pkgfile b/extra/gtk-doc/Pkgfile
index 4aab384f1..c9750e30b 100644
--- a/extra/gtk-doc/Pkgfile
+++ b/extra/gtk-doc/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: gnome-doc-utils
 
 name=gtk-doc
-version=1.14
+version=1.16
 release=1
 source=(http://ftp.gnome.org/pub/gnome/sources/$name/$version/$name-$version.tar.bz2)
 
diff --git a/extra/libimobiledevice/.footprint.i686 b/extra/libimobiledevice/.footprint.i686
deleted file mode 100644
index 7afbf215c..000000000
--- a/extra/libimobiledevice/.footprint.i686
+++ /dev/null
@@ -1,53 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/idevice_id
--rwxr-xr-x	root/root	usr/bin/idevicebackup
--rwxr-xr-x	root/root	usr/bin/ideviceimagemounter
--rwxr-xr-x	root/root	usr/bin/ideviceinfo
--rwxr-xr-x	root/root	usr/bin/idevicepair
--rwxr-xr-x	root/root	usr/bin/idevicescreenshot
--rwxr-xr-x	root/root	usr/bin/idevicesyslog
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/libimobiledevice/
--rw-r--r--	root/root	usr/include/libimobiledevice/afc.h
--rw-r--r--	root/root	usr/include/libimobiledevice/file_relay.h
--rw-r--r--	root/root	usr/include/libimobiledevice/installation_proxy.h
--rw-r--r--	root/root	usr/include/libimobiledevice/libimobiledevice.h
--rw-r--r--	root/root	usr/include/libimobiledevice/lockdown.h
--rw-r--r--	root/root	usr/include/libimobiledevice/mobile_image_mounter.h
--rw-r--r--	root/root	usr/include/libimobiledevice/mobilebackup.h
--rw-r--r--	root/root	usr/include/libimobiledevice/mobilesync.h
--rw-r--r--	root/root	usr/include/libimobiledevice/notification_proxy.h
--rw-r--r--	root/root	usr/include/libimobiledevice/sbservices.h
--rw-r--r--	root/root	usr/include/libimobiledevice/screenshotr.h
-drwxr-xr-x	root/root	usr/include/libimobiledevice/swig/
--rw-r--r--	root/root	usr/include/libimobiledevice/swig/imobiledevice.i
-drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libimobiledevice.a
--rwxr-xr-x	root/root	usr/lib/libimobiledevice.la
-lrwxrwxrwx	root/root	usr/lib/libimobiledevice.so -> libimobiledevice.so.1.0.4
-lrwxrwxrwx	root/root	usr/lib/libimobiledevice.so.1 -> libimobiledevice.so.1.0.4
--rwxr-xr-x	root/root	usr/lib/libimobiledevice.so.1.0.4
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libimobiledevice-1.0.pc
-drwxr-xr-x	root/root	usr/lib/python2.7/
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/imobiledevice/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/__init__.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/__init__.pyo
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/_imobiledevice.a
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/imobiledevice/_imobiledevice.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/imobiledevice/_imobiledevice.so
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/imobiledevice.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/imobiledevice.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/imobiledevice.pyo
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/idevice_id.1.gz
--rw-r--r--	root/root	usr/share/man/man1/idevicebackup.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ideviceimagemounter.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ideviceinfo.1.gz
--rw-r--r--	root/root	usr/share/man/man1/idevicescreenshot.1.gz
--rw-r--r--	root/root	usr/share/man/man1/idevicesyslog.1.gz
diff --git a/extra/libimobiledevice/.footprint.x86_64 b/extra/libimobiledevice/.footprint.x86_64
deleted file mode 100644
index 7afbf215c..000000000
--- a/extra/libimobiledevice/.footprint.x86_64
+++ /dev/null
@@ -1,53 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/idevice_id
--rwxr-xr-x	root/root	usr/bin/idevicebackup
--rwxr-xr-x	root/root	usr/bin/ideviceimagemounter
--rwxr-xr-x	root/root	usr/bin/ideviceinfo
--rwxr-xr-x	root/root	usr/bin/idevicepair
--rwxr-xr-x	root/root	usr/bin/idevicescreenshot
--rwxr-xr-x	root/root	usr/bin/idevicesyslog
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/libimobiledevice/
--rw-r--r--	root/root	usr/include/libimobiledevice/afc.h
--rw-r--r--	root/root	usr/include/libimobiledevice/file_relay.h
--rw-r--r--	root/root	usr/include/libimobiledevice/installation_proxy.h
--rw-r--r--	root/root	usr/include/libimobiledevice/libimobiledevice.h
--rw-r--r--	root/root	usr/include/libimobiledevice/lockdown.h
--rw-r--r--	root/root	usr/include/libimobiledevice/mobile_image_mounter.h
--rw-r--r--	root/root	usr/include/libimobiledevice/mobilebackup.h
--rw-r--r--	root/root	usr/include/libimobiledevice/mobilesync.h
--rw-r--r--	root/root	usr/include/libimobiledevice/notification_proxy.h
--rw-r--r--	root/root	usr/include/libimobiledevice/sbservices.h
--rw-r--r--	root/root	usr/include/libimobiledevice/screenshotr.h
-drwxr-xr-x	root/root	usr/include/libimobiledevice/swig/
--rw-r--r--	root/root	usr/include/libimobiledevice/swig/imobiledevice.i
-drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libimobiledevice.a
--rwxr-xr-x	root/root	usr/lib/libimobiledevice.la
-lrwxrwxrwx	root/root	usr/lib/libimobiledevice.so -> libimobiledevice.so.1.0.4
-lrwxrwxrwx	root/root	usr/lib/libimobiledevice.so.1 -> libimobiledevice.so.1.0.4
--rwxr-xr-x	root/root	usr/lib/libimobiledevice.so.1.0.4
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libimobiledevice-1.0.pc
-drwxr-xr-x	root/root	usr/lib/python2.7/
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/imobiledevice/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/__init__.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/__init__.pyo
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/_imobiledevice.a
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/imobiledevice/_imobiledevice.la
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/imobiledevice/_imobiledevice.so
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/imobiledevice.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/imobiledevice.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/imobiledevice/imobiledevice.pyo
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/idevice_id.1.gz
--rw-r--r--	root/root	usr/share/man/man1/idevicebackup.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ideviceimagemounter.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ideviceinfo.1.gz
--rw-r--r--	root/root	usr/share/man/man1/idevicescreenshot.1.gz
--rw-r--r--	root/root	usr/share/man/man1/idevicesyslog.1.gz
diff --git a/extra/libimobiledevice/.md5sum.i686 b/extra/libimobiledevice/.md5sum.i686
deleted file mode 100644
index a8834487e..000000000
--- a/extra/libimobiledevice/.md5sum.i686
+++ /dev/null
@@ -1,2 +0,0 @@
-eb83311657b4a3cdbbb190eb8e47a20d  libimobiledevice-1.0.4-swig-version.patch
-dbf62f2fddaa87558b6f1ebc76abb549  libimobiledevice-1.0.4.tar.bz2
diff --git a/extra/libimobiledevice/.md5sum.x86_64 b/extra/libimobiledevice/.md5sum.x86_64
deleted file mode 100644
index a8834487e..000000000
--- a/extra/libimobiledevice/.md5sum.x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-eb83311657b4a3cdbbb190eb8e47a20d  libimobiledevice-1.0.4-swig-version.patch
-dbf62f2fddaa87558b6f1ebc76abb549  libimobiledevice-1.0.4.tar.bz2
diff --git a/extra/libimobiledevice/Pkgfile b/extra/libimobiledevice/Pkgfile
deleted file mode 100644
index a9ab1bf1c..000000000
--- a/extra/libimobiledevice/Pkgfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Description: Lib support de iPhone et iPod
-# URL: http://libimobiledevice.org/
-# Maintainer: NuTyX core team
-# Packager: lesibel at free dot fr
-# Depends on: gnutls, libplist, usbmuxd, libtasn1
-# Run on: gnutls,libplist,usbmuxd,libtasn1
-
-name=libimobiledevice
-version=1.0.4
-release=2
-source=(http://libimobiledevice.org/downloads/$name-$version.tar.bz2 \
-	libimobiledevice-1.0.4-swig-version.patch)
-
-build() {
-        cd $name-$version
-
-	patch -p1 -i ../libimobiledevice-1.0.4-swig-version.patch
-
-        PYTHON=python2 ./configure --prefix=/usr 
-        make
-        make DESTDIR=$PKG install
-}
-
-  
diff --git a/extra/libimobiledevice/libimobiledevice-1.0.4-swig-version.patch b/extra/libimobiledevice/libimobiledevice-1.0.4-swig-version.patch
deleted file mode 100644
index 9372c5e22..000000000
--- a/extra/libimobiledevice/libimobiledevice-1.0.4-swig-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.4.old/configure libimobiledevice-1.0.4/configure
---- libimobiledevice-1.0.4.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.4/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false