[arch-commits] Commit in luxrender/trunk (PKGBUILD luxrender-gcc7.patch)

[Antonio Rojas]

    Date: Monday, May 22, 2017 @ 21:21:25
  Author: arojas
Revision: 229332

boost 1.64 rebuild

Added:
  luxrender/trunk/luxrender-gcc7.patch
Modified:
  luxrender/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    9 ++++++---
 luxrender-gcc7.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2017-05-22 21:18:15 UTC (rev 229331)
+++ PKGBUILD    2017-05-22 21:21:25 UTC (rev 229332)
@@ -5,7 +5,7 @@
 pkgname=luxrender
 pkgver=1.6
 _pkgver=b3f85cf7742f
-pkgrel=7
+pkgrel=8
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('x86_64')
 url="http://www.luxrender.net/";
@@ -17,14 +17,17 @@
             'intel-opencl-runtime: OpenCL support for Intel CPUs')
 makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 
'opencl-headers')
 
source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/lux/get/v${pkgver/./}.tar.bz2
 \
-        force_python3.diff)
+        force_python3.diff luxrender-gcc7.patch)
 md5sums=('e40812e4e5a2bb1a58bcbd2a298ba9ee'
-         '42692e65eabc5828693e2682e94b7c64')
+         '42692e65eabc5828693e2682e94b7c64'
+         'fa680b0d621b42c8e7440056bf26ec1c')
 
 prepare() {
   cd "$srcdir"/luxrender-lux-$_pkgver
 
   patch -Np1 < "$srcdir/force_python3.diff"
+  # fix build with GCC 7 (Fedora)
+  patch -p1 -i ../luxrender-gcc7.patch
 }
 
 build() {

Added: luxrender-gcc7.patch
===================================================================
--- luxrender-gcc7.patch                                (rev 0)
+++ luxrender-gcc7.patch        2017-05-22 21:21:25 UTC (rev 229332)
@@ -0,0 +1,13 @@
+--- luxrender-lux-b3f85cf7742f/qtgui/mainwindow.hxx.debug      2016-05-10 
06:21:17.000000000 +0900
++++ luxrender-lux-b3f85cf7742f/qtgui/mainwindow.hxx    2017-03-24 
19:42:42.005564560 +0900
+@@ -134,8 +134,8 @@
+ public:
+       QMRUListModel() : QAbstractListModel(), maxCount(0) { }
+       QMRUListModel(int count, QObject *parent = 0) : 
QAbstractListModel(parent), maxCount(count)  { }
+-      QMRUListModel(const QMRUListModel<T> &other) 
+-              : maxCount(other.maxCount), mruList(other.mruList), 
QAbstractListModel(other.parent()) { }
++      //QMRUListModel(const QMRUListModel<T> &other) 
++              //: maxCount(other.maxCount), mruList(other.mruList), 
QAbstractListModel(other.parent()) { }
+ 
+       int count() const {
+               return maxCount;