[arch-commits] Commit in openscad/trunk (CHANGELOG PKGBUILD)

[Kyle Keen]

    Date: Thursday, February 8, 2018 @ 03:06:43
  Author: kkeen
Revision: 290155

upgpkg: openscad 2015.03.03-16  FS#50040, use qt5

Modified:
  openscad/trunk/CHANGELOG
  openscad/trunk/PKGBUILD

-----------+
 CHANGELOG |    4 ++++
 PKGBUILD  |   17 ++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

Modified: CHANGELOG
===================================================================
--- CHANGELOG	2018-02-08 03:06:22 UTC (rev 290154)
+++ CHANGELOG	2018-02-08 03:06:43 UTC (rev 290155)
@@ -1,3 +1,7 @@
+2018-02-07 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-15
+	- Switch to Qt5
+
 2017-12-27 Kyle Keen <keenerd at gmail.com>
 	* 2015.03.03-14
 	- Rebuild for boost 1.66.0

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-08 03:06:22 UTC (rev 290154)
+++ PKGBUILD	2018-02-08 03:06:43 UTC (rev 290155)
@@ -6,22 +6,29 @@
 pkgname=openscad
 pkgver=2015.03.03
 _ver=2015.03-3  # hopefully -X is temporary
-pkgrel=15
+pkgrel=16
 pkgdesc="The programmers solid 3D CAD modeller"
 url="http://openscad.org/"
 arch=('x86_64')
 license=('GPL2')
 changelog=CHANGELOG
-depends=('qt4' 'qscintilla-qt4' 'cgal' 'opencsg' 'boost-libs' 'shared-mime-info')
+depends=('qt5-base' 'qscintilla-qt5' 'cgal' 'opencsg' 'boost-libs' 'shared-mime-info')
 makedepends=('eigen' 'boost' 'imagemagick')
 # full tests need imagemagick and an X11 or framebuffer session
 checkdepends=('cmake' 'xproto' 'libx11' 'python2')
-source=("http://files.openscad.org/openscad-$_ver.src.tar.gz")
-md5sums=('a498a218a247468eee140ccc44c73afa')
+source=("http://files.openscad.org/openscad-$_ver.src.tar.gz"
+        "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch")
+md5sums=('a498a218a247468eee140ccc44c73afa'
+         '9a2359c30582f7ce4df05f6879bf6635')
 
+prepare() {
+    cd "$srcdir/$pkgname-$_ver"
+    patch -p1 -i ../openscad-2015.03_p2_uic_tr_fix.patch
+}
+
 build() {
     cd "$srcdir/$pkgname-$_ver"
-    qmake-qt4 PREFIX="/usr"
+    qmake-qt5 PREFIX="/usr"
     make
     convert "icons/$pkgname.png" -resize 128x128\> "icons/$pkgname-128.png"
 }