switch to qt5

2 files changed, 13 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d55e84c627..3a05153ccb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = appleseed-git
 	pkgdesc = physically-based global illumination rendering engine primarily designed for animation and visual effects.
-	pkgver = 2.0.0.beta.r291.g653efbc37
+	pkgver = 2.0.0.beta.r297.g94b600d49
 	pkgrel = 1
 	epoch = 1
-	url = http://appleseedhq.net
+	url = https://appleseedhq.net
 	arch = i686
 	arch = x86_64
 	license = MIT
@@ -12,7 +12,7 @@ pkgbase = appleseed-git
 	depends = python2
 	depends = python
 	depends = embree
-	depends = qt4
+	depends = qt5-base
 	depends = seexpr>=2.11
 	depends = boost
 	depends = openexr
@@ -25,8 +25,10 @@ pkgbase = appleseed-git
 	conflicts = appleseed
 	source = appleseed-git::git+https://github.com/appleseedhq/appleseed.git
 	source = cmake.extra.install.dirs.remove.patch
+	source = https://github.com/appleseedhq/appleseed/pull/2526.diff
 	md5sums = SKIP
 	md5sums = 1cc8d927665c126dde4d1135e500c0dc
+	md5sums = 0414eb9eae969118a118c82ac9d47512
 
 pkgname = appleseed-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f5e6d0369ee..78b5dfbc347 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,25 @@
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=appleseed-git
 #_fragment="#branch=2.0.5-beta-maintenance"
-pkgver=2.0.0.beta.r291.g653efbc37
+pkgver=2.0.0.beta.r297.g94b600d49
 pkgrel=1
 epoch=1
 pkgdesc="physically-based global illumination rendering engine primarily designed for animation and visual effects. "
 arch=(i686 x86_64)
-url="http://appleseedhq.net"
+url="https://appleseedhq.net"
 license=('MIT')
 provides=('appleseed')
 conflicts=('appleseed')
-depends=(python2 python embree qt4 'seexpr>=2.11' boost openexr opencolorio openimageio 'openshadinglanguage>=1.8.9' xerces-c zlib)
+depends=(python2 python embree qt5-base 'seexpr>=2.11' boost openexr opencolorio openimageio 'openshadinglanguage>=1.8.9' xerces-c zlib)
 makedepends=(git cmake)
 options=()
 source=("${pkgname}::git+https://github.com/appleseedhq/appleseed.git${_fragment}"
         "cmake.extra.install.dirs.remove.patch"
+        "https://github.com/appleseedhq/appleseed/pull/2526.diff"
         )
 md5sums=('SKIP'
-         '1cc8d927665c126dde4d1135e500c0dc')
+         '1cc8d927665c126dde4d1135e500c0dc'
+         '0414eb9eae969118a118c82ac9d47512')
   
 #_pyver=$(python -c "from sys import version_info; print(\"%d.%d\" % (version_info[0],version_info[1]))")
 #_pyver=$(pacman -Sddp --print-format %v python|grep -oP ^[0-9.]{3})
@@ -40,7 +42,8 @@ pkgver() {
 
 prepare() {
   cd ${pkgname}
-  git apply -v ../cmake.extra.install.dirs.remove.patch
+  git apply -v ${srcdir}/cmake.extra.install.dirs.remove.patch
+  git apply -v ${srcdir}/*.diff
   grep -q avx /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_AVX=ON"
   grep -q avx2 /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_AVX2=ON"
   grep -q f16c /proc/cpuinfo && CMAKE_FLAGS="${CMAKE_FLAGS} -DUSE_F16C=ON"