$ git show --format=fuller --patch-with-stat --summary cc80fc54209784178aebc5ac21458edb60a552b6
commit cc80fc54209784178aebc5ac21458edb60a552b6
Author: Alex <alexander@mezon.ru>
AuthorDate: Mon Sep 16 00:03:58 2019 +0000
Commit: Alex <alexander@mezon.ru>
CommitDate: Mon Sep 16 00:03:58 2019 +0000
3.23.0.2
---
.abf.yml | 2 +-
qcad-system-quazip.patch | 24 ------------------------
qcad.spec | 36 +++++++++++++++++++++++++++++++++---
3 files changed, 34 insertions(+), 28 deletions(-)
delete mode 100644 qcad-system-quazip.patch
diff --git a/.abf.yml b/.abf.yml
index f9f4e45..5421431 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
sources:
icons-qcad.tar.bz2: 094f19792d1df6b6ec33580794a52a844e5c402a
qcad-manual-en-2.0.4.0-1.html.zip: 993d3ad64ac226278e51060a43613506aca31656
- v3.21.3.10.tar.gz: 43a45d623227fbbb526367bd8e9358723acb8d84
+ v3.23.0.2.tar.gz: 3bac0b7aafe0144000f8bd09bee6dea9564724da
diff --git a/qcad-system-quazip.patch b/qcad-system-quazip.patch
deleted file mode 100644
index 49bc2c0..0000000
--- a/qcad-system-quazip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru a/src/3rdparty/3rdparty.pro b/src/3rdparty/3rdparty.pro
---- a/src/3rdparty/3rdparty.pro 2018-01-04 12:06:28.000000000 +0100
-+++ b/src/3rdparty/3rdparty.pro 2018-01-13 15:04:57.672244620 +0100
-@@ -2,8 +2,7 @@
- TEMPLATE = subdirs
- SUBDIRS = \
- spatialindexnavel \
-- stemmer \
-- quazip
-+ stemmer
-
- !r_no_opennurbs {
- SUBDIRS += opennurbs
-diff -Nru a/src/zip/zip.pro b/src/zip/zip.pro
---- a/src/zip/zip.pro 2018-01-04 12:06:28.000000000 +0100
-+++ b/src/zip/zip.pro 2018-01-13 15:07:42.170233519 +0100
-@@ -1,6 +1,6 @@
- include( ../../shared.pri )
-
--INCLUDEPATH+=../3rdparty/quazip/src
-+INCLUDEPATH+=/usr/include/quazip
-
- greaterThan(QT_MAJOR_VERSION, 4) {
- INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
diff --git a/qcad.spec b/qcad.spec
index 62ce7bb..a31a22c 100644
--- a/qcad.spec
+++ b/qcad.spec
@@ -3,13 +3,12 @@
Summary: A professional CAD system
Name: qcad
-Version: 3.21.3.10
-Release: 2
+Version: 3.23.0.2
+Release: 1
Group: Graphics
License: GPLv3 with exceptions, CC-BY, GPLv2+, LGPLv2.1, BSD
URL: http://www.qcad.org
Source0: https://github.com/qcad/qcad/archive/v%{version}.tar.gz
-Patch1: qcad-system-quazip.patch
BuildRequires: qt5-devel
BuildRequires: pkgconfig(Qt5WebKitWidgets)
@@ -28,6 +27,26 @@ BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(Qt5Concurrent)
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Designer)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5OpenGL)
+BuildRequires: pkgconfig(Qt5PrintSupport)
+BuildRequires: pkgconfig(Qt5Qml)
+BuildRequires: pkgconfig(Qt5Quick)
+BuildRequires: pkgconfig(Qt5Script)
+BuildRequires: pkgconfig(Qt5Sql)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5WebChannel)
+BuildRequires: pkgconfig(Qt5WebEngine)
+BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(Qt5XmlPatterns)
+BuildRequires: pkgconfig(Qt5ScriptTools)
+BuildRequires: pkgconfig(Qt5Help)
+BuildRequires: pkgconfig(glu)
+
%description
QCad is a professional CAD System. With QCad you can easily construct
and change drawings with ISO-text and many other features and save
@@ -38,6 +57,17 @@ CAD-systems such as AutoCAD(TM) and many others.
%setup -q
%apply_patches
find . -name ".gitignore" -delete
+rm -rf src/3rdparty/quazip/src
+
+mkdir -p src/3rdparty/qt-labs-qtscriptgenerator-5.13.1/
+cat <<EOF > qt-labs-qtscriptgenerator-5.13.1.pro
+include( ../../../shared.pri )
+
+SUBDIRS = ../qt-labs-qtscriptgenerator-5.5.0/qtbindings
+TEMPLATE = subdirs
+EOF
+
+mv qt-labs-qtscriptgenerator-5.13.1.pro src/3rdparty/qt-labs-qtscriptgenerator-5.13.1/
%build
%qmake_qt5