Fri Jan 31 03:41:19 UTC 2014

10 files changed, 115 insertions, 126 deletions

diff --git a/extra/antlr2/PKGBUILD b/extra/antlr2/PKGBUILD
deleted file mode 100644
index 77f37b20a..000000000
--- a/extra/antlr2/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 193188 2013-08-18 11:26:04Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: George Giorgidze <giorgidze (at) gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgbase=antlr2
-pkgname=('antlr2' 'python2-antlr2')
-pkgver=2.7.7
-pkgrel=4
-# architecture dependant files in /usr/lib/libantlr.a
-arch=('i686' 'x86_64')
-url="http://www.antlr2.org/"
-license=('custom')
-makedepends=('java-environment' 'python2' 'sh')
-source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
-        'runantlr2.sh'
-        'gcc4.4.patch')
-md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
-         'e4aa827cf78f97c4e5fae086831192d6'
-         '8574c93f40e6477e83c29f9b07de49da')
-
-build() {
-  cd "${srcdir}/antlr-${pkgver}"
-
-  patch -Np0 -i ${srcdir}/gcc4.4.patch
-
-  ./configure --prefix=/usr \
-    --disable-examples \
-    --disable-csharp
-  make
-}
-
-package_antlr2() {
-  pkgdesc='Tool for language recognition with C++ or Java actions'
-  depends=('java-runtime' 'sh')
-  replaces=('antlr')
-  conflicts=('antlr')
-  provides=("antlr=${pkgver}")
-
-  cd ${srcdir}/antlr-${pkgver}/lib/cpp
-  make prefix="${pkgdir}/usr" install
-
-  install -Dm644 ${srcdir}/antlr-${pkgver}/antlr/antlr.jar \
-    "${pkgdir}/usr/share/java/antlr2.jar"
-  install -Dm755 ${srcdir}/runantlr2.sh ${pkgdir}/usr/bin/runantlr2
-  install -Dm644 ${srcdir}/antlr-${pkgver}/LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-antlr2() {
-  pkgdesc='Tool for language recognition with C++ or Java actions - Python runtime support'
-  depends=('antlr2' 'python2')
-  replaces=('python-antlr')
-  conflicts=('python-antlr')
-  provides=("python-antlr=${pkgver}")
-
-  cd ${srcdir}/antlr-${pkgver}/lib/python
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -d ${pkgdir}/usr/share/licenses
-  ln -s /usr/share/licenses/antlr2 ${pkgdir}/usr/share/licenses/${pkgname}
-}
diff --git a/extra/antlr2/gcc4.4.patch b/extra/antlr2/gcc4.4.patch
deleted file mode 100644
index de8de9d3f..000000000
--- a/extra/antlr2/gcc4.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
---- lib/cpp/antlr/CharScanner.hpp	2006-11-01 22:37:17.000000000 +0100
-+++ lib/cpp/antlr/CharScanner.hpp	2008-03-19 20:09:21.000000000 +0100
-@@ -10,6 +10,7 @@
- 
- #include <antlr/config.hpp>
- 
-+#include <cstring>
- #include <map>
- 
- #ifdef HAS_NOT_CCTYPE_H
---- lib/cpp/antlr/CharScanner.hpp~      2008-11-11 21:24:02.000000000 +0000
-+++ lib/cpp/antlr/CharScanner.hpp       2008-11-11 21:24:33.000000000 +0000
-@@ -10,6 +10,7 @@
-
- #include <antlr/config.hpp>
-
-+#include <cstdio>
- #include <cstring>
- #include <map>
-
diff --git a/extra/antlr2/runantlr2.sh b/extra/antlr2/runantlr2.sh
deleted file mode 100644
index 716f6f887..000000000
--- a/extra/antlr2/runantlr2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
-export CLASSPATH
-CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
-java antlr.Tool $*
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 3ebf10195..7fb1e296c 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202775 2013-12-27 23:05:21Z schiv $
+# $Id: PKGBUILD 204889 2014-01-30 18:34:44Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: see .contrib
 
 pkgname=ardour
 _pkgname=Ardour3
-pkgver=3.5.143
+pkgver=3.5.308
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ optdepends=('xjadeo: video monitoring')
 install=$pkgname.install
 source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('52c3b8ea3ab014002e84e377f8a15097'
+md5sums=('710e084d5edeb3c216c8fdd57f6ed744'
          '316bd21ece5e2208a104fd09cac521af')
 
 prepare() {
diff --git a/extra/ghostscript/PKGBUILD b/extra/ghostscript/PKGBUILD
new file mode 100644
index 000000000..7e52904c5
--- /dev/null
+++ b/extra/ghostscript/PKGBUILD
@@ -0,0 +1,76 @@
+# $Id: PKGBUILD 204554 2014-01-22 13:38:01Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
+
+pkgname=ghostscript
+pkgver=9.10
+pkgrel=3
+pkgdesc="An interpreter for the PostScript language"
+arch=('i686' 'x86_64')
+license=('AGPL' 'custom')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
+         'libtiff>=4.0.0' 'lcms2' 'dbus' 'libpaper')
+makedepends=('gtk3' 'gnutls')
+optdepends=('texlive-core:      needed for dvipdf'
+            'gtk3:              needed for gsx')
+url="http://www.ghostscript.com/"
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
+options=('!makeflags')
+md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8')
+
+build() {
+  cd ghostscript-${pkgver}
+
+  # force it to use system-libs
+  # keep heavily patched included openjpeg, leads to segfault with system openjpeg
+  # https://bugs.archlinux.org/task/38226
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community
+
+  ./configure --prefix=/usr \
+	--enable-dynamic \
+	--with-ijs \
+	--with-jbig2dec \
+	--with-omni \
+	--with-x \
+	--with-drivers=ALL\
+	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
+	--enable-fontconfig \
+	--enable-freetype \
+	--enable-openjpeg \
+	--without-luratech \
+	--without-omni \
+	--with-system-libtiff \
+	--with-libpaper \
+	--disable-compile-inits #--help # needed for linking with system-zlib
+  make
+
+  # Build IJS
+  cd ijs
+  sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd ghostscript-${pkgver}
+  make DESTDIR="${pkgdir}" \
+	cups_serverroot="${pkgdir}"/etc/cups \
+	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
+
+  # install missing doc files # http://bugs.archlinux.org/task/18023
+  install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/
+  
+  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # remove unwanted localized man-pages
+  rm -rf "$pkgdir"/usr/share/man/[^man1]*
+
+  # install IJS
+  cd ijs
+  make DESTDIR="${pkgdir}" install
+  
+  # remove filters that are now maintained in cups-filters as upstream home
+  rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}
+}
diff --git a/extra/id3lib/20-create-manpages.patch b/extra/id3lib/20-create-manpages.patch
index b2ef4ef57..cebf3d4d4 100644
--- a/extra/id3lib/20-create-manpages.patch
+++ b/extra/id3lib/20-create-manpages.patch
@@ -133,7 +133,7 @@ This patch adds debian-made man pages
 +.B \-1, \-\-v1tag
 +Render only the id3v1 tag
 +.TP
-+.B \-1, \-\-v2tag
++.B \-2, \-\-v2tag
 +Render only the id3v2 tag
 +.TP
 +.B \-s, \-\-strip
@@ -181,7 +181,7 @@ This patch adds debian-made man pages
 +.B \-1, \-\-v1tag
 +Render only the id3v1 tag
 +.TP
-+.B \-1, \-\-v2tag
++.B \-2, \-\-v2tag
 +Render only the id3v2 tag
 +.TP
 +.B \-h, \-\-help
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index 5d1ae757d..ff885aecd 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 204871 2014-01-29 20:02:59Z guillaume $
+# $Id: PKGBUILD 204902 2014-01-30 20:34:39Z guillaume $
 # Maintainer : Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jochem Kossen   <j.kossen@home.nl>
 # Contributor: rtfreedman      <rob.til.freedman@googlemail.com>
 
 pkgname=id3lib
 pkgver=3.8.3
-pkgrel=14
+pkgrel=15
 pkgdesc='Library for reading, writing, and manipulating ID3v1 and ID3v2 tags'
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -31,7 +31,7 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
          '5a78e0fe586fba334eae2a29e4bf5a28'
          '88f21f1bf4f697be8030706bbec11705'
          'b3de841cd2eda0d37c8c8330119e12d4'
-         'd922a91abcdee1ffce26b512b171c2aa'
+         '0c7c939943bdfcc3a0f6be95fe9b2367'
          '74ba59c03f91fedbe4dd8045b29c7e15'
          'd2d06d46df3867d73746f584d1e6fcc5'
          'd3a61d07a2bfa83f4ac6290794789022'
@@ -42,21 +42,21 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7'
          '0973e285cdc420130b984a259cdd8ae0')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p1 -i ${srcdir}/00-add-libz-to-compilation.patch
-  patch -p1 -i ${srcdir}/05-create-m4-directory.patch
-  patch -p1 -i ${srcdir}/10-fix-compilation-with-cpp-headers.patch
-  patch -p1 -i ${srcdir}/15-fix-headers-of-main-functions.patch
-  patch -p1 -i ${srcdir}/20-create-manpages.patch
-  patch -p1 -i ${srcdir}/30-fix-utf16.patch
-  patch -p1 -i ${srcdir}/40-deal-with-mkstemp.patch
-  patch -p1 -i ${srcdir}/60-add-c-wrapper-functions.patch
-  patch -p1 -i ${srcdir}/60-fix_make_check.patch
-  patch -p1 -i ${srcdir}/60-id3lib-missing-nullpointer-check.patch
-  patch -p1 -i ${srcdir}/60-spelling.patch
-  patch -p1 -i ${srcdir}/61-fix_vbr_stack_smash.patch
-  patch -p1 -i ${srcdir}/50-remove-outdated-check.patch
+  patch -p1 -i ../00-add-libz-to-compilation.patch
+  patch -p1 -i ../05-create-m4-directory.patch
+  patch -p1 -i ../10-fix-compilation-with-cpp-headers.patch
+  patch -p1 -i ../15-fix-headers-of-main-functions.patch
+  patch -p1 -i ../20-create-manpages.patch
+  patch -p1 -i ../30-fix-utf16.patch
+  patch -p1 -i ../40-deal-with-mkstemp.patch
+  patch -p1 -i ../60-add-c-wrapper-functions.patch
+  patch -p1 -i ../60-fix_make_check.patch
+  patch -p1 -i ../60-id3lib-missing-nullpointer-check.patch
+  patch -p1 -i ../60-spelling.patch
+  patch -p1 -i ../61-fix_vbr_stack_smash.patch
+  patch -p1 -i ../50-remove-outdated-check.patch
 
   libtoolize -fc
   aclocal
@@ -65,17 +65,20 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+
+  install -d "${pkgdir}"/usr/share/man/man1
+  cp doc/man/* "${pkgdir}"/usr/share/man/man1
 }
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index d9678799e..f1f9a8a47 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 204522 2014-01-22 01:48:52Z eric $
+# $Id: PKGBUILD 204904 2014-01-30 22:09:43Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.8.2
+pkgver=6.8.8.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
         perlmagick.rpath.patch)
-sha1sums=('dc51b9d77f69bec96f398a557acb531c5af13fbc'
+sha1sums=('1a7db104fc9ffd4ba0a50048a5d4eec90864a08e'
           'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index c54f661fa..465006a8a 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 196888 2013-10-20 21:56:36Z dreisner $
+# $Id: PKGBUILD 204900 2014-01-30 20:31:43Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
-pkgver=1.14.0
-pkgrel=2
+pkgver=1.15.0
+pkgrel=1
 pkgdesc="A fast and lightweight key/value database library"
 arch=('i686' 'x86_64')
 url="https://code.google.com/p/leveldb/"
 license=('BSD')
 depends=('gperftools' 'snappy')
 source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('641d54df4aaf7ee569ae003cfbdb888ebdee0d7f')
+sha1sums=('74b70a1156d91807d8d84bfdd026e0bb5acbbf23')
 
 build() {
   make -C "$pkgname-$pkgver"
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 497457f6d..ddec22a80 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203076 2014-01-03 12:12:14Z andrea $
+# $Id: PKGBUILD 204881 2014-01-30 08:57:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -22,7 +22,7 @@ pkgname=('qt5-base'
          'qt5-x11extras'
          'qt5-xmlpatterns')
 pkgver=5.2.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -31,7 +31,7 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
             'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient'
             'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-            'openal' 'gtk2' 'libxkbcommon' 'python' 'harfbuzz')
+            'openal' 'gtk2' 'libxkbcommon' 'python')
 groups=('qt' 'qt5')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
@@ -75,7 +75,6 @@ build() {
     -sysconfdir /etc/xdg \
     -examplesdir /usr/share/doc/qt/examples \
     -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-    -system-harfbuzz \
     -system-sqlite \
     -openssl-linked \
     -nomake examples \
@@ -100,7 +99,7 @@ package_qt5-base() {
   pkgdesc='A cross-platform application and UI framework'
   depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
            'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
-           'qtchooser' 'libxkbcommon' 'harfbuzz')
+           'qtchooser' 'libxkbcommon')
   optdepends=('postgresql-libs: PostgreSQL driver'
               'libmariadbclient: MariaDB driver'
               'unixodbc: ODBC driver'