Sat Sep 8 00:04:17 UTC 2012

15 files changed, 146 insertions, 161 deletions

diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD
index 812beb3af..439163598 100644
--- a/extra/ebook-tools/PKGBUILD
+++ b/extra/ebook-tools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143766 2011-11-29 01:07:45Z giovanni $
+# $Id: PKGBUILD 166337 2012-09-06 15:49:53Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=ebook-tools
-pkgver=0.2.1
-pkgrel=4
+pkgver=0.2.2
+pkgrel=1
 pkgdesc="Tools for accessing and converting various ebook file formats"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/ebook-tools/"
@@ -11,7 +11,7 @@ license=('custom')
 depends=('libzip' 'libxml2' 'convertlit')
 makedepends=('pkgconfig' 'cmake')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045')
+md5sums=('67bce67ceb72dcc3578d6a81ef92b29b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index 7f6a2ca12..f69861820 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $
+# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=fontconfig
-pkgver=2.8.0
+pkgver=2.10.1
 pkgrel=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -11,27 +12,43 @@ depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
-        29-replace-bitmap-fonts.conf
-        30-urw-aliases.patch)
-md5sums=('77e15a92006ddc2adbb06f840d591c0e'
-         'f6b67e8cc79197ed6abd4701911e83da'
-         '51bc6cb633b50f3c28793361738aac5b')
+        29-replace-bitmap-fonts.conf)
+md5sums=('c94e380eea42f2f23ca9537035ef1899'
+         'f6b67e8cc79197ed6abd4701911e83da')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/30-urw-aliases.patch"
-  # enable Position Independent Code for prelinking
-  export CFLAGS="$CFLAGS -fPIC"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+
+  # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
+  libtoolize -f
+  autoreconf -f
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-templatedir=/etc/fonts/conf.avail \
+    --with-xmldir=/etc/fonts \
+    --localstatedir=/var \
+    --disable-static \
+    --with-default-fonts=/usr/share/fonts \
+    --with-add-fonts=/usr/share/fonts
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \
-      "$pkgdir/etc/fonts/conf.avail"
-  rm -f "$pkgdir"/etc/fonts/conf.d/*.conf
+
+  # not upstream, not in FC and not in Gentoo, this should probably go upstream
+  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
+  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
+  pushd $pkgdir/etc/fonts/conf.d
+  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
+  popd
 
   #Install license
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
diff --git a/extra/fontconfig/fontconfig.install b/extra/fontconfig/fontconfig.install
index 20feb6e52..3a0ca573b 100644
--- a/extra/fontconfig/fontconfig.install
+++ b/extra/fontconfig/fontconfig.install
@@ -1,100 +1,39 @@
-configs=('20-fix-globaladvance.conf'
-         '20-unhint-small-vera.conf'
-         '29-replace-bitmap-fonts.conf'
-         '30-metric-aliases.conf'
-         '30-urw-aliases.conf'
-         '40-nonlatin.conf'
-         '45-latin.conf'
-         '49-sansserif.conf'
-         '50-user.conf'
-         '51-local.conf'
-         '60-latin.conf'
-         '65-fonts-persian.conf'
-         '65-nonlatin.conf'
-         '69-unifont.conf'
-         '80-delicious.conf'
-         '90-synthetic.conf')
-
 post_install() {
-  echo -n "updating font cache... "
-  /sbin/ldconfig -r .
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    ln -sf ../conf.avail/${config} .
-  done
-  popd > /dev/null
-  /usr/bin/fc-cache -f
-  echo "done."
-}
-
-post_upgrade() {
-  rm -f /etc/fonts/conf.d/10-bitmaps.conf
   cat << _EOF
-
-===> Important Fontconfig configuration change <===
-
-  The way fontconfig is configured has been changed. 
-  Configuration is done via /etc/fonts/conf.avail and conf.d.
+  
+  Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
   Read /etc/fonts/conf.d/README for more information.
 
   Configuration via /etc/fonts/local.conf is still possible,
   but is no longer recommended for options available in conf.avail.
 
-_EOF
-
-  if [ `vercmp 2.4.1-1 $2` -gt 0 ]; then 
-  # Upgrade from old version, place all symlinks. pre-symlink package version
-    echo -n "Linking configuration files... "
-    pushd /etc/fonts/conf.d > /dev/null
-    for config in "${configs[@]}"; do
-      ln -sf ../conf.avail/${config} .
-    done
-    popd > /dev/null
-    echo "done."
-  fi
+  Main systemwide configuration should be done by symlinks
+  (especially for autohinting, sub-pixel and lcdfilter):
+  
+  cd /etc/fonts/conf.d
+  ln -s ../conf.avail/XX-foo.conf
+  
+  Check also https://wiki.archlinux.org/index.php/Font_Configuration
+  and https://wiki.archlinux.org/index.php/Fonts.
 
-  if [ `vercmp 2.6.0-1 $2` -gt 0 ]; then
-  # pre-2.6.0 versions have missing config
-    echo -n "Adding missing configuration files... "
-    pushd /etc/fonts/conf.d > /dev/null
-    ln -sf ../conf.avail/30-metric-aliases.conf .
-    ln -sf ../conf.avail/40-nonlatin.conf .
-    ln -sf ../conf.avail/45-latin.conf .
-    popd > /dev/null
-    echo "done."
-  fi
+_EOF
 
-  # Remove dead links
-  echo -n "Removing outdated configuration files... "
-  for config in /etc/fonts/conf.d/*; do
-    if [ ! -f ${config} ]; then
-      rm -f ${config}
-    fi
-  done
-  echo "done."
-  
   echo -n "updating font cache... "
   /usr/bin/fc-cache -f
   echo "done."
 }
 
-pre_upgrade() {
-  # Link new config files not present on system yet
-  echo -n "Symlinking new configuration files... "
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    if [ ! -f ../conf.avail/${config} ]; then
-      ln -sf ../conf.avail/${config} .
-    fi
-  done
-  popd > /dev/null
+post_upgrade() {
+  echo -n "updating font cache... "
+  /usr/bin/fc-cache -f
   echo "done."
 }
 
 post_remove() {
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    rm -f ${config}
-  done
-  popd > /dev/null
+  cat << _EOF
+
+  Check for dead symlinks and leftover files 
+  in /etc/fonts/conf.d/
+  
+_EOF
 }
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 0383b1d05..01300dc14 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165451 2012-08-20 08:01:40Z giovanni $
+# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=fping
-pkgver=3.3
+pkgver=3.4
 pkgrel=1
 pkgdesc="A utility to ping multiple hosts at once"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://www.fping.org/"
 license=('custom') 
 depends=('glibc')
 source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
-md5sums=('3260bdc49e72ccc9dc63b1e2fb02eae5')
+md5sums=('a4bc97804e630dbf26dfac8f28c78091')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 415e603af..39bd6c1cb 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,32 +3,33 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit')
-source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
-        fix_firefox_crash.diff)
-sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6'
-            '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3')
+makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
+noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
 build() {
-  cd "${srcdir}"/icedtea-web*
-
-  # fix firefox crash - https://bugs.archlinux.org/task/30969
-  patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff
-
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
+  # extract it
+  cd "$srcdir"
+  LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz
 
+  cd "${srcdir}"/icedtea-web*
   ./configure --prefix=${_jvmdir} \
       --datarootdir=/usr/share \
-      --with-jdk-home=${_jvmdir}
+      --with-jdk-home=${_jvmdir} \
+      --with-browser-tests \
+      --with-firefox=/usr/bin/firefox \
+      --with-chromium=/usr/bin/chromium \
+      --with-epiphany=/usr/bin/epiphany \
+      --with-gtk=2      
   make
 }
 
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 1d90a13db..0d1537aba 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,30 +1,34 @@
-# $Id: PKGBUILD 164729 2012-08-04 08:45:39Z andyrtr $
+# $Id: PKGBUILD 166335 2012-09-06 15:46:37Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
-makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit')
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
-        fix_firefox_crash.diff)
-sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6'
-            '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3')
+makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
+noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
+sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f')
 
 _javaver=6
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  # extract it
+  cd "$srcdir"
+  LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/$pkgname-$pkgver.tar.gz
 
-  # fix firefox crash - https://bugs.archlinux.org/task/30969
-  patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff
-  
-  ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
-      --datarootdir=/usr/share
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=${_jvmdir} \
+      --datarootdir=/usr/share \
+      --with-browser-tests \
+      --with-firefox=/usr/bin/firefox \
+      --with-chromium=/usr/bin/chromium \
+      --with-epiphany=/usr/bin/epiphany \
+      --with-gtk=2
   make
 }
 
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index 9ecc4d9c7..1a2185e75 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163018 2012-07-05 19:22:35Z andrea $
+# $Id: PKGBUILD 166348 2012-09-06 20:40:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
-pkgver=1.2.0.20120705
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="A WebKit browser component for KDE"
 url="http://opendesktop.org/content/show.php?content=127960"
@@ -11,8 +11,8 @@ license=('LGPL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('659f9737bcc79f0bfbd08ff37ad0e232')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('27f72c8044fc798add9f4cbf9c799154')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 973985940..f68f66b5d 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165439 2012-08-19 15:29:10Z andrea $
+# $Id: PKGBUILD 166364 2012-09-06 22:13:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.27
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
@@ -37,7 +37,7 @@ build() {
     -DENABLED_LOCAL_INFILE=ON \
     -DINSTALL_INFODIR=share/mysql/docs \
     -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
     -DINSTALL_SCRIPTDIR=bin \
     -DINSTALL_INCLUDEDIR=include/mysql \
     -DINSTALL_DOCREADMEDIR=share/mysql \
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 0f573142c..395fe2873 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,13 +1,12 @@
-# $Id: PKGBUILD 162741 2012-06-29 11:34:22Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 166361 2012-09-06 21:54:10Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
 pkgver=2.6.2
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -52,7 +51,7 @@ package_qscintilla() {
 }
 
 package_python-qscintilla-common() {
-    pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
+    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
     depends=('qscintilla')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD
new file mode 100644
index 000000000..70a61c17b
--- /dev/null
+++ b/extra/sbc/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 166341 2012-09-06 18:04:29Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=sbc
+pkgver=1.0
+pkgrel=1
+pkgdesc="Bluetooth Subband Codec (SBC) library"
+arch=('i686' 'x86_64')
+url="http://www.bluez.org/"
+license=('GPL' 'LGPL')
+depends=('glibc')
+options=(!libtool)
+source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz)
+md5sums=('aa2bc39c4a09aade064efea4bbbc4b2d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static --disable-tester
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index 332cb5a36..638587d1e 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 161779 2012-06-13 21:37:16Z guillaume $
+# $Id: PKGBUILD 166346 2012-09-06 20:23:30Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
 pkgver=3.7.2
-pkgrel=1
+pkgrel=2
 _date=201202080800
 pkgdesc="An open source widget toolkit for Java"
 arch=('i686' 'x86_64')
 url="http://www.eclipse.org/swt/"
 license=('EPL')
-depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
+depends=('java-runtime>=7' 'gtk2>=2.20.1' 'libxtst')
 optdepends=('libgnomeui' 'mesa' 'libwebkit')
 makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant')
 if [ "${CARCH}" = "i686" ]; then
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 98952ae13..277778cfc 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
 pkgname=tomcat-native
-pkgver=1.1.23
+pkgver=1.1.24
 pkgrel=1
 pkgdesc="The Apache Tomcat Native Library"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=("Apache")
 depends=('apr' 'openssl')
 makedepends=('java-environment')
 source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('f2a55b5a19adbe491edc98e0c11d9028')
+md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21')
 
 build() {
   cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index d0c30fd0b..e55352c56 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $
+# $Id: PKGBUILD 166321 2012-09-06 07:34:07Z 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=600
-__hgrev=11d40fc82f11
+_patchlevel=659
+__hgrev=1052677493be
 _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=('a1c54bde75476ace5d24d4c17f7a81818e80dfda'
-          '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083'
+sha1sums=('5f9bc51f6935368edda0aab6251d2c5cd5350acd'
+          'cb2b2c50a9582e27fe71ac77fc9191122adf0a44'
           '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
           '3494baf53a63581ba69f86a81293640ff681c5c5'
           '25dd3c2ce436e73a367c8f73b68f7f6889682437'
@@ -57,9 +57,9 @@ 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 /}"
+  #export CFLAGS="${CFLAGS/-O2 /}"
 
-  cd "${srcdir}"
+  #cd "${srcdir}"
 
   cp -a ${pkgname}-${pkgver} vim-build
 
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index 938ef597b..23934a11a 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144000 2011-12-01 15:58:58Z giovanni $
+# $Id: PKGBUILD 166331 2012-09-06 15:41:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=xchm
-pkgver=1.20
-pkgrel=2
+pkgver=1.21
+pkgrel=1
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64')
 url="http://xchm.sourceforge.net/"
@@ -13,7 +13,7 @@ install=xchm.install
 source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
         'xchm.desktop'
         'xchm.xml')
-md5sums=('85943645d20af536704a20b58ebd5849'
+md5sums=('9bfe439ce94554ebae95d84f7a1db8e7'
          '31fb9692b9ee9f2a205f58b9ff4bc4fe'
          '4102b0a393f5c60236143cc034664dd0')
 
diff --git a/extra/xchm/xchm.install b/extra/xchm/xchm.install
index 1ad77f9aa..df90cb5ac 100644
--- a/extra/xchm/xchm.install
+++ b/extra/xchm/xchm.install
@@ -1,5 +1,5 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
   update-mime-database usr/share/mime > /dev/null
 }
@@ -9,7 +9,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
   update-mime-database usr/share/mime > /dev/null
 }