Merge commit 'lesibel/master'

5 files changed, 90 insertions, 5 deletions

diff --git a/kde/amarok/.footprint b/kde/amarok/.footprint
index 8e3090fc1..43fceee92 100644
--- a/kde/amarok/.footprint
+++ b/kde/amarok/.footprint
@@ -462,6 +462,19 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/radio_station_service/
 drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/script_console/
 -rw-r--r--	root/root	usr/share/apps/amarok/scripts/script_console/main.js
 -rw-r--r--	root/root	usr/share/apps/amarok/scripts/script_console/script.spec
+drwxr-xr-x	root/root	usr/share/apps/desktoptheme/
+drwxr-xr-x	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/colors
+drwxr-xr-x	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/widgets/
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/widgets/background.svg
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/widgets/text-background.svgz
+drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/
+drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/widgets/
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-albums.svg
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-currenttrack.svg
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-info-applet.svg
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
+-rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
 drwxr-xr-x	root/root	usr/share/apps/solid/
 drwxr-xr-x	root/root	usr/share/apps/solid/actions/
 -rw-r--r--	root/root	usr/share/apps/solid/actions/amarok-play-audiocd.desktop
diff --git a/kde/qtscriptgenerator/.md5sum b/kde/qtscriptgenerator/.md5sum
index 370b99a52..5a31ba6cd 100644
--- a/kde/qtscriptgenerator/.md5sum
+++ b/kde/qtscriptgenerator/.md5sum
@@ -1,2 +1,3 @@
+c0266892ecc645b3407f2203ee11a808  phonon.patch
+a3d48d6a3cfdd9be397bef01d3e4f638  qtscriptgenerator-gcc44.patch
 ca4046ad4bda36cd4e21649d4b98886d  qtscriptgenerator-src-0.1.0.tar.gz
-26abd805d7bb68b5613cc7fd26e8ad4c  qtscriptgenerator.gcc-4.4.patch
diff --git a/kde/qtscriptgenerator/Pkgfile b/kde/qtscriptgenerator/Pkgfile
index cd0460da8..0b0d2b1b4 100644
--- a/kde/qtscriptgenerator/Pkgfile
+++ b/kde/qtscriptgenerator/Pkgfile
@@ -2,18 +2,19 @@
 # URL:http://code.google.com/p/qtscriptgenerator/
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: qt
+# Depends on: qt, phonon
 name=qtscriptgenerator
 version=0.1.0
-release=1
+release=2
 
 source=(http://$name.googlecode.com/files/$name-src-$version.tar.gz \
-        qtscriptgenerator.gcc-4.4.patch)
+        qtscriptgenerator-gcc44.patch phonon.patch ) 
 
 build() {
 	cd $name-src-$version/generator
+ 	patch -Np1 -i $SRC/qtscriptgenerator-gcc44.patch
   # prepare plugins
- 	patch -Np1 -i $SRC/qtscriptgenerator.gcc-4.4.patch
+	patch -Np2 -i $SRC/phonon.patch 
 	qmake
 	make
  	./generator --include-paths=/usr/include
diff --git a/kde/qtscriptgenerator/phonon.patch b/kde/qtscriptgenerator/phonon.patch
new file mode 100644
index 000000000..cef0e1fa1
--- /dev/null
+++ b/kde/qtscriptgenerator/phonon.patch
@@ -0,0 +1,55 @@
+--- 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"
+ 
diff --git a/kde/qtscriptgenerator/qtscriptgenerator-gcc44.patch b/kde/qtscriptgenerator/qtscriptgenerator-gcc44.patch
new file mode 100644
index 000000000..dbb423e5d
--- /dev/null
+++ b/kde/qtscriptgenerator/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>