[digikam] digikam-4.0.0-beta1

Alexey Kurov nucleo at fedoraproject.org
Mon Dec 9 00:42:21 UTC 2013


commit ef2ff5361379ce2ad9d6fc4eb11d71bf926d85fc
Author: nucleo <nucleo at fedoraproject.org>
Date:   Mon Dec 9 02:42:16 2013 +0200

    digikam-4.0.0-beta1

 .gitignore                                |    1 +
 digikam-3.5.0-no_libPropertyBrowser.patch |   10 --------
 digikam-4.0.0-beta1-older-libkexiv2.patch |   33 +++++++++++++++++++++++++++++
 digikam.spec                              |   19 +++++++++++-----
 sources                                   |    2 +-
 5 files changed, 48 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 54bbcd0..e3c1cf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /digikam-3.3.0.tar.bz2
 /digikam-3.4.0.tar.bz2
 /digikam-3.5.0.tar.bz2
+/digikam-4.0.0-beta1.tar.bz2
diff --git a/digikam-4.0.0-beta1-older-libkexiv2.patch b/digikam-4.0.0-beta1-older-libkexiv2.patch
new file mode 100644
index 0000000..d4b1e2b
--- /dev/null
+++ b/digikam-4.0.0-beta1-older-libkexiv2.patch
@@ -0,0 +1,33 @@
+From: Gilles Caulier <caulier.gilles at gmail.com>
+Date: Mon, 02 Dec 2013 16:42:54 +0000
+Subject: support older libkexiv2 API to compile fine
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=c53994f0dbeea49a04aeec9298753a954cff427f
+---
+support older libkexiv2 API to compile fine
+---
+
+
+--- a/libs/widgets/metadata/exifwidget.cpp
++++ b/libs/widgets/metadata/exifwidget.cpp
+@@ -112,7 +112,7 @@
+     }
+ 
+     // Update all metadata contents.
+-    setMetadataMap(data.getExifTagsDataList());
++    setMetadataMap(data.getExifTagsDataList(QStringList()));
+     return true;
+ }
+ 
+
+--- a/libs/widgets/metadata/xmpwidget.cpp
++++ b/libs/widgets/metadata/xmpwidget.cpp
+@@ -123,7 +123,7 @@
+     }
+ 
+     // Update all metadata contents.
+-    setMetadataMap(data.getXmpTagsDataList());
++    setMetadataMap(data.getXmpTagsDataList(QStringList()));
+     return true;
+ }
+ 
+
diff --git a/digikam.spec b/digikam.spec
index 7b9496a..19583e5 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,11 +1,12 @@
+%define pre beta1
 
 %if 0%{?fedora} || 0%{?rhel} > 6
 %define videoslideshow 1
 %endif
 
 Name:    digikam
-Version: 3.5.0
-Release: 4%{?dist}
+Version: 4.0.0
+Release: 0.1.%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -20,11 +21,9 @@ Source1: digikam-import.desktop
 ## upstreamable patches
 # fix build against opencv-2.0
 Patch51:  digikam-3.1.0-opencv20.patch
-# do not install convenience/static libPropertyBrowser
-# https://bugs.kde.org/show_bug.cgi?id=319664
-Patch52:  digikam-3.5.0-no_libPropertyBrowser.patch
 
 ## upstream patches
+Patch100: digikam-4.0.0-beta1-older-libkexiv2.patch
 
 BuildRequires: eigen3-devel
 BuildRequires: desktop-file-utils
@@ -229,7 +228,10 @@ BuildArch: noarch
 %if 0%{?rhel} == 6
 %patch51 -p1 -b .opencv20
 %endif
-%patch52 -p1 -b .no_libPropertyBrowser
+
+pushd core
+%patch100 -p1 -b .older-libkexiv2
+popd
 
 # don't use bundled/old FindKipi.cmake in favor of kdelibs' version
 # see http:/bugs.kde.org/307213
@@ -453,10 +455,12 @@ update-desktop-database -q &> /dev/null
 %{_kde4_libdir}/kde4/kipiplugin_calendar.so
 %{_kde4_libdir}/kde4/kipiplugin_debianscreenshots.so
 %{_kde4_libdir}/kde4/kipiplugin_dngconverter.so
+%{_kde4_libdir}/kde4/kipiplugin_dropbox.so
 %{_kde4_libdir}/kde4/kipiplugin_facebook.so
 %{_kde4_libdir}/kde4/kipiplugin_flickrexport.so
 %{_kde4_libdir}/kde4/kipiplugin_flashexport.so
 %{_kde4_libdir}/kde4/kipiplugin_galleryexport.so
+%{_kde4_libdir}/kde4/kipiplugin_googledrive.so
 %{_kde4_libdir}/kde4/kipiplugin_gpssync.so
 %{_kde4_libdir}/kde4/kipiplugin_htmlexport.so
 %{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
@@ -530,6 +534,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Mon Dec  9 2013 Alexey Kurov <nucleo at fedoraproject.org> - 4.0.0-0.1.beta1
+- digikam-4.0.0-beta1
+
 * Tue Dec 03 2013 Rex Dieter <rdieter at fedoraproject.org> - 3.5.0-4
 - rebuild (exiv2)
 
diff --git a/sources b/sources
index dd3df4d..1c1be2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-16d570269883652487516a77c9d7d6f8  digikam-3.5.0.tar.bz2
+ad62c4de15d9dff21367d5f8ea958389  digikam-4.0.0-beta1.tar.bz2


More information about the scm-commits mailing list