summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-06-12 22:49:51 +0000
committerBen de Groot <yngwin@gentoo.org>2009-06-12 22:49:51 +0000
commit323c8f4fffe293cb1cfd34fc774884c914520b91 (patch)
tree20e3500a42c34e621ba3a3a851490698512f5ad4 /x11-libs/qtscriptgenerator/files
parentwhitespace (diff)
downloadgentoo-2-323c8f4fffe293cb1cfd34fc774884c914520b91.tar.gz
gentoo-2-323c8f4fffe293cb1cfd34fc774884c914520b91.tar.bz2
gentoo-2-323c8f4fffe293cb1cfd34fc774884c914520b91.zip
Use a more correct gcc-4.4 patch. Minor ebuild cleanups.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qtscriptgenerator/files')
-rw-r--r--x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch32
-rw-r--r--x11-libs/qtscriptgenerator/files/qtscriptgenerator-gcc44.patch15
2 files changed, 15 insertions, 32 deletions
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch
deleted file mode 100644
index d12462fa709d..000000000000
--- a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/files/qtscriptgenerator-gcc44.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-gcc44.patch
new file mode 100644
index 000000000000..dbb423e5d808
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-gcc44.patch
@@ -0,0 +1,15 @@
+# Patch from upstream bug tracker:
+# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37
+# So far (2009-06-12) this has not been applied at upstream git repo
+
+diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
+--- generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100
++++ generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <cctype>
+
+ #include <fcntl.h>
++#include <cstdio>
+
+ #ifdef HAVE_MMAP
+ # include <sys/mman.h>