diff --git a/digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch b/digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch new file mode 100644 index 0000000..d61cca4 --- /dev/null +++ b/digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch @@ -0,0 +1,59 @@ +From f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 14 Oct 2014 22:26:19 +0200 +Subject: [PATCH] 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) +--- + libs/imageproperties/captionedit.cpp | 2 +- + libs/imageproperties/imagedescedittab.cpp | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +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 + } +-- +1.8.4.5 + diff --git a/digikam.changes b/digikam.changes index 76f4eef..0988803 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 16 16:24:52 UTC 2014 - nico.kruber@gmail.com + +- add digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch + (fixes builds with KDE 4.14.x) + ------------------------------------------------------------------- Sun Oct 12 12:53:18 UTC 2014 - nico.kruber@gmail.com diff --git a/digikam.spec b/digikam.spec index 5c9bf00..c6b7234 100644 --- a/digikam.spec +++ b/digikam.spec @@ -33,6 +33,8 @@ Patch3: remove-gplv2-only.patch Patch5: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-4.4.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-4.4.0.no-kdcraw.version-check.patch +# PATCH-FIX-UPSTREAM digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch -- fix libkexiv2 version for AltLangStrEdit::textEdit() +Patch7: digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -238,6 +240,7 @@ This package contains the development files for libmediawiki. %patch3 %patch5 %patch6 -p1 +%patch7 -d core -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')