Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: app-admin/qgrubeditor/files/, app-admin/qgrubeditor/
Date: Thu, 30 Aug 2012 16:46:09
Message-Id: 1346345069.6c2a0d50d896f4004962206e5d5ec3633068c9c8.kensington@gentoo
1 commit: 6c2a0d50d896f4004962206e5d5ec3633068c9c8
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 30 16:44:29 2012 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 30 16:44:29 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6c2a0d50
7
8 [app-admin/qgrubeditor] Fix build with GCC 4.7, wrt bug #431494.
9
10 (Portage version: 2.1.11.12/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 .../files/qgrubeditor-2.5.0-gcc-4.7.patch | 11 +++++++++++
14 app-admin/qgrubeditor/qgrubeditor-2.5.0.ebuild | 1 +
15 2 files changed, 12 insertions(+), 0 deletions(-)
16
17 diff --git a/app-admin/qgrubeditor/files/qgrubeditor-2.5.0-gcc-4.7.patch b/app-admin/qgrubeditor/files/qgrubeditor-2.5.0-gcc-4.7.patch
18 new file mode 100644
19 index 0000000..6721a58
20 --- /dev/null
21 +++ b/app-admin/qgrubeditor/files/qgrubeditor-2.5.0-gcc-4.7.patch
22 @@ -0,0 +1,11 @@
23 +--- src/main.cpp
24 ++++ src/main.cpp
25 +@@ -28,6 +28,8 @@
26 + #include <QProcess>
27 + #include <QStringList>
28 +
29 ++#include <unistd.h>
30 ++
31 + #include "qgrubeditor.h"
32 + #include "lib/filetransactions.h"
33 + #include "config.h"
34
35 diff --git a/app-admin/qgrubeditor/qgrubeditor-2.5.0.ebuild b/app-admin/qgrubeditor/qgrubeditor-2.5.0.ebuild
36 index 7c09048..7cf3ba3 100644
37 --- a/app-admin/qgrubeditor/qgrubeditor-2.5.0.ebuild
38 +++ b/app-admin/qgrubeditor/qgrubeditor-2.5.0.ebuild
39 @@ -27,4 +27,5 @@ RDEPEND="${DEPEND}
40
41 S="${WORKDIR}/${MY_PN}"
42
43 +PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
44 DOCS=( AUTHORS README ChangeLog )