[qtscriptgenerator] fix qt-4.8 build, omit failing QFileOpenEvent code
Rex Dieter
rdieter at fedoraproject.org
Thu Dec 22 17:42:05 UTC 2011
commit 7923e9f8a9c92b582a7631cf0db20369976c1244
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Dec 22 11:42:01 2011 -0600
fix qt-4.8 build, omit failing QFileOpenEvent code
...riptgenerator-src-0.1.0-no_QFileOpenEvent.patch | 22 ++++++++++++++++++++
qtscriptgenerator.spec | 9 +++++++-
2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch b/qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch
new file mode 100644
index 0000000..f397b5a
--- /dev/null
+++ b/qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.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/qtscriptgenerator.spec b/qtscriptgenerator.spec
index 1ad6cd0..509d3b1 100644
--- a/qtscriptgenerator.spec
+++ b/qtscriptgenerator.spec
@@ -3,7 +3,7 @@
Name: qtscriptgenerator
Version: 0.1.0
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: A tool to generate Qt bindings for Qt Script
Group: System Environment/Libraries
@@ -15,6 +15,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Patch1: qtscriptgenerator-0.1.0-gcc44.patch
Patch2: qtscriptgenerator-src-0.1.0-no_phonon.patch
+Patch3: qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch
## upstreamable patches
Patch50: qtscriptgenerator-src-0.1.0-qmake_target.path.patch
@@ -54,6 +55,9 @@ from within Qt Script.
%patch1 -p0 -b .gcc44
%patch2 -p1 -b .no_phonon
+%if 0%{?_qt48:1}
+%patch3 -p1 -b .no_QFileOpenEvent
+%endif
%patch50 -p1 -b .qmake_target.path
%patch51 -p1 -b .kde_phonon
@@ -116,6 +120,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Dec 22 2011 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-16
+- fix qt-4.8 build, omit failing QFileOpenEvent code
+
* Wed Nov 16 2011 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-15
- rebuild for qt48
More information about the scm-commits
mailing list