Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Lubomir Blaha (ed4a9c6f86074a98a8188ac2febad6472ea1f260)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Lubomir Blaha <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Lubomir Blaha (ed4a9c6f86074a98a8188ac2febad6472ea1f260)
  • Date: Fri, 23 Jan 2009 13:11:07 -0600

GIT changes to master grimoire by Lubomir Blaha <lblaha AT sourcemage.org>:

kde-apps/gwenview/DETAILS | 1
kde-apps/gwenview/HISTORY | 4 ++
kde-apps/gwenview/PRE_BUILD | 3 +
kde-apps/gwenview/gwenview-1.4.2-exiv2.patch | 46
+++++++++++++++++++++++++++
4 files changed, 54 insertions(+)

New commits:
commit 79514da78c09afc0a7af0fc347e745ca96f7b15d
Author: Lubomir Blaha <lblaha AT sourcemage.org>
Commit: Lubomir Blaha <lblaha AT sourcemage.org>

gwenview: Fix building with exiv2-0.18

diff --git a/kde-apps/gwenview/DETAILS b/kde-apps/gwenview/DETAILS
index ef6a085..eecd87f 100755
--- a/kde-apps/gwenview/DETAILS
+++ b/kde-apps/gwenview/DETAILS
@@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://$SPELL.sourceforge.net
ENTERED=20041019
+ PATCHLEVEL=1
LICENSE[0]=GPL
KEYWORDS="kde image"
SHORT="image viewer for KDE whose aims are ease of use and speed"
diff --git a/kde-apps/gwenview/HISTORY b/kde-apps/gwenview/HISTORY
index 35e45b6..d701830 100644
--- a/kde-apps/gwenview/HISTORY
+++ b/kde-apps/gwenview/HISTORY
@@ -1,3 +1,7 @@
+2009-01-23 Lubomir Blaha <lblaha AT sourcemage.org>
+ * PRE_BUILD, gwenview-1.4.2-exiv2.patch: fix building with exiv2-0.18
(http://bugs.gentoo.org/show_bug.cgi?id=254049)
+ * DETAILS: PATCHLEVEL++
+
2007-10-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added arts for disabling #14039

diff --git a/kde-apps/gwenview/PRE_BUILD b/kde-apps/gwenview/PRE_BUILD
new file mode 100755
index 0000000..317f533
--- /dev/null
+++ b/kde-apps/gwenview/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/gwenview-1.4.2-exiv2.patch
diff --git a/kde-apps/gwenview/gwenview-1.4.2-exiv2.patch
b/kde-apps/gwenview/gwenview-1.4.2-exiv2.patch
new file mode 100644
index 0000000..7020df0
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-1.4.2-exiv2.patch
@@ -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
+ }
+
+



  • [SM-Commit] GIT changes to master grimoire by Lubomir Blaha (ed4a9c6f86074a98a8188ac2febad6472ea1f260), Lubomir Blaha, 01/23/2009

Archive powered by MHonArc 2.6.24.

Top of Page