Hello community,

here is the log from the commit of package gthumb for openSUSE:Factory checked 
in at 2019-02-01 11:45:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gthumb (Old)
 and      /work/SRC/openSUSE:Factory/.gthumb.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gthumb"

Fri Feb  1 11:45:24 2019 rev:92 rq:669856 version:3.6.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/gthumb/gthumb.changes    2019-01-21 
10:52:46.763842794 +0100
+++ /work/SRC/openSUSE:Factory/.gthumb.new.28833/gthumb.changes 2019-02-01 
11:45:25.384553862 +0100
@@ -1,0 +2,5 @@
+Tue Jan 29 11:46:15 UTC 2019 - Dominique Leuenberger <[email protected]>
+
+- Add gthumb-exiv-0.27.patch: Fix build against exiv 0.27.
+
+-------------------------------------------------------------------

New:
----
  gthumb-exiv-0.27.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gthumb.spec ++++++
--- /var/tmp/diff_new_pack.M6iulc/_old  2019-02-01 11:45:26.936552267 +0100
+++ /var/tmp/diff_new_pack.M6iulc/_new  2019-02-01 11:45:26.940552264 +0100
@@ -28,6 +28,8 @@
 # PATCH-FIX-UPSTREAM 
0001-contact-sheet-error-if-the-theme-file-could-not-be-l.patch
 # bsc#1113749 / glgo#GNOME/gthumb#18
 Patch0:         0001-contact-sheet-error-if-the-theme-file-could-not-be-l.patch
+# PATCH-FIX-UPSTREAM gthumb-exiv-0.27.patch glgo#GNOME/gthumb#30 - Fix build 
against exiv 0.27
+Patch1:         gthumb-exiv-0.27.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex

++++++ gthumb-exiv-0.27.patch ++++++
diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp 
b/extensions/exiv2_tools/exiv2-utils.cpp
--- a/extensions/exiv2_tools/exiv2-utils.cpp    2018-06-17 08:24:44.000000000 
+0200
+++ b/extensions/exiv2_tools/exiv2-utils.cpp    2018-12-31 15:51:50.912329232 
+0100
@@ -32,7 +32,8 @@
 #include <sstream>
 #include <vector>
 #include <iomanip>
-#include <exiv2/xmp.hpp>
+#include <exiv2/exiv2.hpp>
+#include <exiv2/xmp_exiv2.hpp>
 #include <gthumb.h>
 #include "exiv2-utils.h"
 
@@ -1073,7 +1074,11 @@
 
        try {
                if (exifData.empty()) {
+#if EXIV2_TEST_VERSION(0,27,0)
+                       throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif 
data found in the file");
+#else
                        throw Exiv2::Error(1, " No Exif data found in the 
file");
+#endif
                }
                Exiv2::ExifData::const_iterator end = exifData.end();
                for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != 
end; ++i) {


Reply via email to