librecad: 2.2.0-rc1 -> 2.2.0-rc2
This commit is contained in:
parent
efb1815d1b
commit
4ce3e862ce
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, boost
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, mkDerivationWith
|
||||
, muparser
|
||||
|
@ -11,36 +10,20 @@
|
|||
, qtsvg
|
||||
, qttools
|
||||
, runtimeShell
|
||||
, gcc8Stdenv
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv = gcc8Stdenv;
|
||||
in
|
||||
|
||||
# Doesn't build with gcc9
|
||||
mkDerivationWith stdenv.mkDerivation rec {
|
||||
pname = "librecad";
|
||||
version = "2.2.0-rc1";
|
||||
version = "2.2.0-rc2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LibreCAD";
|
||||
repo = "LibreCAD";
|
||||
rev = version;
|
||||
sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
|
||||
sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix_qt_5_11_build.patch
|
||||
(
|
||||
fetchpatch {
|
||||
# Fix missing app name and icon on Wayland.
|
||||
url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch";
|
||||
sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5";
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/postprocess-unix.sh \
|
||||
--replace /bin/sh ${runtimeShell}
|
||||
|
@ -88,16 +71,11 @@ mkDerivationWith stdenv.mkDerivation rec {
|
|||
qttools
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "2D CAD package based on Qt";
|
||||
homepage = "https://librecad.org";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [
|
||||
kiwi
|
||||
viric
|
||||
];
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ kiwi viric ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
index 835e47d..2c878e8 100644
|
||||
--- a/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
+++ b/librecad/src/ui/forms/qg_commandwidget.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
+#include <QAction>
|
||||
#include <QKeyEvent>
|
||||
#include <QFileDialog>
|
||||
#include <QSettings>
|
||||
diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
|
||||
index 2beaceb..84068ad 100644
|
||||
--- a/librecad/src/ui/generic/colorwizard.cpp
|
||||
+++ b/librecad/src/ui/generic/colorwizard.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "colorwizard.h"
|
||||
#include "ui_colorwizard.h"
|
||||
|
||||
+#include <QAction>
|
||||
#include <QColorDialog>
|
||||
#include <QLineEdit>
|
||||
#include <QListWidget>
|
||||
diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
|
||||
index 7c35144..0e394f2 100644
|
||||
--- a/librecad/src/ui/generic/widgetcreator.cpp
|
||||
+++ b/librecad/src/ui/generic/widgetcreator.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "widgetcreator.h"
|
||||
#include "ui_widgetcreator.h"
|
||||
|
||||
+#include <QActionGroup>
|
||||
#include <QSettings>
|
||||
#include <QLineEdit>
|
||||
#include <QPushButton>
|
Loading…
Reference in a new issue