diff options
36 files changed, 655 insertions, 135 deletions
diff --git a/community/arm-wince-cegcc-binutils/PKGBUILD b/community/arm-wince-cegcc-binutils/PKGBUILD index 491004df4..edd8f46df 100644 --- a/community/arm-wince-cegcc-binutils/PKGBUILD +++ b/community/arm-wince-cegcc-binutils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 20572 2010-07-09 07:26:42Z spupykin $ +# $Id: PKGBUILD 60993 2011-12-20 11:27:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -pkgname=cross-arm-wince-cegcc-binutils +pkgname=arm-wince-cegcc-binutils pkgver=0.59.1 pkgrel=1 _prefix=/opt/cegcc @@ -12,7 +12,7 @@ options=(!libtool) url="http://cegcc.sf.net" depends=(zlib) groups=('cegcc') -source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) +source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b') build() { @@ -21,15 +21,16 @@ build() { unset CFLAGS unset LDFLAGS + find . -name Makefile.in -exec sed -i 's|WARN_CFLAGS =.*|WARN_CFLAGS =|g' {} \; [ $NOEXTRACT -eq 1 ] || ./configure \ --prefix=${_prefix} \ --exec-prefix=${_prefix} \ --bindir=${_prefix}/bin \ --target=arm-wince-cegcc \ --disable-nls \ - --includedir=${_prefix}/include || return 1 + --includedir=${_prefix}/include - make || (cd etc && make) && make || return 1 - make DESTDIR=$pkgdir install || return 1 + make || (cd etc && make) && make + make DESTDIR=$pkgdir install rm -rf $pkgdir/opt/cegcc/info } diff --git a/community/arm-wince-cegcc-gcc-base/PKGBUILD b/community/arm-wince-cegcc-gcc-base/PKGBUILD new file mode 100644 index 000000000..50d765ac0 --- /dev/null +++ b/community/arm-wince-cegcc-gcc-base/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 61005 2011-12-20 11:51:03Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=arm-wince-cegcc-gcc-base +pkgver=0.59.1 +pkgrel=3 +_prefix=/opt/cegcc +pkgdesc="CE GCC bundle - cross compilation tools for WinCE" +arch=(i686 x86_64) +license=(GPL) +options=(!libtool) +url="http://cegcc.sf.net" +depends=('glibc' 'mpfr' 'cloog') +makedepends=(arm-wince-cegcc-binutils) +source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) +md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b') + +build() { + cd $srcdir/cegcc/src + + mkdir build-gcc-base || true + cd build-gcc-base + + export PATH=$_prefix/bin:$PATH + export TARGET=arm-wince-cegcc + unset CFLAGS + unset LDFLAGS + unset MAKEFLAGS + + ../gcc-4.4.0/configure \ + --with-gcc \ + --with-gnu-ld \ + --with-gnu-as \ + --target=arm-wince-cegcc \ + --build=$CARCH \ + --host=$CARCH \ + --prefix=${_prefix} \ + --disable-threads \ + --disable-nls \ + --disable-shared \ + --enable-languages=c \ + --disable-win32-registry \ + --disable-multilib \ + --disable-interwork \ + --without-headers \ + --with-as=$_prefix/bin/arm-wince-cegcc-as \ + --with-ld=$_prefix/bin/arm-wince-cegcc-ld \ + --with-local-prefix=$_prefix \ + --enable-checking + + make all-gcc || (cd gcc && make) && make all-gcc + make DESTDIR=$pkgdir install-gcc + find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \; + cd $pkgdir/${_prefix} && ln -s arm-wince-cegcc arm-cegcc +} diff --git a/community/arm-wince-cegcc-gcc/PKGBUILD b/community/arm-wince-cegcc-gcc/PKGBUILD new file mode 100644 index 000000000..8787f4b46 --- /dev/null +++ b/community/arm-wince-cegcc-gcc/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 61036 2011-12-20 20:10:53Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=arm-wince-cegcc-gcc +pkgver=0.59.1 +pkgrel=4 +_prefix=/opt/cegcc +pkgdesc="CE GCC bundle - cross compilation tools for WinCE" +arch=(i686 x86_64) +license=('GPL') +options=(!libtool !strip) +url="http://cegcc.sf.net" +depends=('cloog' 'ppl' 'arm-wince-cegcc-binutils') +makedepends=('arm-wince-cegcc-newlib' 'arm-wince-cegcc-w32api' + 'arm-wince-cegcc-importlibs' 'arm-wince-cegcc-gcc-base' + 'arm-wince-cegcc-cegccdll-dummy') +conflicts=('arm-wince-cegcc-gcc-base') +groups=('cegcc') +source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) +md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b') + +build() { + cd $srcdir/cegcc/src + + export PATH=$_prefix/bin:$PATH + export TARGET=arm-wince-cegcc + unset CFLAGS + unset CXXFLAGS + unset CPPFLAGS + unset LDFLAGS + unset MAKEFLAGS + + mkdir -p build-gcc + cd build-gcc + + [ -f Makefile ] || ../gcc-4.4.0/configure \ + --prefix=${_prefix} \ + --exec-prefix=${_prefix} \ + --bindir=${_prefix}/bin \ + --target=$TARGET \ + --build=$CARCH \ + --host=$CARCH \ + --disable-nls \ + --includedir=${_prefix}/include \ + --with-gcc \ + --with-ld=/opt/cegcc/bin/arm-wince-cegcc-ld \ + --with-as=/opt/cegcc/bin/arm-wince-cegcc-as \ + --enable-threads=win32 \ + --enable-languages=c,c++ \ + --disable-win32-registry \ + --disable-multilib \ + --disable-interwork \ + --without-newlib \ + --enable-checking \ + --with-headers \ + --disable-libssp + + make + make DESTDIR=$pkgdir install + rm -f $pkgdir/$_prefix/lib/libiberty.a + find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \; + strip $pkgdir/${_prefix}/bin/arm-wince-cegcc-* || true + find $pkgdir/${_prefix}/libexec/ -type f -exec strip {} \; || true + rm -f $pkgdir/${_prefix}/info/dir + cd $pkgdir/${_prefix} && ln -s arm-wince-cegcc arm-cegcc +} diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD new file mode 100644 index 000000000..efdbf8817 --- /dev/null +++ b/community/ecryptfs-utils/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 61018 2011-12-20 16:47:52Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Richard Murri <admin@richardmurri.com> +# Contributor: Michal Krenek <mikos@sg1.cz> + +pkgname=ecryptfs-utils +pkgver=95 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" +url="https://launchpad.net/ecryptfs" +license=('GPL') +makedepends=('swig' 'intltool' 'gettext') +depends=('keyutils' 'nss' 'python2') +source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") +options=(!libtool) +md5sums=('b015c89d9c684bd1c10b57c7c8d40577') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + ./configure --prefix=/usr PYTHON=python2 + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir/" install + chmod +s "$pkgdir"/sbin/mount.ecryptfs_private +} diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 1a4edef85..42a73d657 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57322 2011-10-25 20:25:24Z foutrelis $ +# $Id: PKGBUILD 61028 2011-12-20 17:34:12Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris -pkgver=11.09 +pkgver=11.12 pkgrel=1 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('gnucap: for computer simulation within the electricity activity' makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') options=('!libtool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('aaa3b9abc2626593f7db6ddbab7e66849419e025') +sha256sums=('ab57e7c96df66114f7298947f6725364f4a8b811f1bb1e9470cbd63eea9e6d81') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD index 67a052c37..952d56834 100644 --- a/community/kchmviewer/PKGBUILD +++ b/community/kchmviewer/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 37626 2011-01-15 20:25:41Z jlichtblau $ +# $Id: PKGBUILD 61052 2011-12-20 23:58:31Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Bogdanov <andorn@gmail.com> pkgname=kchmviewer -pkgver=5.3 -pkgrel=1 +pkgver=6.0 +pkgrel=2 pkgdesc="A .chm files (MS HTML help file format) viewer" arch=('i686' 'x86_64') url="http://kchmviewer.sourceforge.net/" license=('GPL') -depends=('chmlib' 'kdelibs' 'qt' 'xdg-utils') +depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'qt' 'xdg-utils') makedepends=('automoc4' 'cmake') options=('libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('a8666e63358d20d6ead6b9f309434bdfcbd7b869ed7fb425ca8e0a2f7166af22') +sha256sums=('81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979') build() { cd $pkgname-$pkgver diff --git a/community/kchmviewer/kchmviewer.changelog b/community/kchmviewer/kchmviewer.changelog index c47ac0198..3204bc3dc 100644 --- a/community/kchmviewer/kchmviewer.changelog +++ b/community/kchmviewer/kchmviewer.changelog @@ -1,3 +1,6 @@ +2011-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kchmviewer 6.0-1 + 2011-01-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kchmviewer-5.3 diff --git a/community/kchmviewer/kchmviewer.install b/community/kchmviewer/kchmviewer.install index 8de1998bf..82baa7bf0 100644 --- a/community/kchmviewer/kchmviewer.install +++ b/community/kchmviewer/kchmviewer.install @@ -1,5 +1,6 @@ post_install() { which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate + update-desktop-database -q } post_upgrade() { diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 66e2e8b97..77d6a7726 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 60988 2011-12-20 10:07:46Z ttopper $ # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=15.7.1 +pkgver=15.7.2 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64') @@ -16,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'm4: for complex operations using the matho script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('f8144e9c17edf688cbb296d20efaf808') +md5sums=('eb16844e2a4e06ba4f1fe6e2e278c47e') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index 73717c807..18b83b67c 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51180 2011-07-05 16:56:35Z spupykin $ +# $Id: PKGBUILD 60983 2011-12-20 09:13:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.4.2 +pkgver=2.4.4 pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64') @@ -13,11 +13,10 @@ url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz) -md5sums=('920c533806f112787b480806ea125406') +md5sums=('331255d2d44018bcef2ea192aabc1d6a') build() { cd "$srcdir/psycopg2-$pkgver" - # Thanks for the tip, Xentac sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg } diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD index d18e1a070..c392ff4ba 100644 --- a/community/xapian-core/PKGBUILD +++ b/community/xapian-core/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54076 2011-08-13 09:16:09Z spupykin $ +# $Id: PKGBUILD 60985 2011-12-20 09:14:11Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=xapian-core -pkgver=1.2.7 +pkgver=1.2.8 pkgrel=1 pkgdesc='Open source search engine library.' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux') # xapian config requires libxapian.la options=('libtool') source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('6684eb7a990b9cedf4257f41bfddb584') +md5sums=('6c9f9e7ac43aa4e086283201329e98ee') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 0be9ebb2f..3247503ad 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144848 2011-12-08 12:17:04Z allan $ +# $Id: PKGBUILD 145254 2011-12-20 11:55:23Z 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=2 +pkgrel=4 _glibcdate=20111025 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -31,6 +31,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t 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 nscd locale.gen.txt locale-gen) @@ -45,11 +46,11 @@ md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' + '178779bfaa1418c709f31c25eb3d8a3e' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') - mksource() { git clone git://sourceware.org/git/glibc.git pushd glibc @@ -99,6 +100,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 + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -181,9 +186,12 @@ package() { ln -v -s ../lib/ld* . fi - # 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 sbin/{ldconfig,sln} \ @@ -193,10 +201,9 @@ package() { usr/sbin/{iconvconfig,nscd} [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - strip $STRIP_STATIC usr/lib/*.a \ - lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so + strip $STRIP_STATIC usr/lib/*.a - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ + strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ lib/{libmemusage,libpcprofile,libSegFault}.so \ diff --git a/core/glibc/glibc-2.14.1-tzfile-overflow.patch b/core/glibc/glibc-2.14.1-tzfile-overflow.patch new file mode 100644 index 000000000..9e21cbfd3 --- /dev/null +++ b/core/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/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index ae17ecb75..920c6437a 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134029 2011-08-01 10:30:12Z andrea $ +# $Id: PKGBUILD 145250 2011-12-20 08:51:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez pkgver=4.96 -pkgrel=1 +pkgrel=3 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -24,12 +24,13 @@ replaces=('bluez-libs' 'bluez-utils') options=('!libtool' 'emptydirs') backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" +#source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'bluetooth.conf.d' 'rc.bluetooth') md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f' - '8f60a5eb9d84b9c64c478d63e1c24b10' - 'ca4c39eb4bb201bd2eacad01492cd735') + '7412982b440f29fa7f76a41a87fef985' + '8f9498707f809506928b2e480d3b6789') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -49,8 +50,7 @@ build() { --enable-pand \ --enable-dund \ --enable-cups \ - --enable-udevrules \ - --enable-configfiles + --enable-wiimote make } @@ -70,9 +70,14 @@ package() { install -Dm644 ${srcdir}/bluetooth.conf.d \ ${pkgdir}/etc/conf.d/bluetooth - install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - ${pkgdir}/usr/bin/bluez-simple-agent + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules diff --git a/extra/bluez/bluetooth.conf.d b/extra/bluez/bluetooth.conf.d index 6648740eb..1c1e02589 100644 --- a/extra/bluez/bluetooth.conf.d +++ b/extra/bluez/bluetooth.conf.d @@ -25,6 +25,6 @@ #RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" # Options for hidd, dund and pand (default: none) -#HIDD_OPTIONS="" +HIDD_OPTIONS="--server" #DUND_OPTIONS="" #PAND_OPTIONS="" diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth index 096242011..a46ee2abb 100644 --- a/extra/bluez/rc.bluetooth +++ b/extra/bluez/rc.bluetooth @@ -46,7 +46,7 @@ case "$1" in fi if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS --server + $HIDD_EXEC $HIDD_OPTIONS fi if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then stat_append " $RFCOMM_NAME" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index f97ac0662..f079c7170 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144950 2011-12-11 21:22:27Z ibiru $ +# $Id: PKGBUILD 145269 2011-12-20 21:38:03Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.2.2 -pkgrel=4 +pkgver=3.2.3 +pkgrel=1 pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -14,18 +14,12 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz - settings.ini - filechooserdefault_do_not_unref_value_twice.patch - moveresize.patch) -sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6' - '627f430ccecc95ec61d9a83607469e71e95568c077f7bda849a7fe1c02d0bea7') + settings.ini) +sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "$srcdir/gtk+-$pkgver" - patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch" - patch -Np1 -i "$srcdir/moveresize.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD index 42b709b7e..0da149312 100644 --- a/extra/jack/PKGBUILD +++ b/extra/jack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144303 2011-12-04 16:54:45Z schiv $ +# $Id: PKGBUILD 145264 2011-12-20 18:09:32Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> @@ -6,7 +6,7 @@ pkgname=jack _longname=jack-audio-connection-kit pkgver=0.121.3 -pkgrel=4 +pkgrel=5 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -20,6 +20,7 @@ options=('!libtool') provides=("$_longname=$pkgver") conflicts=("$_longname") replaces=("$_longname") +install=$pkgname.install source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz" '99-audio.conf' '40-hpet-permissions.rules') diff --git a/extra/jack/jack.install b/extra/jack/jack.install new file mode 100644 index 000000000..8be532f6d --- /dev/null +++ b/extra/jack/jack.install @@ -0,0 +1,5 @@ +post_upgrade() { + rm -f etc/security/limits.d/99-realtime.conf +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/kmod/PKGBUILD b/extra/kmod/PKGBUILD new file mode 100644 index 000000000..3b17c9f26 --- /dev/null +++ b/extra/kmod/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 145285 2011-12-21 02:42:53Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=kmod +pkgver=2 +pkgrel=2 +pkgdesc="A set of tools to handle common tasks with Linux kernel modules" +arch=('i686' 'x86_64') +url="http://git.profusion.mobi/cgit.cgi/kmod.git" +license=('GPL2') +depends=('glibc' 'zlib') +options=('!libtool') +source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz") +md5sums=('6017364434377f6724f749d7a28c5d7a') + +build() { + cd "$pkgname-$pkgver" + + ./configure --enable-zlib + make +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install +} + +# vim: ft=sh syn=sh et diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 96e9e69b5..51aa6df6f 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129225 2011-06-26 02:06:08Z allan $ +# $Id: PKGBUILD 145273 2011-12-21 01:12:32Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo pkgver=1.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64') url="http://libjpeg-turbo.virtualgl.org/" @@ -19,16 +19,22 @@ source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver. md5sums=('03b9c1406c7bfdc204313c2917ce6962') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man make } +check() { + cd $srcdir/$pkgname-$pkgver + + make test +} + package() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir/" install + make DESTDIR=$pkgdir/ install # provide jpegint.h as it is required by various software install -m644 jpegint.h $pkgdir/usr/include/ @@ -38,5 +44,5 @@ package() { rm $pkgdir/usr/include/turbojpeg.h rm $pkgdir/usr/bin/jpgtest - install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE" + install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE } diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD index 1af7a2b70..6031eb6ff 100644 --- a/extra/liboauth/PKGBUILD +++ b/extra/liboauth/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139509 2011-10-02 17:00:45Z heftig $ +# $Id: PKGBUILD 145266 2011-12-20 18:56:18Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Martin Häger <martin.haeger@gmail.com> pkgname=liboauth -pkgver=0.9.4 -pkgrel=2 +pkgver=0.9.6 +pkgrel=1 pkgdesc='C library implementing OAuth Core RFC 5849' arch=('i686' 'x86_64') url='http://liboauth.sourceforge.net' @@ -13,7 +13,7 @@ license=('MIT') depends=('curl') options=('!libtool') source=("$url/pool/$pkgname-$pkgver.tar.gz") -sha256sums=('77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549') +sha256sums=('9fa0f9d86ac4fbdd8c17d4c242ceef33096e8cf3b1834d9198ccc0cbf8b0f207') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index b869cdf3b..e2099cc99 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 141341 2011-10-29 16:03:56Z andrea $ +# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon -pkgver=4.5.1 -pkgrel=2 +pkgver=4.6.0 +pkgrel=1 epoch=1 arch=('i686' 'x86_64') -url="http://phonon.kde.org" +url='http://phonon.kde.org/' license=('LGPL') pkgdesc="The multimedia framework for KDE" depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') makedepends=('cmake' 'automoc4' 'pulseaudio') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'libqzeitgeist08.patch') -md5sums=('3df071b7f9996afcd67b18958955ecdd' - '99de3dc908277199b502e54613925ff6') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}"/libqzeitgeist08.patch - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON + -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer make } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 7023d412d..257798d85 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 144439 2011-12-05 19:49:38Z andyrtr $ +# $Id: PKGBUILD 145277 2011-12-21 01:41:22Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=1.1.12 -pkgrel=5 +pkgver=1.1.13 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -39,18 +39,14 @@ backup=('usr/share/vlc/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'bp-set-channel-map-pulseaudio-1.0.patch') -md5sums=('91de1ad308c947e35380f9d747ff5713' - 'bae24e02207364d76a1a118644de484e') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('9678fb7a04808b6e0de63746d35e4bb1') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c - patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch - ./configure --prefix=/usr \ --disable-rpath \ --enable-faad \ diff --git a/extra/xdelta/PKGBUILD b/extra/xdelta/PKGBUILD index dabc0db1c..1cc6f85b1 100644 --- a/extra/xdelta/PKGBUILD +++ b/extra/xdelta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91165 2010-09-23 14:13:09Z allan $ +# $Id: PKGBUILD 145275 2011-12-21 01:19:51Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xdelta pkgver=1.1.4 -pkgrel=3 +pkgrel=4 pkgdesc="binary file delta generator" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/xdelta/" diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD index a8149d55c..05cabed7d 100644 --- a/extra/xdelta3/PKGBUILD +++ b/extra/xdelta3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: $ +# $Id: PKGBUILD 145279 2011-12-21 02:07:07Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com> # Contributor: Henning Garus <henning.garus@gmail.com> pkgname=xdelta3 pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A diff utility which works with binary files" arch=('i686' 'x86_64') url="http://xdelta.org/" @@ -15,15 +15,25 @@ optdepends=('python2: for python modules') source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz xdelta3-makefile.patch) md5sums=('5fe038be3a266d2a7913e10d1cec6d88' - '378e9a735d92fb2fc695ed9ce2fad2d5') + 'fa5973870faf7523043c4858ab7c3bdb') build() { cd $srcdir/xdelta$pkgver + patch -Np1 -i $srcdir/xdelta3-makefile.patch sed -i "/PYVER = /s/2.6/2.7/" Makefile make xdelta3 make xdelta3module.so + + # for testsuite + make xdelta3-debug +} + +check() { + cd $srcdir/xdelta$pkgver + + make test } package() { diff --git a/extra/xdelta3/xdelta3-makefile.patch b/extra/xdelta3/xdelta3-makefile.patch index 3085d3c29..d5fa12e70 100644 --- a/extra/xdelta3/xdelta3-makefile.patch +++ b/extra/xdelta3/xdelta3-makefile.patch @@ -1,7 +1,34 @@ -diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile ---- xdelta3.0v-old/Makefile 2009-03-12 01:44:51.000000000 +0000 -+++ xdelta3.0v/Makefile 2009-03-14 17:02:33.000000000 +0000 -@@ -200,6 +200,9 @@ +diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile +--- xdelta3.0.0-orig/Makefile 2011-01-09 18:29:06.000000000 +1000 ++++ xdelta3.0.0/Makefile 2011-12-21 11:53:13.530028738 +1000 +@@ -54,7 +54,7 @@ + WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820" + + # -arch x86_64 +-CFLAGS= -Wall -Wshadow -fno-builtin ++CFLAGS+= -Wall -Wshadow -fno-builtin + WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter + + # $Format: "REL=$Xdelta3Version$" $ +@@ -126,7 +126,7 @@ + $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi + + xdelta3: $(SOURCES) +- $(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \ ++ $(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \ + -DGENERIC_ENCODE_TABLES=0 \ + -DREGRESSION_TEST=1 \ + -DSECONDARY_DJW=1 \ +@@ -137,7 +137,7 @@ + -DXD3_USE_LARGEFILE64=1 + + xdelta3-debug: $(SOURCES) +- $(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \ ++ $(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \ + -DGENERIC_ENCODE_TABLES=1 \ + -DREGRESSION_TEST=1 \ + -DSECONDARY_DJW=1 \ +@@ -202,6 +202,9 @@ xdelta3.o: $(SOURCES) $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o @@ -11,14 +38,14 @@ diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile xdelta3_wrap.o: xdelta3_wrap.c $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \ -DHAVE_CONFIG_H \ -@@ -218,8 +221,8 @@ +@@ -221,8 +224,8 @@ cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages ifeq ("$(DARWIN)", "") -xdelta3module.so: xdelta3_wrap.o xdelta3.o - ld -shared xdelta3.o xdelta3_wrap.o \ +xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o -+ cc -shared xdelta3_PIC.o xdelta3_wrap.o \ ++ cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \ -o xdelta3module.so \ /usr/lib/libpython$(PYVER).so \ -lc diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD index 4aa86f2f2..2a907e9ce 100644 --- a/extra/xfwm4/PKGBUILD +++ b/extra/xfwm4/PKGBUILD @@ -1,39 +1,41 @@ -# $Id: PKGBUILD 138685 2011-09-27 16:03:39Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 145260 2011-12-20 17:23:04Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfwm4 -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Xfce window manager" arch=('i686' 'x86_64') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') -depends=("libxfce4ui" 'libwnck' 'hicolor-icon-theme') +depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme') makedepends=('pkgconfig' 'intltool') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('41b730d5abf39a69fc3b221728ddaa75') -sha1sums=('7822408eaddd9fc4937d9e6825eda7d56dc46b06') +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('0b0e8bea0b257958ad416ab5678cf0cdd7e909943d4d5ab32afc35295a78227e') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-startup-notification \ - --enable-randr \ - --enable-compositor \ - --enable-xsync \ - --disable-debug + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-startup-notification \ + --enable-randr \ + --enable-compositor \ + --enable-xsync \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfwm4/xfwm4.install b/extra/xfwm4/xfwm4.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfwm4/xfwm4.install +++ b/extra/xfwm4/xfwm4.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD index dac2dc6e6..28f67154f 100644 --- a/kde-unstable/calligra/PKGBUILD +++ b/kde-unstable/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143494 2011-11-24 22:35:56Z andrea $ +# $Id: PKGBUILD 145246 2011-12-20 07:55:02Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -23,7 +23,7 @@ pkgname=('calligra-filters' 'calligra-thesaurus-doc' 'calligra-braindump' 'calligra-flow') -pkgver=2.3.84 +pkgver=2.3.85 pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org' @@ -33,7 +33,7 @@ makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf' 'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2') groups=('calligra') source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('6888603d1ff09843a8581eef66baad41') +md5sums=('a00dbd648ea2c2b56ac62025c836c806') build() { cd "${srcdir}" diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index f552f8fe4..aebce916d 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60243 2011-12-08 12:20:06Z allan $ +# $Id: PKGBUILD 61006 2011-12-20 11:55:16Z allan $ # 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/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch b/multilib/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch new file mode 100644 index 000000000..9e21cbfd3 --- /dev/null +++ b/multilib/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/multilib/lib32-v4l-utils/PKGBUILD b/multilib/lib32-v4l-utils/PKGBUILD index 2729e8528..b492b71f8 100644 --- a/multilib/lib32-v4l-utils/PKGBUILD +++ b/multilib/lib32-v4l-utils/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> _pkgbasename=v4l-utils pkgname=lib32-$_pkgbasename -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ license=('LGPL') makedepends=('gcc-multilib') depends=('lib32-gcc-libs' $_pkgbasename lib32-libjpeg-turbo) source=(http://linuxtv.org/downloads/v4l-utils/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7') +sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/testing/xulrunner/PKGBUILD b/testing/xulrunner/PKGBUILD new file mode 100644 index 000000000..58b80ace8 --- /dev/null +++ b/testing/xulrunner/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 145256 2011-12-20 11:59:26Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +pkgname=xulrunner +pkgver=9.0 +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch) +options=('!emptydirs') +replaces=('xulrunner-oss') +md5sums=('d8d0c8c79660752b02d9e9ab69a68f94' + '8dfb78c5bd0581c8cf4753813132bf0b' + '27271ce647a83906ef7a24605e840d61') + +build() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py" +} diff --git a/testing/xulrunner/mozconfig b/testing/xulrunner/mozconfig new file mode 100644 index 000000000..82a6ae512 --- /dev/null +++ b/testing/xulrunner/mozconfig @@ -0,0 +1,38 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/testing/xulrunner/mozilla-pkgconfig.patch b/testing/xulrunner/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/testing/xulrunner/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE |