pkgs/upp: fetch remove inline patch from pr
This commit is contained in:
parent
6d32f8da73
commit
f92651afdf
2 changed files with 6 additions and 14 deletions
|
@ -2,6 +2,7 @@
|
||||||
lib,
|
lib,
|
||||||
callPackage,
|
callPackage,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
|
fetchpatch,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
@ -68,7 +69,11 @@ in {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./no-build-info.patch
|
./no-build-info.patch
|
||||||
./remove-inline-from-HighlightSetup-InitOnce.patch
|
(fetchpatch {
|
||||||
|
# https://github.com/ultimatepp/ultimatepp/pull/271
|
||||||
|
url = "https://github.com/ultimatepp/ultimatepp/commit/db5cad68673f9571e6571116e0570e22e3e44fe8.patch";
|
||||||
|
hash = "sha256-t2PducjE6b5MjDSAIKvEMdHnT8oTGmI073qYuhLFCh0=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs ./configure_makefile
|
patchShebangs ./configure_makefile
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a b
|
|
||||||
index eca1b54..dede1d5 100644
|
|
||||||
--- a/uppsrc/CodeEditor/Style.cpp
|
|
||||||
+++ b/uppsrc/CodeEditor/Style.cpp
|
|
||||||
@@ -38,7 +38,7 @@ void HighlightSetup::DefaultHlStyles()
|
|
||||||
WhiteTheme();
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline void HighlightSetup::InitOnce()
|
|
||||||
+void HighlightSetup::InitOnce()
|
|
||||||
{
|
|
||||||
ONCELOCK {
|
|
||||||
static bool initialised;
|
|
Loading…
Add table
Add a link
Reference in a new issue