graphics/gwenview: Updated for version 1.4.2

This commit is contained in:
Michael Wagner 2010-05-12 17:39:57 +02:00 committed by Robby Workman
parent 6b34a1678c
commit e1b5f977e0
5 changed files with 76 additions and 15 deletions

View file

@ -1,4 +1,14 @@
if [ -x usr/bin/update-desktop-database ]; then
usr/bin/update-desktop-database -q usr/share/applications/kde > /dev/null 2>&1
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
if [ -x /usr/bin/update-mime-database ]; then
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
fi
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; then
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
fi
fi

View file

@ -0,0 +1,46 @@
--- src/imageutils/jpegcontent.cpp.orig 2009-01-09 22:54:12.000000000 +0500
+++ src/imageutils/jpegcontent.cpp 2009-01-09 22:56:48.000000000 +0500
@@ -47,6 +47,17 @@
#include "imageutils/jpegcontent.h"
#include "imageutils/jpegerrormanager.h"
+// Make sure an EXIV2_TEST_VERSION macro exists:
+
+#ifdef EXIV2_VERSION
+# ifndef EXIV2_TEST_VERSION
+# define EXIV2_TEST_VERSION(major,minor,patch) \
+ ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
+# endif
+#else
+# define EXIV2_TEST_VERSION(major,minor,patch) (false)
+#endif
+
namespace ImageUtils {
const int INMEM_DST_DELTA=4096;
@@ -589,7 +600,12 @@
QImage JPEGContent::thumbnail() const {
QImage image;
if (!d->mExifData.empty()) {
+#if (EXIV2_TEST_VERSION(0,17,91))
+ Exiv2::ExifThumbC thumb(d->mExifData);
+ Exiv2::DataBuf const thumbnail = thumb.copy();
+#else
Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
+#endif
image.loadFromData(thumbnail.pData_, thumbnail.size_);
}
return image;
@@ -611,7 +627,12 @@
return;
}
+#if (EXIV2_TEST_VERSION(0,17,91))
+ Exiv2::ExifThumb thumb(d->mExifData);
+ thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
+#else
d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
+#endif
}

View file

@ -1,7 +1,7 @@
#!/bin/sh
#
# Slackware build script for gwenview
# (C) 2007 Michael Wagner <lapinours@web.de>
# (C) 2009 Michael Wagner <slackware.wagnerm@arcor.de>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -24,14 +24,15 @@
PRGNAM=gwenview
VERSION=1.4.2
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
DOCS="AUTHORS COPYING* INSTALL NEWS README"
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@ -39,24 +40,28 @@ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
fi
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP || exit 1
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
cd $PRGNAM-$VERSION || exit 1
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
# Patch gwenview to compile with libexiv2.so.{4,5}
patch -p0 < $CWD/exiv2-soname5.diff
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--mandir=/usr/man \
|| exit 1
--mandir=/usr/man
make || exit 1
make install-strip DESTDIR=$PKG || exit 1
make
make install-strip DESTDIR=$PKG
gzip -9 $PKG/usr/man/man1/* 2> /dev/null

View file

@ -4,5 +4,5 @@ HOMEPAGE="http://gwenview.sourceforge.net"
DOWNLOAD="http://downloads.sourceforge.net/gwenview/gwenview-1.4.2.tar.bz2"
MD5SUM="33c3fc68224d57f5f5cc4d34b48293c6"
MAINTAINER="Michael Wagner"
EMAIL="lapinours@web.de"
EMAIL="slackware.wagnerm@arcor.de"
APPROVED="rworkman"

View file

@ -5,7 +5,7 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler---------------------------------------------------|
|-----handy-ruler------------------------------------------------------|
gwenview: Gwenview Image Viewer (image viewer for KDE)
gwenview:
gwenview: Gwenview is a fast and easy to use image viewer for KDE.
@ -14,6 +14,6 @@ gwenview: to provide easy navigation among your images. Gwenview can either
gwenview: be used as standalone application or embedded in Konqueror via
gwenview: KParts.
gwenview: Internationalization files are available in an extra package.
gwenview:
gwenview:
gwenview: Homepage: http://gwenview.sourceforge.net
gwenview: