Mon Sep 17 00:03:15 UTC 2012

6 files changed, 32 insertions, 42 deletions

diff --git a/extra/hunspell/PKGBUILD b/extra/hunspell/PKGBUILD
index fefa04db4..a4b178a7e 100644
--- a/extra/hunspell/PKGBUILD
+++ b/extra/hunspell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 125861 2011-05-30 15:55:43Z andyrtr $
+# $Id: PKGBUILD 166664 2012-09-15 07:49:23Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
 
 pkgname=hunspell
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Spell checker and morphological analyzer library and program"
 arch=('i686' 'x86_64')
 url="http://hunspell.sourceforge.net/"
@@ -25,4 +25,9 @@ build() {
 package() {
   cd "$srcdir/hunspell-$pkgver"
   make DESTDIR="$pkgdir" install
+  
+  # add generic hunspell.so for development and projects not using pkgconfig flags - FS#30592
+  pushd $pkgdir/usr/lib
+  ln -s libhunspell-?.?.so libhunspell.so
+  popd
 }
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 4ec38ec74..0e9746d8b 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,21 +1,18 @@
-# $Id: PKGBUILD 165850 2012-09-01 14:16:05Z guillaume $
+# $Id: PKGBUILD 166669 2012-09-15 09:10:55Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') 
  # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u7
-_openjdk_build=b147
-_openjdk_date=27_jun_2011
 _icedtea_ver=2.3.2
-_date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
 _CORBA_CHANGESET=7fae6a3a68c7
-_HOTSPOT_CHANGESET=ea39d76b3bde
+_HOTSPOT_CHANGESET=ea39d76b3bde # see "${srcdir}/icedtea7"/hotspot.map
 _JAXP_CHANGESET=ee4bd94136ec
 _JAXWS_CHANGESET=c89c6ac953e7
 _JDK_CHANGESET=f78eb7e08ee1
@@ -25,18 +22,16 @@ _OPENJDK_CHANGESET=acba2d30209d
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
 options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'wget'
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
+             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget')
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
 _url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig}
         ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
@@ -93,8 +88,6 @@ build() {
   # default is to build with first found java-environment found in our repos - is jdk7-openjdk
   [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
-#  unset MAKEFLAGS # parallel build is currently broken 
-
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
@@ -113,6 +106,7 @@ build() {
 	$BOOTSTRAPOPT \
         --with-parallel-jobs="${MAKEFLAGS/-j}" \
         --disable-tests \
+        --disable-downloading --disable-Werror \
         --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
         --with-jdk-home=${JAVA_HOME} \
         --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
@@ -126,9 +120,6 @@ build() {
         --enable-nss \
         --with-rhino \
         --with-abs-install-dir=${_jvmdir}
-	#--help
-	#--enable-systemtap      Enable inclusion of SystemTap trace support - needs systemtab from AUR
-
     make
 }
 
@@ -139,8 +130,7 @@ check() {
 
 package_jre7-openjdk-headless() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs"
-  depends=('libjpeg-turbo' 'lcms2' 'nss'
-           'ca-certificates-java' 'java-rhino')
+  depends=('libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java')
   optdepends=('libcups: needed for Java Mauve support - libmawt.so'
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime-headless=7')
diff --git a/extra/java7-openjdk/jre7-openjdk-headless.install b/extra/java7-openjdk/jre7-openjdk-headless.install
index 45f52fe32..0787545b9 100644
--- a/extra/java7-openjdk/jre7-openjdk-headless.install
+++ b/extra/java7-openjdk/jre7-openjdk-headless.install
@@ -9,7 +9,3 @@ post_upgrade() {
     /usr/sbin/init-jks-keystore
   fi
 }
-
-#post_remove() {
-#
-#}
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index e60188213..c21ec1994 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148812 2012-02-05 11:51:30Z ibiru $
+# $Id: PKGBUILD 166698 2012-09-15 23:58:57Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=lcms2
-pkgver=2.3
-pkgrel=2
+pkgver=2.4
+pkgrel=1
 pkgdesc="Small-footprint color management engine, version 2"
 arch=('i686' 'x86_64')
 license=('MIT')
@@ -12,7 +12,7 @@ depends=('libtiff')
 url="http://www.littlecms.com"
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133')
+sha1sums=('9944902864283af49e4e21a1ca456db4e04ea7c2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +20,11 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index ff03a1326..709eb00c7 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166619 2012-09-13 09:11:48Z giovanni $
+# $Id: PKGBUILD 166690 2012-09-15 17:24:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.09.12
+pkgver=2012.09.13
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('88ceec23abb1df597e333945e95120fd')
+md5sums=('33ffc8df7f07a6db0e923d73dfdc0547')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index e55352c56..f5a047404 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166321 2012-09-06 07:34:07Z tdziedzic $
+# $Id: PKGBUILD 166660 2012-09-15 04:03:40Z tdziedzic $
 # 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=659
-__hgrev=1052677493be
+_patchlevel=661
+__hgrev=5884d056e1d1
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-sha1sums=('5f9bc51f6935368edda0aab6251d2c5cd5350acd'
-          'cb2b2c50a9582e27fe71ac77fc9191122adf0a44'
+sha1sums=('989e907fe9858647e762bddc927f656a03fb5226'
+          '195c7fc5163fca966ea331d8160bf2d307c1533c'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
@@ -55,12 +55,6 @@ mksource() {
 }
 
 build() {
-  # remove -O2 because there is a crash with python because of it
-  # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196
-  #export CFLAGS="${CFLAGS/-O2 /}"
-
-  #cd "${srcdir}"
-
   cp -a ${pkgname}-${pkgver} vim-build
 
   # define the place for the global (g)vimrc file (set to /etc/vimrc)