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

5 files changed, 29 insertions, 8 deletions

diff --git a/kde/digikam/.footprint b/kde/digikam/.footprint
index fc4867adf..cdbcaae89 100644
--- a/kde/digikam/.footprint
+++ b/kde/digikam/.footprint
@@ -81,6 +81,8 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kio_digikamdates.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kio_digikamsearch.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kio_digikamtags.so
+drwxr-xr-x	root/root	usr/lib/kde4/libexec/
+-rwxr-xr-x	root/root	usr/lib/kde4/libexec/digikamdatabaseserver
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/ExternalDraw.so
@@ -111,8 +113,14 @@ drwxr-xr-x	root/root	usr/share/apps/digikam/data/
 -rw-r--r--	root/root	usr/share/apps/digikam/data/assistant-scancollection.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/assistant-tooltips.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/banner-digikam.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/bluejean-texture.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/bothhorz.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/bothvert.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/bricks-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/bricks2-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/burlap-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/canvas-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/cellwood-texture.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/centerheight.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/centerwidth.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/chalk-pattern.png
@@ -125,6 +133,7 @@ drwxr-xr-x	root/root	usr/share/apps/digikam/data/
 -rw-r--r--	root/root	usr/share/apps/digikam/data/dried-pattern.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/duplicatebothhorz.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/duplicatebothvert.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/fabric-texture.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/granit-pattern.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/histogram-lin.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/histogram-log.png
@@ -141,8 +150,15 @@ drwxr-xr-x	root/root	usr/share/apps/digikam/data/
 -rw-r--r--	root/root	usr/share/apps/digikam/data/logo-gphoto.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/logo-lcms.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/marble-pattern.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/marble-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/marble2-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/metalwire-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/modern-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/moss-texture.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/original.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/paper-pattern.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/paper-texture.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/paper2-texture.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/parque-pattern.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/pine-pattern.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/pink-pattern.png
@@ -150,11 +166,15 @@ drwxr-xr-x	root/root	usr/share/apps/digikam/data/
 -rw-r--r--	root/root	usr/share/apps/digikam/data/rock-pattern.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/splash-digikam.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/stone-pattern.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/stone-texture.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/target.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/togglemouseover.png
--rw-r--r--	root/root	usr/share/apps/digikam/data/topicset.iptc-subjectcode.xml
 -rw-r--r--	root/root	usr/share/apps/digikam/data/wall-pattern.png
+-rw-r--r--	root/root	usr/share/apps/digikam/data/wall-texture.png
 -rw-r--r--	root/root	usr/share/apps/digikam/data/wood-pattern.png
+drwxr-xr-x	root/root	usr/share/apps/digikam/database/
+-rw-r--r--	root/root	usr/share/apps/digikam/database/dbconfig.xml
+-rw-r--r--	root/root	usr/share/apps/digikam/database/mysql-global.conf
 -rw-r--r--	root/root	usr/share/apps/digikam/digikam.notifyrc
 -rw-r--r--	root/root	usr/share/apps/digikam/digikamimageplugin_color_ui.rc
 -rw-r--r--	root/root	usr/share/apps/digikam/digikamimageplugin_decorate_ui.rc
diff --git a/kde/digikam/.md5sum b/kde/digikam/.md5sum
index 6e3fae3fb..000645609 100644
--- a/kde/digikam/.md5sum
+++ b/kde/digikam/.md5sum
@@ -1 +1 @@
-8f68022008cf1650924cc8688f176572  digikam-1.2.0.tar.bz2
+25d09fdab2b2450c6c6075aab3377fce  digikam-1.3.0.tar.bz2
diff --git a/kde/digikam/Pkgfile b/kde/digikam/Pkgfile
index 98a3dec37..554ac9646 100755
--- a/kde/digikam/Pkgfile
+++ b/kde/digikam/Pkgfile
@@ -2,10 +2,10 @@
 # URL: http://www.digikam.org
 # Maintainer: NuTyX packager Team
 # Packager: lesibel at free dot fr
-# Depends on: libgphoto2, lcms, kdegraphics, kdepimlibs, jasper, lensfun, libjpeg, kipi-plugins, marble
+# Depends on: libgphoto2, lcms, kdegraphics, kdepimlibs, jasper, lensfun, libjpeg, kipi-plugins, marble, mysql, doxygen
 
 name=digikam
-version=1.2.0
+version=1.3.0
 release=1
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2)
 
diff --git a/kde/gtk-kde4/.md5sum b/kde/gtk-kde4/.md5sum
index 8feb0c5ef..09c69eae4 100644
--- a/kde/gtk-kde4/.md5sum
+++ b/kde/gtk-kde4/.md5sum
@@ -1,2 +1,2 @@
-5ab407a9f3f856af3575954c42262e31  74689-gtk-kde4(src)0.9.3.tar.gz
 1e5e0f2b057e9288a88834442ea56e5a  fix-permission.patch
+ff16f21fe6c673fb1858808681c97350  gtk-kde4(src)0.9.4.tar.gz
diff --git a/kde/gtk-kde4/Pkgfile b/kde/gtk-kde4/Pkgfile
index 5ecbcc1fe..ea1a8b758 100755
--- a/kde/gtk-kde4/Pkgfile
+++ b/kde/gtk-kde4/Pkgfile
@@ -5,11 +5,12 @@
 # Depends on: kdebase-workspace, gtk-engines
 
 name=gtk-kde4
-version=0.9.3
-release=2
-source=(http://kde-apps.org/CONTENT/content-files/74689-$name\(src\)$version.tar.gz \
+version=0.9.4
+release=1
+source=(http://betta.houa.org/no-site/$name\(src\)$version.tar.gz 
         fix-permission.patch )
 build() {
+	mv $name\(src\) $name
         cd $name
 	patch -p1 -i ../fix-permission.patch
 	cmake -DCMAKE_INSTALL_PREFIX=/usr