Merge pull request #67245 from nyanloutre/fix_kde_update
kde: multiple staging fixes
This commit is contained in:
commit
84a91208a9
|
@ -3,7 +3,8 @@
|
|||
, kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n
|
||||
, kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons
|
||||
, kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts
|
||||
, qtx11extras, qtgraphicaleffects, qtxmlpatterns, xorg
|
||||
, qtx11extras, qtgraphicaleffects, qtxmlpatterns, qtquickcontrols2
|
||||
, xorg
|
||||
}:
|
||||
|
||||
|
||||
|
@ -19,7 +20,7 @@
|
|||
kconfig kconfigwidgets kcoreaddons kdeclarative ki18n
|
||||
kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons
|
||||
kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts
|
||||
qtx11extras qtgraphicaleffects qtxmlpatterns
|
||||
qtx11extras qtgraphicaleffects qtxmlpatterns qtquickcontrols2
|
||||
xorg.libxkbfile xorg.libxcb
|
||||
];
|
||||
|
||||
|
|
|
@ -3,8 +3,7 @@
|
|||
mkDerivation rec {
|
||||
pname = "grantlee";
|
||||
version = "5.1.0";
|
||||
grantleeCompatVersion = "5.1";
|
||||
grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";
|
||||
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
|
||||
|
|
24
pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
Normal file
24
pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Sat, 20 Jul 2019 17:35:30 +0200
|
||||
Subject: [PATCH] Fix compile with newer Qt/cmake combination
|
||||
|
||||
Without this i get huge errors about Qt needing C++11 support
|
||||
---
|
||||
CMakeLists.txt | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6d51110..0859788 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -11,6 +11,9 @@ endif()
|
||||
|
||||
project(Grantlee)
|
||||
|
||||
+set (CMAKE_CXX_STANDARD 11)
|
||||
+set (CMAKE_CXX_EXTENSIONS OFF)
|
||||
+
|
||||
# Workaround for http://public.kitware.com/Bug/view.php?id=12301
|
||||
if (MINGW)
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
|
@ -1,2 +1,3 @@
|
|||
grantlee-nix-profiles.patch
|
||||
grantlee-no-canonicalize-filepath.patch
|
||||
grantlee-cxx11.patch
|
||||
|
|
|
@ -8,4 +8,7 @@ mkDerivation {
|
|||
buildInputs = [ kconfig kcoreaddons kio kparts ];
|
||||
propagatedBuildInputs = [ qtwebkit ];
|
||||
outputs = [ "out" "dev" ];
|
||||
cmakeFlags = [
|
||||
"-DBUILD_DESIGNERPLUGIN=OFF"
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue