summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-08 01:48:35 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-08 01:48:35 +0000
commit6237451c2680038f4af7263e0e3c1e7bc8a5cdd8 (patch)
treeff65242bdba8e6694e5ad6b807770193a2880d5e /x11-libs/qtscriptgenerator
parentFix gcc-4.4 compatibility, bug 267816. Thanks to uzytkownik <uzytkownik2@gmai... (diff)
downloadgentoo-2-6237451c2680038f4af7263e0e3c1e7bc8a5cdd8.tar.gz
gentoo-2-6237451c2680038f4af7263e0e3c1e7bc8a5cdd8.tar.bz2
gentoo-2-6237451c2680038f4af7263e0e3c1e7bc8a5cdd8.zip
Fix GCC 4.4 compatibility, bug 268086. Thanks to Andreas Sturmlechner <andreas.sturmlechner@gmail.com> for the patch.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qtscriptgenerator')
-rw-r--r--x11-libs/qtscriptgenerator/ChangeLog8
-rw-r--r--x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch32
-rw-r--r--x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild5
3 files changed, 43 insertions, 2 deletions
diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index dc1d8cc25709..2af647faa63b 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/qtscriptgenerator
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.1 2009/04/15 05:40:01 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.2 2009/05/08 01:48:35 loki_val Exp $
+
+ 08 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+ qtscriptgenerator-0.1.0.ebuild,
+ +files/qtscriptgenerator-0.1.0-gcc44.patch:
+ Fix GCC 4.4 compatibility, bug 268086. Thanks to Andreas Sturmlechner
+ <andreas.sturmlechner@gmail.com> for the patch.
*qtscriptgenerator-0.1.0 (15 Apr 2009)
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch
new file mode 100644
index 000000000000..d12462fa709d
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch
@@ -0,0 +1,32 @@
+--- orig/generator/parser/rpp/pp-macro-expander.h 2009-02-20 12:42:24.000000000 +0100
++++ generator/parser/rpp/pp-macro-expander.h 2009-05-01 12:22:51.000000000 +0200
+@@ -15,6 +15,8 @@
+ #ifndef PP_MACRO_EXPANDER_H
+ #define PP_MACRO_EXPANDER_H
+
++#include <stdio.h>
++
+ namespace rpp {
+
+ struct pp_frame
+--- orig/generator/parser/rpp/pp-engine-bits.h 2009-02-20 12:42:24.000000000 +0100
++++ generator/parser/rpp/pp-engine-bits.h 2009-05-01 12:16:23.000000000 +0200
+@@ -15,6 +15,8 @@
+ #ifndef PP_ENGINE_BITS_H
+ #define PP_ENGINE_BITS_H
+
++#include <stdio.h>
++
+ namespace rpp {
+
+ inline std::string pp::fix_file_path(std::string const &filename) const
+--- orig/generator/parser/rpp/pp-internal.h 2009-02-20 12:42:24.000000000 +0100
++++ generator/parser/rpp/pp-internal.h 2009-05-01 12:24:47.000000000 +0200
+@@ -16,6 +16,7 @@
+ #define PP_INTERNAL_H
+
+ #include <algorithm>
++#include <stdio.h>
+
+ namespace rpp {
+
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
index cf64f9f540b6..d3006cfcf1de 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild,v 1.1 2009/04/15 05:40:01 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild,v 1.2 2009/05/08 01:48:35 loki_val Exp $
EAPI="2"
@@ -50,6 +50,9 @@ src_prepare() {
sed -i \
-e "/qtscript_phonon/d" \
qtbindings/qtbindings.pro || die "sed failed"
+
+ # Fix for GCC-4.4, bug 268086
+ epatch "${FILESDIR}/${P}-gcc44.patch"
qt4_src_prepare
}