[qtscriptgenerator] arm_ftbfs_float patch (from mamba)
Rex Dieter
rdieter at fedoraproject.org
Thu May 3 14:54:19 UTC 2012
commit 26cb7065e6fe96e577487fb595a20820115dcbd0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu May 3 09:56:41 2012 -0500
arm_ftbfs_float patch (from mamba)
qtscriptgenerator-0.2.0-arm-ftbfs-float.patch | 41 +++++++++++++++++++++++++
qtscriptgenerator.spec | 15 +++++++--
2 files changed, 53 insertions(+), 3 deletions(-)
---
diff --git a/qtscriptgenerator-0.2.0-arm-ftbfs-float.patch b/qtscriptgenerator-0.2.0-arm-ftbfs-float.patch
new file mode 100644
index 0000000..6305c9a
--- /dev/null
+++ b/qtscriptgenerator-0.2.0-arm-ftbfs-float.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 &)const" remove="all"/>
+ <modify-function signature="operator!=(const QEasingCurve &)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 &)const" remove="all"/>
+ <modify-function signature="operator!=(const QEasingCurve &)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/qtscriptgenerator.spec b/qtscriptgenerator.spec
index 1974f2d..24e066b 100644
--- a/qtscriptgenerator.spec
+++ b/qtscriptgenerator.spec
@@ -1,9 +1,7 @@
-#define snap 20101211
-
Name: qtscriptgenerator
Version: 0.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A tool to generate Qt bindings for Qt Script
Group: System Environment/Libraries
@@ -17,7 +15,10 @@ Patch2: qtscriptgenerator-src-0.1.0-no_phonon.patch
## upstreamable patches
Patch50: qtscriptgenerator-src-0.1.0-qmake_target.path.patch
+# needs work
Patch51: qtscriptgenerator-kde_phonon443.patch
+# fix arm ftbfs, kudos to mamba
+Patch52: qtscriptgenerator-0.2.0-arm-ftbfs-float.patch
## debian patches
Patch60: memory_alignment_fix.diff
@@ -56,6 +57,11 @@ from within Qt Script.
%patch50 -p1 -b .qmake_target.path
%patch51 -p1 -b .kde_phonon
+# I *think* we can do this unconditionally, but I'd like to
+# investigate more in-depth first
+%ifarch %{arm}
+%patch52 -p1 -b .arm_ftbfs_float
+%endif
%patch60 -p1 -b .memory_alignment
@@ -117,6 +123,9 @@ rm -rf %{buildroot}
%changelog
+* Thu May 03 2012 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-2
+- arm_ftbfs_float patch (from mamba)
+
* Tue May 01 2012 Rex Dieter <rdieter at fedoraproject.org> 0.2.0-1
- 0.2.0
More information about the scm-commits
mailing list