Date: Thursday, June 10, 2021 @ 19:47:39
Author: eworm
Revision: 961669
archrelease: copy trunk to community-x86_64
Added:
librecad/repos/community-x86_64/0001-fix-build-with-Qt-5.11.patch
(from rev 961668, librecad/trunk/0001-fix-build-with-Qt-5.11.patch)
librecad/repos/community-x86_64/0002-fix-build-with-Qt-5.15.patch
(from rev 961668, librecad/trunk/0002-fix-build-with-Qt-5.15.patch)
librecad/repos/community-x86_64/0003-add-boost-tuple-include-to-fix-build.patch
(from rev 961668,
librecad/trunk/0003-add-boost-tuple-include-to-fix-build.patch)
librecad/repos/community-x86_64/PKGBUILD
(from rev 961668, librecad/trunk/PKGBUILD)
Deleted:
librecad/repos/community-x86_64/0001-fix-build-with-Qt-5.11.patch
librecad/repos/community-x86_64/0002-fix-build-with-Qt-5.15.patch
librecad/repos/community-x86_64/PKGBUILD
-------------------------------------------------+
0001-fix-build-with-Qt-5.11.patch | 86 +++++------
0002-fix-build-with-Qt-5.15.patch | 74 +++++-----
0003-add-boost-tuple-include-to-fix-build.patch | 29 ++++
PKGBUILD | 159 +++++++++++-----------
4 files changed, 190 insertions(+), 158 deletions(-)
Deleted: 0001-fix-build-with-Qt-5.11.patch
===================================================================
--- 0001-fix-build-with-Qt-5.11.patch 2021-06-10 19:47:36 UTC (rev 961668)
+++ 0001-fix-build-with-Qt-5.11.patch 2021-06-10 19:47:39 UTC (rev 961669)
@@ -1,43 +0,0 @@
-From 5bd5d5b1ea6781fcbc3c9c61b2059703647dc5d2 Mon Sep 17 00:00:00 2001
-From: Jiri Slaby <[email protected]>
-Date: Mon, 11 Jun 2018 10:44:00 +0200
-Subject: [PATCH 1/1] fix build with Qt 5.11
-
-The new Qt removed some implicit inclusions of headers. To avoid build
-errors, add explicit includes of those we use in the sources.
-
-Signed-off-by: Jiri Slaby <[email protected]>
-
-(cherry picked from commit 6c392e903e162b9283e88f53006e929663f2e883)
-Signed-off-by: Christian Hesse <[email protected]>
----
- librecad/src/ui/forms/qg_commandwidget.cpp | 2 ++
- librecad/src/ui/generic/widgetcreator.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp
b/librecad/src/ui/forms/qg_commandwidget.cpp
-index 7cd69398..2b90d671 100644
---- a/librecad/src/ui/forms/qg_commandwidget.cpp
-+++ b/librecad/src/ui/forms/qg_commandwidget.cpp
-@@ -24,6 +24,8 @@
- **
- **********************************************************************/
- #include "qg_commandwidget.h"
-+
-+#include <QAction>
- #include <QKeyEvent>
- #include <algorithm>
-
-diff --git a/librecad/src/ui/generic/widgetcreator.cpp
b/librecad/src/ui/generic/widgetcreator.cpp
-index ca89ab13..260d9afd 100644
---- a/librecad/src/ui/generic/widgetcreator.cpp
-+++ b/librecad/src/ui/generic/widgetcreator.cpp
-@@ -27,6 +27,8 @@
- #include "widgetcreator.h"
- #include "ui_widgetcreator.h"
-
-+#include <QAction>
-+#include <QActionGroup>
- #include <QSettings>
- #include <QLineEdit>
- #include <QPushButton>
Copied: librecad/repos/community-x86_64/0001-fix-build-with-Qt-5.11.patch (from
rev 961668, librecad/trunk/0001-fix-build-with-Qt-5.11.patch)
===================================================================
--- 0001-fix-build-with-Qt-5.11.patch (rev 0)
+++ 0001-fix-build-with-Qt-5.11.patch 2021-06-10 19:47:39 UTC (rev 961669)
@@ -0,0 +1,43 @@
+From 5bd5d5b1ea6781fcbc3c9c61b2059703647dc5d2 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <[email protected]>
+Date: Mon, 11 Jun 2018 10:44:00 +0200
+Subject: [PATCH 1/1] fix build with Qt 5.11
+
+The new Qt removed some implicit inclusions of headers. To avoid build
+errors, add explicit includes of those we use in the sources.
+
+Signed-off-by: Jiri Slaby <[email protected]>
+
+(cherry picked from commit 6c392e903e162b9283e88f53006e929663f2e883)
+Signed-off-by: Christian Hesse <[email protected]>
+---
+ librecad/src/ui/forms/qg_commandwidget.cpp | 2 ++
+ librecad/src/ui/generic/widgetcreator.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp
b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 7cd69398..2b90d671 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -24,6 +24,8 @@
+ **
+ **********************************************************************/
+ #include "qg_commandwidget.h"
++
++#include <QAction>
+ #include <QKeyEvent>
+ #include <algorithm>
+
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp
b/librecad/src/ui/generic/widgetcreator.cpp
+index ca89ab13..260d9afd 100644
+--- a/librecad/src/ui/generic/widgetcreator.cpp
++++ b/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,8 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+
++#include <QAction>
++#include <QActionGroup>
+ #include <QSettings>
+ #include <QLineEdit>
+ #include <QPushButton>
Deleted: 0002-fix-build-with-Qt-5.15.patch
===================================================================
--- 0002-fix-build-with-Qt-5.15.patch 2021-06-10 19:47:36 UTC (rev 961668)
+++ 0002-fix-build-with-Qt-5.15.patch 2021-06-10 19:47:39 UTC (rev 961669)
@@ -1,37 +0,0 @@
-From 81741a875847c806c05f0f3a4610e69b3c3002aa Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <[email protected]>
-Date: Wed, 20 May 2020 14:12:15 +0200
-Subject: Fix build with Qt 5.15 (missing QPainterPath include)
-
----
- librecad/src/lib/engine/lc_splinepoints.cpp | 1 +
- librecad/src/lib/gui/rs_painterqt.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/librecad/src/lib/engine/lc_splinepoints.cpp
b/librecad/src/lib/engine/lc_splinepoints.cpp
-index 5eaed81b8..e6324ec10 100644
---- a/librecad/src/lib/engine/lc_splinepoints.cpp
-+++ b/librecad/src/lib/engine/lc_splinepoints.cpp
-@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
- **********************************************************************/
-
-+#include <QPainterPath>
- #include <QPolygonF>
- #include "lc_splinepoints.h"
-
-diff --git a/librecad/src/lib/gui/rs_painterqt.h
b/librecad/src/lib/gui/rs_painterqt.h
-index 878753cb7..a0b432e06 100644
---- a/librecad/src/lib/gui/rs_painterqt.h
-+++ b/librecad/src/lib/gui/rs_painterqt.h
-@@ -29,6 +29,7 @@
- #define RS_PAINTERQT_H
-
- #include <QPainter>
-+#include <QPainterPath>
-
- #include "rs_painter.h"
- #include "rs_pen.h"
---
-cgit v1.2.3
-
Copied: librecad/repos/community-x86_64/0002-fix-build-with-Qt-5.15.patch (from
rev 961668, librecad/trunk/0002-fix-build-with-Qt-5.15.patch)
===================================================================
--- 0002-fix-build-with-Qt-5.15.patch (rev 0)
+++ 0002-fix-build-with-Qt-5.15.patch 2021-06-10 19:47:39 UTC (rev 961669)
@@ -0,0 +1,37 @@
+From 81741a875847c806c05f0f3a4610e69b3c3002aa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <[email protected]>
+Date: Wed, 20 May 2020 14:12:15 +0200
+Subject: Fix build with Qt 5.15 (missing QPainterPath include)
+
+---
+ librecad/src/lib/engine/lc_splinepoints.cpp | 1 +
+ librecad/src/lib/gui/rs_painterqt.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/librecad/src/lib/engine/lc_splinepoints.cpp
b/librecad/src/lib/engine/lc_splinepoints.cpp
+index 5eaed81b8..e6324ec10 100644
+--- a/librecad/src/lib/engine/lc_splinepoints.cpp
++++ b/librecad/src/lib/engine/lc_splinepoints.cpp
+@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+ **********************************************************************/
+
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include "lc_splinepoints.h"
+
+diff --git a/librecad/src/lib/gui/rs_painterqt.h
b/librecad/src/lib/gui/rs_painterqt.h
+index 878753cb7..a0b432e06 100644
+--- a/librecad/src/lib/gui/rs_painterqt.h
++++ b/librecad/src/lib/gui/rs_painterqt.h
+@@ -29,6 +29,7 @@
+ #define RS_PAINTERQT_H
+
+ #include <QPainter>
++#include <QPainterPath>
+
+ #include "rs_painter.h"
+ #include "rs_pen.h"
+--
+cgit v1.2.3
+
Copied:
librecad/repos/community-x86_64/0003-add-boost-tuple-include-to-fix-build.patch
(from rev 961668,
librecad/trunk/0003-add-boost-tuple-include-to-fix-build.patch)
===================================================================
--- 0003-add-boost-tuple-include-to-fix-build.patch
(rev 0)
+++ 0003-add-boost-tuple-include-to-fix-build.patch 2021-06-10 19:47:39 UTC
(rev 961669)
@@ -0,0 +1,29 @@
+From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <[email protected]>
+Date: Tue, 4 May 2021 09:25:03 +0200
+Subject: [PATCH] add boost tuple include to fix build
+
+With boost 1.76, we see:
+lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math'
does not name a template type
+ 70 | boost::math::tuple<double, double, double> operator()(double const&
z) const {
+ | ^~~~~
+
+Fix this by including the proper boost header.
+---
+ librecad/src/lib/engine/rs_ellipse.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/librecad/src/lib/engine/rs_ellipse.cpp
b/librecad/src/lib/engine/rs_ellipse.cpp
+index 291f734ea..d47bf6ca4 100644
+--- a/librecad/src/lib/engine/rs_ellipse.cpp
++++ b/librecad/src/lib/engine/rs_ellipse.cpp
+@@ -48,6 +48,9 @@
+ #include <boost/version.hpp>
+ #include <boost/math/tools/roots.hpp>
+ #include <boost/math/special_functions/ellint_2.hpp>
++#if BOOST_VERSION > 104500
++#include <boost/math/tools/tuple.hpp>
++#endif
+ #endif
+
+ namespace{
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-10 19:47:36 UTC (rev 961668)
+++ PKGBUILD 2021-06-10 19:47:39 UTC (rev 961669)
@@ -1,78 +0,0 @@
-# Maintainer: Christian Hesse <[email protected]>
-# Contributor: mickele <mimocciola at yahoo dot com> (librecad-git PKGBUILD)
-# Contributor: Ilmari Repo <ilmari at gmail dot com> (librecad-svn PKGBUILD)
-# Contributor: GazJ Gary James <garyjames82 at gmail dot com> (CADuntu
PKGBUILD)
-
-pkgname=librecad
-pkgver=2.1.3
-pkgrel=5
-pkgdesc='A 2D CAD drawing tool based on the community edition of QCad'
-arch=('x86_64')
-url='https://www.librecad.org/'
-license=('GPL')
-depends=('qt5-base' 'qt5-svg' 'libxcb' 'muparser')
-makedepends=('qt5-tools' 'boost' 'imagemagick' 'librsvg')
-conflicts=('librecad-git')
-replaces=('librecad-svn' 'caduntu' 'caduntu-svn')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreCAD/LibreCAD/archive/${pkgver}.tar.gz";
- '0001-fix-build-with-Qt-5.11.patch'
- '0002-fix-build-with-Qt-5.15.patch')
-sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06'
- '7590015c964888673844b1342e684e417b8bd2a5baacecebfbdc2f9aa0749360'
- 'a5c37f871ce88a4efd0236c6329a19afe7993be96df9fe02b3affd79a44314bb')
-
-prepare() {
- cd "${srcdir}/LibreCAD-${pkgver}"
-
- # fix build with recent Qt
- patch -Np1 < ../0001-fix-build-with-Qt-5.11.patch
- patch -Np1 < ../0002-fix-build-with-Qt-5.15.patch
-}
-
-build() {
- cd "${srcdir}/LibreCAD-${pkgver}"
-
- # fix version string
- sed -i "/^SCMREVISION/c SCMREVISION=\"${pkgver}\"" librecad/src/src.pro
-
- qmake-qt5 librecad.pro
-
- # fix include path... this is an issue with gcc 6.1.1 and qmake-qt5...
- make qmake_all
- sed -i '/INCPATH/s|-isystem /usr/include ||' librecad/src/Makefile
-
- make
-}
-
-package() {
- cd "${srcdir}/LibreCAD-${pkgver}"
-
- # executables
- install -D -m0755 unix/librecad "${pkgdir}/usr/bin/librecad"
- install -D -m0755 unix/ttf2lff "${pkgdir}/usr/bin/ttf2lff"
-
- # desktop file and man pages
- install -D -m0644 desktop/librecad.desktop
"${pkgdir}/usr/share/applications/librecad.desktop"
- install -D -m0644 desktop/librecad.1
"${pkgdir}/usr/share/man/man1/librecad.1"
-
- # documentation
- install -D -m0644 librecad/support/doc/README
"${pkgdir}/usr/share/doc/librecad/index.README"
- install -D -m0644 librecad/support/doc/index.html
"${pkgdir}/usr/share/doc/librecad/index.html"
- install -D -m0644 librecad/support/doc/style.css
"${pkgdir}/usr/share/doc/librecad/style.css"
- install -D -m0644 librecad/support/doc/img/librecadlogo.png
"${pkgdir}/usr/share/doc/librecad/img/librecadlogo.png"
-
- # icons
- for SIZE in 16 24 32 48 64 96 128; do
- # set modify/create for reproducible builds
- convert -scale ${SIZE} +set date:create +set date:modify \
- desktop/graphics_icons_and_splash/Icon\
LibreCAD/Icon_Librecad.svg \
- "${srcdir}"/librecad.png
- install -D -m0644 "${srcdir}"/librecad.png
"${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/librecad.png"
- done
- install -D -m0644 desktop/graphics_icons_and_splash/Icon\
LibreCAD/Icon_Librecad.svg
"${pkgdir}/usr/share/icons/hicolor/scalable/apps/librecad.svg"
-
- # resources
- mkdir -p "${pkgdir}/usr/share/librecad/"
- cp -r unix/resources/{library,patterns,fonts,qm}
"${pkgdir}/usr/share/librecad/"
-}
-
Copied: librecad/repos/community-x86_64/PKGBUILD (from rev 961668,
librecad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-10 19:47:39 UTC (rev 961669)
@@ -0,0 +1,81 @@
+# Maintainer: Christian Hesse <[email protected]>
+# Contributor: mickele <mimocciola at yahoo dot com> (librecad-git PKGBUILD)
+# Contributor: Ilmari Repo <ilmari at gmail dot com> (librecad-svn PKGBUILD)
+# Contributor: GazJ Gary James <garyjames82 at gmail dot com> (CADuntu
PKGBUILD)
+
+pkgname=librecad
+pkgver=2.1.3
+pkgrel=6
+pkgdesc='A 2D CAD drawing tool based on the community edition of QCad'
+arch=('x86_64')
+url='https://www.librecad.org/'
+license=('GPL')
+depends=('qt5-base' 'qt5-svg' 'libxcb' 'muparser')
+makedepends=('qt5-tools' 'boost' 'imagemagick' 'librsvg')
+conflicts=('librecad-git')
+replaces=('librecad-svn' 'caduntu' 'caduntu-svn')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreCAD/LibreCAD/archive/${pkgver}.tar.gz";
+ '0001-fix-build-with-Qt-5.11.patch'
+ '0002-fix-build-with-Qt-5.15.patch'
+ '0003-add-boost-tuple-include-to-fix-build.patch')
+sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06'
+ '7590015c964888673844b1342e684e417b8bd2a5baacecebfbdc2f9aa0749360'
+ 'a5c37f871ce88a4efd0236c6329a19afe7993be96df9fe02b3affd79a44314bb'
+ '84e9440b18ae28c22e7becf9e1f20f9ea38687d2112f38a1186b03a2278ce23a')
+
+prepare() {
+ cd "${srcdir}/LibreCAD-${pkgver}"
+
+ # fix build with recent Qt
+ patch -Np1 < ../0001-fix-build-with-Qt-5.11.patch
+ patch -Np1 < ../0002-fix-build-with-Qt-5.15.patch
+ patch -Np1 < ../0003-add-boost-tuple-include-to-fix-build.patch
+}
+
+build() {
+ cd "${srcdir}/LibreCAD-${pkgver}"
+
+ # fix version string
+ sed -i "/^SCMREVISION/c SCMREVISION=\"${pkgver}\"" librecad/src/src.pro
+
+ qmake-qt5 librecad.pro
+
+ # fix include path... this is an issue with gcc 6.1.1 and qmake-qt5...
+ make qmake_all
+ sed -i '/INCPATH/s|-isystem /usr/include ||' librecad/src/Makefile
+
+ make
+}
+
+package() {
+ cd "${srcdir}/LibreCAD-${pkgver}"
+
+ # executables
+ install -D -m0755 unix/librecad "${pkgdir}/usr/bin/librecad"
+ install -D -m0755 unix/ttf2lff "${pkgdir}/usr/bin/ttf2lff"
+
+ # desktop file and man pages
+ install -D -m0644 desktop/librecad.desktop
"${pkgdir}/usr/share/applications/librecad.desktop"
+ install -D -m0644 desktop/librecad.1
"${pkgdir}/usr/share/man/man1/librecad.1"
+
+ # documentation
+ install -D -m0644 librecad/support/doc/README
"${pkgdir}/usr/share/doc/librecad/index.README"
+ install -D -m0644 librecad/support/doc/index.html
"${pkgdir}/usr/share/doc/librecad/index.html"
+ install -D -m0644 librecad/support/doc/style.css
"${pkgdir}/usr/share/doc/librecad/style.css"
+ install -D -m0644 librecad/support/doc/img/librecadlogo.png
"${pkgdir}/usr/share/doc/librecad/img/librecadlogo.png"
+
+ # icons
+ for SIZE in 16 24 32 48 64 96 128; do
+ # set modify/create for reproducible builds
+ convert -scale ${SIZE} +set date:create +set date:modify \
+ desktop/graphics_icons_and_splash/Icon\
LibreCAD/Icon_Librecad.svg \
+ "${srcdir}"/librecad.png
+ install -D -m0644 "${srcdir}"/librecad.png
"${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/librecad.png"
+ done
+ install -D -m0644 desktop/graphics_icons_and_splash/Icon\
LibreCAD/Icon_Librecad.svg
"${pkgdir}/usr/share/icons/hicolor/scalable/apps/librecad.svg"
+
+ # resources
+ mkdir -p "${pkgdir}/usr/share/librecad/"
+ cp -r unix/resources/{library,patterns,fonts,qm}
"${pkgdir}/usr/share/librecad/"
+}
+
