Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-01-23 18:14:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[testing] librecad: fix build

Browse Source
This commit is contained in:
Jeff Huang 2018-10-25 05:24:01 +02:00
parent 9d1422d590
commit ab484255b1
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
librecad/PKGBUILD
View File

@ -9,14 +9,19 @@ depends=('qt5-base' 'qt5-svg' 'libxcb' 'muparser')
makedepends=('qt5-tools' 'boost' 'imagemagick' 'librsvg') makedepends=('qt5-tools' 'boost' 'imagemagick' 'librsvg')
conflicts=('librecad-git') conflicts=('librecad-git')
replaces=('librecad-svn' 'caduntu' 'caduntu-svn') replaces=('librecad-svn' 'caduntu' 'caduntu-svn')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreCAD/LibreCAD/archive/${pkgver}.tar.gz") source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreCAD/LibreCAD/archive/${pkgver}.tar.gz"
sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06') librecad-qt-5.11.patch)
sha256sums=('74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06'
'85f246a1f44f1d6bf9c1b8625a9b6a1949faee0eaedee2c90661d153ef9a0f77')
prepare() { prepare() {
cd "${srcdir}/LibreCAD-${pkgver}" cd "${srcdir}/LibreCAD-${pkgver}"
# fix version string # fix version string
sed -i "/^SCMREVISION/c SCMREVISION=\"${pkgver}\"" librecad/src/src.pro sed -i "/^SCMREVISION/c SCMREVISION=\"${pkgver}\"" librecad/src/src.pro
# Qt 5.11 build fix
patch -p1 ../librecad-qt-5.11.patch
} }
build() { build() {

34
librecad/librecad-qt-5.11.patch Normal file
View File

@ -0,0 +1,34 @@
diff -up LibreCAD-2.2.0-rc1/librecad/src/ui/forms/qg_commandwidget.cpp.qt511 LibreCAD-2.2.0-rc1/librecad/src/ui/forms/qg_commandwidget.cpp
--- LibreCAD-2.2.0-rc1/librecad/src/ui/forms/qg_commandwidget.cpp.qt511 2018-07-23 13:44:03.713571700 -0400
+++ LibreCAD-2.2.0-rc1/librecad/src/ui/forms/qg_commandwidget.cpp 2018-07-23 13:44:16.145253360 -0400
@@ -27,6 +27,7 @@
#include <algorithm>
+#include <QAction>
#include <QKeyEvent>
#include <QFileDialog>
#include <QSettings>
diff -up LibreCAD-2.2.0-rc1/librecad/src/ui/generic/colorwizard.cpp.qt511 LibreCAD-2.2.0-rc1/librecad/src/ui/generic/colorwizard.cpp
--- LibreCAD-2.2.0-rc1/librecad/src/ui/generic/colorwizard.cpp.qt511 2018-07-23 13:44:27.832954070 -0400
+++ LibreCAD-2.2.0-rc1/librecad/src/ui/generic/colorwizard.cpp 2018-07-23 13:44:41.272609918 -0400
@@ -27,6 +27,7 @@
#include "colorwizard.h"
#include "ui_colorwizard.h"
+#include <QAction>
#include <QColorDialog>
#include <QLineEdit>
#include <QListWidget>
diff -up LibreCAD-2.2.0-rc1/librecad/src/ui/generic/widgetcreator.cpp.qt511 LibreCAD-2.2.0-rc1/librecad/src/ui/generic/widgetcreator.cpp
--- LibreCAD-2.2.0-rc1/librecad/src/ui/generic/widgetcreator.cpp.qt511 2018-07-23 13:44:52.488322714 -0400
+++ LibreCAD-2.2.0-rc1/librecad/src/ui/generic/widgetcreator.cpp 2018-07-23 13:45:07.415940459 -0400
@@ -27,6 +27,8 @@
#include "widgetcreator.h"
#include "ui_widgetcreator.h"
+#include <QAction>
+#include <QActionGroup>
#include <QSettings>
#include <QLineEdit>
#include <QPushButton>