From 4ac93228afaf8da847b4ec91aac9c43f3bef472c Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 30 May 2014 03:59:31 +0000 Subject: Fri May 30 03:50:04 UTC 2014 --- extra/cairo/PKGBUILD | 19 +++++++++++++---- extra/cairo/cairo-1.12.16-lto-optional.patch | 29 ++++++++++++++++++++++++++ extra/php/PKGBUILD | 6 +++--- extra/transmission/PKGBUILD | 6 +++--- extra/vim/PKGBUILD | 5 +++-- extra/xvidcore/PKGBUILD | 31 ++++++++++++---------------- 6 files changed, 66 insertions(+), 30 deletions(-) create mode 100644 extra/cairo/cairo-1.12.16-lto-optional.patch (limited to 'extra') diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 63717626d..9e89c6576 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197880 2013-10-30 11:26:13Z allan $ +# $Id: PKGBUILD 213824 2014-05-29 16:21:41Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Brice Carpentier pkgname=cairo pkgver=1.12.16 -pkgrel=1 +pkgrel=2 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -16,8 +16,18 @@ makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' #optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz + cairo-1.12.16-lto-optional.patch) +sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec' + '80883e44a57942762995aea2f136701b1fa54568') + +prepare() { + cd $pkgname-$pkgver + # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782 + # patch to make it optional is taken from Gentoo + patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch + autoreconf -vfi +} build() { cd $pkgname-$pkgver @@ -26,6 +36,7 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ + --disable-lto \ --enable-tee \ --enable-gl \ --enable-egl \ diff --git a/extra/cairo/cairo-1.12.16-lto-optional.patch b/extra/cairo/cairo-1.12.16-lto-optional.patch new file mode 100644 index 000000000..8e3c6186c --- /dev/null +++ b/extra/cairo/cairo-1.12.16-lto-optional.patch @@ -0,0 +1,29 @@ +diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings +index f984eb2..15b3da2 100644 +--- a/build/configure.ac.warnings ++++ b/build/configure.ac.warnings +@@ -38,13 +38,18 @@ dnl options. Namely, the following: + + dnl -flto working really needs a test link, not just a compile + +-safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" +-AC_TRY_LINK([],[ ++AC_ARG_ENABLE(lto, ++ AS_HELP_STRING([--disable-lto], ++ [Do not try to use Link-Time Optimization])) ++if test "x$enable_lto" != "xno"; then ++ safe_MAYBE_WARN="$MAYBE_WARN" ++ MAYBE_WARN="$MAYBE_WARN -flto" ++ AC_TRY_LINK([],[ + int main(int argc, char **argv) { return 0; } +-],[],[ ++ ],[],[ + MAYBE_WARN="$safe_MAYBE_WARN" +-]) ++ ]) ++fi + + MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" + + diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 184dbecc3..416a0ec8b 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 211933 2014-05-01 11:34:12Z pierre $ +# $Id: PKGBUILD 213812 2014-05-29 11:04:10Z pierre $ # Maintainer: Pierre Schmitz pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.12 +pkgver=5.5.13 pkgrel=1 arch=('i686' 'x86_64') license=('PHP') @@ -34,7 +34,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz" "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('b6a6e9c72589c265aafb7b3353a34030' +md5sums=('32d0fc26fccdb249a918c0e01ffb7b82' 'SKIP' '510f9092ebfe6e378e12817e197a88b6' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 1b53b4baf..7d68d94e8 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 213661 2014-05-27 18:32:30Z anatolik $ +# $Id: PKGBUILD 213749 2014-05-29 01:09:31Z anatolik $ # Maintainer : Tom Gundersen # Maintainer : Ionut Biru pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.83 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') @@ -54,7 +54,7 @@ package_transmission-gtk() { package_transmission-qt() { pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" - depends=('curl' 'qt5-base' 'libevent') + depends=('curl' 'qt5-base' 'libevent' 'libxkbcommon-x11') optdepends=('transmission-cli: daemon and web support') install=transmission-qt.install diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 541a9aaac..65091bf87 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -10,7 +10,7 @@ _patchlevel=307 __hgrev=54d96e3b2eec _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" @@ -213,7 +213,8 @@ package_gvim-python3() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI) with python 3 support' depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua' 'python') - provides=("vim=${pkgver}-${pkgrel}") + provides=("vim=${pkgver}-${pkgrel}" + "gvim=${pkgver}-${pkgrel}") conflicts=('vim') install=gvim.install diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD index 5ef4629a6..6ccade69a 100644 --- a/extra/xvidcore/PKGBUILD +++ b/extra/xvidcore/PKGBUILD @@ -1,33 +1,28 @@ -# $Id: PKGBUILD 197326 2013-10-25 02:31:05Z bisson $ -# Maintainer: tobias +# $Id: PKGBUILD 213826 2014-05-29 17:50:09Z bpiotrowski $ +# Maintainer: Tom Gundersen +# Maintainer: Bartłomiej Piotrowski +# Contributor: tobias # Contributor: Sarah Hay pkgname=xvidcore -pkgver=1.3.2 -pkgrel=3 -pkgdesc="XviD is an open source MPEG-4 video codec" +pkgver=1.3.3 +pkgrel=1 +pkgdesc='XviD is an open source MPEG-4 video codec' arch=('i686' 'x86_64') -url="http://www.xvid.org/" +url='http://www.xvid.org/' license=('GPL') depends=('glibc') makedepends=('nasm') -source=(http://downloads.xvid.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('34389e980d4f849688f8b1e168f4e2f9') -sha1sums=('74f9ce9c1bebcc9806bf21cb53274b8102700309') +source=(http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2) +md5sums=('f0a77572ac4694038e8519726b2883d9') build() { - cd "${srcdir}/${pkgname}/build/generic" + cd $pkgname/build/generic ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}/build/generic" - make DESTDIR="${pkgdir}" install - - #Fix dynamic libraries - cd "${pkgdir}/usr/lib" - _mylib=$(basename libxvidcore.so.*) - ln -sf ${_mylib} libxvidcore.so.4 - ln -sf ${_mylib} libxvidcore.so + cd $pkgname/build/generic + make DESTDIR="$pkgdir" install } -- cgit v1.2.3-54-g00ecf