From ae043e63c32e87a99827f9965f996f7cda54644b Mon Sep 17 00:00:00 2001 From: Bruno Postle Date: Sat, 23 Mar 2019 10:20:17 +0000 Subject: [PATCH] Fix build for cmake 3.14 #1690947 --- hugin.spec | 9 ++++++++- wx_use_libs.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 wx_use_libs.patch diff --git a/hugin.spec b/hugin.spec index 2d53435..a6bfe5f 100644 --- a/hugin.spec +++ b/hugin.spec @@ -1,9 +1,10 @@ Summary: A panoramic photo stitcher and more Name: hugin Version: 2018.0.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2 +Patch0: wx_use_libs.patch URL: http://hugin.sourceforge.net/ Requires: shared-mime-info Requires: webclient @@ -42,6 +43,9 @@ src/hugin_script_interface/plugins/*.py sed -i 's^exiv2/easyaccess.hpp^exiv2/exiv2.hpp^' \ src/hugin_base/panodata/Exiv2Helper.cpp +# Bugzilla #1690947 +%patch0 -p1 + %build # hugin now forces build out of tree [ ! -d "build" ] && mkdir build @@ -200,6 +204,9 @@ EOF %{_mandir}/man1/hugin_lensdb.* %changelog +* Sat Mar 23 2019 Bruno Postle - 2019.0.0-10 +- upstream fix for cmake 3.14 changes + * Thu Jan 31 2019 Kalev Lember - 2018.0.0-9 - Rebuilt for Boost 1.69 diff --git a/wx_use_libs.patch b/wx_use_libs.patch new file mode 100644 index 0000000..4d0c5b3 --- /dev/null +++ b/wx_use_libs.patch @@ -0,0 +1,18 @@ +diff -r 05a55c15585c -r 2a4ddd1a0fed CMakeLists.txt +--- a/CMakeLists.txt Sat Mar 23 10:11:35 2019 +0100 ++++ b/CMakeLists.txt Sat Mar 23 08:20:27 2019 +0100 +@@ -159,12 +159,11 @@ + # This must come before FINDs for tiff, jpeg, png, zlib to enable + # finding the wxWidgets distributions of those packages (Win32 only). + IF(WIN32) +- SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl qa) ++ FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl qa) + ELSE() + # Unix needs also wxWidgets net library +- SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa) ++ FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa) + ENDIF() +-FIND_PACKAGE(wxWidgets REQUIRED) + + # hugin requires wxwidgets 3.0 or above + IF (UNIX)