From 648599b08776ea788a3ddb0365eb30fda03efe7b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 9 May 2013 00:41:55 -0700 Subject: Thu May 9 00:41:55 PDT 2013 --- extra/gpsd/PKGBUILD | 6 ++-- extra/libxslt/PKGBUILD | 13 +++----- extra/mono/PKGBUILD | 38 +++++++++++----------- extra/muparser/PKGBUILD | 14 ++++---- extra/openjpeg/PKGBUILD | 8 ++--- extra/system-config-printer/PKGBUILD | 27 +++++++-------- .../fix-typo-in-service.patch | 18 ---------- extra/xerces-c/PKGBUILD | 9 +++-- extra/xfce4-notifyd/PKGBUILD | 6 ++-- 9 files changed, 59 insertions(+), 80 deletions(-) delete mode 100644 extra/system-config-printer/fix-typo-in-service.patch (limited to 'extra') diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 452e166cb..f48b083b5 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183237 2013-04-19 00:40:14Z tomegun $ +# $Id: PKGBUILD 184760 2013-05-07 23:25:13Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: Sergej Pupykin # Contributor: Giacomo Rizzo pkgname=gpsd -pkgver=3.8 +pkgver=3.9 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') @@ -74,6 +74,6 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('1a3177b907f25c0ce6d1a0aa22597270' +md5sums=('53a88f24a0973d23427e82e9a8914f19' 'SKIP' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index 7cdc5e9d2..10007a312 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149384 2012-02-07 12:34:45Z jgc $ +# $Id: PKGBUILD 184790 2013-05-08 14:12:44Z bpiotrowski $ # Maintainer: Eric Belanger # Contributor: John Proctor pkgname=libxslt -pkgver=1.1.26 -pkgrel=3 +pkgver=1.1.28 +pkgrel=1 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') url="http://xmlsoft.org/XSLT/" @@ -13,14 +13,11 @@ depends=('libxml2' 'libgcrypt') makedepends=('python2') checkdepends=('docbook-xml') options=('!libtool') -source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz - CVE-2011-1202.patch) -md5sums=('e61d0364a30146aaa3001296f853b2b9' - 'ce9744943575efaa6b5501668899b753') +source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz) +md5sums=('9667bf6f9310b957254fdcf6596600b7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/CVE-2011-1202.patch" sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py ./configure --prefix=/usr --with-python=/usr/bin/python2 make diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index de3dcfc85..4830eb61f 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168399 2012-10-10 22:19:40Z tomegun $ +# $Id: PKGBUILD 184799 2013-05-08 17:55:32Z bpiotrowski $ # Maintainer: Daniel Isenmann # Contributor: Brice Carpentier pkgname=mono -pkgver=2.10.8 -pkgrel=2 +pkgver=2.10.9 +pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11') @@ -14,39 +14,39 @@ makedepends=('pkgconfig') options=('!libtool' '!makeflags') provides=('monodoc') conflicts=('monodoc') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d) +md5sums=('bbbff9d3d0c36b904437ada36a27eb9e' + 'b9ef8a65fea497acf176cca16c1e2402') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} # build mono ./configure --prefix=/usr --sysconfdir=/etc \ --with-libgdiplus=installed - make || return 1 + make # build jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make || return 1 + cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install # install jay - cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay - make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay + make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install + cd "${srcdir}"/${pkgname}-${pkgver} # install binfmt conf file and pathes - install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf + install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf #install license - mkdir -p ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 mcs/MIT.X11 ${pkgdir}/usr/share/licenses/${pkgname}/ + mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 mcs/MIT.X11 "${pkgdir}"/usr/share/licenses/${pkgname}/ #fix .pc file to be able to request mono on what it depends, fixes #go-oo build - sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc + sed -i -e "s:#Requires:Requires:" "${pkgdir}"/usr/lib/pkgconfig/mono.pc } -md5sums=('411a2d9bcfc37a61eb9aedba88b40533' - 'b9ef8a65fea497acf176cca16c1e2402') diff --git a/extra/muparser/PKGBUILD b/extra/muparser/PKGBUILD index 0ee617c87..fa5ef53dc 100644 --- a/extra/muparser/PKGBUILD +++ b/extra/muparser/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 143909 2011-11-30 20:28:47Z andrea $ +# $Id: PKGBUILD 184801 2013-05-08 19:46:08Z bpiotrowski $ # Maintainer: Ronald van Haren # Contributor: damir pkgname=muparser -pkgver=1.34 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="A fast math parser library" arch=('i686' 'x86_64') url="http://muparser.sourceforge.net/" depends=('gcc-libs') license=('custom') options=('!makeflags') -source=("http://downloads.sourceforge.net/$pkgname/${pkgname}_v134.tar.gz") -md5sums=('0c4f4bf86aa2a5a737adc0e08cb77737') +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}_v${pkgver//./_}.zip") +md5sums=('9de40ec1dab5bd2787ee344fce5846ad') build() { - cd $srcdir/${pkgname}_v134 + cd $srcdir/${pkgname}_v${pkgver//./_} ./configure --prefix=/usr make } package() { - cd $srcdir/${pkgname}_v134 + cd $srcdir/${pkgname}_v${pkgver//./_} make DESTDIR=$pkgdir install # license diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD index 7055c1972..c269813b9 100644 --- a/extra/openjpeg/PKGBUILD +++ b/extra/openjpeg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156266 2012-04-16 14:12:28Z jgc $ +# $Id: PKGBUILD 184788 2013-05-08 13:56:11Z bpiotrowski $ # Maintainer: Jan de Groot pkgname=openjpeg -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="An open source JPEG 2000 codec" arch=(i686 x86_64) @@ -11,12 +11,12 @@ url="http://www.openjpeg.org" depends=('zlib') options=('!libtool') source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) -sha1sums=('dce705ae45f137e4698a8cf39d1fbf22bc434fa8') +sha1sums=('1b0b74d1af4c297fd82806a9325bb544caf9bb8b') build() { cd "${srcdir}/${pkgname}-${pkgver}" # make sure we use system libs - rm -rf thirtparty + rm -rf thirdparty ./configure --prefix=/usr \ --disable-static --disable-silent-rules make diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 5d3794597..953e9d099 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $ +# $Id: PKGBUILD 184759 2013-05-07 22:59:56Z eric $ # Maintainer: # Contributor: Andrea Scarpino pkgname=system-config-printer -pkgver=1.3.12 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') license=('GPL') -depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' - 'gnome-icon-theme' 'python2-notify') +depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' + 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') conflicts=('system-config-printer-common' 'system-config-printer-gnome') -source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig} - 'fix-typo-in-service.patch') -md5sums=('0775647e1c34ef25364de3c178a4ed36' - '1aa2246047b424e2d23473749368b8c6' - 'd30d14aeb6d2bfeac0679d28704473ec') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('3267c2eac454f470c0659034196d2668' + 'SKIP') -build() { +prepare() { cd ${pkgname}-${pkgver} - - # Fixed upstream - patch -p1 -i "${srcdir}"/fix-typo-in-service.patch - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer +} +build() { + cd ${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch deleted file mode 100644 index 56f17dcec..000000000 --- a/extra/system-config-printer/fix-typo-in-service.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 -From: Tim Waugh -Date: Tue, 23 Oct 2012 13:55:12 +0000 -Subject: Fixed typo in systemd config file. - ---- -diff --git a/udev/configure-printer@.service.in b/udev/configure-printer@.service.in -index 8a20967..5898c79 100644 ---- a/udev/configure-printer@.service.in -+++ b/udev/configure-printer@.service.in -@@ -4,4 +4,4 @@ Requires=cups.socket - After=cups.socket - - [Service] --ExecStart=@udevhelperdir@/configure-printer add "%i" -+ExecStart=@udevhelperdir@/udev-configure-printer add "%i" --- -cgit v0.9.1 diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD index 11095214b..23c6bb99d 100644 --- a/extra/xerces-c/PKGBUILD +++ b/extra/xerces-c/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179593 2013-03-07 13:22:22Z andrea $ +# $Id: PKGBUILD 184762 2013-05-08 07:12:02Z andrea $ # Maintainer: # Contributor: Sergej Pupykin # Contributor: Geoffroy Carrier @@ -6,7 +6,7 @@ pkgname=xerces-c pkgver=3.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A validating XML parser written in a portable subset of C++" arch=('i686' 'x86_64') url="http://xerces.apache.org/xerces-c/" @@ -18,8 +18,11 @@ md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae') build() { cd ${pkgname}-${pkgver} + + [[ "${CARCH}" = "i686" ]] && SSE2="--disable-sse2" + ./configure --prefix=/usr \ - --sysconfdir=/etc + --sysconfdir=/etc ${SSE2} make } diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD index 4511dd426..7b7d3c25c 100644 --- a/extra/xfce4-notifyd/PKGBUILD +++ b/extra/xfce4-notifyd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183310 2013-04-21 17:16:07Z foutrelis $ +# $Id: PKGBUILD 184796 2013-05-08 16:11:31Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: tobias pkgname=xfce4-notifyd -pkgver=0.2.3 +pkgver=0.2.4 pkgrel=1 pkgdesc="Notification daemon for the Xfce desktop" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ provides=('notification-daemon') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2) -sha256sums=('dd40f64c9db22b0b971e81e8e74a4ab6afe6d0bb819ab5d0badee89e13faa63b') +sha256sums=('8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0') build() { cd "$srcdir/$pkgname-$pkgver" -- cgit v1.2.3-54-g00ecf