tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
goldendict: fix build with gcc47
Vladimír Čunát
13 years ago
d210a4a8
d91df9a4
+41
-1
2 changed files
expand all
collapse all
unified
split
pkgs
applications
misc
goldendict
default.nix
gcc47.patch
+1
-1
pkgs/applications/misc/goldendict/default.nix
···
11
cd ${name}-src
12
tar xf ${src}
13
'';
14
-
patches = [ ./goldendict-paths.diff ];
15
patchFlags = "-p 0";
16
configurePhase = ''
17
qmake
···
11
cd ${name}-src
12
tar xf ${src}
13
'';
14
+
patches = [ ./goldendict-paths.diff ./gcc47.patch ];
15
patchFlags = "-p 0";
16
configurePhase = ''
17
qmake
+40
pkgs/applications/misc/goldendict/gcc47.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001
2
+
From: Michael Palimaka <kensington@gentoo.org>
3
+
Date: Fri, 20 Jul 2012 03:27:38 +1000
4
+
Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes.
5
+
6
+
---
7
+
processwrapper.cc | 4 ++++
8
+
qtsingleapplication/src/qtlocalpeer.cpp | 1 +
9
+
2 files changed, 5 insertions(+)
10
+
11
+
diff --git processwrapper.cc processwrapper.cc
12
+
index f7f3f19..86b985d 100644
13
+
--- processwrapper.cc
14
+
+++ processwrapper.cc
15
+
@@ -2,6 +2,10 @@
16
+
17
+
#include <QtCore>
18
+
19
+
+#if defined(Q_OS_UNIX)
20
+
+#include <unistd.h>
21
+
+#endif
22
+
+
23
+
#ifdef Q_OS_WIN32
24
+
25
+
#include <windows.h>
26
+
diff --git qtsingleapplication/src/qtlocalpeer.cpp qtsingleapplication/src/qtlocalpeer.cpp
27
+
index 382d182..506c142 100644
28
+
--- qtsingleapplication/src/qtlocalpeer.cpp
29
+
+++ qtsingleapplication/src/qtlocalpeer.cpp
30
+
@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
31
+
#endif
32
+
#if defined(Q_OS_UNIX)
33
+
#include <time.h>
34
+
+#include <unistd.h>
35
+
#endif
36
+
37
+
namespace QtLP_Private {
38
+
--
39
+
1.7.11.1
40
+