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

6 files changed, 33 insertions, 103 deletions

diff --git a/extra/cairo/Pkgfile b/extra/cairo/Pkgfile
index 42ec1f909..b793942db 100755
--- a/extra/cairo/Pkgfile
+++ b/extra/cairo/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.cairographics.org/ 
 # Packager: thierryn1 at hispeed dot ch
 # Maintainer: Blankoworld <blankoworld at wanadoo dot fr>
-# Depends on: xorg, glitz, libpng, xorg-xcb-util
+# Depends on: fontconfig,xorg-libx11,xorg-libxrender,xorg-xcb-util,xorg-libpixman,glitz,libpng
 
 name=cairo
 version=1.8.10
diff --git a/extra/gobject-introspection/.footprint b/extra/gobject-introspection/.footprint
index c15347ec3..8fd34ce10 100644
--- a/extra/gobject-introspection/.footprint
+++ b/extra/gobject-introspection/.footprint
@@ -1,36 +1,20 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/g-ir-annotation-tool
 -rwxr-xr-x	root/root	usr/bin/g-ir-compiler
 -rwxr-xr-x	root/root	usr/bin/g-ir-generate
 -rwxr-xr-x	root/root	usr/bin/g-ir-scanner
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/gobject-introspection-1.0/
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giarginfo.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gibaseinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gicallableinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giconstantinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gienuminfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gierrordomaininfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gifieldinfo.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gifunctioninfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giinterfaceinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giobjectinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gipropertyinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giregisteredtypeinfo.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/girepository.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/girffi.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gisignalinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gistructinfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gitypeinfo.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gitypelib.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gitypes.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giunioninfo.h
--rw-r--r--	root/root	usr/include/gobject-introspection-1.0/givfuncinfo.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
--rw-r--r--	root/root	usr/lib/girepository-1.0/DBus-1.0.typelib
--rw-r--r--	root/root	usr/lib/girepository-1.0/DBusGLib-1.0.typelib
+-rw-r--r--	root/root	usr/lib/girepository-1.0/Everything-1.0.typelib
+-rw-r--r--	root/root	usr/lib/girepository-1.0/GIMarshallingTests-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/GIRepository-2.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/GL-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/GLib-2.0.typelib
@@ -53,9 +37,6 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/_giscanner.a
 -rwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/_giscanner.la
 -rwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/_giscanner.so
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationmain.py
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationmain.pyc
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationmain.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationparser.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationparser.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationparser.pyo
@@ -65,36 +46,30 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/cachestore.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/cachestore.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/cachestore.pyo
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/codegen.py
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/codegen.pyc
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/codegen.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/config.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/config.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/config.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/dumper.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/dumper.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/dumper.pyo
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/gdumpparser.py
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/gdumpparser.pyc
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/gdumpparser.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/girparser.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/girparser.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/girparser.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/girwriter.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/girwriter.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/girwriter.pyo
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/introspectablepass.py
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/introspectablepass.pyc
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/introspectablepass.pyo
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/glibast.py
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/glibast.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/glibast.pyo
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/glibtransformer.py
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/glibtransformer.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/glibtransformer.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/libtoolimporter.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/libtoolimporter.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/libtoolimporter.pyo
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/maintransformer.py
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/maintransformer.pyc
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/maintransformer.pyo
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/message.py
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/message.pyc
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/message.pyo
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/minixpath.py
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/minixpath.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/minixpath.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/odict.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/odict.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/odict.pyo
@@ -107,9 +82,6 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/sourcescanner.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/sourcescanner.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/sourcescanner.pyo
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/testcodegen.py
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/testcodegen.pyc
--rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/testcodegen.pyo
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/transformer.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/transformer.pyc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/transformer.pyo
@@ -121,9 +93,19 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/xmlwriter.pyo
 -rw-r--r--	root/root	usr/lib/libgirepository-1.0.a
 -rwxr-xr-x	root/root	usr/lib/libgirepository-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libgirepository-1.0.so -> libgirepository-1.0.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libgirepository-1.0.so.1 -> libgirepository-1.0.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libgirepository-1.0.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libgirepository-1.0.so -> libgirepository-1.0.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libgirepository-1.0.so.0 -> libgirepository-1.0.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libgirepository-1.0.so.0.0.0
+-rw-r--r--	root/root	usr/lib/libgirepository-everything-1.0.a
+-rwxr-xr-x	root/root	usr/lib/libgirepository-everything-1.0.la
+lrwxrwxrwx	root/root	usr/lib/libgirepository-everything-1.0.so -> libgirepository-everything-1.0.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libgirepository-everything-1.0.so.1 -> libgirepository-everything-1.0.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libgirepository-everything-1.0.so.1.0.0
+-rw-r--r--	root/root	usr/lib/libgirepository-gimarshallingtests-1.0.a
+-rwxr-xr-x	root/root	usr/lib/libgirepository-gimarshallingtests-1.0.la
+lrwxrwxrwx	root/root	usr/lib/libgirepository-gimarshallingtests-1.0.so -> libgirepository-gimarshallingtests-1.0.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libgirepository-gimarshallingtests-1.0.so.1 -> libgirepository-gimarshallingtests-1.0.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libgirepository-gimarshallingtests-1.0.so.1.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gobject-introspection-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gobject-introspection-no-export-1.0.pc
@@ -131,8 +113,8 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/introspection.m4
 drwxr-xr-x	root/root	usr/share/gir-1.0/
--rw-r--r--	root/root	usr/share/gir-1.0/DBus-1.0.gir
--rw-r--r--	root/root	usr/share/gir-1.0/DBusGLib-1.0.gir
+-rw-r--r--	root/root	usr/share/gir-1.0/Everything-1.0.gir
+-rw-r--r--	root/root	usr/share/gir-1.0/GIMarshallingTests-1.0.gir
 -rw-r--r--	root/root	usr/share/gir-1.0/GIRepository-2.0.gir
 -rw-r--r--	root/root	usr/share/gir-1.0/GL-1.0.gir
 -rw-r--r--	root/root	usr/share/gir-1.0/GLib-2.0.gir
@@ -149,58 +131,6 @@ drwxr-xr-x	root/root	usr/share/gir-1.0/
 -rw-r--r--	root/root	usr/share/gir-1.0/xrandr-1.3.gir
 drwxr-xr-x	root/root	usr/share/gobject-introspection-1.0/
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/Makefile.introspection
--rw-r--r--	root/root	usr/share/gobject-introspection-1.0/gdump.c
-drwxr-xr-x	root/root	usr/share/gobject-introspection-1.0/tests/
--rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/everything.c
--rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/everything.h
--rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/gimarshallingtests.c
--rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/gimarshallingtests.h
--rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/regress.c
--rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/regress.h
-drwxr-xr-x	root/root	usr/share/gtk-doc/
-drwxr-xr-x	root/root	usr/share/gtk-doc/html/
-drwxr-xr-x	root/root	usr/share/gtk-doc/html/gi/
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/annotation-glossary.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIArgInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIBaseInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GICallableInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIConstantInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIEnumInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIErrorDomainInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIFieldInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIFunctionInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIInterfaceInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIObjectInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIPropertyInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIRegisteredTypeInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GISignalInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIStructInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GITypeInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIUnionInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-GIVFuncInfo.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-ffi.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-gir-reference.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-gir.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-girepository.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-girffi.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-gtypelib.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-libgirepository.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-overview.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-repository-structs.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-struct-hierarchy.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi-typelib.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi.devhelp
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/gi.devhelp2
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/girepository.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/glib.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/home.png
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/index.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/index.sgml
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/left.png
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/overview.png
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/right.png
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/style.css
--rw-r--r--	root/root	usr/share/gtk-doc/html/gi/up.png
 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/g-ir-compiler.1.gz
diff --git a/extra/gobject-introspection/.md5sum b/extra/gobject-introspection/.md5sum
index 3f533a1d5..f12f38750 100644
--- a/extra/gobject-introspection/.md5sum
+++ b/extra/gobject-introspection/.md5sum
@@ -1 +1 @@
-260ba5e77b5c0de0e7d8faf63ecbfee7  gobject-introspection-0.9.12.tar.bz2
+7ea9be9a347b5c408fd3c3907803de9b  gobject-introspection-0.6.14.tar.bz2
diff --git a/extra/gobject-introspection/Pkgfile b/extra/gobject-introspection/Pkgfile
index 19c85677c..a19183111 100644
--- a/extra/gobject-introspection/Pkgfile
+++ b/extra/gobject-introspection/Pkgfile
@@ -5,8 +5,7 @@
 # Depends on: glib, libffi, python, cairo
 
 name=gobject-introspection
-version=0.9.12
-#0.6.14
+version=0.6.14
 release=1
 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
 
@@ -15,5 +14,6 @@ build() {
 		./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
+	rm -rf $PKG/usr/share/gtk-doc
 }
   
diff --git a/extra/nvidia-settings/.md5sum b/extra/nvidia-settings/.md5sum
index 90374b203..619d7fd3f 100644
--- a/extra/nvidia-settings/.md5sum
+++ b/extra/nvidia-settings/.md5sum
@@ -1 +1 @@
-cb61b75a305e78291db313dae39c625b  NVIDIA-Linux-x86-256.44.run
+8bcefb2423908160d3676200650ad5c9  NVIDIA-Linux-x86-260.19.12.run
diff --git a/extra/nvidia-settings/Pkgfile b/extra/nvidia-settings/Pkgfile
index dfec2f91f..bf8a23122 100755
--- a/extra/nvidia-settings/Pkgfile
+++ b/extra/nvidia-settings/Pkgfile
@@ -2,10 +2,10 @@
 # URL: http://www.nvidia.com/object/unix.html
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg-server, nvidia
+# Depends on: nvidia
 
 name=nvidia-settings
-version=256.44
+version=260.19.12
 release=1
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64