Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

1 files changed, 0 insertions, 87 deletions

diff --git a/extra/kdeedu-marble/fix-with-qt48.patch b/extra/kdeedu-marble/fix-with-qt48.patch
deleted file mode 100644
index 3694a48fb..000000000
--- a/extra/kdeedu-marble/fix-with-qt48.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 79c39f45468bace95169d1ba959884ce27087d1e
-Author: Torsten Rahn <rahn@kde.org>
-Date:   Wed Feb 8 17:18:15 2012 +0100
-
-    Fixes for Marble with Qt 4.8:
-    
-    - Provide proper colors for Marble's Atlas, Temperature,
-      Precipitation and Venus/Mars Topography maps.
-      ( due to introduction of QImage::fill( QColor ) overload )
-    
-    - Show proper icons for MarbleLegendBrowser
-      ( due to new interpretation of the "current directory" in
-        QTextBrowser )
-
-diff --git a/src/lib/MarbleLegendBrowser.cpp b/src/lib/MarbleLegendBrowser.cpp
-index 4a25095..ffa0a23 100644
---- a/src/lib/MarbleLegendBrowser.cpp
-+++ b/src/lib/MarbleLegendBrowser.cpp
-@@ -130,26 +130,24 @@ void MarbleLegendBrowser::loadLegend()
-     t.start();
- 
-     // Read the html string.
--    QString finalHtml;
-+    QString legendPath;
- 
-     // Check for a theme specific legend.html first
-     if ( d->m_marbleModel != 0 && d->m_marbleModel->mapTheme() != 0 )
-     {
-         GeoSceneDocument *currentMapTheme = d->m_marbleModel->mapTheme();
- 
--        QString customLegendPath = MarbleDirs::path( "maps/" + 
-+        legendPath = MarbleDirs::path( "maps/" + 
-         currentMapTheme->head()->target() + '/' + 
-         currentMapTheme->head()->theme() + "/legend.html" ); 
--        if ( !customLegendPath.isEmpty() )
--            finalHtml = readHtml( QUrl::fromLocalFile( customLegendPath  ) );
--        else
--            finalHtml.clear();
-     }
--
--    if ( finalHtml.isEmpty() ) {
--        finalHtml = readHtml( QUrl::fromLocalFile( MarbleDirs::path( "legend.html" ) ) );
-+    if ( legendPath.isEmpty() ) {
-+	legendPath = MarbleDirs::path( "legend.html" ); 
-     }
- 
-+    QString finalHtml = readHtml( QUrl::fromLocalFile( legendPath ) );
-+    finalHtml.replace( QString( "./" ), legendPath.section( '/', 0, -2 ) + '/' );
-+
-     // Generate some parts of the html from the MapTheme <Legend> tag. 
-     const QString sectionsHtml = generateSectionsHtml();
- 
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index 4a4f8f3..d0deead 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( Qt::transparent );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0) );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {
-commit b89ff577fcbd085fbd180f59aa669dded1818082
-Author: Bernhard Beschow <bbeschow@cs.tu-berlin.de>
-Date:   Wed Feb 8 18:14:59 2012 +0100
-
-    compile with Qt < 4.8
-    
-    * take into account the comment in the API doc, which suggests to use QColor::rgb()
-    (cherry picked from commit 6eafb31f509c622e2672c31b73ebcb1b3dafb3e9)
-
-diff --git a/src/lib/TextureColorizer.cpp b/src/lib/TextureColorizer.cpp
-index d0deead..9319a89 100644
---- a/src/lib/TextureColorizer.cpp
-+++ b/src/lib/TextureColorizer.cpp
-@@ -176,7 +176,7 @@ void TextureColorizer::colorize( QImage *origimg, const ViewportParams *viewport
-         m_coastImage = QImage( viewport->size(), QImage::Format_RGB32 );
- 
-     // update coast image
--    m_coastImage.fill( QColor( 0, 0, 255, 0) );
-+    m_coastImage.fill( QColor( 0, 0, 255, 0).rgb() );
- 
-     bool doClip = false; //assume false
-     switch( viewport->projection() ) {