20110312.2 global branch merge.current-20110312.2

11 files changed, 29 insertions, 26 deletions

diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild
index 4379542111..bc1d1f0166 100644
--- a/graphics/digikam/digikam.SlackBuild
+++ b/graphics/digikam/digikam.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by Niklas 'Nille' Åkerström for slackware64 and to use cmake.
 
 PRGNAM=digikam
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/graphics/digikam/digikam.info b/graphics/digikam/digikam.info
index 8e736c84c1..caaceaf6a5 100644
--- a/graphics/digikam/digikam.info
+++ b/graphics/digikam/digikam.info
@@ -1,10 +1,10 @@
 PRGNAM="digikam"
-VERSION="1.2.0"
+VERSION="1.7.0"
 HOMEPAGE="http://www.digikam.org/"
-DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-1.2.0.tar.bz2"
-MD5SUM="8f68022008cf1650924cc8688f176572"
+DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-1.7.0.tar.bz2"
+MD5SUM="ecc6ec563cc5309f21da9c4946397875"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="Nille dot kungen[AT]gmail dot com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index ccb3d7a28f..8c888d982c 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -24,11 +24,11 @@
 
 PRGNAM=fontforge
 VERSION=20100501
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 ENABLE_BCINT=${ENABLE_BCINT:-no}
-FREETYPE=${FREETYPE:-"2.3.12"}
+FREETYPE=${FREETYPE:-"2.4.4"}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -66,7 +66,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION freetype-$FREETYPE
 tar xvf $CWD/${PRGNAM}_full-${VERSION}.tar.bz2
-tar xvf $CWD/freetype-$FREETYPE.tar.xz
+tar xvf $CWD/freetype-$FREETYPE.tar.bz2
 chown -R root:root $PRGNAM-$VERSION freetype-$FREETYPE
 chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION freetype-$FREETYPE
 cd $PRGNAM-$VERSION
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index 0608749dc1..062713d139 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -3,12 +3,12 @@ VERSION="20100501"
 HOMEPAGE="http://fontforge.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/fontforge/fontforge_full-20100501.tar.bz2 \
   http://fontforge.sf.net/cidmaps.tgz \
-  http://slackware.osuosl.org/slackware-13.1/source/l/freetype/freetype-2.3.12.tar.xz"
+  http://slackware.osuosl.org/slackware-current/source/l/freetype/freetype-2.4.4.tar.bz2"
 MD5SUM="5f3d20d645ec1aa2b7b4876386df8717 \
   063691163e592515b31514515bb3ce8c \
-  e8f60e286eaa492bb766f17241972626"
+  b3e2b6e2f1c3e0dffa1fd2a0f848b671"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index b641847b3b..10f0524850 100644
--- a/graphics/inkscape/inkscape.SlackBuild
+++ b/graphics/inkscape/inkscape.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=inkscape
-VERSION=0.48.0
-BUILD=${BUILD:-2}
+VERSION=0.48.1
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info
index 2fb6f3ed26..5b0841c382 100644
--- a/graphics/inkscape/inkscape.info
+++ b/graphics/inkscape/inkscape.info
@@ -1,10 +1,10 @@
 PRGNAM="inkscape"
-VERSION="0.48.0"
+VERSION="0.48.1"
 HOMEPAGE="http://www.inkscape.org/"
-DOWNLOAD="http://downloads.sourceforge.net/inkscape/inkscape-0.48.0.tar.gz"
-MD5SUM="bb94543b813157d83281657a89465d46"
+DOWNLOAD="http://downloads.sourceforge.net/inkscape/inkscape-0.48.1.tar.gz"
+MD5SUM="3c179eb998d49d1c312822e15773bf6d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/graphics/kipi-plugins/kipi-plugins.SlackBuild b/graphics/kipi-plugins/kipi-plugins.SlackBuild
index afaceafee8..f5c7a7d6f5 100644
--- a/graphics/kipi-plugins/kipi-plugins.SlackBuild
+++ b/graphics/kipi-plugins/kipi-plugins.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kipi-plugins
-VERSION=${VERSION:-1.0.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,10 +71,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch kipi-plugins so it compiles on KDE 4.2.x
-# http://www.digikam.org/drupal/node/492
-patch -p1 < $CWD/$PRGNAM-kde4.2.patch
-
 mkdir build && cd build
   cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
diff --git a/graphics/kipi-plugins/kipi-plugins.info b/graphics/kipi-plugins/kipi-plugins.info
index 6aba163505..db7ef388cc 100644
--- a/graphics/kipi-plugins/kipi-plugins.info
+++ b/graphics/kipi-plugins/kipi-plugins.info
@@ -1,10 +1,10 @@
 PRGNAM="kipi-plugins"
-VERSION="1.0.0"
+VERSION="1.7.0"
 HOMEPAGE="http://www.kipi-plugins.org/"
-DOWNLOAD="http://downloads.sourceforge.net/kipi/kipi-plugins-1.0.0.tar.bz2"
-MD5SUM="4ed822101f0023773361fbe035822934"
+DOWNLOAD="http://downloads.sourceforge.net/kipi/kipi-plugins-1.7.0.tar.bz2"
+MD5SUM="d1cc95109d826d651b1ca81e1ebbd6df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="michiel,rworkman"
+APPROVED=""
diff --git a/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.gz b/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.gz
new file mode 100644
index 0000000000..0e8b28c700
--- /dev/null
+++ b/graphics/kphotoalbum/kphotoalbum-4.1.1-docbook_fix.gz
diff --git a/graphics/kphotoalbum/kphotoalbum-r1213128-exiv2-0.21.gz b/graphics/kphotoalbum/kphotoalbum-r1213128-exiv2-0.21.gz
new file mode 100644
index 0000000000..37590f2302
--- /dev/null
+++ b/graphics/kphotoalbum/kphotoalbum-r1213128-exiv2-0.21.gz
diff --git a/graphics/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild
index abba1c7124..2aec5808e2 100644
--- a/graphics/kphotoalbum/kphotoalbum.SlackBuild
+++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild
@@ -56,6 +56,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# add patch for build against kde 4.5 - safe also for 13.1
+# see http://bugs.gentoo.org/show_bug.cgi?id=335023
+zcat $CWD/kphotoalbum-4.1.1-docbook_fix.gz | patch -p1
+
+# add a fix for exiv-0.21
+zcat $CWD/kphotoalbum-r1213128-exiv2-0.21.gz | patch -p4
+
 mkdir build && cd build
   cmake \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \