diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-16 00:06:15 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-16 00:06:15 -0700 |
| commit | 975d6f489c6c43bbc7b816ac43333c54c1f4df21 (patch) | |
| tree | e10299091457df6104611a2b54c3a27cdbeab49b | |
| parent | a196f69321b722259bed2cc63e6f64a5cb0b8389 (diff) | |
Tue Apr 16 00:06:15 PDT 2013
31 files changed, 272 insertions, 241 deletions
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index deb501fa5..269bb7076 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80035 2012-11-15 15:53:42Z spupykin $ +# $Id: PKGBUILD 88266 2013-04-15 11:13:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -8,18 +8,18 @@ pkgname=cgit pkgver=0.9.1 _gitver=1.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64') url="http://hjemli.net/git/cgit" license=('GPL') depends=('openssl') -makedepends=('git' 'zlib' 'curl' 'asciidoc') +makedepends=('zlib' 'curl' 'asciidoc') install=cgit.install source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz" "git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz" "apache.example.conf") -md5sums=('ed1a1ccccdcbf55ddd6a9de29bca6edf' +md5sums=('272ee8fec2d81ac1e65117578e64df1e' 'c63cc7ca8a4bbf97c8802f354511223e' 'bd5696bea0654bfcf98f249b1a36737d') diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 9c2807e88..daad24122 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88116 2013-04-12 03:06:47Z fyan $ +# $Id: PKGBUILD 88241 2013-04-15 00:59:54Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> @@ -13,7 +13,7 @@ pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.10.1390.102 _patchver=${pkgver}.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://code.google.com/p/mozc/" license=('custom') @@ -26,6 +26,7 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2 http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch + http://fcitx.googlecode.com/files/fcitx-mozc-icon.tar.gz mozc_1.10.1390.102_remove_warn_as_error.patch ) @@ -99,20 +100,21 @@ package() { install -D -m 644 unix/fcitx/mozc.conf "${pkgdir}/usr/share/fcitx/inputmethod/mozc.conf" install -d "${pkgdir}/usr/share/fcitx/mozc/icon" - install -m 644 data/images/product_icon_32bpp-128.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png" - install -m 644 data/images/unix/ui-alpha_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png" - install -m 644 data/images/unix/ui-alpha_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png" - install -m 644 data/images/unix/ui-direct.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png" - install -m 644 data/images/unix/ui-hiragana.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png" - install -m 644 data/images/unix/ui-katakana_full.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png" - install -m 644 data/images/unix/ui-katakana_half.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png" - install -m 644 data/images/unix/ui-dictionary.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png" - install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" - install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_full.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-alpha_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-alpha_half.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-direct.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-direct.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-hiragana.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-hiragana.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_full.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_full.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-katakana_half.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-katakana_half.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-dictionary.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-dictionary.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-properties.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" + install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } md5sums=('ff1611354703cbaa76cd562007ba57e9' '63310f8bad30f528ba10a6574b807952' 'bb9fa83c00dece4de5f92ca1773e2bc5' 'a72001a9067a4c2c4e0e836d0f92ece4' '1d94b16b5379f0ccd9f4e372c59b8190' + '80fe2ef127b70649df22d133822ac8a7' '36689e236c97e570c1a8c98f947755bb') diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 72745e63c..24f81dac5 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87046 2013-03-26 11:49:39Z foutrelis $ +# $Id: PKGBUILD 88243 2013-04-15 01:48:05Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> @@ -6,21 +6,26 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=5 +pkgrel=6 groups=('fcitx-im') arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \ - 'iso-codes' 'gobject-introspection' 'libxkbfile') + 'iso-codes' 'gobject-introspection' 'libxkbfile' 'git') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz - https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch) + https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch + https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch + https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch +) build() { #source /etc/profile.d/qt4.sh cd "$srcdir/$pkgbase-$pkgver" patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch" + patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch" + git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch" cd "$srcdir" mkdir -p build @@ -122,4 +127,6 @@ package_fcitx-qt4() { } md5sums=('6e291717c24615b9dc9bfaa2949af3a7' - 'ce299aa5b596cc52dc9e66b47795e627') + 'ce299aa5b596cc52dc9e66b47795e627' + '6f420547bc8af9627db2e5290f758433' + '51e53377e1b83661f2896e25d1a46242') diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD index 2628cfe76..4ddc9b982 100644 --- a/community/opencc/PKGBUILD +++ b/community/opencc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85687 2013-03-05 05:00:24Z fyan $ +# $Id: PKGBUILD 88240 2013-04-15 00:24:49Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=opencc -pkgver=0.4.0 +pkgver=0.4.2 pkgrel=1 pkgdesc="Library for Open Chinese Convert" arch=('i686' 'x86_64') @@ -22,4 +22,4 @@ package() { cd "$srcdir/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('00a2de2314cd28fc8631c229fb3aa894') +md5sums=('d5c001098e824dae0e3debb1b864304b') diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index b4af7ef35..68507ffc9 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82878 2013-01-25 09:55:32Z spupykin $ +# $Id: PKGBUILD 88252 2013-04-15 10:48:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-odbc -pkgver=1.41 +pkgver=1.43 pkgrel=1 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi' 'perl' 'unixodbc') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") -md5sums=('94bce7246d69df1ea5b2f8a702f35554') +md5sums=('35e37488170b5111f826226c4d466961') build() { cd DBD-ODBC-${pkgver} diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD index 172143d89..c0f2a9056 100644 --- a/community/perl-dbd-sqlite2/PKGBUILD +++ b/community/perl-dbd-sqlite2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 71771 2012-06-02 10:30:10Z bluewind $ +# $Id: PKGBUILD 88254 2013-04-15 10:48:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-dbd-sqlite2 -pkgver=0.33 -pkgrel=9 +pkgver=0.36 +pkgrel=1 pkgdesc="Perl/CPAN Module DBD::SQLite2" arch=("i686" "x86_64") url="http://search.cpan.org/dist/DBD-SQLite2" license=("GPL" "PerlArtistic") depends=("perl-dbi") -source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") -md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') +source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/DBD-SQLite2-$pkgver.tar.gz") +md5sums=('221b30e630c72613d1fb5663db048a71') build() { cd DBD-SQLite2-${pkgver} diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index 338bf74ea..095d8718a 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71773 2012-06-02 10:30:14Z bluewind $ +# $Id: PKGBUILD 88257 2013-04-15 10:48:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-dbd-sybase -pkgver=1.14 -pkgrel=2 +pkgver=1.15 +pkgrel=1 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-Sybase/" @@ -11,7 +11,7 @@ license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") -md5sums=('db6662d710b3adffe37bd8aec8060eda') +md5sums=('d76f09f9a25896fd879ef89a98748708') build() { cd $srcdir/DBD-Sybase-${pkgver} diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 116d6f41d..b27773bf4 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87797 2013-04-06 18:59:06Z giovanni $ +# $Id: PKGBUILD 88284 2013-04-15 17:29:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.7.1 -pkgrel=3 +pkgver=0.7.2 +pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" @@ -13,7 +13,7 @@ depends=('qt5-webkit' 'boost-libs') makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('e6c281b6702a8f9d79cc85703dc8d3ea') +md5sums=('540745983db57a2150cc2f4057455b19') build() { cd "${srcdir}" diff --git a/community/wdm/PKGBUILD b/community/wdm/PKGBUILD index e5391a139..76e858c53 100644 --- a/community/wdm/PKGBUILD +++ b/community/wdm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65381 2012-02-21 02:29:21Z spupykin $ +# $Id: PKGBUILD 88268 2013-04-15 11:14:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: eric <eric@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> @@ -20,6 +20,10 @@ build() { --sysconfdir=/etc/wdm --with-wdmdir=/etc/wdm --mandir=/usr/share/man \ --with-fakehome=/var/empty make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install # used /etc/pam.d/xscreensaver as an example # diff --git a/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch b/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch deleted file mode 100644 index aaedc27c6..000000000 --- a/core/curl/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch +++ /dev/null @@ -1,39 +0,0 @@ -From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001 -From: Linus Nielsen Feltzing <linus@haxx.se> -Date: Sun, 10 Feb 2013 22:57:58 +0100 -Subject: [PATCH] Fix NULL pointer reference when closing an unused multi - handle. - ---- - lib/multi.c | 8 +++++--- - tests/data/Makefile.am | 1 + - tests/data/test1508 | 31 +++++++++++++++++++++++++++++ - tests/libtest/Makefile.inc | 6 +++++- - tests/libtest/lib1508.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 91 insertions(+), 4 deletions(-) - create mode 100644 tests/data/test1508 - create mode 100644 tests/libtest/lib1508.c - -diff --git a/lib/multi.c b/lib/multi.c -index fa0afb9..706df23 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) - /* Close all the connections in the connection cache */ - close_all_connections(multi); - -- multi->closure_handle->dns.hostcache = multi->hostcache; -- Curl_hostcache_clean(multi->closure_handle); -+ if(multi->closure_handle) { -+ multi->closure_handle->dns.hostcache = multi->hostcache; -+ Curl_hostcache_clean(multi->closure_handle); - -- Curl_close(multi->closure_handle); -+ Curl_close(multi->closure_handle); -+ } - multi->closure_handle = NULL; - - Curl_hash_destroy(multi->sockhash); --- -1.8.1.3 - diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 51d860f43..cda53a9cc 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177958 2013-02-12 13:57:28Z dreisner $ +# $Id: PKGBUILD 182802 2013-04-15 12:46:55Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.29.0 -pkgrel=2 +pkgver=7.30.0 +pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -15,27 +15,14 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - 0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch curlbuild.h) -md5sums=('4f57d3b4a3963038bd5e04dbff385390' - '6283fbb36933cf8720acc34c43169f1d' - '5bfd1899e8b19cfdd78774f6337f8b47' +md5sums=('60bb6ff558415b73ba2f00163fd307c5' + 'SKIP' '751bd433ede935c8fae727377625a8ae') -ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') -case $ptrsize in - 8) _curlbuild=curlbuild-64.h ;; - 4) _curlbuild=curlbuild-32.h ;; - *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" - exit 1 - ;; -esac - build() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -58,6 +45,15 @@ package() { make DESTDIR="$pkgdir" install + local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') + case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; + esac + # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 4b855c496..393b40877 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181166 2013-04-02 06:48:56Z allan $ +# $Id: PKGBUILD 182769 2013-04-15 01:13:43Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,18 +6,18 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.8.0 -pkgrel=1 -#_snapshot=4.7-20120721 +pkgrel=2 +_snapshot=4.8-20130411 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') -checkdepends=('dejagnu') +checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 -md5sums=('e6040024eb9e761c3bea348d1fa5abb0') +source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2) + #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 +md5sums=('cb529205469260f0d56adc01088c4850') if [ -n "${_snapshot}" ]; then @@ -26,7 +26,7 @@ else _basedir=gcc-${pkgver} fi -build() { +prepare() { cd ${srcdir}/${_basedir} # Do not run fixincludes @@ -37,14 +37,20 @@ build() { echo ${pkgver} > gcc/BASE-VER + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + + mkdir ${srcdir}/gcc-build +} + +build() { + cd ${srcdir}/gcc-build + # using -pipe causes spurious test-suite failures # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 CFLAGS=${CFLAGS/-pipe/} CXXFLAGS=${CXXFLAGS/-pipe/} - cd ${srcdir} - mkdir gcc-build && cd gcc-build - ${srcdir}/${_basedir}/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ --mandir=/usr/share/man --infodir=/usr/share/info \ @@ -132,17 +138,15 @@ package_gcc() # unfortunately it is much, much easier to install the lot and clean-up the mess... rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{atomic,ffi,gfortran,go{,begin},iberty,objc}.a + rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a rm $pkgdir/usr/lib/libgfortran.spec rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libffi,libgomp,libquadmath,libitm}.info + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index d77f47151..fbb494374 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 170033 2012-10-31 05:23:26Z eric $ +# $Id: PKGBUILD 182863 2013-04-15 21:02:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.7 -pkgrel=1 +pkgrel=2 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64') url="http://www.nico.schottelius.org/software/gpm/" license=('GPL') depends=('ncurses' 'bash') -backup=('etc/conf.d/gpm') options=('!makeflags') install=gpm.install source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ - gpm gpm.conf.d gpm.sh gpm.service) + gpm.sh gpm.service) sha1sums=('8d9f3655c80ce7667d31ede2a100b44986480369' - '19e1feb1493373512a77801699df012d186336ea' - '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' '88fe5ff10916c68a87abc8418a56eb0073f69fa9' '20b92360f0ad38a2032fcae37bdbd01b31e43f77') @@ -30,8 +27,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" - install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service" diff --git a/core/gpm/gpm b/core/gpm/gpm deleted file mode 100755 index 7b5213dd7..000000000 --- a/core/gpm/gpm +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GPM_ARGS= -[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/sbin/gpm) -case "$1" in - start) - stat_busy "Starting GPM Daemon" - [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS} - PID=$(pidof -o %PPID /usr/sbin/gpm) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gpm - stat_done - fi - ;; - stop) - stat_busy "Stopping GPM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gpm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/gpm/gpm.conf.d b/core/gpm/gpm.conf.d deleted file mode 100644 index ab43bb7eb..000000000 --- a/core/gpm/gpm.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to gpm -# -GPM_ARGS="-m /dev/input/mice -t imps2" diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index 7333352ed..ac1fc27bc 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182142 2013-04-08 05:56:24Z allan $ +# $Id: PKGBUILD 182768 2013-04-15 01:13:42Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl -pkgver=0.11.1 -pkgrel=2 +pkgver=0.11.2 +pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64') url="http://www.kotnet.org/~skimo/isl/" @@ -11,7 +11,7 @@ depends=('gmp') license=('MIT') options=('!libtool') source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('bce1586384d8635a76d2f017fb067cd2') +md5sums=('c40daa17d2995d1c98a0c1aca607541f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,7 +29,7 @@ package() { make -j1 DESTDIR="$pkgdir/" install install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.1-gdb.py + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.2-gdb.py install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE } diff --git a/core/perl/CVE-2012-6329.patch b/core/perl/CVE-2012-6329.patch new file mode 100644 index 000000000..5f59e03c1 --- /dev/null +++ b/core/perl/CVE-2012-6329.patch @@ -0,0 +1,79 @@ +commit 1735f6f53ca19f99c6e9e39496c486af323ba6a8 +Author: Brian Carlson <brian.carlson@cpanel.net> +Date: Wed Nov 28 08:54:33 2012 -0500 + + Fix misparsing of maketext strings. + + Case 61251: This commit fixes a misparse of maketext strings that could + lead to arbitrary code execution. Basically, maketext was compiling + bracket notation into functions, but neglected to escape backslashes + inside the content or die on fully-qualified method names when + generating the code. This change escapes all such backslashes and dies + when a method name with a colon or apostrophe is specified. +--- + AUTHORS | 1 + + dist/Locale-Maketext/lib/Locale/Maketext.pm | 24 ++++++++---------------- + 2 files changed, 9 insertions(+), 16 deletions(-) + +diff --git a/AUTHORS b/AUTHORS +index 70734b0..009dea0 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -154,6 +154,7 @@ Breno G. de Oliveira <garu@cpan.org> + Brent Dax <brentdax@cpan.org> + Brooks D Boyd + Brian Callaghan <callagh@itginc.com> ++Brian Carlson <brian.carlson@cpanel.net> + Brian Clarke <clarke@appliedmeta.com> + brian d foy <brian.d.foy@gmail.com> + Brian Fraser <fraserbn@gmail.com> +diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm +index 4822027..63e5fba 100644 +--- a/dist/Locale-Maketext/lib/Locale/Maketext.pm ++++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm +@@ -625,21 +625,9 @@ sub _compile { + # 0-length method name means to just interpolate: + push @code, ' ('; + } +- elsif($m =~ /^\w+(?:\:\:\w+)*$/s +- and $m !~ m/(?:^|\:)\d/s +- # exclude starting a (sub)package or symbol with a digit ++ elsif($m =~ /^\w+$/s ++ # exclude anything fancy, especially fully-qualified module names + ) { +- # Yes, it even supports the demented (and undocumented?) +- # $obj->Foo::bar(...) syntax. +- $target->_die_pointing( +- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, +- 2 + length($c[-1]) +- ) +- if $m =~ m/^SUPER::/s; +- # Because for SUPER:: to work, we'd have to compile this into +- # the right package, and that seems just not worth the bother, +- # unless someone convinces me otherwise. +- + push @code, ' $_[0]->' . $m . '('; + } + else { +@@ -693,7 +681,9 @@ sub _compile { + elsif(substr($1,0,1) ne '~') { + # it's stuff not containing "~" or "[" or "]" + # i.e., a literal blob +- $c[-1] .= $1; ++ my $text = $1; ++ $text =~ s/\\/\\\\/g; ++ $c[-1] .= $text; + + } + elsif($1 eq '~~') { # "~~" +@@ -731,7 +721,9 @@ sub _compile { + else { + # It's a "~X" where X is not a special character. + # Consider it a literal ~ and X. +- $c[-1] .= $1; ++ my $text = $1; ++ $text =~ s/\\/\\\\/g; ++ $c[-1] .= $text; + } + } + } diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 1dd0db9fb..29693141f 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180140 2013-03-18 08:31:17Z bluewind $ +# $Id: PKGBUILD 182787 2013-04-15 10:15:37Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> @@ -7,7 +7,7 @@ pkgname=perl pkgver=5.16.3 -pkgrel=1 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -18,6 +18,7 @@ source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 cgi-cr-escaping.diff perlbin.sh perlbin.csh + CVE-2012-6329.patch provides.pl) install=perl.install options=('makeflags' '!purge') @@ -25,6 +26,7 @@ md5sums=('025102de0e4a597cf541e57da80c6aa3' '0486659c9eefe682364a3e364d814296' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' + '5dc374e095d896fb30618e414aeb9017' '999c3eea6464860704abbb055a0f0896') # workaround to let the integrity check find the correct provides array if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then @@ -35,6 +37,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} patch -i "$srcdir/cgi-cr-escaping.diff" -p1 + patch -i "$srcdir/CVE-2012-6329.patch" -p1 if [ "${CARCH}" = "x86_64" ]; then # for x86_64 diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index a538da976..7412d21da 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166377 2012-09-07 09:11:49Z tpowa $ +# $Id: PKGBUILD 182774 2013-04-15 06:32:19Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.26 +pkgver=1.0.27 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -24,4 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('2dfa35d28471d721e592b616beedf965') +md5sums=('f090c7dbd0fe57d786d82e411eac2d08') diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 5fd8b4e61..e63024bb2 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166379 2012-09-07 09:13:20Z tpowa $ +# $Id: PKGBUILD 182805 2013-04-15 13:03:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.26 -pkgrel=1 +pkgver=1.0.27 +pkgrel=3 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -13,11 +13,17 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - alsa - alsa.conf.d - 90alsa) + 90alsa + alsa-restore-1.0.27.service.patch + alsactl-fix-buffer-overflow-1.0.27.patch) backup=(etc/conf.d/alsa) +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch + patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-alsaconf \ @@ -29,14 +35,12 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa - install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('4dcf1017fafc91603af96705c073eca9' - '2ba1a1cbf653bf1a69f8a720fd6549da' - '4c8ae9f976c7df5e271a4cb91ccc7767' - '529216f6a46e61a546640e08ea7a0879') +md5sums=('cbfb21a24f63fb052b3392195639ce48' + '529216f6a46e61a546640e08ea7a0879' + '0a27f7b80351d6baa274c32d859bf037' + 'cd577445636542f9f60b420e4ffe3f0f') diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch new file mode 100644 index 000000000..b3a9d48fd --- /dev/null +++ b/extra/alsa-utils/alsa-restore-1.0.27.service.patch @@ -0,0 +1,10 @@ +--- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old 2013-04-15 14:37:57.326541394 +0200 ++++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-15 14:38:10.179673494 +0200 +@@ -12,6 +12,6 @@ + Conflicts=shutdown.target + + [Service] +-Type=oneshop ++Type=oneshot + ExecStart=-@sbindir@/alsactl restore + StandardOutput=syslog diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch new file mode 100644 index 000000000..d4b526614 --- /dev/null +++ b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch @@ -0,0 +1,25 @@ +From: Jaroslav Kysela <perex@perex.cz> +Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200) +Subject: alsactl: Fix the string size for the lock file contents +X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b + +alsactl: Fix the string size for the lock file contents + +The string length is 10 characters + LF + '\0' = 12 characters. + +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + +diff --git a/alsactl/lock.c b/alsactl/lock.c +index d34d013..fce208b 100644 +--- a/alsactl/lock.c ++++ b/alsactl/lock.c +@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout) + int fd = -1, err = 0; + struct flock lck; + struct stat st; +- char lcktxt[11]; ++ char lcktxt[12]; + char *nfile; + + if (!do_lock) diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index 259a37015..ead1f357c 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181377 2013-04-04 01:09:57Z eric $ +# $Id: PKGBUILD 182782 2013-04-15 06:46:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.12 +pkgver=1.0.13 _themever=1.0.1 pkgrel=1 pkgdesc="A fast, flexible, and very extensible Window Manager" @@ -10,11 +10,11 @@ arch=('i686' 'x86_64') url="http://www.enlightenment.org" license=('BSD' 'custom') depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ - 'libxdamage' 'libxrandr' 'libpulse' 'audiofile') + 'libxrandr' 'libpulse') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) -sha1sums=('d0d9533f645cd5e72392517df2b50748eaa58411' +sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9' 'ae34e2df1294198795736bf953bf695aba93b710') build() { diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD index c66286d89..4e0ab9937 100644 --- a/extra/libcdio-paranoia/PKGBUILD +++ b/extra/libcdio-paranoia/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: damir <damir@archlinux.org> pkgname=libcdio-paranoia -pkgver=10.2+0.90 +pkgver=10.2+0.90+1 pkgrel=1 pkgdesc="CD paranoia libraries from libcdio" arch=('i686' 'x86_64') @@ -11,27 +11,17 @@ license=('GPL' 'LGPL') url="http://www.gnu.org/software/libcdio/" depends=('libcdio') options=('!libtool') -source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig} - header-fix.patch) -md5sums=('432e9f1c5ceb645c4bca9db3f9297437' - '39766404d473ecda66c2f3a932d1c57c' - '1ebb33a1cfe00181de31138ef001e01b') +source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('e79e196864dd3b1ca87a01345abbda07' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i ../header-fix.patch - sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac - aclocal - autoconf - automake --add-missing + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make -j1 DESTDIR="${pkgdir}" install - - #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \ - # $pkgdir/usr/include/cdio/cdio_config.h } diff --git a/extra/libcdio-paranoia/header-fix.patch b/extra/libcdio-paranoia/header-fix.patch deleted file mode 100644 index 15cf0e0e2..000000000 --- a/extra/libcdio-paranoia/header-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- include/cdio/paranoia/Makefile.am.orig 2013-01-08 10:40:32.237218755 +0000 -+++ include/cdio/paranoia/Makefile.am 2013-01-08 10:41:22.269997804 +0000 -@@ -3,8 +3,8 @@ - ######################################################## - # - --libcdioincludedir=$(includedir)/cdio --dist_libcdioinclude_HEADERS = cdda.h paranoia.h -+cdio_paranoia_includedir=$(includedir)/cdio/paranoia -+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h - - EXTRA_DIST = version.h.in - BUILT_SOURCES = version.h diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index 004ccdaf0..36a144f1b 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171967 2012-11-25 14:53:14Z andrea $ +# $Id: PKGBUILD 182786 2013-04-15 10:09:42Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64') url="http://wiki.gpodder.org/wiki/Libmygpo-qt" @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake' 'doxygen') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('dd07ccc88eac954a3860aeda96aab7b1') +md5sums=('447e60c8c695b4280a0e20c71abacf49') build() { mkdir build diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 3fa1d4ae2..e0102c451 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175939 2013-01-25 05:33:39Z eric $ +# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck -pkgver=1.22 +pkgver=1.25 pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('361db9a4dcaf8fa279ca813e146ce7d7') +md5sums=('847f315cbd074b42c44f360383ac13e9') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD index c27973c7a..5ee861f74 100644 --- a/extra/pyalpm/PKGBUILD +++ b/extra/pyalpm/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer : Rémy Oudompheng <remy@archlinux.org> pkgname=pyalpm -pkgver=0.6 +pkgver=0.6.1 pkgrel=1 pkgdesc="Libalpm bindings for Python 3" arch=('i686' 'x86_64') @@ -9,10 +9,14 @@ url="http://projects.archlinux.org/users/remy/pyalpm.git/" license=('GPL') depends=('python>=3.2' 'pacman>=4.1') source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('614fa9f8a5c7cef0828b4f6306ef92f2') +md5sums=('7310508a3b009705b77dd1d93b3012d9') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # workaround Python packaging issue (FS#34658) + export CFLAGS="$CFLAGS -Wno-format" + python setup.py build } diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index d9e9562c8..ccecfea41 100644 --- a/extra/qpdf/PKGBUILD +++ b/extra/qpdf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175524 2013-01-18 19:34:24Z andyrtr $ +# $Id: PKGBUILD 182840 2013-04-15 16:29:09Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Miguel Revilla <yo at miguelrevilla.com> # Contributor: David Sotelo <dvsotelo at gmail.com> # Contributor: Nuno Araujo <nuno.araujo@russo79.com> pkgname=qpdf -pkgver=4.0.1 +pkgver=4.1.0 pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('pcre' 'perl') makedepends=('make') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('093baece867a0a7e07774bd4008156b3') +md5sums=('eedd61acc53744446d181429651a9baf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index bf89afacc..219a4fff2 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178993 2013-03-01 10:25:02Z andrea $ +# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=13.02 +pkgver=13.04 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64') @@ -23,14 +23,22 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('c1e2f80b599a942896e9ebd63896032f') +md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b') build() { cd "$srcdir/$pkgname-$pkgver" # lrdf + raptor2 compatibility - export lrdf_CFLAGS="$(pkg-config --cflags raptor2)" - LRELEASE=/usr/lib/qt4/bin/lrelease LUPDATE=/usr/lib/qt4/bin/lupdate ./configure --prefix=/usr + lrdf_CFLAGS="$(pkg-config --cflags raptor2)" + + # qt4 compatibility (qt->qt5) + LRELEASE=/usr/lib/qt4/bin/lrelease + LUPDATE=/usr/lib/qt4/bin/lupdate + + export lrdf_CFLAGS LRELEASE LUPDATE + + ./configure --prefix=/usr + make } diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 43212c413..b16e32620 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -106,9 +106,6 @@ package() { install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" - # Recommend free addons - install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js" - for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png" done |