From 6f1cb0a6e53cb12a278626cdc5ce360f46e41f7c Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Fri, 22 Oct 2010 20:58:17 +0200
Subject: qtscriptgenerator, port nettoye

---
 kde/qtscriptgenerator/Pkgfile                      |  2 +-
 kde/qtscriptgenerator/phonon.patch                 | 55 ----------------------
 .../qtscriptgenerator-gcc44.patch                  | 15 ------
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 kde/qtscriptgenerator/phonon.patch
 delete mode 100644 kde/qtscriptgenerator/qtscriptgenerator-gcc44.patch

(limited to 'kde/qtscriptgenerator')

diff --git a/kde/qtscriptgenerator/Pkgfile b/kde/qtscriptgenerator/Pkgfile
index 0b0d2b1b4..29ee55fa9 100644
--- a/kde/qtscriptgenerator/Pkgfile
+++ b/kde/qtscriptgenerator/Pkgfile
@@ -8,7 +8,7 @@ version=0.1.0
 release=2
 
 source=(http://$name.googlecode.com/files/$name-src-$version.tar.gz \
-        qtscriptgenerator-gcc44.patch phonon.patch ) 
+        http://nutyx.meticul.eu/files/patchs/$name/{qtscriptgenerator-gcc44.patch,phonon.patch} ) 
 
 build() {
 	cd $name-src-$version/generator
diff --git a/kde/qtscriptgenerator/phonon.patch b/kde/qtscriptgenerator/phonon.patch
deleted file mode 100644
index cef0e1fa1..000000000
--- a/kde/qtscriptgenerator/phonon.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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
deleted file mode 100644
index dbb423e5d..000000000
--- a/kde/qtscriptgenerator/qtscriptgenerator-gcc44.patch
+++ /dev/null
@@ -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>
-- 
cgit v1.2.3-54-g00ecf