- more fixes for exiv2 0.27

- rel 11

diff --git a/gwenview-exiv2.patch b/gwenview-exiv2.patch
index 45bc716c1839adbd3476aaecf486f3944f5d7471..6513c1b968e8479badf8d9ca780c94d41aa33a92 100644 (file)
--- a/gwenview-exiv2.patch
+++ b/gwenview-exiv2.patch
@@ -1,14 +1,29 @@
-diff -ruNp gwenview-4.14.3.orig/CMakeLists.txt gwenview-4.14.3/CMakeLists.txt
---- gwenview-4.14.3.orig/CMakeLists.txt        2014-09-30 11:11:42.000000000 +0200
-+++ gwenview-4.14.3/CMakeLists.txt     2019-03-01 13:43:17.190543553 +0100
-@@ -32,8 +32,8 @@ macro_log_feature(JPEG_FOUND "libjpeg" "
+diff -ur gwenview-4.14.3/CMakeLists.txt gwenview-4.14.3-exiv2/CMakeLists.txt
+--- gwenview-4.14.3/CMakeLists.txt     2014-09-30 11:11:42.000000000 +0200
++++ gwenview-4.14.3-exiv2/CMakeLists.txt       2019-03-03 13:02:46.118526216 +0100
+@@ -32,8 +32,11 @@
  find_package(PNG)
  macro_log_feature(PNG_FOUND "libpng" "PNG image manipulation support" "http://www.libpng.org" TRUE)
  
 -find_package(Exiv2)
 -macro_log_feature(EXIV2_FOUND "Exiv2" "Image metadata support" "http://www.exiv2.org" TRUE "0.19")
 +find_package(exiv2)
-+macro_log_feature(EXIV2_FOUND "exiv2" "Image metadata support" "http://www.exiv2.org" TRUE "0.19")
++macro_log_feature(exiv2_FOUND "exiv2" "Image metadata support" "http://www.exiv2.org" TRUE "0.19")
++if(exiv2_FOUND)
++    set(EXIV2_LIBRARIES exiv2lib)
++endif()
  
  macro_optional_find_package(Kipi)
  macro_log_feature(KIPI_FOUND "libkipi" "Provides various image manipulation and export features" "http://www.kipi-plugins.org" FALSE)
+Only in gwenview-4.14.3-exiv2: CMakeLists.txt~
+diff -ur gwenview-4.14.3/lib/exiv2imageloader.h gwenview-4.14.3-exiv2/lib/exiv2imageloader.h
+--- gwenview-4.14.3/lib/exiv2imageloader.h     2014-09-30 11:11:42.000000000 +0200
++++ gwenview-4.14.3-exiv2/lib/exiv2imageloader.h       2019-03-03 12:59:49.629697780 +0100
+@@ -29,6 +29,7 @@
+ 
+ // Exiv2
+ #include <string.h>
++#include <exiv2/exiv2.hpp>
+ #include <exiv2/image.hpp>
+ 
+ // Local

diff --git a/kde4-gwenview.spec b/kde4-gwenview.spec
index c3cfc510faed5a7b927cebca06620d436a7cd3f6..47ba581fe5edb3e6561bd1e4550e3f486577aaf9 100644 (file)
--- a/kde4-gwenview.spec
+++ b/kde4-gwenview.spec
@@ -6,7 +6,7 @@ Summary:        K Desktop Environment - Simple image viewer
 Summary(pl.UTF-8):     K Desktop Environment - Prosta przeglądarka obrazków
 Name:          kde4-gwenview
 Version:       4.14.3
-Release:       10
+Release:       11
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -56,6 +56,7 @@ obsługiwane przez zainstalowaną wersję Qt.
 %build
 install -d build
 cd build
+export CXXFLAGS="%{rpmcxxflags} -fexceptions"
 %cmake \
        ..
 %{__make}