diff options
| author | Larry Hajali <larryhaja@gmail.com> | 2017-05-29 22:22:48 -0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-06-03 08:00:28 +0700 |
| commit | 82a484fa9641b07b2323d0329cd34b79150c5d8b (patch) | |
| tree | c8eb0c4c5c2aff62dc87eb91db93693e763ee34f | |
| parent | cb25a44eb12cd75fdc73fff4efa670bfd14abaa5 (diff) | |
graphics/qcad: Updated for version 3.17.1.1
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
| -rw-r--r-- | graphics/qcad/qcad.SlackBuild | 5 | ||||
| -rw-r--r-- | graphics/qcad/qcad.info | 6 | ||||
| -rw-r--r-- | graphics/qcad/qt4.patch | 22 |
3 files changed, 29 insertions, 4 deletions
diff --git a/graphics/qcad/qcad.SlackBuild b/graphics/qcad/qcad.SlackBuild index 722686d302f1..ff553d08fc08 100644 --- a/graphics/qcad/qcad.SlackBuild +++ b/graphics/qcad/qcad.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qcad -VERSION=${VERSION:-3.16.5.0} +VERSION=${VERSION:-3.17.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,9 @@ 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 adfe83149d3f..612a62996925 100644 --- a/graphics/qcad/qcad.info +++ b/graphics/qcad/qcad.info @@ -1,8 +1,8 @@ PRGNAM="qcad" -VERSION="3.16.5.0" +VERSION="3.17.1.1" HOMEPAGE="http://www.qcad.org/en/" -DOWNLOAD="https://github.com/qcad/qcad/archive/v3.16.5.0/qcad-3.16.5.0.tar.gz" -MD5SUM="3afe0d254cb090f4071ada21c2a69756" +DOWNLOAD="https://github.com/qcad/qcad/archive/v3.17.1.1/qcad-3.17.1.1.tar.gz" +MD5SUM="6c8db4dcaf18befdae5f4c236473d704" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/qcad/qt4.patch b/graphics/qcad/qt4.patch new file mode 100644 index 000000000000..dc3fa2765229 --- /dev/null +++ b/graphics/qcad/qt4.patch @@ -0,0 +1,22 @@ +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) { |