| 1 |
commit: c10012dd97518bc32dfdaf493911391ae70f7e4a |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 10 17:01:05 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 10 17:01:05 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c10012dd |
| 7 |
|
| 8 |
[x11-libs/qtscriptgenerator] Add fedora patch to compile with Qt 4.8, fixes bug 397917. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/qtscriptgenerator-0.1.0-qt48.patch | 22 ++++++++++++++++++++ |
| 14 |
.../qtscriptgenerator-9999.ebuild | 9 ++++++- |
| 15 |
2 files changed, 29 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..f397b5a |
| 20 |
--- /dev/null |
| 21 |
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch |
| 22 |
@@ -0,0 +1,22 @@ |
| 23 |
+diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml |
| 24 |
+--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 |
| 25 |
++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 |
| 26 |
+@@ -2233,7 +2233,6 @@ |
| 27 |
+ |
| 28 |
+ |
| 29 |
+ </object-type> |
| 30 |
+- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> |
| 31 |
+ <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> |
| 32 |
+ <modify-function signature="reason()const"> |
| 33 |
+ <remove/> |
| 34 |
+diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml |
| 35 |
+--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 |
| 36 |
++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 |
| 37 |
+@@ -2555,7 +2555,6 @@ |
| 38 |
+ |
| 39 |
+ |
| 40 |
+ </object-type> |
| 41 |
+- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> |
| 42 |
+ <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> |
| 43 |
+ <modify-function signature="reason()const"> |
| 44 |
+ <remove/> |
| 45 |
|
| 46 |
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild |
| 47 |
index 1a111ce..02d00fa 100644 |
| 48 |
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild |
| 49 |
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild |
| 50 |
@@ -1,4 +1,4 @@ |
| 51 |
-# Copyright 1999-2011 Gentoo Foundation |
| 52 |
+# Copyright 1999-2012 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Header: $ |
| 55 |
|
| 56 |
@@ -26,6 +26,12 @@ RDEPEND="${DEPEND}" |
| 57 |
|
| 58 |
PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns" |
| 59 |
|
| 60 |
+# Fix for GCC-4.4 (bug 268086), Qt 4.8 (bug 397917) |
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}/${PN}-gcc44.patch" |
| 63 |
+ "${FILESDIR}/${PN}-0.1.0-qt48.patch" |
| 64 |
+) |
| 65 |
+ |
| 66 |
src_prepare() { |
| 67 |
# remove phonon |
| 68 |
sed -i "/typesystem_phonon.xml/d" generator/generator.qrc \ |
| 69 |
@@ -33,7 +39,6 @@ src_prepare() { |
| 70 |
sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro \ |
| 71 |
|| die "sed failed" |
| 72 |
|
| 73 |
- epatch "${FILESDIR}/${PN}-gcc44.patch" |
| 74 |
qt4-r2_src_prepare |
| 75 |
} |
Archives