mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-04 20:29:09 +01:00
graphics/qcad: Updated for version 3.21.3.0
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
This commit is contained in:
parent
0a4899caf2
commit
4121bbbe26
3 changed files with 5 additions and 30 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Slackware build script for qcad
|
# 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.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use of this script, with or without modification, is
|
# Redistribution and use of this script, with or without modification, is
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
PRGNAM=qcad
|
PRGNAM=qcad
|
||||||
VERSION=${VERSION:-3.17.1.1}
|
VERSION=${VERSION:-3.21.3.0}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
|
@ -69,9 +69,6 @@ find -L . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
-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.
|
# Build with Qt5/Qt4. Default is Qt4.
|
||||||
if [ "${QT5:-no}" == "yes" ]; then
|
if [ "${QT5:-no}" == "yes" ]; then
|
||||||
qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
|
qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
PRGNAM="qcad"
|
PRGNAM="qcad"
|
||||||
VERSION="3.17.1.1"
|
VERSION="3.21.3.0"
|
||||||
HOMEPAGE="https://www.qcad.org/en/"
|
HOMEPAGE="https://www.qcad.org/en/"
|
||||||
DOWNLOAD="https://github.com/qcad/qcad/archive/v3.17.1.1/qcad-3.17.1.1.tar.gz"
|
DOWNLOAD="https://github.com/qcad/qcad/archive/v3.21.3.0/qcad-3.21.3.0.tar.gz"
|
||||||
MD5SUM="092f69e0ca6bf5f643a65af0b736dd21"
|
MD5SUM="72f1c98918e8ecce7867c41ba8fec55d"
|
||||||
DOWNLOAD_x86_64=""
|
DOWNLOAD_x86_64=""
|
||||||
MD5SUM_x86_64=""
|
MD5SUM_x86_64=""
|
||||||
REQUIRES=""
|
REQUIRES=""
|
||||||
|
|
|
@ -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) {
|
|
Loading…
Reference in a new issue