summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2018-09-19 09:34:28 -0700
committerDavid Spencer <idlemoor@slackbuilds.org>2018-09-21 23:32:25 +0100
commit4121bbbe2671c6e57215694c5ff2b986d23919df (patch)
tree2a7f4fd0dcf4262c129dc52ccb8f33ee7d247c26
parent0a4899caf21ab182531f5c5e62d7af9e4a1fd36f (diff)
downloadslackbuilds-4121bbbe2671c6e57215694c5ff2b986d23919df.tar.gz
graphics/qcad: Updated for version 3.21.3.0
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
-rw-r--r--graphics/qcad/qcad.SlackBuild7
-rw-r--r--graphics/qcad/qcad.info6
-rw-r--r--graphics/qcad/qt4.patch22
3 files changed, 5 insertions, 30 deletions
diff --git a/graphics/qcad/qcad.SlackBuild b/graphics/qcad/qcad.SlackBuild
index ff553d08fc..b1fd47ee37 100644
--- a/graphics/qcad/qcad.SlackBuild
+++ b/graphics/qcad/qcad.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for qcad
-# Copyright 2013-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2013-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qcad
-VERSION=${VERSION:-3.17.1.1}
+VERSION=${VERSION:-3.21.3.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,9 +69,6 @@ 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 Qt4 compile issue.
-patch -p1 < $CWD/qt4.patch
-
# Build with Qt5/Qt4. Default is Qt4.
if [ "${QT5:-no}" == "yes" ]; then
qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
diff --git a/graphics/qcad/qcad.info b/graphics/qcad/qcad.info
index 08ca027f80..0f0ad66420 100644
--- a/graphics/qcad/qcad.info
+++ b/graphics/qcad/qcad.info
@@ -1,8 +1,8 @@
PRGNAM="qcad"
-VERSION="3.17.1.1"
+VERSION="3.21.3.0"
HOMEPAGE="https://www.qcad.org/en/"
-DOWNLOAD="https://github.com/qcad/qcad/archive/v3.17.1.1/qcad-3.17.1.1.tar.gz"
-MD5SUM="092f69e0ca6bf5f643a65af0b736dd21"
+DOWNLOAD="https://github.com/qcad/qcad/archive/v3.21.3.0/qcad-3.21.3.0.tar.gz"
+MD5SUM="72f1c98918e8ecce7867c41ba8fec55d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/graphics/qcad/qt4.patch b/graphics/qcad/qt4.patch
deleted file mode 100644
index dc3fa27652..0000000000
--- a/graphics/qcad/qt4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 214e27993fbbadad4241b6bf4e1c5f23eea7a70d Mon Sep 17 00:00:00 2001
-From: Andrew Mustun <andrew@qcad.org>
-Date: Mon, 29 May 2017 11:31:50 +0200
-Subject: [PATCH] back port to qt 4
-
----
- src/core/RBlockReferenceEntity.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/RBlockReferenceEntity.cpp b/src/core/RBlockReferenceEntity.cpp
-index 3141aa649..9032faeb3 100644
---- a/src/core/RBlockReferenceEntity.cpp
-+++ b/src/core/RBlockReferenceEntity.cpp
-@@ -417,7 +417,7 @@ void RBlockReferenceEntity::exportEntity(RExporter& e, bool preview, bool forceS
- if (entity->getLayerId()==layer0Id) {
- QStack<REntity*> blockRefStack = e.getBlockRefViewportStack();
- bool skip = false;
-- for (int i=blockRefStack.length()-1; i>=0; i--) {
-+ for (int i=blockRefStack.size()-1; i>=0; i--) {
- REntity* ent = blockRefStack.at(i);
- RBlockReferenceEntity* blockRef = dynamic_cast<RBlockReferenceEntity*>(ent);
- if (blockRef==NULL) {