[arch-commits] Commit in digikam/trunk (PKGBUILD digikam_libkexiv2.patch)

Ronald van Haren ronald at archlinux.org
Mon Nov 3 12:36:10 UTC 2014


    Date: Monday, November 3, 2014 @ 13:36:10
  Author: ronald
Revision: 225564

upgpkg: digikam 4.4.0-1

update to 4.4.0; add upstream build fix

Added:
  digikam/trunk/digikam_libkexiv2.patch
Modified:
  digikam/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 ++++++---
 digikam_libkexiv2.patch |   53 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-03 09:24:13 UTC (rev 225563)
+++ PKGBUILD	2014-11-03 12:36:10 UTC (rev 225564)
@@ -5,8 +5,8 @@
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=4.2.0
-pkgrel=3
+pkgver=4.4.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,11 +14,14 @@
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4a54136629bed3b30cf4e9355e8d5b498b0d4e54')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "digikam_libkexiv2.patch")
+sha1sums=('1feb43120addda314e09761440ec2058e430171c'
+          '39a09a8e7de1612eb47f3ef0966c6fa02b7e3284')
 
 prepare() {
   mkdir build
+  cd ${pkgname}-${pkgver}/core
+  patch -Np1 -i "${srcdir}/digikam_libkexiv2.patch"
 }
 
 build() {

Added: digikam_libkexiv2.patch
===================================================================
--- digikam_libkexiv2.patch	                        (rev 0)
+++ digikam_libkexiv2.patch	2014-11-03 12:36:10 UTC (rev 225564)
@@ -0,0 +1,53 @@
+commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
+Author: Pino Toscano <pino at kde.org>
+Date:   Tue Oct 14 22:26:19 2014 +0200
+
+    fix libkexiv2 version for AltLangStrEdit::textEdit()
+    
+    it is part of current libkexiv2/master only (i.e. post 4.14.x, which
+    is 2.3.x)
+
+diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp
+index 88413fc..70bdb6d 100644
+--- a/libs/imageproperties/captionedit.cpp
++++ b/libs/imageproperties/captionedit.cpp
+@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text)
+ 
+ MsgTextEdit* CaptionEdit::textEdit() const
+ {
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     return d->altLangStrEdit->textEdit();
+ #else
+     return 0;
+diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp
+index ebfbae1..3d12777 100644
+--- a/libs/imageproperties/imagedescedittab.cpp
++++ b/libs/imageproperties/imagedescedittab.cpp
+@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent)
+ 
+     // Initialize ---------------------------------------------
+ 
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->titleEdit->textEdit()->installEventFilter(this);
+     d->captionsEdit->textEdit()->installEventFilter(this);
+ #endif
+@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit()
+ void ImageDescEditTab::setFocusToTitlesEdit()
+ {
+     d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->titleEdit->textEdit()->setFocus();
+ #endif
+ }
+@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit()
+ void ImageDescEditTab::setFocusToCommentsEdit()
+ {
+     d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->captionsEdit->textEdit()->setFocus();
+ #endif
+ }


More information about the arch-commits mailing list