rev 19767 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2013-12-15 07:01:33 +0000 (Sun, 15 Dec 2013)
New Revision: 19767

Added:
   kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/series
Log:
Pull upstream
+changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2013-12-15 06:53:43 UTC (rev 19766)
+++ kde-extras/digikam/trunk/debian/changelog	2013-12-15 07:01:33 UTC (rev 19767)
@@ -3,6 +3,8 @@
   * NOT RELEASED YET
   * New upstream release
   * quilt refresh sendimages-icedove.diff
+  * Pull upstream
+    +changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff
 
  -- Mark Purcell <msp at debian.org>  Wed, 11 Dec 2013 20:02:59 +1100
 

Added: kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff	2013-12-15 07:01:33 UTC (rev 19767)
@@ -0,0 +1,32 @@
+commit c53994f0dbeea49a04aeec9298753a954cff427f
+Author: Gilles Caulier <caulier.gilles at gmail.com>
+Date:   Mon Dec 2 17:42:54 2013 +0100
+
+    support older libkexiv2 API to compile fine
+
+diff --git a/libs/widgets/metadata/exifwidget.cpp b/libs/widgets/metadata/exifwidget.cpp
+index 5bd0e04..23729ca 100644
+--- a/libs/widgets/metadata/exifwidget.cpp
++++ b/libs/widgets/metadata/exifwidget.cpp
+@@ -112,7 +112,7 @@ bool ExifWidget::decodeMetadata()
+     }
+ 
+     // Update all metadata contents.
+-    setMetadataMap(data.getExifTagsDataList());
++    setMetadataMap(data.getExifTagsDataList(QStringList()));
+     return true;
+ }
+ 
+diff --git a/libs/widgets/metadata/xmpwidget.cpp b/libs/widgets/metadata/xmpwidget.cpp
+index d14a471..6e0690d 100644
+--- a/libs/widgets/metadata/xmpwidget.cpp
++++ b/libs/widgets/metadata/xmpwidget.cpp
+@@ -123,7 +123,7 @@ bool XmpWidget::decodeMetadata()
+     }
+ 
+     // Update all metadata contents.
+-    setMetadataMap(data.getXmpTagsDataList());
++    setMetadataMap(data.getXmpTagsDataList(QStringList()));
+     return true;
+ }
+ 

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2013-12-15 06:53:43 UTC (rev 19766)
+++ kde-extras/digikam/trunk/debian/patches/series	2013-12-15 07:01:33 UTC (rev 19767)
@@ -1 +1,2 @@
 sendimages-icedove.diff
+changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff