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
commitd19643c20418f5e347471128367be9f8199d860e (patch)
treeff5b48cbfa48db2eea518b669a956c5d3bf8825a /x11-libs/qtscriptgenerator
parentFix gcc-4.4 compatibility, bug 267816. Thanks to uzytkownik <uzytkownik2@gmai... (diff)
downloadhistorical-d19643c20418f5e347471128367be9f8199d860e.tar.gz
historical-d19643c20418f5e347471128367be9f8199d860e.tar.bz2
historical-d19643c20418f5e347471128367be9f8199d860e.zip
Fix GCC 4.4 compatibility, bug 268086. Thanks to Andreas Sturmlechner <andreas.sturmlechner@gmail.com> for the patch.
Package-Manager: portage-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/Manifest5
-rw-r--r--x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch32
-rw-r--r--x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild5
4 files changed, 46 insertions, 4 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/Manifest b/x11-libs/qtscriptgenerator/Manifest
index a0a914159c74..12367381174f 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -1,4 +1,5 @@
+AUX qtscriptgenerator-0.1.0-gcc44.patch 919 RMD160 0d59634c2210514bebbe379ff81c5f5ca3c61b1a SHA1 5496c72279b1ff1367acf1f5c238840538ba3b0e SHA256 4c48b8d8f3495327e203b0476f511c9366612edd29a7645f9bb7669566f75cee
DIST qtscriptgenerator-src-0.1.0.tar.gz 374223 RMD160 a02ce6fea2fbc3d3a6ae9e51c6b563ef4bcd51f3 SHA1 eeae733106369e289f257b754822bc372fd6ba75 SHA256 462ec57a65cf61228070a442299a5ecd189f80325f8246e5f98e0b8b06941f41
-EBUILD qtscriptgenerator-0.1.0.ebuild 1671 RMD160 0b811c6e874e98ff8edb66e4f23013bff1245b13 SHA1 9a91441d269a40a74a95d82e2cc4eaf44dcdfe0a SHA256 111c20fde51a63debd64f32c9849a04b81041e7994abc36a371ab2c0920c4b89
-MISC ChangeLog 532 RMD160 97f4d7a93dcfeced9a1ef865214b43e0a31e83a1 SHA1 91615145b212c32744811602201cfab2887a92d5 SHA256 d6d9cc39e9651f84bd35d1372d45be45e6d4da5dbe46efde5b638315f785325f
+EBUILD qtscriptgenerator-0.1.0.ebuild 1739 RMD160 a434e954342ae41fffcc07e646666a465438d72b SHA1 419d3ab2b679bce9de269b5c58a6a6d57c67935e SHA256 2509af6093ba9c2d47e882cb80e52ea21f0b35d456139168a7bbed720e16d896
+MISC ChangeLog 785 RMD160 8f39ed81c18b61271354f7981b82054985ee7c38 SHA1 9b8ce6f62666bf21b2a41c89c73ae9cc33c6860d SHA256 b3a58383265a9ee2c780eaeaf4d1ab03b9d577244d567ec0077de5a754615897
MISC metadata.xml 174 RMD160 150ebb914d1d3dba874847502ec6fca3569bdd9d SHA1 069ee757d92149b01569258dd651246ae0c56e88 SHA256 24acedd614ebfee8dfa4f4bbe7729fd1b503351fb7c055fe3ff0109ef01e2a8e
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
}