Hello community,

here is the log from the commit of package qt4-qtscript for openSUSE:Factory 
checked in at 2012-07-13 11:34:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt4-qtscript (Old)
 and      /work/SRC/openSUSE:Factory/.qt4-qtscript.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qt4-qtscript", Maintainer is "[email protected]"

Changes:
--------
--- /work/SRC/openSUSE:Factory/qt4-qtscript/qt4-qtscript.changes        
2012-01-30 12:28:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qt4-qtscript.new/qt4-qtscript.changes   
2012-07-13 11:34:12.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 12 15:35:02 UTC 2012 - [email protected]
+
+- fix arm build
+
+-------------------------------------------------------------------

New:
----
  fix-arm-build.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt4-qtscript.spec ++++++
--- /var/tmp/diff_new_pack.b2lAeS/_old  2012-07-13 11:34:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b2lAeS/_new  2012-07-13 11:34:13.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package qt4-qtscript
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define date 20111225
 
+%define date 20111225
 
 Name:           qt4-qtscript
 Version:        0.2.0
-Release:        1
-License:        SUSE-LGPL-2.1-with-nokia-exception-1.1
+Release:        0
 Summary:        Qt bindings generator for Qt Script
-Url:            http://code.google.com/p/qtscriptgenerator/
+License:        SUSE-LGPL-2.1-with-nokia-exception-1.1
 Group:          Development/Libraries/KDE
+Url:            http://code.google.com/p/qtscriptgenerator/
 Source0:        qtscriptgenerator-src-%{version}.tar.gz
 Patch0:         qtscript-qt-no_phonon.diff
 Patch1:         gcc-44.diff
 Patch2:         qtscript-separate-webkit.patch
+Patch3:         fix-arm-build.diff
 BuildRequires:  libQtWebKit-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %requires_eq    libqt4
@@ -39,7 +40,6 @@
 the Qt API from within Qt Script.
 
 %package doc
-License:        SUSE-LGPL-2.1-with-nokia-exception-1.1
 Summary:        Qt bindings generator for Qt Script
 Group:          Development/Libraries/KDE
 Requires:       %{name} = %{version}
@@ -54,6 +54,9 @@
 %patch0
 %patch1
 %patch2
+%ifarch %arm
+%patch3
+%endif
 
 %build
 export QTDIR=/usr

++++++ fix-arm-build.diff ++++++
Index: generator/typesystem_core-common.xml
===================================================================
--- generator/typesystem_core-common.xml.orig
+++ generator/typesystem_core-common.xml
@@ -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" />
Index: generator/typesystem_core-qtscript.xml
===================================================================
--- generator/typesystem_core-qtscript.xml.orig
+++ generator/typesystem_core-qtscript.xml
@@ -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>
 
Index: generator/typesystem_core.xml
===================================================================
--- generator/typesystem_core.xml.orig
+++ generator/typesystem_core.xml
@@ -1390,12 +1390,14 @@
   <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"/>
   
     <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>
 
++++++ qtscript-separate-webkit.patch ++++++
--- /var/tmp/diff_new_pack.b2lAeS/_old  2012-07-13 11:34:13.000000000 +0200
+++ /var/tmp/diff_new_pack.b2lAeS/_new  2012-07-13 11:34:13.000000000 +0200
@@ -1,6 +1,8 @@
---- generator/qtscript_masterinclude.h 2009-02-20 12:42:24.000000000 +0100
-+++ generator/qtscript_masterinclude.h 2011-09-27 09:38:10.798171231 +0200
-@@ -35,9 +35,7 @@
+Index: generator/qtscript_masterinclude.h
+===================================================================
+--- generator/qtscript_masterinclude.h.orig
++++ generator/qtscript_masterinclude.h
+@@ -53,9 +53,7 @@
  #  include <QtXmlPatterns/QtXmlPatterns>
  #endif
  

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to