[arch-commits] Commit in qtscriptgenerator/repos (16 files)

Andrea Scarpino andrea at archlinux.org
Tue May 1 07:24:54 UTC 2012


    Date: Tuesday, May 1, 2012 @ 03:24:53
  Author: andrea
Revision: 158023

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qtscriptgenerator/repos/extra-i686/PKGBUILD
    (from rev 158022, qtscriptgenerator/trunk/PKGBUILD)
  qtscriptgenerator/repos/extra-i686/no-phonon.patch
    (from rev 158022, qtscriptgenerator/trunk/no-phonon.patch)
  qtscriptgenerator/repos/extra-i686/phonon.patch
    (from rev 158022, qtscriptgenerator/trunk/phonon.patch)
  qtscriptgenerator/repos/extra-x86_64/PKGBUILD
    (from rev 158022, qtscriptgenerator/trunk/PKGBUILD)
  qtscriptgenerator/repos/extra-x86_64/no-phonon.patch
    (from rev 158022, qtscriptgenerator/trunk/no-phonon.patch)
  qtscriptgenerator/repos/extra-x86_64/phonon.patch
    (from rev 158022, qtscriptgenerator/trunk/phonon.patch)
Deleted:
  qtscriptgenerator/repos/extra-i686/PKGBUILD
  qtscriptgenerator/repos/extra-i686/gcc44.patch
  qtscriptgenerator/repos/extra-i686/no-phonon.patch
  qtscriptgenerator/repos/extra-i686/phonon.patch
  qtscriptgenerator/repos/extra-i686/qt48.patch
  qtscriptgenerator/repos/extra-x86_64/PKGBUILD
  qtscriptgenerator/repos/extra-x86_64/gcc44.patch
  qtscriptgenerator/repos/extra-x86_64/no-phonon.patch
  qtscriptgenerator/repos/extra-x86_64/phonon.patch
  qtscriptgenerator/repos/extra-x86_64/qt48.patch

------------------------------+
 extra-i686/PKGBUILD          |   94 ++++++++++++++-----------------
 extra-i686/gcc44.patch       |   15 -----
 extra-i686/no-phonon.patch   |   68 +++++++++++-----------
 extra-i686/phonon.patch      |  122 ++++++++++++++++++++---------------------
 extra-i686/qt48.patch        |   22 -------
 extra-x86_64/PKGBUILD        |   94 ++++++++++++++-----------------
 extra-x86_64/gcc44.patch     |   15 -----
 extra-x86_64/no-phonon.patch |   68 +++++++++++-----------
 extra-x86_64/phonon.patch    |  122 ++++++++++++++++++++---------------------
 extra-x86_64/qt48.patch      |   22 -------
 10 files changed, 278 insertions(+), 364 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-i686/PKGBUILD	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=qtscriptgenerator
-pkgver=0.1.0
-pkgrel=5
-pkgdesc="A tool that generates Qt bindings for Qt Script"
-arch=("i686" "x86_64")
-url="https://code.google.com/p/qtscriptgenerator/"
-license=('GPL')
-depends=('qt' 'phonon' 'qtwebkit')
-makedepends=('pkgconfig' 'mesa')
-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
-
-  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
-  cd generator
-  qmake
-  make
-  ./generator --include-paths=/usr/include
-
-  # build plugins
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
-  qmake
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
-  # move plugins to correct directory
-  install -d "${pkgdir}"/usr/lib/qt/plugins/script
-  mv "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
-    "${pkgdir}"/usr/lib/qt/plugins/script/
-}

Copied: qtscriptgenerator/repos/extra-i686/PKGBUILD (from rev 158022, qtscriptgenerator/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-05-01 07:24:53 UTC (rev 158023)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=qtscriptgenerator
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="A tool that generates Qt bindings for Qt Script"
+arch=("i686" "x86_64")
+url="https://code.google.com/p/qtscriptgenerator/"
+license=('GPL')
+depends=('qtwebkit')
+makedepends=('pkgconfig' 'mesa')
+source=("https://qtscriptgenerator.googlecode.com/files/${pkgname}-src-${pkgver}.tar.gz"
+        'phonon.patch'
+        'no-phonon.patch')
+sha1sums=('4c1078f26b196156e857c17c9d11a66cfea66f00'
+          'cca1cd546628a10a91475a82fe12ad2e4066a7d0'
+          'c50b26e6504f5c981a916860d9c3929e436e1067')
+
+build() {
+  cd "${srcdir}"/$pkgname-src-$pkgver
+
+  patch -p1 -i "${srcdir}"/phonon.patch
+  patch -p1 -i "${srcdir}"/no-phonon.patch
+
+  # prepare plugins
+  cd generator
+  qmake
+  make
+  ./generator --include-paths=/usr/include
+
+  # build plugins
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  qmake
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  # move plugins to correct directory
+  install -d "${pkgdir}"/usr/lib/qt/plugins/script
+  cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
+    "${pkgdir}"/usr/lib/qt/plugins/script/
+}

Deleted: extra-i686/gcc44.patch
===================================================================
--- extra-i686/gcc44.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-i686/gcc44.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,15 +0,0 @@
-# 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>

Deleted: extra-i686/no-phonon.patch
===================================================================
--- extra-i686/no-phonon.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-i686/no-phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,34 +0,0 @@
-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 \

Copied: qtscriptgenerator/repos/extra-i686/no-phonon.patch (from rev 158022, qtscriptgenerator/trunk/no-phonon.patch)
===================================================================
--- extra-i686/no-phonon.patch	                        (rev 0)
+++ extra-i686/no-phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -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 \

Deleted: extra-i686/phonon.patch
===================================================================
--- extra-i686/phonon.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-i686/phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,61 +0,0 @@
-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>
- 
--#ifndef QT_NO_XMLPATTERNS
--#  include <QtXmlPatterns/QtXmlPatterns>
--#endif
--
--#ifndef QT_NO_WEBKIT
--#  include <QtWebKit/QtWebKit>
--#endif
--
--#ifndef QT_NO_PHONON
--#  include <phonon/phonon>
--#endif
-+#include <QtXmlPatterns/QtXmlPatterns>                                                              
-+
-+#include <QtWebKit/QtWebKit>                                                                        
-+
-+#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"
-+#include "phonon/mediaobjectinterface.h"
-+#include "phonon/mediasource.h"
-+#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"
-+#include "phonon/videowidget.h"
-+#include "phonon/videowidgetinterface.h"
-+#include "phonon/volumefadereffect.h"
-+#include "phonon/volumefaderinterface.h"
-+#include "phonon/volumeslider.h"
- 
- #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
- 

Copied: qtscriptgenerator/repos/extra-i686/phonon.patch (from rev 158022, qtscriptgenerator/trunk/phonon.patch)
===================================================================
--- extra-i686/phonon.patch	                        (rev 0)
+++ extra-i686/phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -0,0 +1,61 @@
+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>
+ 
+-#ifndef QT_NO_XMLPATTERNS
+-#  include <QtXmlPatterns/QtXmlPatterns>
+-#endif
+-
+-#ifndef QT_NO_WEBKIT
+-#  include <QtWebKit/QtWebKit>
+-#endif
+-
+-#ifndef QT_NO_PHONON
+-#  include <phonon/phonon>
+-#endif
++#include <QtXmlPatterns/QtXmlPatterns>                                                              
++
++#include <QtWebKit/QtWebKit>                                                                        
++
++#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"
++#include "phonon/mediaobjectinterface.h"
++#include "phonon/mediasource.h"
++#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"
++#include "phonon/videowidget.h"
++#include "phonon/videowidgetinterface.h"
++#include "phonon/volumefadereffect.h"
++#include "phonon/volumefaderinterface.h"
++#include "phonon/volumeslider.h"
+ 
+ #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
+ 

Deleted: extra-i686/qt48.patch
===================================================================
--- extra-i686/qt48.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-i686/qt48.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,22 +0,0 @@
-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/>

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-x86_64/PKGBUILD	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=qtscriptgenerator
-pkgver=0.1.0
-pkgrel=5
-pkgdesc="A tool that generates Qt bindings for Qt Script"
-arch=("i686" "x86_64")
-url="https://code.google.com/p/qtscriptgenerator/"
-license=('GPL')
-depends=('qt' 'phonon' 'qtwebkit')
-makedepends=('pkgconfig' 'mesa')
-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
-
-  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
-  cd generator
-  qmake
-  make
-  ./generator --include-paths=/usr/include
-
-  # build plugins
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
-  qmake
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
-  # move plugins to correct directory
-  install -d "${pkgdir}"/usr/lib/qt/plugins/script
-  mv "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
-    "${pkgdir}"/usr/lib/qt/plugins/script/
-}

Copied: qtscriptgenerator/repos/extra-x86_64/PKGBUILD (from rev 158022, qtscriptgenerator/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-05-01 07:24:53 UTC (rev 158023)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=qtscriptgenerator
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="A tool that generates Qt bindings for Qt Script"
+arch=("i686" "x86_64")
+url="https://code.google.com/p/qtscriptgenerator/"
+license=('GPL')
+depends=('qtwebkit')
+makedepends=('pkgconfig' 'mesa')
+source=("https://qtscriptgenerator.googlecode.com/files/${pkgname}-src-${pkgver}.tar.gz"
+        'phonon.patch'
+        'no-phonon.patch')
+sha1sums=('4c1078f26b196156e857c17c9d11a66cfea66f00'
+          'cca1cd546628a10a91475a82fe12ad2e4066a7d0'
+          'c50b26e6504f5c981a916860d9c3929e436e1067')
+
+build() {
+  cd "${srcdir}"/$pkgname-src-$pkgver
+
+  patch -p1 -i "${srcdir}"/phonon.patch
+  patch -p1 -i "${srcdir}"/no-phonon.patch
+
+  # prepare plugins
+  cd generator
+  qmake
+  make
+  ./generator --include-paths=/usr/include
+
+  # build plugins
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  qmake
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  # move plugins to correct directory
+  install -d "${pkgdir}"/usr/lib/qt/plugins/script
+  cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
+    "${pkgdir}"/usr/lib/qt/plugins/script/
+}

Deleted: extra-x86_64/gcc44.patch
===================================================================
--- extra-x86_64/gcc44.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-x86_64/gcc44.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,15 +0,0 @@
-# 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>

Deleted: extra-x86_64/no-phonon.patch
===================================================================
--- extra-x86_64/no-phonon.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-x86_64/no-phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,34 +0,0 @@
-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 \

Copied: qtscriptgenerator/repos/extra-x86_64/no-phonon.patch (from rev 158022, qtscriptgenerator/trunk/no-phonon.patch)
===================================================================
--- extra-x86_64/no-phonon.patch	                        (rev 0)
+++ extra-x86_64/no-phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -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 \

Deleted: extra-x86_64/phonon.patch
===================================================================
--- extra-x86_64/phonon.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-x86_64/phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,61 +0,0 @@
-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>
- 
--#ifndef QT_NO_XMLPATTERNS
--#  include <QtXmlPatterns/QtXmlPatterns>
--#endif
--
--#ifndef QT_NO_WEBKIT
--#  include <QtWebKit/QtWebKit>
--#endif
--
--#ifndef QT_NO_PHONON
--#  include <phonon/phonon>
--#endif
-+#include <QtXmlPatterns/QtXmlPatterns>                                                              
-+
-+#include <QtWebKit/QtWebKit>                                                                        
-+
-+#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"
-+#include "phonon/mediaobjectinterface.h"
-+#include "phonon/mediasource.h"
-+#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"
-+#include "phonon/videowidget.h"
-+#include "phonon/videowidgetinterface.h"
-+#include "phonon/volumefadereffect.h"
-+#include "phonon/volumefaderinterface.h"
-+#include "phonon/volumeslider.h"
- 
- #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
- 

Copied: qtscriptgenerator/repos/extra-x86_64/phonon.patch (from rev 158022, qtscriptgenerator/trunk/phonon.patch)
===================================================================
--- extra-x86_64/phonon.patch	                        (rev 0)
+++ extra-x86_64/phonon.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -0,0 +1,61 @@
+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>
+ 
+-#ifndef QT_NO_XMLPATTERNS
+-#  include <QtXmlPatterns/QtXmlPatterns>
+-#endif
+-
+-#ifndef QT_NO_WEBKIT
+-#  include <QtWebKit/QtWebKit>
+-#endif
+-
+-#ifndef QT_NO_PHONON
+-#  include <phonon/phonon>
+-#endif
++#include <QtXmlPatterns/QtXmlPatterns>                                                              
++
++#include <QtWebKit/QtWebKit>                                                                        
++
++#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"
++#include "phonon/mediaobjectinterface.h"
++#include "phonon/mediasource.h"
++#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"
++#include "phonon/videowidget.h"
++#include "phonon/videowidgetinterface.h"
++#include "phonon/volumefadereffect.h"
++#include "phonon/volumefaderinterface.h"
++#include "phonon/volumeslider.h"
+ 
+ #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
+ 

Deleted: extra-x86_64/qt48.patch
===================================================================
--- extra-x86_64/qt48.patch	2012-05-01 07:17:19 UTC (rev 158022)
+++ extra-x86_64/qt48.patch	2012-05-01 07:24:53 UTC (rev 158023)
@@ -1,22 +0,0 @@
-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/>




More information about the arch-commits mailing list