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

4 files changed, 34 insertions, 35 deletions

diff --git a/extra/gimp/.footprint b/extra/gimp/.footprint
index da8dbe70d..9599a1e05 100644
--- a/extra/gimp/.footprint
+++ b/extra/gimp/.footprint
@@ -471,41 +471,41 @@ drwxr-xr-x	root/root	usr/lib/gimp/2.0/python/
 -rw-r--r--	root/root	usr/lib/gimp/2.0/python/gimpui.pyo
 -rw-r--r--	root/root	usr/lib/gimp/2.0/python/pygimp-logo.png
 -rwxr-xr-x	root/root	usr/lib/libgimp-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimp-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimp-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpbase-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpbase-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpbase-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpcolor-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpcolor-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpcolor-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpconfig-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpconfig-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpconfig-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpmath-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpmath-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpmath-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpmodule-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpmodule-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpmodule-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpthumb-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpthumb-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpthumb-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpui-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpui-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpui-2.0.so.0.600.10
 -rwxr-xr-x	root/root	usr/lib/libgimpwidgets-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.600.8
-lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.600.8
--rwxr-xr-x	root/root	usr/lib/libgimpwidgets-2.0.so.0.600.8
+lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.600.10
+lrwxrwxrwx	root/root	usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.600.10
+-rwxr-xr-x	root/root	usr/lib/libgimpwidgets-2.0.so.0.600.10
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gimp-2.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gimpthumb-2.0.pc
@@ -1304,12 +1304,12 @@ drwxr-xr-x	root/root	usr/share/gtk-doc/html/libgimpmath/
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmath/style.css
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmath/up.png
 drwxr-xr-x	root/root	usr/share/gtk-doc/html/libgimpmodule/
--rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/GimpModule.html
--rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/GimpModuleDB.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/home.png
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/index.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/index.sgml
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/left.png
+-rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmodule.html
+-rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmoduledb.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/libgimpmodule-index-deprecated.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-2.html
 -rw-r--r--	root/root	usr/share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-4.html
diff --git a/extra/gimp/.md5sum b/extra/gimp/.md5sum
index 55f1429cb..80b19f8a9 100644
--- a/extra/gimp/.md5sum
+++ b/extra/gimp/.md5sum
@@ -1,4 +1,4 @@
-a4d9462c9420954824a80c9b1963f9d9  gimp-2.6.8.tar.bz2
+b92710ad9f1b52fec98554d765473819  gimp-2.6.10.tar.bz2
 d7927c7f1057d2deabf0456e94d2e8c3  gimp-splash-2009-2.png
 ca3f9d966013b38b9a219a4b8044ba49  gimp.desktop
 211eccab51593526e852816e647f7da4  libpng-1.4.patch
diff --git a/extra/gimp/Pkgfile b/extra/gimp/Pkgfile
index 233bc3313..1d366797b 100644
--- a/extra/gimp/Pkgfile
+++ b/extra/gimp/Pkgfile
@@ -2,18 +2,17 @@
 # URL: http://www.gimp.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gtk, libart_lgpl, pygtk, curl, libgtkhtml, libexif, openexr, gegl, poppler, libmng
+# Depends on: gtk, pygtk, curl, libgtkhtml, libexif, xorg-libxmu, xorg-libxpm, openexr, gegl, poppler-glib, libmng
 
 name=gimp
-version=2.6.8
-release=3
+version=2.6.10
+release=1
 source=(ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2 \
 	gimp-splash-2009-2.png gimp.desktop libpng-1.4.patch)
 
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../libpng-1.4.patch
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile
index a36e08e3f..c57612330 100755
--- a/kde/kde/Pkgfile
+++ b/kde/kde/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.kde.org/
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdenetwork, kdemultimedia, kdeutils, kde-l10n-fr, kdebase, kdebase-runtime, kdebase-workspace, kdeplasma-addons, kdegames, kdeartwork, phonon, desktop-file-utils, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre, ede1, wicd
+# Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdenetwork, kdemultimedia, kdeutils, kde-l10n-fr, kdebase, kdebase-runtime, kdebase-workspace, kdeplasma-addons, kdegames, phonon, desktop-file-utils, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre, ede1, wicd
 
 name=kde
 version=4.4.92