diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-01-10 18:01:05 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-01-10 18:01:05 +0100 |
| commit | c10012dd97518bc32dfdaf493911391ae70f7e4a (patch) | |
| tree | cc7623d4cc2db00e554a79aeff01c0db1e37966a /x11-libs/qtscriptgenerator | |
| parent | [kde-base/kdeutils-meta] Add ksecrets (diff) | |
| download | kde-c10012dd97518bc32dfdaf493911391ae70f7e4a.tar.gz kde-c10012dd97518bc32dfdaf493911391ae70f7e4a.tar.bz2 kde-c10012dd97518bc32dfdaf493911391ae70f7e4a.zip | |
[x11-libs/qtscriptgenerator] Add fedora patch to compile with Qt 4.8, fixes bug 397917.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-libs/qtscriptgenerator')
| -rw-r--r-- | x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch | 22 | ||||
| -rw-r--r-- | x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild | 9 |
2 files changed, 29 insertions, 2 deletions
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch new file mode 100644 index 0000000000..f397b5ab13 --- /dev/null +++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch @@ -0,0 +1,22 @@ +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 +@@ -2233,7 +2233,6 @@ + + + </object-type> +- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> + <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> + <modify-function signature="reason()const"> + <remove/> +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 +@@ -2555,7 +2555,6 @@ + + + </object-type> +- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> + <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> + <modify-function signature="reason()const"> + <remove/> diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild index 1a111cee0f..02d00faaf0 100644 --- a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild +++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -26,6 +26,12 @@ RDEPEND="${DEPEND}" PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns" +# Fix for GCC-4.4 (bug 268086), Qt 4.8 (bug 397917) +PATCHES=( + "${FILESDIR}/${PN}-gcc44.patch" + "${FILESDIR}/${PN}-0.1.0-qt48.patch" +) + src_prepare() { # remove phonon sed -i "/typesystem_phonon.xml/d" generator/generator.qrc \ @@ -33,7 +39,6 @@ src_prepare() { sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro \ || die "sed failed" - epatch "${FILESDIR}/${PN}-gcc44.patch" qt4-r2_src_prepare } |