rpms/qtscriptgenerator/devel qtscriptgenerator-kde_phonon.patch, NONE, 1.1 qtscriptgenerator-src-0.1.0-qmake_target.path.patch, NONE, 1.1 qtscriptgenerator.spec, 1.4, 1.5
Rex Dieter
rdieter at fedoraproject.org
Mon Oct 19 16:00:43 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/qtscriptgenerator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13712
Modified Files:
qtscriptgenerator.spec
Added Files:
qtscriptgenerator-kde_phonon.patch
qtscriptgenerator-src-0.1.0-qmake_target.path.patch
Log Message:
* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-9
- fix build (for qt-4.6.0/phonon-isms)
qtscriptgenerator-kde_phonon.patch:
qtscript_masterinclude.h | 46 +++++++++++++++++++++++++++++++++++-----------
1 file changed, 35 insertions(+), 11 deletions(-)
--- NEW FILE qtscriptgenerator-kde_phonon.patch ---
--- 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 @@
#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/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/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/phonondefs.h"
+#include "phonon/phononnamespace.h"
+#include "phonon/platformplugin.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"
qtscriptgenerator-src-0.1.0-qmake_target.path.patch:
qtbindings/qtbindingsbase.pri | 1 +
tools/qsexec/src/qsexec.pro | 3 +++
2 files changed, 4 insertions(+)
--- NEW FILE qtscriptgenerator-src-0.1.0-qmake_target.path.patch ---
diff -up qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri.qmake_target.path qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri
--- qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri.qmake_target.path 2009-07-07 12:02:29.981909473 -0500
+++ qtscriptgenerator-src-0.1.0/qtbindings/qtbindingsbase.pri 2009-07-07 12:11:18.928769486 -0500
@@ -6,3 +6,4 @@ QT += script
CONFIG += debug_and_release
GENERATEDCPP = $$PWD/../generated_cpp
TARGET=$$qtLibraryTarget($$TARGET)
+target.path=$$[QT_INSTALL_PLUGINS]/script
diff -up qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro.qmake_target.path qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro
--- qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro.qmake_target.path 2009-02-20 05:42:24.000000000 -0600
+++ qtscriptgenerator-src-0.1.0/tools/qsexec/src/qsexec.pro 2009-07-07 12:06:42.141780908 -0500
@@ -9,3 +9,6 @@ win32:CONFIG+=console
mac:CONFIG-=app_bundle
SOURCES += main.cpp
+
+target.path=$$[QT_INSTALL_BINS]
+
Index: qtscriptgenerator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qtscriptgenerator/devel/qtscriptgenerator.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- qtscriptgenerator.spec 27 Jul 2009 02:38:27 -0000 1.4
+++ qtscriptgenerator.spec 19 Oct 2009 16:00:43 -0000 1.5
@@ -1,7 +1,7 @@
Name: qtscriptgenerator
Version: 0.1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A tool to generate Qt bindings for Qt Script
Group: System Environment/Libraries
@@ -12,6 +12,10 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
Patch1: qtscriptgenerator-0.1.0-gcc44.patch
+## upstreamable patches
+Patch50: qtscriptgenerator-src-0.1.0-qmake_target.path.patch
+Patch51: qtscriptgenerator-kde_phonon.patch
+
## upstream patches
# http://code.google.com/p/qtscriptgenerator/issues/detail?id=27
Patch100: qtscriptgenerator-sun_issue27.patch
@@ -44,6 +48,8 @@ from within Qt Script.
%setup -q -n %{name}-src-%{version}
%patch1 -p0 -b .gcc44
+%patch50 -p1 -b .qmake_target.path
+%patch51 -p1 -b .kde_phonon
%patch100 -p4 -b .sun_issue27
@@ -103,6 +109,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Oct 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.1.0-9
+- fix build (for qt-4.6.0/phonon-isms)
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list