summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-01-10 11:44:32 +0000
committerVlastimil Babka <caster@gentoo.org>2009-01-10 11:44:32 +0000
commit4595bf65ddbb5baf240d9178493d8d0a78eebe22 (patch)
tree7d7545bbcd2a1d82ba52df5b5be499d052e6a58c /media-gfx/gwenview
parentSign manifest (diff)
downloadhistorical-4595bf65ddbb5baf240d9178493d8d0a78eebe22.tar.gz
historical-4595bf65ddbb5baf240d9178493d8d0a78eebe22.tar.bz2
historical-4595bf65ddbb5baf240d9178493d8d0a78eebe22.zip
Revbump to fix building with media-libs/exiv2-0.18, bug #254049. Thanks to Yar Odin <yarodin@gmail.com> and Lars <polynomial-C@gmx.de> for the patch.
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo-perfctr x86_64
Diffstat (limited to 'media-gfx/gwenview')
-rw-r--r--media-gfx/gwenview/ChangeLog11
-rw-r--r--media-gfx/gwenview/Manifest14
-rw-r--r--media-gfx/gwenview/files/gwenview-1.4.2-exiv2.patch47
-rw-r--r--media-gfx/gwenview/gwenview-1.4.2-r1.ebuild69
4 files changed, 128 insertions, 13 deletions
diff --git a/media-gfx/gwenview/ChangeLog b/media-gfx/gwenview/ChangeLog
index 3bd76f01847d..f7e51d46e9b4 100644
--- a/media-gfx/gwenview/ChangeLog
+++ b/media-gfx/gwenview/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-gfx/gwenview
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.61 2008/08/22 22:10:21 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/ChangeLog,v 1.62 2009/01/10 11:44:32 caster Exp $
+
+*gwenview-1.4.2-r1 (10 Jan 2009)
+
+ 10 Jan 2009; Vlastimil Babka <caster@gentoo.org>
+ +files/gwenview-1.4.2-exiv2.patch, +gwenview-1.4.2-r1.ebuild:
+ Revbump to fix building with media-libs/exiv2-0.18, bug #254049. Thanks to
+ Yar Odin <yarodin@gmail.com> and Lars <polynomial-C@gmx.de> for the patch.
22 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
diff --git a/media-gfx/gwenview/Manifest b/media-gfx/gwenview/Manifest
index ffde591fd368..ef48426dcfe6 100644
--- a/media-gfx/gwenview/Manifest
+++ b/media-gfx/gwenview/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gwenview-1.4.2-exiv2.patch 1355 RMD160 bcd01b67902489a8c6d9f2bd8b4e8bb614ce3376 SHA1 8501ffc18d306feb2bcfe2c8c6734880468a5554 SHA256 bc2a07cc1f7deea253d238ebd79312dda53d73a2794813656f8de9f53123a06c
DIST gwenview-1.4.2.tar.bz2 984977 RMD160 9c8bc84c90c2eda36f31fb6728990bc7e8063dd4 SHA1 d2168b48eb7f27b4338681acc49b5b2a51268209 SHA256 26ec1a3f3ac7cce9584b44e6090402776fb84df3fc5f9e5aadbe66e9887851fd
DIST gwenview-i18n-1.4.2.tar.bz2 2035865 RMD160 9b8bc4cc5c8d7f9c3d94201af751ac6e5d56a70a SHA1 1496f5f3448ee56ebcfbde6c06f3ec2a8c2847ae SHA256 6f673e837988faefde25ad9df2242d39bd8c7ff1bde06d8c217c8d5ced48d8c1
+EBUILD gwenview-1.4.2-r1.ebuild 1500 RMD160 2365add72f3804d08008dce872ba6b4bdab7fda5 SHA1 0b4a508dc508b59e55ac7f03c25d8dbf1f6f8b4b SHA256 52c178341c478a56658e871ca35ca8d12b06d717e0a39972f39a226de12f1942
EBUILD gwenview-1.4.2.ebuild 1435 RMD160 12ed7307c0d6bcbabd9c4cd7f070984500199a37 SHA1 cde9ffb3174acb52c790fa685662d9b374fbf0e9 SHA256 da59e5842790a8b4d51b247ce5d9d55c22fcd674bc01c9c66a7f550aba972ee6
-MISC ChangeLog 8454 RMD160 d37067f9931f7138db31cbbc1d39df67dad45831 SHA1 deab1043dd4434536cb66bda8d443e2ea3f73f5e SHA256 2dedb231f31120200722f996f4f1227abb83c0073594b568789cc5f63843a73d
+MISC ChangeLog 8758 RMD160 f7218a4a2e46989e076a845ced0864ff9f542cf0 SHA1 c31466d05d372f00206f3cb300af76bcffb325a7 SHA256 0dca93668fc1a9573a46be28750ae5b04aff30ab64c88f76d3e59ddf08642ba2
MISC metadata.xml 244 RMD160 d0dad825021e803beef87d79bb0fad320f106357 SHA1 2e2c424a4cf2fd7e286108f23aea637e44da2879 SHA256 9e924db1025e6dc7d77447f1a04baa87fee3e324394e825e3f7ace393d076139
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivOZ0ACgkQkKaRLQcq0GKx0QCdEZBCADRcaLBGISdrHFvHbEtY
-u1EAnimOypQmJs4+VzZ1UWwXidge/0KD
-=hPu3
------END PGP SIGNATURE-----
diff --git a/media-gfx/gwenview/files/gwenview-1.4.2-exiv2.patch b/media-gfx/gwenview/files/gwenview-1.4.2-exiv2.patch
new file mode 100644
index 000000000000..afd1760f7210
--- /dev/null
+++ b/media-gfx/gwenview/files/gwenview-1.4.2-exiv2.patch
@@ -0,0 +1,47 @@
+# patch from Yar Odin <yarodin@gmail.com> in bug #254049
+--- 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
+ }
+
+
diff --git a/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild b/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..f8c43ee35d0f
--- /dev/null
+++ b/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2-r1.ebuild,v 1.1 2009/01/10 11:44:32 caster Exp $
+
+inherit kde
+
+MY_P=${P/_/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="image viewer for KDE"
+HOMEPAGE="http://gwenview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kipi kdeenablefinal"
+
+DEPEND="kipi? ( >=media-plugins/kipi-plugins-0.1.0_beta2 )
+ media-gfx/exiv2"
+
+need-kde 3.5
+
+I18N="${PN}-i18n-${PV}"
+
+LANGS="ar az bg br ca cs cy da de el en_GB es et fi fo fr ga gl he hi hu
+is it ja ka ko lt nb nl nso pa pl pt pt_BR ro ru rw sk sr sr@Latn sv ta
+th tr uk xh zh_CN zh_TW zu"
+
+for X in ${LANGS}; do
+ SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/${PN}/${I18N}.tar.bz2 )"
+ IUSE="${IUSE} linguas_${X}"
+done
+
+src_unpack() {
+ kde_src_unpack
+
+ # bug #254049
+ epatch "${FILESDIR}/"${P}"-exiv2.patch"
+
+ if [ -d "${WORKDIR}/${I18N}" ]; then
+ cd "${WORKDIR}/${I18N}"
+ for X in ${LANGS}; do
+ use linguas_${X} || rm -rf "${X}"
+ done
+ rm -f configure
+ fi
+}
+
+src_compile() {
+ local myconf="$(use_enable kipi)"
+ rm -f "${S}/configure"
+
+ kde_src_compile
+
+ if [ -d "${WORKDIR}/${I18N}" ]; then
+ KDE_S="${WORKDIR}/${I18N}" \
+ kde_src_compile
+ fi
+}
+
+src_install() {
+ kde_src_install
+
+ if [ -d "${WORKDIR}/${I18N}" ]; then
+ KDE_S="${WORKDIR}/${I18N}" \
+ kde_src_install
+ fi
+}