Sat Dec 31 23:14:47 UTC 2011

5 files changed, 122 insertions, 33 deletions

diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD
index 7e9773a58..328e6d28e 100644
--- a/extra/qtscriptgenerator/PKGBUILD
+++ b/extra/qtscriptgenerator/PKGBUILD
@@ -1,38 +1,50 @@
-# $Id: PKGBUILD 75658 2010-04-02 04:17:23Z pierre $
+# $Id: PKGBUILD 145770 2011-12-30 11:51:06Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qtscriptgenerator
 pkgver=0.1.0
-pkgrel=4
-pkgdesc="Script generator for qt"
+pkgrel=5
+pkgdesc="A tool that generates Qt bindings for Qt Script"
 arch=("i686" "x86_64")
-url="http://code.google.com/p/qtscriptgenerator/"
+url="https://code.google.com/p/qtscriptgenerator/"
 license=('GPL')
-depends=('qt' 'phonon')
+depends=('qt' 'phonon' 'qtwebkit')
 makedepends=('pkgconfig' 'mesa')
-source=(http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz
-        phonon.patch
-        qtscriptgenerator-gcc44.patch)
-md5sums=('ca4046ad4bda36cd4e21649d4b98886d' 'c0266892ecc645b3407f2203ee11a808'\
-         'a3d48d6a3cfdd9be397bef01d3e4f638')
+source=("https://qtscriptgenerator.googlecode.com/files/${pkgname}-src-${pkgver}.tar.gz"
+        'no-phonon.patch'
+        'gcc44.patch'
+        'qt48.patch'
+        'phonon.patch')
+sha1sums=('eeae733106369e289f257b754822bc372fd6ba75'
+          'c50b26e6504f5c981a916860d9c3929e436e1067'
+          '87cd599403fa9bb441ddc27c77e0b6242e2cc150'
+          '5487e2ed1ce4d35b48b3433dc5cc2a1752a03ff1'
+          'cca1cd546628a10a91475a82fe12ad2e4066a7d0')
 
 build() {
-  cd $srcdir/$pkgname-src-$pkgver/generator
-  patch -p1 -i $srcdir/qtscriptgenerator-gcc44.patch || return 1
+  cd "${srcdir}"/$pkgname-src-$pkgver
+
+  patch -p0 -i "${srcdir}"/gcc44.patch
+  patch -p1 -i "${srcdir}"/phonon.patch
+  patch -p1 -i "${srcdir}"/qt48.patch
+  patch -p1 -i "${srcdir}"/no-phonon.patch
+
   # prepare plugins
-  patch -Np2 -i $srcdir/phonon.patch || return 1
-  qmake || return 1
-  make || return 1
-  ./generator --include-paths=/usr/include || return 1
+  cd generator
+  qmake
+  make
+  ./generator --include-paths=/usr/include
+
   # build plugins
-  cd "$srcdir/$pkgname-src-$pkgver/qtbindings"
-  qmake || return 1
-  make || return 1
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  qmake
+  make
 }
 
 package() {
-  cd "$srcdir/$pkgname-src-$pkgver/qtbindings"
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
   # move plugins to correct directory
-  mkdir -p $pkgdir/usr/lib/qt/plugins/script
-  mv $srcdir/$pkgname-src-$pkgver/plugins/script/* $pkgdir/usr/lib/qt/plugins/script/
+  install -d "${pkgdir}"/usr/lib/qt/plugins/script
+  mv "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
+    "${pkgdir}"/usr/lib/qt/plugins/script/
 }
diff --git a/extra/qtscriptgenerator/gcc44.patch b/extra/qtscriptgenerator/gcc44.patch
new file mode 100644
index 000000000..dbb423e5d
--- /dev/null
+++ b/extra/qtscriptgenerator/gcc44.patch
@@ -0,0 +1,15 @@
+# Patch from upstream bug tracker:
+# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37
+# So far (2009-06-12) this has not been applied at upstream git repo
+
+diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
+--- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
++++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <cctype>
+
+ #include <fcntl.h>
++#include <cstdio>
+
+ #ifdef HAVE_MMAP
+ #  include <sys/mman.h>
diff --git a/extra/qtscriptgenerator/no-phonon.patch b/extra/qtscriptgenerator/no-phonon.patch
new file mode 100644
index 000000000..071b9aa69
--- /dev/null
+++ b/extra/qtscriptgenerator/no-phonon.patch
@@ -0,0 +1,34 @@
+diff -up qtscriptgenerator-src-0.1.0/generator/build_all.txt.no_phonon qtscriptgenerator-src-0.1.0/generator/build_all.txt
+--- qtscriptgenerator-src-0.1.0/generator/build_all.txt.no_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/generator/build_all.txt	2010-12-21 12:43:23.717989854 -0600
+@@ -6,7 +6,6 @@
+   <load-typesystem name="typesystem_svg.xml" generate="yes" />
+   <load-typesystem name="typesystem_network.xml" generate="yes" />
+   <load-typesystem name="typesystem_xml.xml" generate="yes" />
+-  <load-typesystem name="typesystem_phonon.xml" generate="yes" />
+   <load-typesystem name="typesystem_webkit.xml" generate="yes" />
+   <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" />
+   <load-typesystem name="typesystem_uitools.xml" generate="yes" />
+diff -up qtscriptgenerator-src-0.1.0/generator/generate.sh.no_phonon qtscriptgenerator-src-0.1.0/generator/generate.sh
+--- qtscriptgenerator-src-0.1.0/generator/generate.sh.no_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/generator/generate.sh	2010-12-21 12:43:23.717989854 -0600
+@@ -12,8 +12,6 @@ xsltproc --stringparam source $PWD/types
+ 
+ xsltproc --stringparam source $PWD/typesystem_sql-qtscript.xml merge.xsl typesystem_sql-common.xml > typesystem_sql.xml
+ 
+-xsltproc --stringparam source $PWD/typesystem_phonon-qtscript.xml merge.xsl typesystem_phonon-common.xml > typesystem_phonon.xml
+-
+ xsltproc --stringparam source $PWD/typesystem_webkit-qtscript.xml merge.xsl typesystem_webkit-common.xml > typesystem_webkit.xml
+ 
+ xsltproc --stringparam source $PWD/typesystem_xmlpatterns-qtscript.xml merge.xsl typesystem_xmlpatterns-common.xml > typesystem_xmlpatterns.xml
+diff -up qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro.no_phonon qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro
+--- qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro.no_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/qtbindings/qtbindings.pro	2010-12-21 12:45:01.010979847 -0600
+@@ -6,7 +6,6 @@ SUBDIRS = qtscript_core \
+ 	  qtscript_sql \
+ 	  qtscript_svg \
+ 	  qtscript_xml \
+-	  qtscript_phonon \
+ 	  qtscript_webkit \
+ 	  qtscript_xmlpatterns \
+ 	  qtscript_uitools \
diff --git a/extra/qtscriptgenerator/phonon.patch b/extra/qtscriptgenerator/phonon.patch
index cef0e1fa1..de22f4926 100644
--- a/extra/qtscriptgenerator/phonon.patch
+++ b/extra/qtscriptgenerator/phonon.patch
@@ -1,6 +1,7 @@
---- b/generator/qtscript_masterinclude.h	2009-03-21 20:37:30.719523909 -0400
-+++ a/generator/qtscript_masterinclude.h	2009-03-21 21:00:25.108149339 -0400
-@@ -31,17 +31,41 @@
+diff -up qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h.kde_phonon qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h
+--- qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h.kde_phonon	2010-10-26 02:53:53.000000000 -0500
++++ qtscriptgenerator-src-0.1.0/generator/qtscript_masterinclude.h	2010-12-11 17:00:08.456338081 -0600
+@@ -49,17 +49,46 @@
  
  #include <QtUiTools/QtUiTools>
  
@@ -18,19 +19,22 @@
 +#include <QtXmlPatterns/QtXmlPatterns>                                                              
 +
 +#include <QtWebKit/QtWebKit>                                                                        
-+                                                                                                    
-+#include "phonon/abstractaudiooutput.h"                                                             
-+#include "phonon/abstractmediastream.h"                                                             
-+#include "phonon/abstractvideooutput.h"                                                             
-+#include "phonon/addoninterface.h"                                                                  
-+#include "phonon/audiooutput.h"                                                                     
-+#include "phonon/audiooutputinterface.h"                                                            
-+#include "phonon/backendcapabilities.h"                                                             
++
++#include "phonon/abstractaudiooutput.h"
++#include "phonon/abstractmediastream.h"
++#include "phonon/abstractvideooutput.h"
++#include "phonon/addoninterface.h"
++#include "phonon/audiodataoutput.h"
++#include "phonon/audiodataoutputinterface.h"
++#include "phonon/audiooutput.h"
++#include "phonon/audiooutputinterface.h"
++#include "phonon/backendcapabilities.h"
 +#include "phonon/backendinterface.h"
 +#include "phonon/effect.h"
 +#include "phonon/effectinterface.h"
 +#include "phonon/effectparameter.h"
 +#include "phonon/effectwidget.h"
++#include "phonon/globalconfig.h"
 +#include "phonon/mediacontroller.h"
 +#include "phonon/medianode.h"
 +#include "phonon/mediaobject.h"
@@ -39,9 +43,11 @@
 +#include "phonon/objectdescription.h"
 +#include "phonon/objectdescriptionmodel.h"
 +#include "phonon/path.h"
++#include "phonon/phonon_export.h"
 +#include "phonon/phonondefs.h"
 +#include "phonon/phononnamespace.h"
 +#include "phonon/platformplugin.h"
++#include "phonon/pulsesupport.h"
 +#include "phonon/seekslider.h"
 +#include "phonon/streaminterface.h"
 +#include "phonon/videoplayer.h"
diff --git a/extra/qtscriptgenerator/qt48.patch b/extra/qtscriptgenerator/qt48.patch
new file mode 100644
index 000000000..f397b5ab1
--- /dev/null
+++ b/extra/qtscriptgenerator/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-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;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-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
+         <modify-function signature="reason()const">
+             <remove/>