kde5_latest.ktexteditor: update patches and dependencies
ktexteditor-5.18.0 needs its patches updated. An optional dependency on `libgit2` was also added. `makeQtWrapper` was added to `nativeBuildInputs` to set `XDG_DATA_DIRS` correctly.
This commit is contained in:
parent
67d63d24e0
commit
ab16bbd0a4
3 changed files with 18 additions and 25 deletions
|
@ -1,17 +1,21 @@
|
|||
{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
|
||||
, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
|
||||
, qtxmlpatterns, sonnet
|
||||
{ kdeFramework, lib, copyPathsToStore
|
||||
, extra-cmake-modules, makeQtWrapper, perl
|
||||
, karchive, kconfig, kguiaddons, kiconthemes, kparts
|
||||
, libgit2
|
||||
, qtscript, qtxmlpatterns
|
||||
, ki18n, kio, sonnet
|
||||
}:
|
||||
|
||||
kdeFramework {
|
||||
name = "ktexteditor";
|
||||
nativeBuildInputs = [ extra-cmake-modules perl ];
|
||||
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
|
||||
buildInputs = [
|
||||
karchive kconfig kguiaddons kiconthemes kparts qtscript
|
||||
qtxmlpatterns
|
||||
karchive kconfig kguiaddons kiconthemes kparts
|
||||
libgit2
|
||||
qtscript qtxmlpatterns
|
||||
];
|
||||
propagatedBuildInputs = [ ki18n kio sonnet ];
|
||||
patches = [ ./0001-no-qcoreapplication.patch ];
|
||||
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.ttuegel ];
|
||||
};
|
||||
|
|
|
@ -1,17 +1,8 @@
|
|||
From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Wed, 14 Oct 2015 09:08:59 -0500
|
||||
Subject: [PATCH] no qcoreapplication
|
||||
|
||||
---
|
||||
src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
|
||||
index 3c63140..e3d5efe 100644
|
||||
--- a/src/syntax/data/katehighlightingindexer.cpp
|
||||
+++ b/src/syntax/data/katehighlightingindexer.cpp
|
||||
@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName)
|
||||
Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
|
||||
===================================================================
|
||||
--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
|
||||
+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
|
||||
@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
@ -34,7 +25,7 @@ index 3c63140..e3d5efe 100644
|
|||
if (hlFilenamesListing.isEmpty()) {
|
||||
return 1;
|
||||
}
|
||||
@@ -147,7 +144,7 @@ int main(int argc, char *argv[])
|
||||
@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
|
||||
return anyError;
|
||||
|
||||
// create outfile, after all has worked!
|
||||
|
@ -43,6 +34,3 @@ index 3c63140..e3d5efe 100644
|
|||
if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
|
||||
return 7;
|
||||
|
||||
--
|
||||
2.5.2
|
||||
|
|
@ -0,0 +1 @@
|
|||
no-qcoreapplication.patch
|
Loading…
Reference in a new issue