Add patch to from OpenMamba to fix build on arm, wrt bug #448136.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 50 insertions, 4 deletions

diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index 65f62e73fc4c..111ba653e449 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qtscriptgenerator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.26 2012/06/07 21:24:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.27 2012/12/30 14:04:37 kensington Exp $
+
+  30 Dec 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/qtscriptgenerator-0.2.0-arm.patch, qtscriptgenerator-0.2.0.ebuild:
+  Add patch to from OpenMamba to fix build on arm, wrt bug #448136.
 
   07 Jun 2012; Johannes Huber <johu@gentoo.org>
   -files/qtscriptgenerator-0.1.0-qt48.patch,
@@ -118,4 +122,3 @@
   +metadata.xml, +qtscriptgenerator-0.1.0.ebuild:
   Initial import to the tree of qtscriptgenerator from the kde-testing
   overlay. Thanks to hwoarang and reavertm for their work on the ebuild.
-
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
new file mode 100644
index 000000000000..6305c9ad2a27
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
@@ -0,0 +1,41 @@
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml	2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml	2012-03-08 05:36:14.342528441 +0100
+@@ -921,6 +921,7 @@
+   <value-type name="QEasingCurve">
+     <modify-function signature="customType()const" remove="all" />
+     <modify-function signature="setCustomType(double)" remove="all" />
++    <modify-function signature="setCustomType(float)" remove="all" />
+   </value-type>
+ 
+   <object-type name="QAbstractAnimation" />
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml	2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml	2012-03-08 05:41:37.492524499 +0100
+@@ -1447,6 +1447,7 @@
+     <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="setCustomType(double)" remove="all"/>
++    <modify-function signature="setCustomType(float)" remove="all"/>
+     <modify-function signature="customType()const" remove="all"/>
+   </value-type>
+ 
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml	2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml	2012-03-08 05:39:53.932524942 +0100
+@@ -1388,14 +1388,12 @@
+   </value-type>
+ 
+   <value-type name="QEasingCurve">
+-    <modify-function signature="customType()const" remove="all"/>
+-    <modify-function signature="setCustomType(double)" remove="all"/>
+-  
+     <modify-function signature="QEasingCurve(QEasingCurve)" remove="all"/>
+     <modify-function signature="operator=(QEasingCurve)" remove="all"/>
+     <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+     <modify-function signature="setCustomType(double)" remove="all"/>
++    <modify-function signature="setCustomType(float)" remove="all"/>
+     <modify-function signature="customType()const" remove="all"/>
+   </value-type>
+ 
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
index 5102199896c7..15dfc8688f45 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.4 2012/06/07 21:19:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.5 2012/12/30 14:04:37 kensington Exp $
 
 EAPI=4
 
 MY_PN="${PN}-src"
 MY_P="${MY_PN}-${PV}"
 
-inherit multilib qt4-r2
+inherit eutils multilib qt4-r2
 
 DESCRIPTION="Tool for generating Qt bindings for Qt Script"
 HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
@@ -44,6 +44,8 @@ src_prepare() {
 	sed -i "/typesystem_phonon.xml/d" generator/generator.qrc || die "sed failed"
 	sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
 
+	use arm && epatch "${FILESDIR}"/${P}-arm.patch
+
 	qt4-r2_src_prepare
 }