[arch-commits] Commit in qtscriptgenerator/repos (12 files)
Antonio Rojas
arojas at archlinux.org
Fri Jan 20 19:29:51 UTC 2017
Date: Friday, January 20, 2017 @ 19:29:50
Author: arojas
Revision: 287032
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qtscriptgenerator/repos/extra-i686/PKGBUILD
(from rev 287031, qtscriptgenerator/trunk/PKGBUILD)
qtscriptgenerator/repos/extra-i686/no-phonon.patch
(from rev 287031, qtscriptgenerator/trunk/no-phonon.patch)
qtscriptgenerator/repos/extra-i686/phonon.patch
(from rev 287031, qtscriptgenerator/trunk/phonon.patch)
qtscriptgenerator/repos/extra-x86_64/PKGBUILD
(from rev 287031, qtscriptgenerator/trunk/PKGBUILD)
qtscriptgenerator/repos/extra-x86_64/no-phonon.patch
(from rev 287031, qtscriptgenerator/trunk/no-phonon.patch)
qtscriptgenerator/repos/extra-x86_64/phonon.patch
(from rev 287031, qtscriptgenerator/trunk/phonon.patch)
Deleted:
qtscriptgenerator/repos/extra-i686/PKGBUILD
qtscriptgenerator/repos/extra-i686/no-phonon.patch
qtscriptgenerator/repos/extra-i686/phonon.patch
qtscriptgenerator/repos/extra-x86_64/PKGBUILD
qtscriptgenerator/repos/extra-x86_64/no-phonon.patch
qtscriptgenerator/repos/extra-x86_64/phonon.patch
------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++++++++
/no-phonon.patch | 46 +++++++++++++++
/phonon.patch | 122 +++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 44 --------------
extra-i686/no-phonon.patch | 34 -----------
extra-i686/phonon.patch | 61 --------------------
extra-x86_64/PKGBUILD | 44 --------------
extra-x86_64/no-phonon.patch | 34 -----------
extra-x86_64/phonon.patch | 61 --------------------
9 files changed, 268 insertions(+), 278 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-20 19:29:16 UTC (rev 287031)
+++ extra-i686/PKGBUILD 2017-01-20 19:29:50 UTC (rev 287032)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=qtscriptgenerator
-pkgver=0.2.0
-pkgrel=4
-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 $pkgname-src-$pkgver
-
- patch -p1 -i "${srcdir}"/phonon.patch
- patch -p1 -i "${srcdir}"/no-phonon.patch
-
- # prepare plugins
- cd generator
- qmake-qt4
- make
- QTDIR=/usr ./generator --include-paths=/usr/include/qt4
-
- # build plugins
- cd ../qtbindings
- qmake-qt4
- make
-}
-
-package() {
- cd $pkgname-src-$pkgver/qtbindings
- # move plugins to correct directory
- install -d "${pkgdir}"/usr/lib/qt4/plugins/script
- cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
- "${pkgdir}"/usr/lib/qt4/plugins/script/
-}
Copied: qtscriptgenerator/repos/extra-i686/PKGBUILD (from rev 287031, qtscriptgenerator/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-20 19:29:50 UTC (rev 287032)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=qtscriptgenerator
+pkgver=0.2.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=('qt4')
+makedepends=('pkgconfig' 'mesa')
+source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-src-$pkgver.tar.gz"
+ 'phonon.patch'
+ 'no-phonon.patch')
+sha1sums=('4c1078f26b196156e857c17c9d11a66cfea66f00'
+ 'cca1cd546628a10a91475a82fe12ad2e4066a7d0'
+ '99e4c14eb00eed5fcd7fb6e87b0286ab733b80b4')
+
+prepare() {
+ cd $pkgname-src-$pkgver
+# Don't build webkit or phonon bindings
+ sed -e '/webkit/d' -e '/phonon/d' -i qtbindings/qtbindings.pro
+
+ patch -p1 -i "${srcdir}"/phonon.patch
+ patch -p1 -i "${srcdir}"/no-phonon.patch
+}
+
+build() {
+ cd $pkgname-src-$pkgver
+
+ # prepare plugins
+ cd generator
+ qmake-qt4
+ make
+ QTDIR=/usr ./generator --include-paths=/usr/include/qt4
+
+ # build plugins
+ cd ../qtbindings
+ qmake-qt4
+ make
+}
+
+package() {
+ cd $pkgname-src-$pkgver/qtbindings
+ # move plugins to correct directory
+ install -d "${pkgdir}"/usr/lib/qt4/plugins/script
+ cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
+ "${pkgdir}"/usr/lib/qt4/plugins/script/
+}
Deleted: extra-i686/no-phonon.patch
===================================================================
--- extra-i686/no-phonon.patch 2017-01-20 19:29:16 UTC (rev 287031)
+++ extra-i686/no-phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -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 287031, qtscriptgenerator/trunk/no-phonon.patch)
===================================================================
--- extra-i686/no-phonon.patch (rev 0)
+++ extra-i686/no-phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -0,0 +1,23 @@
+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
Deleted: extra-i686/phonon.patch
===================================================================
--- extra-i686/phonon.patch 2017-01-20 19:29:16 UTC (rev 287031)
+++ extra-i686/phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -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 287031, qtscriptgenerator/trunk/phonon.patch)
===================================================================
--- extra-i686/phonon.patch (rev 0)
+++ extra-i686/phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -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/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-20 19:29:16 UTC (rev 287031)
+++ extra-x86_64/PKGBUILD 2017-01-20 19:29:50 UTC (rev 287032)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=qtscriptgenerator
-pkgver=0.2.0
-pkgrel=4
-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 $pkgname-src-$pkgver
-
- patch -p1 -i "${srcdir}"/phonon.patch
- patch -p1 -i "${srcdir}"/no-phonon.patch
-
- # prepare plugins
- cd generator
- qmake-qt4
- make
- QTDIR=/usr ./generator --include-paths=/usr/include/qt4
-
- # build plugins
- cd ../qtbindings
- qmake-qt4
- make
-}
-
-package() {
- cd $pkgname-src-$pkgver/qtbindings
- # move plugins to correct directory
- install -d "${pkgdir}"/usr/lib/qt4/plugins/script
- cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
- "${pkgdir}"/usr/lib/qt4/plugins/script/
-}
Copied: qtscriptgenerator/repos/extra-x86_64/PKGBUILD (from rev 287031, qtscriptgenerator/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-20 19:29:50 UTC (rev 287032)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=qtscriptgenerator
+pkgver=0.2.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=('qt4')
+makedepends=('pkgconfig' 'mesa')
+source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-src-$pkgver.tar.gz"
+ 'phonon.patch'
+ 'no-phonon.patch')
+sha1sums=('4c1078f26b196156e857c17c9d11a66cfea66f00'
+ 'cca1cd546628a10a91475a82fe12ad2e4066a7d0'
+ '99e4c14eb00eed5fcd7fb6e87b0286ab733b80b4')
+
+prepare() {
+ cd $pkgname-src-$pkgver
+# Don't build webkit or phonon bindings
+ sed -e '/webkit/d' -e '/phonon/d' -i qtbindings/qtbindings.pro
+
+ patch -p1 -i "${srcdir}"/phonon.patch
+ patch -p1 -i "${srcdir}"/no-phonon.patch
+}
+
+build() {
+ cd $pkgname-src-$pkgver
+
+ # prepare plugins
+ cd generator
+ qmake-qt4
+ make
+ QTDIR=/usr ./generator --include-paths=/usr/include/qt4
+
+ # build plugins
+ cd ../qtbindings
+ qmake-qt4
+ make
+}
+
+package() {
+ cd $pkgname-src-$pkgver/qtbindings
+ # move plugins to correct directory
+ install -d "${pkgdir}"/usr/lib/qt4/plugins/script
+ cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
+ "${pkgdir}"/usr/lib/qt4/plugins/script/
+}
Deleted: extra-x86_64/no-phonon.patch
===================================================================
--- extra-x86_64/no-phonon.patch 2017-01-20 19:29:16 UTC (rev 287031)
+++ extra-x86_64/no-phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -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 287031, qtscriptgenerator/trunk/no-phonon.patch)
===================================================================
--- extra-x86_64/no-phonon.patch (rev 0)
+++ extra-x86_64/no-phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -0,0 +1,23 @@
+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
Deleted: extra-x86_64/phonon.patch
===================================================================
--- extra-x86_64/phonon.patch 2017-01-20 19:29:16 UTC (rev 287031)
+++ extra-x86_64/phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -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 287031, qtscriptgenerator/trunk/phonon.patch)
===================================================================
--- extra-x86_64/phonon.patch (rev 0)
+++ extra-x86_64/phonon.patch 2017-01-20 19:29:50 UTC (rev 287032)
@@ -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"
+
More information about the arch-commits
mailing list