diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-07-26 00:24:00 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2017-07-26 00:24:00 -0500 |
| commit | 463368437cb9fb5d4db355cae128925f85b36328 (patch) | |
| tree | 9e73bff64473cea7944e2e9bfa3e878575eedf3d | |
| parent | 4e0da3b781b49e5dfd7435e39c60e8b197837fac (diff) | |
| download | abslibre-463368437cb9fb5d4db355cae128925f85b36328.tar.gz abslibre-463368437cb9fb5d4db355cae128925f85b36328.tar.bz2 abslibre-463368437cb9fb5d4db355cae128925f85b36328.zip | |
luxrender-1.6-8.parabola1: boost 1.64 rebuild
| -rw-r--r-- | libre/luxrender/PKGBUILD | 14 | ||||
| -rw-r--r-- | libre/luxrender/luxrender-gcc7.patch | 13 |
2 files changed, 22 insertions, 5 deletions
diff --git a/libre/luxrender/PKGBUILD b/libre/luxrender/PKGBUILD index e1495cf73..54cf36ac3 100644 --- a/libre/luxrender/PKGBUILD +++ b/libre/luxrender/PKGBUILD @@ -2,11 +2,12 @@ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor (Arch): flixie <69one@gmx.net> # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer: Márcio Silva <coadde@parabola.nu> +# Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=luxrender pkgver=1.6 _pkgver=b3f85cf7742f -pkgrel=7.parabola1 +pkgrel=8.parabola1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, with opencl-mesa recommendation" arch=('x86_64') url="http://www.luxrender.net/" @@ -19,14 +20,17 @@ makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-hea conflicts=("$pkgname-libre" "$pkgname-parabola") replaces=("$pkgname-libre" "$pkgname-parabola") source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/lux/get/v${pkgver/./}.tar.bz2 \ - force_python3.diff) -md5sums=('e40812e4e5a2bb1a58bcbd2a298ba9ee' - '42692e65eabc5828693e2682e94b7c64') + force_python3.diff luxrender-gcc7.patch) +sha256sums=('29144f657087644086928a66421df5d25fc4dccd05970200932f5693650ddecf' + '916a45aec1326e6990c1ff9f141080c17a33ed793c44d1af9a2dacb9b21c19d2' + 'e51e33ac85c247696a0cab7751b5e91a23df5dac45af05b9ee68299e4a37dc6d') 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() { diff --git a/libre/luxrender/luxrender-gcc7.patch b/libre/luxrender/luxrender-gcc7.patch new file mode 100644 index 000000000..62dd64428 --- /dev/null +++ b/libre/luxrender/luxrender-gcc7.patch @@ -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; |