From 680981de92873c32e1139a8581a8938c8e13dd0a79b119074bc1c75f98c934c1 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 29 Jan 2019 20:39:55 +0000 Subject: [PATCH] Accepting request 669774 from home:dimstar:Factory - Add hugin-exiv2-0.27.patch: Fix build against exiv 0.27 (boo#1123401). OBS-URL: https://build.opensuse.org/request/show/669774 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=87 --- hugin-exiv2-0.27.patch | 20 ++++++++++++++++++++ hugin.changes | 6 ++++++ hugin.spec | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 hugin-exiv2-0.27.patch diff --git a/hugin-exiv2-0.27.patch b/hugin-exiv2-0.27.patch new file mode 100644 index 0000000..0f158ed --- /dev/null +++ b/hugin-exiv2-0.27.patch @@ -0,0 +1,20 @@ +Index: hugin-2018.0.0/src/hugin_base/panodata/Exiv2Helper.cpp +=================================================================== +--- hugin-2018.0.0.orig/src/hugin_base/panodata/Exiv2Helper.cpp ++++ hugin-2018.0.0/src/hugin_base/panodata/Exiv2Helper.cpp +@@ -28,7 +28,7 @@ + #include "Exiv2Helper.h" + #include "hugin_math/hugin_math.h" + #include "hugin_utils/utils.h" +-#include "exiv2/easyaccess.hpp" ++#include "exiv2/exiv2.hpp" + + namespace HuginBase + { +@@ -600,4 +600,4 @@ namespace HuginBase + }; + + }; //namespace Exiv2Helper +-}; //namespace HuginBase +\ No newline at end of file ++}; //namespace HuginBase diff --git a/hugin.changes b/hugin.changes index f28b5ed..a19b6dd 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 29 09:23:42 UTC 2019 - Dominique Leuenberger + +- Add hugin-exiv2-0.27.patch: Fix build against exiv 0.27 + (boo#1123401). + ------------------------------------------------------------------- Tue Feb 6 08:16:56 UTC 2018 - adrian@suse.de diff --git a/hugin.spec b/hugin.spec index fcca1ed..3ac6d07 100644 --- a/hugin.spec +++ b/hugin.spec @@ -65,6 +65,7 @@ Source1: %{name}-svn-dummy # This script is a combined appdata.prov and desktop-file.prov to enable hugin to provide appdata.xml and desktop files see boo#952324 Source2: find-hugin-provides.prov Patch0: hugin.appdata.patch +Patch1: hugin-exiv2-0.27.patch Requires: enblend-enfuse >= 3.2 # needed for photo stiching (bnc#822775) Requires: make @@ -87,6 +88,7 @@ detection and extraction of key points. %prep %setup -q %patch0 +%patch1 -p1 # For SVN snapshot: #setup -q -n %%{name}