Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/librep/PKGBUILD
	extra/pixman/PKGBUILD

11 files changed, 143 insertions, 101 deletions

diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index 43c2284ad..3c738d6ec 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147794 2012-01-28 10:33:10Z andrea $
+# $Id: PKGBUILD 149702 2012-02-09 14:11:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,15 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2")
-sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d')
+source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
+        'fix-with-qt48.patch')
+sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d'
+          '3ec130564aa1b7a61a0c3cd51533c69c6c35bd0e')
 
 build() {
+  cd "${srcdir}"/marble-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-with-qt48.patch
+
   cd "${srcdir}"
   mkdir build
   cd build
diff --git a/extra/kdeedu-marble/fix-with-qt48.patch b/extra/kdeedu-marble/fix-with-qt48.patch
new file mode 100644
index 000000000..3694a48fb
--- /dev/null
+++ b/extra/kdeedu-marble/fix-with-qt48.patch
@@ -0,0 +1,87 @@
+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() ) {
diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD
index 90a1829ab..f7d067d42 100644
--- a/extra/libdmtx/PKGBUILD
+++ b/extra/libdmtx/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 149591 2012-02-08 15:18:48Z andrea $
+# $Id: PKGBUILD 149704 2012-02-09 14:15:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: jose <jose1711 [at] gmail (dot) com>
 
 pkgname=libdmtx
 pkgver=0.7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A software for reading and writing Data Matrix 2D barcodes"
 url="http://www.libdmtx.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-depends=('imagemagick')
+depends=('glibc')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('d3a4c0becd92895eb606dbdb78b023e2')
 options=('!libtool')
diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD
index decc80456..da970abc5 100644
--- a/extra/libshout/PKGBUILD
+++ b/extra/libshout/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137685 2011-09-10 12:10:13Z pierre $
+# $Id: PKGBUILD 149753 2012-02-10 04:20:16Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=libshout
-pkgver=2.2.2
-pkgrel=4
+pkgver=2.3.0
+pkgrel=1
 epoch=1
 pkgdesc="Library for accessing a shoutcast/icecast server"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url="http://www.icecast.org/"
 options=('!libtool' '!emptydirs')
 license=('LGPL')
 source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4f75fc9901c724b712c371c9a1e782d3')
+md5sums=('976a5979505f3de4026ae7fffb10754b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 8b2ae6712..d29fdd372 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145886 2012-01-03 19:05:26Z giovanni $
+# $Id: PKGBUILD 149745 2012-02-09 23:48:35Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.2.1
+pkgver=5.3.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('d4942dc6427935838e914b8b7b83021a')
+md5sums=('2cd84ff24e1d9217dd3caf170f34e758')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index e51695ba4..9efe9206a 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,24 +1,22 @@
-# $Id: PKGBUILD 149625 2012-02-08 20:40:04Z pierre $
+# $Id: PKGBUILD 149729 2012-02-09 19:52:17Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Bächler <thomas.archlinux.org>
 
 pkgbase=ntfs-3g_ntfsprogs
 pkgname=('ntfs-3g' 'ntfsprogs')
-pkgver=2011.4.12
-pkgrel=2
+pkgver=2012.1.15
+pkgrel=1
 url="http://www.tuxera.com"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc' 'fuse')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://tuxera.com/opensource/${pkgbase}-${pkgver}.tgz
-        25-ntfs-config-write-policy.fdi)
-sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7'
-          '200029f2999a2c284fd30ae25734abf6459c3501')
+source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
+sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "$srcdir/$pkgbase-$pkgver"
   ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
     --with-fuse=external --disable-static \
     --mandir=/usr/share/man
@@ -29,19 +27,17 @@ package_ntfs-3g() {
   pkgdesc="Stable read and write NTFS driver"
 
   for DIR in src libntfs-3g include; do
-    cd "${srcdir}/${pkgbase}-${pkgver}/${DIR}"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/$pkgbase-$pkgver/$DIR"
+    make DESTDIR="$pkgdir" install
   done
 
-  ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs"
-  install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor"
-  install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/"
+  ln -s /bin/ntfs-3g "$pkgdir/sbin/mount.ntfs"
 }
 
 package_ntfsprogs() {
   pkgdesc="NTFS filesystem utilities"
   depends=('util-linux' 'ntfs-3g')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/ntfsprogs"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 9f35512fc..be8ec7580 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 149216 2012-02-06 13:29:48Z jgc $
+# $Id: PKGBUILD 149727 2012-02-09 19:48:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.24.2
-pkgrel=2
+pkgver=0.24.4
+pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
-revert-reject-trapezoids-where-top-is-above-the-edges.patch)
-sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418'
-          'ee36251d47ccefd5e276cabdba9917fbb2be787a')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('683450f917015366ac7918fc517c76801aeff374')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,7 +20,6 @@ build() {
 #    patch -Np1 -i $srcdir/pixman-loongson2f.patch
 #    autoreconf -i
 #  }
-  patch -Np1 -i "${srcdir}/revert-reject-trapezoids-where-top-is-above-the-edges.patch"
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch b/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch
deleted file mode 100644
index e661db57c..000000000
--- a/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e5555d7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 25 Jan 2012 19:03:05 +0000
-Subject: Revert "Reject trapezoids where top (botttom) is above (below) the edges"
-
-Cairo 1.10 will sometimes generate trapezoids like this, so we can't
-consider them invalid. Fixes bug 45009, reported by Michael Biebl.
-
-This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06.
----
-diff --git a/pixman/pixman.h b/pixman/pixman.h
-index 20ff496..18d9513 100644
---- a/pixman/pixman.h
-+++ b/pixman/pixman.h
-@@ -908,14 +908,10 @@ struct pixman_triangle
- };
- 
- /* whether 't' is a well defined not obviously empty trapezoid */
--#define pixman_trapezoid_valid(t)					\
--    ((t)->left.p1.y != (t)->left.p2.y &&				\
--     (t)->right.p1.y != (t)->right.p2.y &&				\
--     (int) ((t)->bottom - (t)->top) > 0 &&				\
--     (t)->bottom <= (t)->left.p2.y &&					\
--     (t)->bottom <= (t)->right.p2.y &&					\
--     (t)->top >= (t)->left.p1.y &&					\
--     (t)->top >= (t)->right.p1.y)
-+#define pixman_trapezoid_valid(t)				   \
-+    ((t)->left.p1.y != (t)->left.p2.y &&			   \
-+     (t)->right.p1.y != (t)->right.p2.y &&			   \
-+     (int) ((t)->bottom - (t)->top) > 0)
- 
- struct pixman_span_fix
- {
-diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c
-index de518d8..ff03b50 100644
---- a/test/composite-traps-test.c
-+++ b/test/composite-traps-test.c
-@@ -251,6 +251,6 @@ test_composite (int      testnum,
- int
- main (int argc, const char *argv[])
- {
--    return fuzzer_test_main("composite traps", 40000, 0x4346479C,
-+    return fuzzer_test_main("composite traps", 40000, 0xE3112106,
- 			    test_composite, argc, argv);
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index f83caa24e..8f8f8bbbf 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 148932 2012-02-05 11:56:32Z ibiru $
+# $Id: PKGBUILD 149755 2012-02-10 04:38:45Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
 license=('GPL' 'LGPL')
-depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
+depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm')
 makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 optdepends=('libao: for ao plugin'
             'ffmpeg: for ffmpeg plugin'
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index 61165383a..aa8ab9acc 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 143223 2011-11-23 16:04:33Z tpowa $
+# $Id: PKGBUILD 149731 2012-02-09 19:52:20Z ibiru $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=testdisk
 pkgver=6.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cgsecurity.org/index.html?testdisk.html"
 license=('GPL')
-depends=('libjpeg>=8' 'openssl' 'progsreiserfs' 'ntfsprogs')
-makedepends=('pkgconfig')
-source=(http://www.cgsecurity.org/${pkgname}-${pkgver}.tar.bz2)
+depends=('libjpeg' 'openssl' 'progsreiserfs' 'ntfsprogs')
+source=(http://www.cgsecurity.org/$pkgname-$pkgver.tar.bz2)
+md5sums=('3bcbf0722d3823ca155e633969ce9f0b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
               --without-ewf \
               --enable-sudo
-  make || return 1
-  make DESTDIR="${pkgdir}/" install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('3bcbf0722d3823ca155e633969ce9f0b')
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 63584d79b..01a73038a 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146756 2012-01-17 03:35:55Z eric $
+# $Id: PKGBUILD 149747 2012-02-10 02:50:07Z eric $
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Maintainer: tobias [ tobias at archlinux org ]
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=401
-__hgrev=0dabc2ce136c
+_patchlevel=434
+__hgrev=9140571d01ab
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -18,8 +18,8 @@ makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
 source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz{,.sig}
         pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
         vimrc archlinux.vim gvim.desktop)
-sha1sums=('99498cb48c0c720ae9972a6cd33d4926bdf733b7'
-          'ad14ce56f99ae1a86c96c5a5d0f44e48ad18a00e'
+sha1sums=('008d6a6e8af0bcfc8eb1f2c05db5621b9782dd4c'
+          'efdd011d2daa8238166b777b5b5e37e0a08bd7d4'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
@@ -48,6 +48,7 @@ mksource() {
   rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
   tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
   rm -r ${pkgname}-${pkgver}
+# gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
 }
 
 build() {