summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/arm-elf-binutils/PKGBUILD54
-rw-r--r--community/arm-elf-gcc-base/PKGBUILD60
-rw-r--r--community/cclive/PKGBUILD8
-rw-r--r--community/clucene/PKGBUILD35
-rw-r--r--community/cuyo/PKGBUILD29
-rw-r--r--community/cuyo/cuyo.changelog5
-rw-r--r--community/cuyo/cuyo.diff37
-rw-r--r--community/cuyo/cuyo.install1
-rw-r--r--community/html2text/PKGBUILD27
-rw-r--r--community/john/PKGBUILD10
-rw-r--r--community/ltris/PKGBUILD11
-rw-r--r--community/ltris/ltris.changelog5
-rw-r--r--community/ltris/ltris.install13
-rw-r--r--community/pinot/PKGBUILD30
-rw-r--r--community/pinot/pinot.changelog2
-rw-r--r--community/workrave/PKGBUILD4
-rw-r--r--community/xmonad-contrib/PKGBUILD9
-rw-r--r--community/xmonad/PKGBUILD8
-rw-r--r--extra/acpid/PKGBUILD6
-rw-r--r--extra/fontforge/PKGBUILD15
-rw-r--r--extra/gtkimageview/PKGBUILD6
-rw-r--r--extra/libspiro/PKGBUILD25
-rw-r--r--extra/lighttpd/PKGBUILD20
-rw-r--r--extra/midori/PKGBUILD6
-rw-r--r--extra/mkvtoolnix/PKGBUILD10
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD24
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch72
-rw-r--r--staging/erlang/PKGBUILD71
-rw-r--r--staging/kwebkitpart/PKGBUILD30
-rw-r--r--staging/kwebkitpart/kwebkitpart.install11
-rw-r--r--staging/qt/PKGBUILD5
-rw-r--r--testing/glibc/PKGBUILD6
-rw-r--r--testing/glibc/glibc-2.14.1-tzfile-overflow.patch2
33 files changed, 497 insertions, 160 deletions
diff --git a/community/arm-elf-binutils/PKGBUILD b/community/arm-elf-binutils/PKGBUILD
new file mode 100644
index 000000000..ac242c134
--- /dev/null
+++ b/community/arm-elf-binutils/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 60835 2011-12-18 22:14:40Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=arm-elf-binutils
+pkgver=2.22
+pkgrel=1
+_xprefix=/usr
+pkgdesc="A set of programs to assemble and manipulate binary and object files"
+arch=(i686 x86_64)
+license=(GPL)
+options=(!libtool)
+url="http://sources.redhat.com/binutils"
+depends=('glibc' 'zlib')
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz)
+md5sums=('8b3ad7090e3989810943aa19103fdb83')
+
+build() {
+ cd $srcdir/binutils-${pkgver}
+
+ [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \
+ --program-prefix=arm-elf- \
+ --enable-shared \
+ --disable-multilib \
+ --with-lib-path=${_xprefix}/lib/binutils/arm-elf \
+ --disable-nls \
+ --target=arm-elf \
+ --host=$CHOST \
+ --build=$CHOST \
+ --with-sysroot=/usr/$CHOST/arm-elf \
+# --with-build-sysroot=/usr/i686-pc-linux-gnu/arm-elf/
+
+# mkdir -p $pkgdir/${_xprefix}/lib/binutils
+# sed -i 's|know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));|{know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));}|' gas/config/tc-arm.c
+
+ make configure-host
+ make tooldir=$pkgdir/${_xprefix}
+ make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install
+
+ mkdir -p $pkgdir/${_xprefix}/lib/binutils/arm-elf
+ cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/arm-elf
+
+ rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}*
+
+ rm -f $pkgdir/usr/bin/ar
+ rm -f $pkgdir/usr/bin/as
+ rm -f $pkgdir/usr/bin/ld
+ rm -f $pkgdir/usr/bin/nm
+ rm -f $pkgdir/usr/bin/objdump
+ rm -f $pkgdir/usr/bin/ranlib
+ rm -f $pkgdir/usr/bin/strip
+ rm -f $pkgdir/usr/bin/objcopy
+ rm -f $pkgdir/usr/lib/libiberty.a
+ rm -rf $pkgdir/usr/share
+}
diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD
new file mode 100644
index 000000000..a4490b7ea
--- /dev/null
+++ b/community/arm-elf-gcc-base/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 60837 2011-12-18 22:34:22Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=arm-elf-gcc-base
+pkgver=4.6.2
+pkgrel=1
+pkgdesc="The GNU Compiler Collection"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+url="http://gcc.gnu.org"
+depends=('arm-elf-binutils' 'libmpc' 'libelf')
+options=(!libtool !emptydirs zipman docs !strip)
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2)
+md5sums=('780f614ab18c7a9066dec6387d7490b2')
+
+build() {
+ cd $srcdir/gcc-$pkgver
+
+ export CFLAGS="-O2 -pipe"
+ export CXXFLAGS="-O2 -pipe"
+
+ [ $NOEXTRACT -eq 1 ] || rm -rf build
+ mkdir build
+ cd build
+
+ [ $NOEXTRACT -eq 1 ] || ../configure --prefix=/usr \
+ --target=arm-elf \
+ --host=$CHOST \
+ --build=$CHOST \
+ --enable-shared --disable-nls --enable-languages=c --enable-multilib \
+ --with-local-prefix=/usr/lib/arm-elf \
+ --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \
+ --enable-softfloat \
+ --with-float=soft \
+ --with-newlib \
+ --with-sysroot=/usr/$CHOST/arm-elf
+
+ make all-gcc all-target-libgcc
+}
+
+package() {
+ cd $srcdir/gcc-$pkgver/build
+
+ export CFLAGS="-O2 -pipe"
+ export CXXFLAGS="-O2 -pipe"
+
+ make DESTDIR=$pkgdir install-gcc install-target-libgcc
+
+ rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
+ rm -f $pkgdir/usr/share/man/man7/gfdl.7*
+ rm -f $pkgdir/usr/share/man/man7/gpl.7*
+ rm -rf $pkgdir/usr/share/info
+
+ cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/
+ rm -rf $pkgdir/usr/libexec
+
+ # strip it manually
+ strip $pkgdir/usr/bin/* 2>/dev/null || true
+ find $pkgdir/usr/lib -type f -exec arm-elf-strip {} \; 2>/dev/null || true
+}
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 720e06a85..758c47069 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59926 2011-12-02 20:58:05Z ibiru $
+# $Id: PKGBUILD 60841 2011-12-19 01:09:02Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: joyfulgirl@archlinux.us
# Contributor: nathan owe ndowens04 at gmail dot com
pkgname=cclive
-pkgver=0.7.7
-pkgrel=2
+pkgver=0.7.8
+pkgrel=1
pkgdesc='Commandline downloader for popular video websites.'
arch=('i686' 'x86_64')
url='http://cclive.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('GPL3')
depends=('boost-libs' 'pcre' 'curl' 'libquvi')
makedepends=('boost')
source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8265be865a22fb477bcc050f0dc310dc')
+md5sums=('01ffbe54e48440721b3c283c993928f1')
build() {
cd "$pkgname-$pkgver"
diff --git a/community/clucene/PKGBUILD b/community/clucene/PKGBUILD
index d99078c74..87e7ffbcd 100644
--- a/community/clucene/PKGBUILD
+++ b/community/clucene/PKGBUILD
@@ -1,31 +1,40 @@
-# $Id: PKGBUILD 49740 2011-06-20 20:01:57Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 60839 2011-12-18 22:57:14Z arodseth $
+# Maintainer: Alexander Rødseth
# Contributor: Alois Nespor <alois.nespor@gmail.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
pkgname=clucene
pkgver=2.3.3.4
-pkgrel=1
-pkgdesc="A C++ port of Lucene: the high-performance, full-featured text search engine"
-arch=('i686' 'x86_64')
-url="http://clucene.sourceforge.net"
+pkgrel=2
+pkgdesc="C++ port of the high-performance text search engine Lucene"
+arch=('x86_64' 'i686')
+url="http://clucene.sourceforge.net/"
license=('APACHE' 'LGPL')
depends=('gcc-libs' 'zlib' 'boost-libs')
makedepends=('cmake' 'boost')
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz")
-md5sums=('48d647fbd8ef8889e5a7f422c1bfda94')
+sha256sums=('ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab')
build() {
- cd "${srcdir}"
+ cd "$srcdir"
+
mkdir build
cd build
- cmake ../$pkgname-core-$pkgver \
+ cmake "../$pkgname-core-$pkgver" \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_ASCII_MODE=OFF \
+ -DENABLE_PACKAGING=OFF \
+ -DDISABLE_MULTITHREADING=OFF
+ # The three lines above are from
+ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-cpp/clucene/clucene-2.3.3.4.ebuild
+ # Thanks, Gentoo
make
}
package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
+ cd "$srcdir/build"
+
+ make DESTDIR="$pkgdir" install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/cuyo/PKGBUILD b/community/cuyo/PKGBUILD
index eb3e84019..f80aec17b 100644
--- a/community/cuyo/PKGBUILD
+++ b/community/cuyo/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 5434 2009-11-08 13:15:53Z jlichtblau $
+# $Id: PKGBUILD 60801 2011-12-18 13:21:49Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=cuyo
-pkgver=2.1.1
-pkgrel=4
-pkgdesc="Tetris-style puzzle game for up to two players with a twist."
+pkgver=2.1.2
+pkgrel=1
+pkgdesc="Tetris-style puzzle game for up to two players with a twist"
arch=('i686' 'x86_64')
url="http://www.karimmi.de/cuyo/"
license=('GPL')
-depends=('sdl' 'sdl_mixer' 'sdl_image' 'xdg-utils')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'sdl' 'sdl_mixer' 'sdl_image' 'xdg-utils')
makedepends=('patch')
install=$pkgname.install
-source=(http://download.savannah.gnu.org/releases/cuyo/$pkgname-2.~-1.1.tar.gz \
+changelog=$pkgname.changelog
+source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-2.~-1.2.tar.gz \
$pkgname.diff)
-
-md5sums=('1629b257311c6c55cf657f0fa92dbd92'
- '923c88e894cfd9c77d75f21b448ee6cf')
+sha256sums=('3fb44af4e6f8d205d11d44b5a96ffa4a11eab5a4fa86897463c0c6ca0658adb0'
+ 'dd81909594072f030571f2afc39cc69838eed26304d2d89949ac1c2c850dcafe')
build() {
- cd ${srcdir}/$pkgname-2.~-1.1
+ cd ${srcdir}/$pkgname-2.~-1.2
- patch -Np1 -i ${srcdir}/$pkgname.diff || return 1
+ patch -Np0 -i ${srcdir}/$pkgname.diff
./configure --prefix=/usr
- make || return 1
+ make
+}
+
+package() {
+ cd ${srcdir}/$pkgname-2.~-1.2
+
make DESTDIR=${pkgdir} install
}
diff --git a/community/cuyo/cuyo.changelog b/community/cuyo/cuyo.changelog
new file mode 100644
index 000000000..2212ac481
--- /dev/null
+++ b/community/cuyo/cuyo.changelog
@@ -0,0 +1,5 @@
+2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * cuyo 2.1.2-1
+
+2009-11-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Update to minor release 2.1.1-4
diff --git a/community/cuyo/cuyo.diff b/community/cuyo/cuyo.diff
index 3011623d3..3da3b1c64 100644
--- a/community/cuyo/cuyo.diff
+++ b/community/cuyo/cuyo.diff
@@ -1,32 +1,11 @@
-diff -ruN cuyo-2.~-1.1-orig/icons/cuyo.desktop cuyo-2.~-1.1/icons/cuyo.desktop
---- cuyo-2.~-1.1-orig/icons/cuyo.desktop 2007-12-20 18:22:32.000000000 +0100
-+++ cuyo-2.~-1.1/icons/cuyo.desktop 2009-11-08 14:08:56.000000000 +0100
-@@ -1,11 +1,13 @@
- [Desktop Entry]
-+Type=Application
- Name=Cuyo
-+GenericName=Cuyo
- Icon=cuyo
--Type=Application
-+Exec=cuyo
-+StartupNotify=true
- Terminal=false
--MimeType=application/x-executable
-+MimeType=application/x-executable;
+--- icons/cuyo.desktop 2011-12-18 13:48:54.000000000 +0100
++++ icons/cuyo.desktop 2011-12-18 13:48:54.000000000 +0100
+@@ -7,4 +7,4 @@
Categories=Game;BlocksGame;
-Encoding=UTF-8
- Comment=A tetris like game with many levels
+ Comment=Play a tetris like game with many levels
+Comment[cs]=Hra podobná tetrisu s mnoha úrovněmi
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
--Exec=cuyo
-diff -ruN cuyo-2.~-1.1-orig/src/stringzeug.h cuyo-2.~-1.1/src/stringzeug.h
---- cuyo-2.~-1.1-orig/src/stringzeug.h 2006-07-03 19:26:23.000000000 +0200
-+++ cuyo-2.~-1.1/src/stringzeug.h 2009-11-08 14:08:56.000000000 +0100
-@@ -19,6 +19,7 @@
- #define STRINGZEUG_H
-
- #include <config.h>
-+#include <cstdarg>
- #include <string>
-
-
+ Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+@@ -12,2 +12 @@
+ GenericName=Tetris like game
+-
diff --git a/community/cuyo/cuyo.install b/community/cuyo/cuyo.install
index b711352cb..4c0972beb 100644
--- a/community/cuyo/cuyo.install
+++ b/community/cuyo/cuyo.install
@@ -1,5 +1,6 @@
post_install() {
which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+ update-desktop-database -q
}
post_upgrade() {
diff --git a/community/html2text/PKGBUILD b/community/html2text/PKGBUILD
index ecccaae48..38fee9ebe 100644
--- a/community/html2text/PKGBUILD
+++ b/community/html2text/PKGBUILD
@@ -1,23 +1,30 @@
-# $Id: PKGBUILD 5125 2009-11-06 16:14:08Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# $Id: PKGBUILD 60804 2011-12-18 13:31:52Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=html2text
pkgver=1.3.2a
-pkgrel=8
+pkgrel=9
pkgdesc="A HTML to text converter"
arch=('i686' 'x86_64')
url="http://www.mbayer.de/html2text"
license=('GPL2')
depends=('gcc-libs')
-source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/$pkgname-$pkgver.tar.gz)
-md5sums=('6097fe07b948e142315749e6620c9cfc')
+source=(http://ftp.ibiblio.org/pub/linux/apps/www/converters/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd ${srcdir}/${pkgname}-${pkgver}
+
./configure
- make || return 1
- install -D -m 755 html2text $pkgdir/usr/bin/html2text
- install -D -m 644 html2text.1.gz $pkgdir/usr/share/man/man1/html2text.1.gz
- install -D -m 644 html2textrc.5.gz $pkgdir/usr/share/man/man5/html2textrc.5.gz
+ make
}
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ install -D -m755 $pkgname ${pkgdir}/usr/bin/$pkgname
+ install -D -m644 $pkgname.1.gz ${pkgdir}/usr/share/man/man1/$pkgname.1.gz
+ install -D -m644 html2textrc.5.gz ${pkgdir}/usr/share/man/man5/html2textrc.5.gz
+}
diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index c346ce19a..d47fd0017 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -5,9 +5,9 @@
# Contributor: Michal Krenek <mikos@sg1.cz>
pkgname=john
-pkgver=1.7.8
-pkgrel=7
-_jumbover=8
+pkgver=1.7.9
+pkgrel=1
+_jumbover=5
pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
arch=('i686' 'x86_64')
url="http://www.openwall.com/$pkgname/"
@@ -18,8 +18,8 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2
http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz
ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
params.h.patch)
-md5sums=('e6d7f261829610d6949c706ebac0517c'
- '96cb581fd8447f3f96614fd365896b07'
+md5sums=('45f54fc59386ecd67daaef9f19781d93'
+ '68cacb612f20c71eed6c24cbaf28148a'
'c8d5c69f86c2eedb485583b0305284a1'
'f69ed632eba8fb9e45847a4b4a323787')
diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD
index c500494db..17db56fa0 100644
--- a/community/ltris/PKGBUILD
+++ b/community/ltris/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 54927 2011-08-28 13:23:10Z jlichtblau $
+# $Id: PKGBUILD 60814 2011-12-18 17:13:32Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
pkgname=ltris
-pkgver=1.0.17
+pkgver=1.0.18
pkgrel=1
pkgdesc="A tetris clone where you have a bowl with blocks falling down"
arch=('i686' 'x86_64')
url="http://lgames.sourceforge.net/index.php?project=LTris"
license=('GPL')
depends=('sdl_mixer')
+backup=('var/games/ltris.hscr')
install=$pkgname.install
+changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/lgames/$pkgname-$pkgver.tar.gz)
-sha256sums=('b4d2888bc50bb2ad9dd59f97c15fbfaee96c54d86c834f1231cd6e8af66bf52c')
+sha256sums=('3cba90365d50e79601368499af77d54cb03c0cf2544324e5df246eb1eeaa0e30')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -29,7 +31,4 @@ package() {
install -d ${pkgdir}/usr/share/pixmaps
install -m644 icons/ltris{16,32,48}.xpm ${pkgdir}/usr/share/pixmaps
-
- ./configure --prefix=/usr --localstatedir=/var/games
- make
}
diff --git a/community/ltris/ltris.changelog b/community/ltris/ltris.changelog
index 0454493b1..4cf7b905f 100644
--- a/community/ltris/ltris.changelog
+++ b/community/ltris/ltris.changelog
@@ -1,3 +1,8 @@
+2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+ * ltris 1.0.18-1
+ * Upstream update
+
2011-08-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* ltris 1.0.17-1
diff --git a/community/ltris/ltris.install b/community/ltris/ltris.install
index ff4947f6e..e270274bd 100644
--- a/community/ltris/ltris.install
+++ b/community/ltris/ltris.install
@@ -1,17 +1,4 @@
post_install() {
- touch /var/games/ltris.hscr
- chown root:games /var/games/ltris.hscr
- chmod 664 /var/games/ltris.hscr
-}
-
-pre_upgrade() {
- if [ -e /var/ltris.hscr ]; then
- install -d /var/games
- cp /var/ltris.hscr /var/games
- fi
-}
-
-post_upgrade() {
chown root:games /var/games/ltris.hscr
chmod 664 /var/games/ltris.hscr
}
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 2a139fcba..a63a719d2 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 40072 2011-02-19 22:02:17Z ebelanger $
+# $Id: PKGBUILD 60809 2011-12-18 16:48:56Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=pinot
-pkgver=0.97
+pkgver=0.98
pkgrel=1
-pkgdesc='Personal search and metasearch tool.'
+pkgdesc='Personal search and metasearch tool'
arch=('i686' 'x86_64')
url='http://pinot.berlios.de/'
license=('GPL')
depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl'
'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib'
- 'hicolor-icon-theme' 'cairo')
+ 'hicolor-icon-theme' 'cairo' 'exiv2')
makedepends=('boost' 'desktop-file-utils')
optdepends=('unzip: ZIP files extraction'
'poppler: PDF to text conversion'
@@ -22,13 +23,14 @@ optdepends=('unzip: ZIP files extraction'
'antiword: MS Word to text conversion'
'catdoc: XLS and PPT to text conversion'
'deskbar-applet: Pinot Deskbar-Applet module')
-install='pinot.install'
-source=("http://download.berlios.de/pinot/pinot-${pkgver}.tar.gz")
-md5sums=('9e16fe25f021c15f28c9382a008aca8d')
-sha1sums=('680d18e8777545cbde6a117629f89630a94a6bc8')
+options=('!emptydirs')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz)
+sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${srcdir}/$pkgname-$pkgver
sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\
/usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\
@@ -39,8 +41,10 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ cd ${srcdir}/$pkgname-$pkgver
+
+ make DESTDIR=${pkgdir} install
+
# Remove Deskbar-Applet handler
- rm -rf "${pkgdir}/usr/lib/deskbar-applet/handlers"
+ rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers
}
diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog
new file mode 100644
index 000000000..7d899cdb0
--- /dev/null
+++ b/community/pinot/pinot.changelog
@@ -0,0 +1,2 @@
+2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * pinot 0.98-1
diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD
index 37ce6ac31..916d2b25f 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51933 2011-07-18 09:09:27Z spupykin $
+# $Id: PKGBUILD 60818 2011-12-18 17:24:11Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: William Rea <sillywilly@gmail.com>
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64')
license=('GPL2')
url="http://workrave.org"
depends=('libxtst' 'gtkmm' 'gconf' 'gdome2' 'gstreamer0.10' 'libsm' 'libice')
-makedepends=('intltool' 'python-cheetah')
+makedepends=('intltool')
source=(http://downloads.sourceforge.net/workrave/workrave-$pkgver.tar.gz)
md5sums=('d5eaf399b38b063053cff1a8527cba8e')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 911dc0b90..59774e0dd 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 60423 2011-12-13 19:10:42Z spupykin $
+# $Id: PKGBUILD 60798 2011-12-18 11:12:08Z jelle $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: orbisvicis <gmail.com>
pkgname=xmonad-contrib
-pkgver=0.9.2
-pkgrel=4
+pkgver=0.10
+pkgrel=1
pkgdesc="Add-ons for xmonad"
arch=('i686' 'x86_64')
url="http://xmonad.org/"
license=('BSD')
-depends=('ghc=7.0.3' 'xmonad=0.9.2' 'sh' 'haskell-x11=1.5.0.1'
+depends=('ghc=7.0.3' 'xmonad=0.10' 'sh' 'haskell-x11=1.5.0.1'
'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.6')
install='xmonad-contrib.install'
source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
@@ -33,3 +33,4 @@ package() {
runhaskell Setup.lhs copy --destdir=$pkgdir
install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
}
+md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 88bf218d6..7748b9fcd 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60410 2011-12-13 13:22:16Z spupykin $
+# $Id: PKGBUILD 60796 2011-12-18 11:10:08Z jelle $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: shild <shildv@gmail.com>
pkgname=xmonad
-pkgver=0.9.2
-pkgrel=3
+pkgver=0.10
+pkgrel=1
pkgdesc="A lightweight X11 tiled window manager written in Haskell"
arch=('i686' 'x86_64')
url="http://xmonad.org/"
@@ -16,7 +16,7 @@ source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$p
xmonad.desktop
xmonad.session
xmonad.svg)
-md5sums=('5a4117f798664d772d2a834ea6c90f1c'
+md5sums=('f8381e1ec15137863558a454d4466467'
'f8e3d84a9f154d1b5d7fcffbc0a058c9'
'9d1bc84a7f32897d32f3fc71ef76228e'
'72bfa5e62e4e44fe7fa59b6a7593d993')
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index fc0425799..ae5cfc9e0 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 143248 2011-11-24 01:29:25Z eric $
+# $Id: PKGBUILD 145167 2011-12-18 19:59:26Z eric $
# Maintainer:
# Contributor: xduugu
# Contributor: Manolis Tzanidakis
# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
pkgname=acpid
-pkgver=2.0.13
+pkgver=2.0.14
pkgrel=1
pkgdesc="A daemon for delivering ACPI power management events with netlink support"
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
'anything'
'handler.sh'
'acpid.conf.d')
-md5sums=('5bbbb9a320192df1cdd8d0e9a0196379'
+md5sums=('14fc1eabc3489f3ded9347fcd55f158a'
'd69203a032c4583f9abaafcf21a7ed84'
'2d37b98d6e74bab815604b8b48c6cfd4'
'd411b758e8531adee191b66bcbc2892d'
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index a880f0dc7..0ddc7805d 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 124359 2011-05-20 08:42:23Z bisson $
+# $Id: PKGBUILD 145161 2011-12-18 12:09:19Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=fontforge
-pkgver=20110222
+pkgver=20111214
pkgrel=2
pkgdesc='Outline and bitmap font editor'
arch=('i686' 'x86_64')
-url='http://fontforge.sourceforge.net'
+url='http://fontforge.sourceforge.net/'
license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_full-${pkgver}.tar.bz2")
-sha1sums=('8fada07647f102351bb1d7d1c4da487356e7142f')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
+
+# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's/python /python2 /g' Makefile.dynamic.in
- export CFLAGS="${CFLAGS// -O2 / -O1 }" # on i686, -O2 yields FS#20430
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD
index c3e235b5b..fb9e39f62 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/extra/gtkimageview/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 143749 2011-11-28 20:31:19Z giovanni $
+# $Id: PKGBUILD 145169 2011-12-18 22:03:46Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan Blazek <appolito@gmail.com>
# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
pkgname=gtkimageview
pkgver=1.6.4
-pkgrel=2
-pkgdesc="Simple image viewer widget for GTK"
+pkgrel=3
+pkgdesc="Simple image viewer widget for GTK2"
arch=('i686' 'x86_64')
url="http://trac.bjourne.webfactional.com/"
license=('LGPL2.1')
diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD
new file mode 100644
index 000000000..d27e6b9c1
--- /dev/null
+++ b/extra/libspiro/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 145163 2011-12-18 12:09:22Z bisson $
+# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libspiro
+pkgver=20071029
+pkgrel=2
+pkgdesc='Simplifies the drawing of beautiful curves'
+url='http://libspiro.sourceforge.net/'
+license=('GPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
+sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 1d9c20cb4..bf13443ab 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143810 2011-11-29 13:33:30Z stephane $
+# $Id: PKGBUILD 145165 2011-12-18 18:44:31Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=lighttpd
-pkgver=1.4.29
-pkgrel=3
+pkgver=1.4.30
+pkgrel=1
pkgdesc='a secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
@@ -16,14 +16,14 @@ optdepends=('libxml2: mod_webdav'
'sqlite3: mod_webdav')
backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
options=('!libtool' 'emptydirs')
-source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
- "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc"
+source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
+ "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
-md5sums=('e6e67b09986cb504db630b5a86b2dd76'
- 'de2afb4ed6a088fd7fa5f13c387a08f0'
- '268386e71f5748dc1d887b9a0ab65589'
- '913e2157fa78d990c32146f387d44c2b'
- 'acdaa94299e6299cb5085e6d88babeca')
+sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
+ '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a'
+ 'ceff3a88e876f6104c094379d507b89bc504777d0f98a0930406a70624fcf024'
+ '6c5892830e77731d27e3ebb64a0d87ab9139c68eb703aec6741c591814cef26f'
+ '44267e8b670faaf5712ad0bc9fd84b8c52281ddd22ef2c22d4b474dbb1cf5d2a')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD
index 8f4cdbe1a..432e226e2 100644
--- a/extra/midori/PKGBUILD
+++ b/extra/midori/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142825 2011-11-16 00:02:11Z eric $
+# $Id: PKGBUILD 145174 2011-12-19 00:22:14Z eric $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: rabyte <rabyte.at.gmail.dot.com>
# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
pkgname=midori
-pkgver=0.4.2
+pkgver=0.4.3
pkgrel=1
pkgdesc="A lightweight web browser based on Gtk WebKit"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util
makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
optdepends=('vala: for use in extensions')
source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('4ec9c3daa332ebe865cba6aa8256ef63')
+md5sums=('900037557b82818d79d2dd1c5a7d7fd2')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index f19be33ce..a42e33200 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 144061 2011-12-02 20:54:42Z ibiru $
+# $Id: PKGBUILD 145175 2011-12-19 00:22:15Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: xduugu <xduugu@gmx.com>
pkgbase=mkvtoolnix
pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.1.0
-pkgrel=1
+pkgver=5.2.0
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
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=('fed878893a7f292969e8bd81c7ab9209')
+md5sums=('53445217c42736d5932082e5596c20d4')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -56,6 +56,7 @@ package_mkvtoolnix-cli() {
rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
+ rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
rm -rf "${pkgdir}"/usr/share/applications
rm -rf "${pkgdir}"/usr/share/icons
rm -rf "${pkgdir}"/usr/share/mime
@@ -79,4 +80,5 @@ package_mkvtoolnix-gtk() {
rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
+ rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
}
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index 61b3494d5..59f17da2a 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59996 2011-12-03 03:13:45Z heftig $
+# $Id: PKGBUILD 60806 2011-12-18 13:40:00Z heftig $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.14.1
-pkgrel=2
+pkgrel=4
_glibcdate=20111025
pkgdesc="GNU C Library for multilib"
arch=('x86_64')
@@ -29,6 +29,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
glibc-2.14-revert-4768ae77.patch
glibc-2.14-reexport-rpc-interface.patch
glibc-2.14-reinstall-nis-rpc-headers.patch
+ glibc-2.14.1-tzfile-overflow.patch
lib32-glibc.conf)
md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
'4dadb9203b69a3210d53514bb46f41c3'
@@ -41,6 +42,7 @@ md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
+ '178779bfaa1418c709f31c25eb3d8a3e'
'a8f4549c716cd37244fbf1ed059497f8')
build() {
@@ -84,6 +86,10 @@ build() {
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+ # http://sourceware.org/bugzilla/show_bug.cgi?id=13506
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=97ac2654
+ patch -Np1 -i ${srcdir}/glibc-2.14.1-tzfile-overflow.patch
+
cd ${srcdir}
mkdir glibc-build
cd glibc-build
@@ -139,17 +145,19 @@ package() {
# We need one 32 bit specific header file
find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
- # manually strip files as stripping libpthread-*.so and libthread_db.so
- # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
- # valgrind on x86_64
+ # Do not strip the following files for improved debugging support
+ # ("improved" as in not breaking gdb and valgrind...):
+ # ld-${pkgver}.so
+ # libc-${pkgver}.so
+ # libpthread-${pkgver}.so
+ # libthread_db-1.0.so
cd $pkgdir
strip $STRIP_BINARIES usr/lib32/getconf/*
- strip $STRIP_STATIC usr/lib32/*.a \
- lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
+ strip $STRIP_STATIC usr/lib32/*.a
- strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
+ strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
lib32/{libmemusage,libpcprofile,libSegFault}.so \
diff --git a/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch b/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch
new file mode 100644
index 000000000..9e21cbfd3
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch
@@ -0,0 +1,72 @@
+diff --git a/time/tzfile.c b/time/tzfile.c
+index 144e20b..402389c 100644
+--- a/time/tzfile.c
++++ b/time/tzfile.c
+@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
+ goto read_again;
+ }
+
++ if (__builtin_expect (num_transitions
++ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1))
++ / (sizeof (time_t) + 1)), 0))
++ goto lose;
+ total_size = num_transitions * (sizeof (time_t) + 1);
+ total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
+ & ~(__alignof__ (struct ttinfo) - 1));
+ types_idx = total_size;
+- total_size += num_types * sizeof (struct ttinfo) + chars;
++ if (__builtin_expect (num_types
++ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0))
++ goto lose;
++ total_size += num_types * sizeof (struct ttinfo);
++ if (__builtin_expect (chars > SIZE_MAX - total_size, 0))
++ goto lose;
++ total_size += chars;
++ if (__builtin_expect (__alignof__ (struct leap) - 1
++ > SIZE_MAX - total_size, 0))
++ goto lose;
+ total_size = ((total_size + __alignof__ (struct leap) - 1)
+ & ~(__alignof__ (struct leap) - 1));
+ leaps_idx = total_size;
++ if (__builtin_expect (num_leaps
++ > (SIZE_MAX - total_size) / sizeof (struct leap), 0))
++ goto lose;
+ total_size += num_leaps * sizeof (struct leap);
+- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8
+- ? st.st_size - (ftello (f)
+- + num_transitions * (8 + 1)
+- + num_types * 6
+- + chars
+- + num_leaps * 12
+- + num_isstd
+- + num_isgmt) - 1 : 0);
++ tzspec_len = 0;
++ if (sizeof (time_t) == 8 && trans_width == 8)
++ {
++ off_t rem = st.st_size - ftello (f);
++ if (__builtin_expect (rem < 0
++ || (size_t) rem < (num_transitions * (8 + 1)
++ + num_types * 6
++ + chars), 0))
++ goto lose;
++ tzspec_len = (size_t) rem - (num_transitions * (8 + 1)
++ + num_types * 6
++ + chars);
++ if (__builtin_expect (num_leaps > SIZE_MAX / 12
++ || tzspec_len < num_leaps * 12, 0))
++ goto lose;
++ tzspec_len -= num_leaps * 12;
++ if (__builtin_expect (tzspec_len < num_isstd, 0))
++ goto lose;
++ tzspec_len -= num_isstd;
++ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
++ goto lose;
++ tzspec_len -= num_isgmt + 1;
++ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
++ goto lose;
++ }
++ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))
++ goto lose;
+
+ /* Allocate enough memory including the extra block requested by the
+ caller. */
diff --git a/staging/erlang/PKGBUILD b/staging/erlang/PKGBUILD
new file mode 100644
index 000000000..f2860ed78
--- /dev/null
+++ b/staging/erlang/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 145156 2011-12-18 09:42:26Z andyrtr $
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
+
+pkgname=erlang
+pkgver=R14B04
+pkgrel=2
+pkgdesc="A small concurrent functional programming language developed by Ericsson."
+arch=(i686 x86_64)
+url="http://www.erlang.org/index.html"
+license=('custom')
+depends=('ncurses' 'glibc')
+makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
+optdepends=('wxgtk: for wx support' 'unixodbc: database')
+
+options=('!makeflags')
+source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
+ http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
+md5sums=('4b469729f103f52702bfb1fb24529dc0'
+ 'f31e72518daae4007f595c0b224dd59f')
+
+# please check these deps reported by namcap when you do the next build:
+#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar)
+#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so'])
+
+
+build() {
+ cd "$srcdir/otp_src_${pkgver/./-}"
+ export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
+ export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
+
+ sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
+
+ CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
+ make
+}
+
+package() {
+ cd "$srcdir/otp_src_${pkgver/./-}"
+ make INSTALL_PREFIX="$pkgdir" install
+
+# fix prefix
+ cd "$pkgdir"
+ for i in usr/lib/erlang/bin/erl \
+ usr/lib/erlang/bin/start \
+ usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
+ usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
+ usr/lib/erlang/releases/RELEASES ;do
+ sed -i "s#$pkgdir##" $i
+ done
+
+# fix symlinks
+ cd "$pkgdir/usr/lib/erlang/bin"
+ ln -sf ../erts-${ERTSVERSION}/bin/epmd
+
+ cd "$pkgdir/usr/bin"
+ for file in *; do
+ ln -sfv ../lib/erlang/bin/$file
+ done
+
+ ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
+
+# install documentation
+ install -d "$pkgdir/usr/share/doc/erlang"
+ install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
+ cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
+
+ install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
+
+}
diff --git a/staging/kwebkitpart/PKGBUILD b/staging/kwebkitpart/PKGBUILD
new file mode 100644
index 000000000..9c249c12e
--- /dev/null
+++ b/staging/kwebkitpart/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 145154 2011-12-18 09:29:04Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=kwebkitpart
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="A WebKit browser component for KDE"
+url="http://opendesktop.org/content/show.php?content=127960"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('e736d7b26cf6e3c0eed837837b3f032b')
+
+build() {
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/kwebkitpart/kwebkitpart.install b/staging/kwebkitpart/kwebkitpart.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/kwebkitpart/kwebkitpart.install
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD
index 095469bd0..0ffd9d6ff 100644
--- a/staging/qt/PKGBUILD
+++ b/staging/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145101 2011-12-17 02:20:56Z andrea $
+# $Id: PKGBUILD 145152 2011-12-18 05:35:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -49,7 +49,6 @@ build() {
-no-phonon \
-no-phonon-backend \
-no-webkit \
- -no-declarative-debug \
-graphicssystem raster \
-openssl-linked \
-nomake demos \
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 95b1eea1b..4097d6498 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145148 2011-12-18 02:31:57Z allan $
+# $Id: PKGBUILD 145159 2011-12-18 10:48:43Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.14.1
-pkgrel=3
+pkgrel=4
_glibcdate=20111025
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
@@ -46,7 +46,7 @@ md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
- '1c5fe2ad0120a40432d429f958d18965'
+ '178779bfaa1418c709f31c25eb3d8a3e'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
diff --git a/testing/glibc/glibc-2.14.1-tzfile-overflow.patch b/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
index af996e7b6..9e21cbfd3 100644
--- a/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
+++ b/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
@@ -59,7 +59,7 @@ index 144e20b..402389c 100644
+ if (__builtin_expect (tzspec_len < num_isstd, 0))
+ goto lose;
+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec == 0 || tzspec_len - 1 < num_isgmt, 0))
++ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
+ goto lose;
+ tzspec_len -= num_isgmt + 1;
+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))