diff options
| -rw-r--r-- | graphics/kipi-plugins/doinst.sh | 1 | ||||
| -rw-r--r-- | graphics/kipi-plugins/kipi-plugins-kde4.2.patch | 11 | ||||
| -rw-r--r-- | graphics/kipi-plugins/kipi-plugins.SlackBuild | 29 | ||||
| -rw-r--r-- | graphics/kipi-plugins/kipi-plugins.info | 8 |
4 files changed, 17 insertions, 32 deletions
diff --git a/graphics/kipi-plugins/doinst.sh b/graphics/kipi-plugins/doinst.sh index 36904a5040983..2a6a812ed5327 100644 --- a/graphics/kipi-plugins/doinst.sh +++ b/graphics/kipi-plugins/doinst.sh @@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 fi fi - diff --git a/graphics/kipi-plugins/kipi-plugins-kde4.2.patch b/graphics/kipi-plugins/kipi-plugins-kde4.2.patch deleted file mode 100644 index d18397c196adc..0000000000000 --- a/graphics/kipi-plugins/kipi-plugins-kde4.2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kipi-plugins-1.0.0/acquireimages/scandialog.cpp 2009-12-21 10:20:42.000000000 +0000 -+++ kipi-plugins-1.0.0/acquireimages/scandialog.cpp 2010-01-05 01:22:44.000000000 +0000 -@@ -146,7 +146,7 @@ - - void ScanDialog::closeEvent(QCloseEvent *e) - { -- d->saneWidget->closeDevice(); -+ d->saneWidget->scanCancel(); - saveSettings(); - e->accept(); - } diff --git a/graphics/kipi-plugins/kipi-plugins.SlackBuild b/graphics/kipi-plugins/kipi-plugins.SlackBuild index afaceafee803d..32f8a16c0e1c2 100644 --- a/graphics/kipi-plugins/kipi-plugins.SlackBuild +++ b/graphics/kipi-plugins/kipi-plugins.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Kipi Plugins -# Copyright 2007-2010 Frank Caraballo <fecaraballo{at}gmail{dot}com> +# Copyright 2007-2011 Frank Caraballo <fecaraballo{at}gmail{dot}com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,16 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kipi-plugins -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-1.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -62,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -71,27 +69,26 @@ 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 +mkdir -p build +cd build cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG -cd - +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING* HACKING INSTALL NEWS README tips TODO \ +cp -a \ + AUTHORS ChangeLog COPYING* HACKING INSTALL NEWS README tips TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/kipi-plugins/kipi-plugins.info b/graphics/kipi-plugins/kipi-plugins.info index 6aba163505761..ec1ed60c8e3b5 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.9.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.9.0.tar.bz2" +MD5SUM="a3200b0ce90251bc631fa90ff0818dc0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Frank Caraballo" EMAIL="fecaraballo{at}gmail{dot}com" -APPROVED="michiel,rworkman" +APPROVED="rworkman" |