Date: Thursday, November 8, 2018 @ 09:31:16
Author: eworm
Revision: 403223
archrelease: copy trunk to community-x86_64
Added:
librecad/repos/community-x86_64/0001-fix-build-with-Qt-5.11.patch
(from rev 403222, librecad/trunk/0001-fix-build-with-Qt-5.11.patch)
librecad/repos/community-x86_64/PKGBUILD
(from rev 403222, librecad/trunk/PKGBUILD)
Deleted:
librecad/repos/community-x86_64/PKGBUILD
-----------------------------------+
0001-fix-build-with-Qt-5.11.patch | 43 ++++++++++
PKGBUILD | 141 +++++++++++++++++++-----------------
2 files changed, 118 insertions(+), 66 deletions(-)
Copied: librecad/repos/community-x86_64/0001-fix-build-with-Qt-5.11.patch (from
rev 403222, 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 2018-11-08 09:31:16 UTC (rev 403223)
@@ -0,0 +1,43 @@
+From 5bd5d5b1ea6781fcbc3c9c61b2059703647dc5d2 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jsl...@suse.cz>
+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 <jsl...@suse.cz>
+
+(cherry picked from commit 6c392e903e162b9283e88f53006e929663f2e883)
+Signed-off-by: Christian Hesse <m...@eworm.de>
+---
+ 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: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-08 09:31:01 UTC (rev 403222)
+++ PKGBUILD 2018-11-08 09:31:16 UTC (rev 403223)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <m...@eworm.de>
-# 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=3
-pkgdesc='A 2D CAD drawing tool based on the community edition of QCad'
-arch=('i686' 'x86_64')
-url='http://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";)
-sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06')
-
-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
- convert -scale ${SIZE} \
- 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 403222,
librecad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-08 09:31:16 UTC (rev 403223)
@@ -0,0 +1,75 @@
+# Maintainer: Christian Hesse <m...@eworm.de>
+# 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=4
+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')
+sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06'
+ '7590015c964888673844b1342e684e417b8bd2a5baacecebfbdc2f9aa0749360')
+
+prepare() {
+ cd "${srcdir}/LibreCAD-${pkgver}"
+
+ # fix build with Qt 5.11
+ patch -Np1 < ../0001-fix-build-with-Qt-5.11.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/"
+}
+
