graphics/qcad: Updated for version 3.15.5.3

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

3 files changed, 36 insertions, 10 deletions

diff --git a/graphics/qcad/qcad.SlackBuild b/graphics/qcad/qcad.SlackBuild
index 0af254919b..842bf0de08 100644
--- a/graphics/qcad/qcad.SlackBuild
+++ b/graphics/qcad/qcad.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for qcad
 
-# Copyright 2013-2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qcad
-VERSION=${VERSION:-3.12.4.8}
+VERSION=${VERSION:-3.15.5.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 2>/dev/null || tar xvf $CWD/v${VERSION}.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix for qt 5.6.1.
+patch -Np1 < $CWD/qt-labs-qtscriptgenerator-5.6.1.patch
 
 # Build with Qt5/Qt4. Default is Qt4.
 if [ "${QT5:-no}" == "yes" ]; then
@@ -84,10 +86,11 @@ fi
 make
 
 # Need to manually install files.
-mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin
+mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin $PKG/usr/man/man1
 cp -ar examples fonts libraries linetypes patterns plugins scripts ts $PKG/usr/share/$PRGNAM
 cp release/* $PKG/usr/share/$PRGNAM
 install -m 0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
+install -m 0644 $PRGNAM.1 $PKG/usr/man/man1
 
 # Don't repackage libraries that already come with Qt4/Qt5.
 rm -f $PKG/usr/share/$PRGNAM/plugins/designer/{libqwebview.so,readme.txt} \
@@ -123,6 +126,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/share/applications
 install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 for i in 16 32 48 64 96 128; do
   convert scripts/${PRGNAM}_icon.png -resize ${i}x${i}! $PRGNAM-$i.png
   install -D -m 0644 $PRGNAM-$i.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
diff --git a/graphics/qcad/qcad.info b/graphics/qcad/qcad.info
index 14243e22e1..88ff789298 100644
--- a/graphics/qcad/qcad.info
+++ b/graphics/qcad/qcad.info
@@ -1,8 +1,8 @@
 PRGNAM="qcad"
-VERSION="3.12.4.8"
+VERSION="3.15.5.3"
 HOMEPAGE="http://www.qcad.org/en/"
-DOWNLOAD="https://github.com/qcad/qcad/archive/v3.12.4.8.tar.gz"
-MD5SUM="89b92dbbbad554bfbb210313241ac728"
+DOWNLOAD="https://github.com/qcad/qcad/archive/v3.15.5.3/qcad-3.15.5.3.tar.gz"
+MD5SUM="9e385d486cb590c648aa3aa081059576"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/graphics/qcad/qt-labs-qtscriptgenerator-5.6.1.patch b/graphics/qcad/qt-labs-qtscriptgenerator-5.6.1.patch
new file mode 100644
index 0000000000..d9c115d022
--- /dev/null
+++ b/graphics/qcad/qt-labs-qtscriptgenerator-5.6.1.patch
@@ -0,0 +1,21 @@
+From 19bbd927517184390b0bf6a97a1bc950d8261b2f Mon Sep 17 00:00:00 2001
+From: Andrew Mustun <andrew@qcad.org>
+Date: Mon, 19 Sep 2016 13:11:25 +0200
+Subject: [PATCH] update
+
+---
+ .../qt-labs-qtscriptgenerator-5.6.0.pro                               | 4 ----
+ .../qt-labs-qtscriptgenerator-5.6.1.pro                               | 4 ++++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+ create mode 100644 src/3rdparty/qt-labs-qtscriptgenerator-5.6.1/qt-labs-qtscriptgenerator-5.6.1.pro
+
+diff --git a/src/3rdparty/qt-labs-qtscriptgenerator-5.6.1/qt-labs-qtscriptgenerator-5.6.1.pro b/src/3rdparty/qt-labs-qtscriptgenerator-5.6.1/qt-labs-qtscriptgenerator-5.6.1.pro
+new file mode 100644
+index 0000000..1a6ce0b
+--- /dev/null
++++ b/src/3rdparty/qt-labs-qtscriptgenerator-5.6.1/qt-labs-qtscriptgenerator-5.6.1.pro
+@@ -0,0 +1,4 @@
++include( ../../../shared.pri )
++
++SUBDIRS = ../qt-labs-qtscriptgenerator-5.5.0/qtbindings
++TEMPLATE = subdirs