[arch-commits] Commit in hugin/trunk (PKGBUILD hugin-cmake-3.14.patch)

[Antonio Rojas]

    Date: Monday, March 25, 2019 @ 20:45:08
  Author: arojas
Revision: 443484

wxgtk 3.1 rebuild

Added:
  hugin/trunk/hugin-cmake-3.14.patch
Modified:
  hugin/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   11 ++++++++---
 hugin-cmake-3.14.patch |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-25 19:36:51 UTC (rev 443483)
+++ PKGBUILD	2019-03-25 20:45:08 UTC (rev 443484)
@@ -6,7 +6,7 @@
 
 pkgname=hugin
 pkgver=2018.0.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Panorama photo stitcher"
 arch=('x86_64')
 url="http://hugin.sourceforge.net/"
@@ -16,11 +16,16 @@
          'lensfun' 'make' 'enblend-enfuse')
 makedepends=('cmake' 'boost' 'tclap' 'mesa' 'swig')
 optdepends=('perl-image-exiftool: GPano tags support')
-source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/r/_r}.tar.bz2")
-sha256sums=('d3af0d066ac50e3bb243a175a64ecda136d87178419457e8822e11bcf0e565cb')
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/r/_r}.tar.bz2"
+        hugin-cmake-3.14.patch)
+sha256sums=('d3af0d066ac50e3bb243a175a64ecda136d87178419457e8822e11bcf0e565cb'
+            '873c1b44a9f93a0c8febc12b2c72e0ef5cdd9000ea90b0bf2050bf25198ddae3')
 
 prepare() {
     mkdir -p build
+
+    cd $pkgname-$pkgver
+    patch -p1 -i ../hugin-cmake-3.14.patch # Fix build with cmake 3.14
 }
 
 build() {

Added: hugin-cmake-3.14.patch
===================================================================
--- hugin-cmake-3.14.patch	                        (rev 0)
+++ hugin-cmake-3.14.patch	2019-03-25 20:45:08 UTC (rev 443484)
@@ -0,0 +1,13 @@
+diff -r 5abfb4de7961 CMakeLists.txt
+--- a/CMakeLists.txt	Sun Jan 21 12:56:33 2018 +0100
++++ b/CMakeLists.txt	Sat Mar 23 11:56:35 2019 +0000
+@@ -162,8 +162,7 @@
+ ##
+ #  This must come before FINDs for tiff, jpeg, png, zlib to enable
+ #  finding the wxWidgets distributions of those packages (Win32 only).
+-SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa)
+-FIND_PACKAGE(wxWidgets REQUIRED)
++FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa)
+ 
+ # hugin requires wxwidgets 3.0 or above
+ IF (UNIX)