diff options
Diffstat (limited to 'extra')
83 files changed, 555 insertions, 863 deletions
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index b23aea1fe..a552605ac 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173212 2012-12-13 09:39:25Z heftig $ +# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.30 +pkgver=0.6.31 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('8955b53b0ac9036b3f6a91202ff954f1' +md5sums=('d594f1da95c6a83c0463695ca31815b2' '1d5cf127e5aac407fe7c37b2f4fd503c') build() { diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 4f3bd8bb0..204ceef99 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $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 -pkgrel=1.1 +pkgver=1.0.27 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -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 288344d5d..af7ad9d40 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 183071 2013-04-17 07:11:00Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.26 -pkgrel=1.1 +pkgver=1.0.27 +pkgrel=4 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -13,11 +13,19 @@ 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 + arecord-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 + patch -Np1 -i ${srcdir}/arecord-1.0.27.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-alsaconf \ @@ -29,14 +37,13 @@ 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' + 'cecb38f03bd245d0584bfd63370e9a05') 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/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch new file mode 100644 index 000000000..f9edb2d21 --- /dev/null +++ b/extra/alsa-utils/arecord-1.0.27.patch @@ -0,0 +1,24 @@ +From: Jaroslav Kysela <perex@perex.cz> +Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200) +Subject: arecord: add a missing break to the capture loop +X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977 + +arecord: add a missing break to the capture loop + +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + +diff --git a/aplay/aplay.c b/aplay/aplay.c +index 5bdc39c..000d25b 100644 +--- a/aplay/aplay.c ++++ b/aplay/aplay.c +@@ -3021,6 +3021,9 @@ static void capture(char *orig_name) + fd = -1; + } + ++ if (in_aborting) ++ break; ++ + /* repeat the loop when format is raw without timelimit or + * requested counts of data are recorded + */ diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index aa9812f84..41cc52485 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $ +# $Id: PKGBUILD 183103 2013-04-17 15:00:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('9c1db8606e520f201c451ec9a0b095f6') +md5sums=('89c1348aa79e898d7c34a6206311c9c2') build() { cd "${srcdir}/apr-util-${pkgver}" diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD deleted file mode 100644 index 881b5485b..000000000 --- a/extra/at/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168299 2012-10-08 05:32:58Z eric $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Todd Musall <tmusall@comcast.net> - -pkgname=at -pkgver=3.1.13 -pkgrel=2 -pkgdesc="AT and batch delayed command scheduling utility and daemon" -arch=('i686' 'x86_64' 'mips64el') -url="http://packages.qa.debian.org/a/at.html" -license=('GPL') -depends=('pam') -makedepends=('ssmtp') -backup=('etc/at.deny') -options=('!makeflags') -source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz - atd atd.service) -md5sums=('1da61af6c29e323abaaf13ee1a8dad79' - '35574e34829e7df07a3269d4ab646a29' - '33976a813f4fe7f5659354601044c6f8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --with-jobdir=/var/spool/atd \ - --with-atspool=/var/spool/atd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make IROOT="${pkgdir}" docdir=/usr/share/doc install - install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" - install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service" -} diff --git a/extra/at/atd b/extra/at/atd deleted file mode 100644 index d10a46a3b..000000000 --- a/extra/at/atd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/atd` -case "$1" in - start) - stat_busy "Starting ATD Daemon" - [ -z "$PID" ] && /usr/sbin/atd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon atd - stat_done - fi - ;; - stop) - stat_busy "Stopping ATD Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon atd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/at/atd.service b/extra/at/atd.service deleted file mode 100644 index ba359878c..000000000 --- a/extra/at/atd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=ATD daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/atd - -[Install] -WantedBy=multi-user.target diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 5cf70124a..8d3a91031 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $ +# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -9,22 +9,20 @@ pkgname=bitlbee pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('openssl' 'glib2') +depends=('gnutls' 'glib2') makedepends=('asciidoc' 'libotr3') optdepends=('libotr3: for OTR encryption support' 'xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' - 'rc.d' 'bitlbee.tmpfiles') sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - '02423c500ac64f673ba26a3395c7c7036c17343e' '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' @@ -40,7 +38,7 @@ build() { --pidfile=/run/bitlbee/bitlbee.pid \ --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=openssl \ + --ssl=gnutls \ --strip=0 \ --otr=plugin @@ -56,6 +54,5 @@ package() { install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee" - install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee" install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" } diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d deleted file mode 100644 index ade85221a..000000000 --- a/extra/bitlbee/rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/bitlbee/bitlbee.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting bitlbee daemon" - if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then - stat_fail - exit 1 - else - add_daemon bitlbee - stat_done - fi - ;; - stop) - stat_busy "Stopping bitlbee daemon" - if [[ -z $PID ]] || ! kill $PID &>/dev/null; then - stat_fail - exit 1 - else - rm -f "$pidfile" - rm_daemon bitlbee - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -# vim: set ft=sh et ts=2 sw=2: diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index 8906fd484..b6fa0a72c 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160461 2012-06-02 10:25:40Z bluewind $ +# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cairo-perl -pkgver=1.082 -pkgrel=2 +pkgver=1.103 +pkgrel=1 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -11,14 +11,11 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('cairo' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz - testsuite.patch) -md5sums=('cfd61e519ff20023979c255d4040fe06' - '6a3ceac304a5a53f8fdd5652d98f6855') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz) +md5sums=('c693e5535ed60283c068d92120412f98') build() { cd "${srcdir}/Cairo-${pkgver}" - patch -Np1 -i "${srcdir}/testsuite.patch" perl Makefile.PL INSTALLDIRS=vendor make } diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD index 6014fbee3..a537d3991 100644 --- a/extra/check/PKGBUILD +++ b/extra/check/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171322 2012-11-17 08:55:42Z heftig $ +# $Id: PKGBUILD 183188 2013-04-18 16:03:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jeremy Cowgar <jeremy@cowgar.com> pkgname=check -pkgver=0.9.9 +pkgver=0.9.10 pkgrel=1 pkgdesc="A unit testing framework for C" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('LGPL') options=('!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f3702f2fcfc19ce3f62dca66c241a168') +md5sums=('6d10a8efb9a683467b92b3bce97aeb30') build() { cd $pkgname-$pkgver diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD deleted file mode 100644 index 3e0a2bd04..000000000 --- a/extra/chkrootkit/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 143673 2011-11-28 09:58:36Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=chkrootkit -pkgver=0.49 -pkgrel=3.1 -pkgdesc="Locally checks for signs of a rootkit" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.chkrootkit.org" -depends=('sh' 'net-tools') -license=('BSD') -source=(http://www.reznor.com/tools/chkrootkit.tar.gz chkrootkit.cron \ - fix-tools-path.patch backslashes.patch kallsyms.patch) -md5sums=('304d840d52840689e0ab0af56d6d3a18' - 'f4b6494270f708bf016e087104681739' - '3e5f2d5e2f4fa7a0d780baec9039c07f' - '758f892dcf73e8a2a4694662fba366d4' - 'd087f3aad8a9e97fea496ef83e4f1d48') -sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6' - '6dda90abf779b6f5c3bacd638e1231f34635575d' - '7fcad8117a064f0a6910134e8bb3a55de110650f' - 'e22546f445c145cf05dbc1a10f7b196fcd1c8202' - 'dc5b402ee69a7a5ae622ecfd733682516df54e88') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/var/adm|/var/log|' check_wtmpx.c chklastlog.c chkutmp.c chkwtmp.c - patch -p0 -i "${srcdir}/fix-tools-path.patch" - patch -p1 -i "${srcdir}/backslashes.patch" - patch -p1 -i "${srcdir}/kallsyms.patch" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit \ - chkutmp chkwtmp ifpromisc strings-static ; do - install -D -m755 $i "${pkgdir}/usr/sbin/$i" - done - install -D -m744 "${srcdir}/chkrootkit.cron" "${pkgdir}/etc/cron.weekly/chkrootkit" - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/chkrootkit/backslashes.patch b/extra/chkrootkit/backslashes.patch deleted file mode 100644 index 6ac981441..000000000 --- a/extra/chkrootkit/backslashes.patch +++ /dev/null @@ -1,22 +0,0 @@ -Author: James R. Van Zandt <jrv@debian.org> -Description: Two of the chkrootkit messages have unnecessary backslashes (#498063) ---- a/chkrootkit -+++ b/chkrootkit -@@ -672,7 +672,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h - if [ "`find ${LIBS} -name libproc.a 2> /dev/null`" != "" -a \ - "$SYSTEM" != "FreeBSD" ] - then -- echo "Possible t0rn v8 \(or variation\) rootkit installed" -+ echo "Possible t0rn v8 (or variation) rootkit installed" - else - if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi - fi -@@ -726,7 +726,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h - - if [ -d ${ROOTDIR}dev/ptyxx -o -r "${ROOTDIR}usr/lib/.ark?" -o \ - -d ${ROOTDIR}usr/doc/"... " ]; then -- echo "Possible Ambient's rootkit \(ark\) installed" -+ echo "Possible Ambient's rootkit (ark) installed" - else - if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi - fi diff --git a/extra/chkrootkit/chkrootkit.cron b/extra/chkrootkit/chkrootkit.cron deleted file mode 100644 index 0fc84ded8..000000000 --- a/extra/chkrootkit/chkrootkit.cron +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/sbin/chkrootkit -q diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch deleted file mode 100644 index d45f07901..000000000 --- a/extra/chkrootkit/fix-tools-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- chkrootkit -+++ chkrootkit -@@ -17,6 +17,8 @@ unalias netstat > /dev/null 2>&1 - unalias ps > /dev/null 2>&1 - unalias dirname > /dev/null 2>&1 - -+cd /usr/sbin -+ - # Workaround for recent GNU coreutils - _POSIX2_VERSION=199209 - export _POSIX2_VERSION diff --git a/extra/chkrootkit/kallsyms.patch b/extra/chkrootkit/kallsyms.patch deleted file mode 100644 index 4e3694aad..000000000 --- a/extra/chkrootkit/kallsyms.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/chkrootkit -+++ b/chkrootkit -@@ -308,7 +316,7 @@ lkm () - fi - - if [ "${EXPERT}" = "t" ]; then -- [ -r /proc/ksyms ] && ${egrep} -i "adore|sebek" < /proc/ksyms 2>/dev/null -+ [ -r /proc/kallsyms ] && ${egrep} -i "adore|sebek" < /proc/kallsyms 2>/dev/null - [ -d /proc/knark ] && ${ls} -la /proc/knark 2> /dev/null - PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` - [ "$PV" = "" ] && PV=2 -@@ -318,14 +326,14 @@ lkm () - fi - - ### adore LKM -- [ -r /proc/ksyms ] && \ -- if `${egrep} -i adore < /proc/ksyms >/dev/null 2>&1`; then -+ [ -r /proc/kallsyms ] && \ -+ if `${egrep} -i adore < /proc/kallsyms >/dev/null 2>&1`; then - echo "Warning: Adore LKM installed" - fi - - ### sebek LKM (Adore based) -- [ -r /proc/ksyms ] && \ -- if `${egrep} -i sebek < /proc/ksyms >/dev/null 2>&1`; then -+ [ -r /proc/kallsyms ] && \ -+ if `${egrep} -i sebek < /proc/kallsyms >/dev/null 2>&1`; then - echo "Warning: Sebek LKM installed" - fi - diff --git a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch new file mode 100644 index 000000000..05223cdb2 --- /dev/null +++ b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch @@ -0,0 +1,26 @@ +From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@thekelleys.org.uk> +Date: Thu, 18 Apr 2013 09:47:49 +0100 +Subject: [PATCH] Fix wrong size in memset() call. + +Thanks to Dave Reisner. +--- + src/ipset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ipset.c b/src/ipset.c +index a34ed96..f175fa4 100644 +--- a/src/ipset.c ++++ b/src/ipset.c +@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr, + return -1; + } + +- memset(buffer, 0, sizeof(buffer)); ++ memset(buffer, 0, BUFF_SZ); + + nlh = (struct nlmsghdr *)buffer; + nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr)); +-- +1.8.2.1 + diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 4c4798ab2..68e1007dd 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173229 2012-12-14 17:31:42Z dreisner $ +# $Id: PKGBUILD 183176 2013-04-18 12:45:45Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.65 +pkgver=2.66 pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" @@ -12,17 +12,20 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc' 'dbus-core') install=$pkgname.install -backup=('etc/dnsmasq.conf' - 'etc/conf.d/dnsmasq') -source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" - 'dnsmasq.confd' - 'rc.dnsmasq' +backup=('etc/dnsmasq.conf') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" + '0001-Fix-wrong-size-in-memset-call.patch' 'dnsmasq.service') -md5sums=('a91534a5d6f053d5c80f67ef502afa34' - '66479e99123faeab83ebaed709ef95b5' - '819fbdf6440d710616e6df5f8ca9cdba' +md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20' + '05ccefefde68ebdebce5e40d2b3c78be' '7ac45726cabef4145db40d758cc7fedf') +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch" +} + build() { cd "$pkgname-$pkgver" @@ -30,7 +33,7 @@ build() { # compile time opts report properly on startup. yuck. sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - make + make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" } package() { @@ -38,9 +41,6 @@ package() { make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install - install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq - install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq" - install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service diff --git a/extra/dnsmasq/dnsmasq.confd b/extra/dnsmasq/dnsmasq.confd deleted file mode 100644 index 933b92850..000000000 --- a/extra/dnsmasq/dnsmasq.confd +++ /dev/null @@ -1,9 +0,0 @@ -# -# runtime config for dnsmasq -# - -# if unset, dnsmasq will run as nobody. -DNSMASQ_USER=dnsmasq - -# other runtime options. treated as an array. -DNSMASQ_OPTS=() diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq deleted file mode 100755 index 4030c2896..000000000 --- a/extra/dnsmasq/rc.dnsmasq +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dnsmasq - -checkconfig() { - local testout - - if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then - echo "$testout" - return 1 - fi - - return 0 -} - -pidfile=/run/dnsmasq.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting DNS/DHCP daemon" - if [[ -z $PID ]] && checkconfig && - /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \ - "--pid-file=$pidfile" \ - "${DNSMASQ_OPTS[@]}"; then - add_daemon dnsmasq - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping DNS/DHCP daemon" - if [[ $PID ]] && kill "$PID" &> /dev/null; then - # dnsmasq doesn't clean up after itself - rm -f "$pidfile" - rm_daemon dnsmasq - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - checkconfig) - # diagnostics will be printed, with zero/non-zero exit - /usr/bin/dnsmasq --test - ;; - *) - echo "usage: $0 <start|stop|restart|checkconfig>" -esac - diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index ea4f499fb..fdb45581b 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.1 pkgdesc="A fast, flexible, and very extensible Window Manager" @@ -10,11 +10,11 @@ arch=('i686' 'x86_64' 'mips64el') 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/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index 203525ccb..f6bb0d394 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144961 2011-12-12 08:42:45Z allan $ +# $Id: PKGBUILD 182910 2013-04-16 04:51:02Z allan $ # Maintainer : Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=fakechroot pkgver=2.16 -pkgrel=1.1 +pkgrel=2 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fakechroot/fakechroot/wiki" @@ -14,6 +14,14 @@ install=fakechroot.install source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) md5sums=('3ea5efb76664e787450e0cfcefc1b807') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # https://github.com/fakechroot/fakechroot/issues/10 + sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t +} + build() { cd ${srcdir}/${pkgname}-${pkgver} # Somehow not all files use the chroot found by configure. diff --git a/extra/fakechroot/fakechroot.install b/extra/fakechroot/fakechroot.install index 2b5eb2100..61c5b73e5 100644 --- a/extra/fakechroot/fakechroot.install +++ b/extra/fakechroot/fakechroot.install @@ -3,9 +3,6 @@ post_install() { } post_upgrade() { - if [ "$(vercmp $2 2.9-2)" -lt 0 ]; then - sed -i -e '/\/usr\/lib\/libfakechroot/d' etc/ld.so.conf - fi sbin/ldconfig -r . } diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD index 4b6ea6351..4b57a7256 100644 --- a/extra/farstream/PKGBUILD +++ b/extra/farstream/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 170993 2012-11-14 14:37:18Z ibiru $ +# $Id: PKGBUILD 183166 2013-04-18 07:35:04Z eric $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=farstream -pkgver=0.2.2 -pkgrel=1.1 +pkgver=0.2.3 +pkgrel=1 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" arch=(i686 x86_64 'mips64el') url="http://www.freedesktop.org/wiki/Software/Farstream" -license=('LGPL2.1') +license=('LGPL') depends=('gst-plugins-base-libs' 'libnice') makedepends=('gobject-introspection') optdepends=('gst-plugins-good' 'gst-plugins-bad') conflicts=('farsight2') replaces=('farsight2') options=(!libtool) -source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('01c20c1ed014ad4e18e55f1f6caf7877') +source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('a8971167068b69a6933d3eaaeb9ab448' + 'SKIP') build() { - cd $pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr \ --with-package-name='Parabola GNU/Linux-libre farstream package' \ --with-package-origin='https://parabolagnulinux.org/' \ diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD index af46210a7..ad99ff035 100644 --- a/extra/freeglut/PKGBUILD +++ b/extra/freeglut/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168622 2012-10-13 15:13:40Z andyrtr $ +# $Id: PKGBUILD 182877 2013-04-15 22:13:33Z heftig $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=freeglut -pkgver=2.8.0 -pkgrel=2.1 +pkgver=2.8.1 +pkgrel=1 pkgdesc="Provides functionality for small OpenGL programs" arch=('i686' 'x86_64' 'mips64el') url="http://freeglut.sourceforge.net/" @@ -16,8 +16,8 @@ provides=('glut') conflicts=('glut') options=('!libtool') source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz) -md5sums=('5db8651af306bc403fbfd36934a20e1d') -sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1') +md5sums=('918ffbddcffbac83c218bc52355b6d5a') +sha1sums=('7330b622481e2226c0c9f6d2e72febe96b03f9c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index c9dd7b476..f1d5e11d2 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158109 2012-05-03 01:01:32Z foutrelis $ +# $Id: PKGBUILD 183169 2013-04-18 10:54:20Z juergen $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=geoip -pkgver=1.4.8 -pkgrel=2 +pkgver=1.5.0 +pkgrel=1 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=('i686' 'x86_64' 'mips64el') url="http://www.maxmind.com/app/c" @@ -13,7 +13,7 @@ depends=('zlib' 'geoip-database') backup=('etc/geoip/GeoIP.conf') options=('!libtool' '!emptydirs') source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz) -sha256sums=('cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4') +sha256sums=('d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2') build() { cd "$srcdir/GeoIP-$pkgver" diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD index 71d07567f..a00431b14 100644 --- a/extra/gob2/PKGBUILD +++ b/extra/gob2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $ +# $Id: PKGBUILD 183109 2013-04-17 15:27:46Z jgc $ # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=gob2 -pkgver=2.0.18 -pkgrel=1.1 +pkgver=2.0.19 +pkgrel=1 pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('glib2') url="http://www.5z.com/jirka/gob.html" source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz) -md5sums=('cd08248762962aec88100ddaaff4f9e0') +md5sums=('d7f2e7b96c33458d69b6381e28e4ac69') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index c7182bfb9..604b8ad6f 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176065 2013-01-27 09:20:55Z giovanni $ +# $Id: PKGBUILD 182988 2013-04-16 16:24:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.41.1 +pkgver=1.41.2 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('4485615cd699a78eb42444324546942a') +md5sums=('48cb7fa1d9cca2ebea1844694668c8a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 839db9b80..66681ff2d 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173164 2012-12-11 22:33:51Z eric $ +# $Id: PKGBUILD 183196 2013-04-18 19:51:15Z eric $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=ibus -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('31d732c17d0a103565fa29995c5610e8be8b2dca') +sha1sums=('a7e1695731b4c954fa8897d091e6dda64e08b28c') build() { cd ${pkgname}-${pkgver} diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index d304aa9e8..64ad7fd10 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,15 +3,15 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56') +md5sums=('94ce02c42c1e4d1411357fb3c1014f67') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -28,9 +28,8 @@ build() { --with-browser-tests \ --with-firefox=/usr/bin/firefox \ --with-chromium=/usr/bin/chromium \ - --with-epiphany=/usr/bin/epiphany \ - --with-gtk=2 - make + --with-epiphany=/usr/bin/epiphany + make } check() { @@ -44,7 +43,7 @@ check() { package_icedtea-web-java7() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" - depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') + depends=('jre7-openjdk' 'desktop-file-utils') provides=('java-web-start=7') replaces=('icedtea-web') install=${pkgname}.install diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index 649a47d70..accf2d8f1 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169945 2012-10-30 22:46:18Z heftig $ +# $Id: PKGBUILD 183001 2013-04-16 19:33:50Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=json-glib -pkgver=0.15.2 +pkgver=0.16.0 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ license=('GPL') depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37') build(){ cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD index b0a300d7d..39c211128 100644 --- a/extra/lensfun/PKGBUILD +++ b/extra/lensfun/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162692 2012-06-28 10:33:24Z tpowa $ +# $Id: PKGBUILD 182923 2013-04-16 07:16:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lensfun -pkgver=0.2.6 +pkgver=0.2.7 pkgrel=1 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('glibc' 'glib2') makedepends=('python2' 'libpng' 'doxygen') source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" if [ "$CARCH" = "mips64el" ]; then confflags="--vectorization=" @@ -20,7 +20,11 @@ build() { confflags="" fi sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure - ./configure \ +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ --prefix=/usr \ --libdir=/usr/lib ${confflags} make all @@ -30,4 +34,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make INSTALL_PREFIX="$pkgdir" install } -md5sums=('740e4749db04da0a597630dd6339b966') +md5sums=('6061cc2d00a42d3e62512878426fc841') diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD index c31a7dca8..b57d888fe 100644 --- a/extra/libcdio-paranoia/PKGBUILD +++ b/extra/libcdio-paranoia/PKGBUILD @@ -3,35 +3,25 @@ # Contributor: damir <damir@archlinux.org> pkgname=libcdio-paranoia -pkgver=10.2+0.90 -pkgrel=1.1 +pkgver=10.2+0.90+1 +pkgrel=1 pkgdesc="CD paranoia libraries from libcdio" arch=('i686' 'x86_64' 'mips64el') 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/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 1add053ce..3a6a38d8c 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181892 2013-04-05 08:54:36Z svenstaro $ +# $Id: PKGBUILD 183096 2013-04-17 14:16:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw pkgver=4.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,8 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_LCMS2=ON make } diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD index b511f5e57..798a2c6e2 100644 --- a/extra/liblqr/PKGBUILD +++ b/extra/liblqr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150613 2012-02-18 22:56:34Z pierre $ +# $Id: PKGBUILD 182915 2013-04-16 05:57:47Z eric $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=liblqr -pkgver=0.4.1 -pkgrel=3.1 +pkgver=0.4.2 +pkgrel=1 pkgdesc="A seam-carving C/C++ library called Liquid Rescale" arch=('i686' 'x86_64' 'mips64el') url="http://liblqr.wikidot.com/" @@ -12,7 +12,7 @@ depends=('glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2") -md5sums=('0e24ed3c9fcdcb111062640764d7b87a') +md5sums=('915643d993da97e10665d48c0bf8f3d0') build() { cd "$srcdir/$pkgname-1-$pkgver" diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index d9078cb82..05e91dd5b 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179313 2013-03-05 11:12:56Z tpowa $ +# $Id: PKGBUILD 182921 2013-04-16 07:10:02Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt -pkgver=0.8.1a +pkgver=0.8.2 pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,14 @@ makedepends=('libtool' 'git') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") -build() { +prepare() { cd $srcdir/$pkgname-$pkgver libtoolize --copy --force ./autogen.sh +} + +build() { + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make } @@ -25,4 +29,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('5889dad7fc9443cd61987309622aa382') +md5sums=('562b39b6788f8128b7185b83f14ca516') diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index 74e1a1fb6..50f62378d 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' 'mips64el') 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/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD index cc6685765..57a4c8f5c 100644 --- a/extra/libnl1/PKGBUILD +++ b/extra/libnl1/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 150908 2012-02-23 13:56:22Z heftig $ +# $Id: PKGBUILD 182913 2013-04-16 05:29:35Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libnl1 -pkgver=1.1 -pkgrel=1.2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" arch=('i686' 'x86_64' 'mips64el') url="http://www.infradead.org/~tgr/libnl/" license=('GPL') depends=('glibc') -source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz" - 'fix-compilation.patch') -md5sums=('ae970ccd9144e132b68664f98e7ceeb1' - 'e1f5e82c8aa1b3ad025c7b588178de1e') +options=('!staticlibs') +source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz") +md5sums=('4e4fa2197f4412b20c2952325d674b12') build() { - cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch + cd libnl-${pkgver} ./configure --prefix=/usr make } package() { - cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install + cd libnl-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/libnl1/fix-compilation.patch b/extra/libnl1/fix-compilation.patch deleted file mode 100644 index 891562a39..000000000 --- a/extra/libnl1/fix-compilation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 -@@ -26,6 +26,7 @@ - #include <sys/socket.h> - #include <inttypes.h> - #include <assert.h> -+#include <limits.h> - - #include <arpa/inet.h> - #include <netdb.h> diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD index b82443e8b..f4b69312f 100644 --- a/extra/libofx/PKGBUILD +++ b/extra/libofx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165144 2012-08-11 18:49:23Z eric $ +# $Id: PKGBUILD 183162 2013-04-18 06:30:55Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgbase=libofx pkgname=('libofx' 'libofx-doc') -pkgver=0.9.5 +pkgver=0.9.8 pkgrel=1 pkgdesc="API for the OFX banking standard" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +11,11 @@ url="http://libofx.sourceforge.net" license=('GPL') depends=('opensp' 'curl' 'libxml++') checkdepends=('gnupg') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch) -sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73' - '6c327e24543cb8ba901bfb204343a85c68264654') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('e0159d77c4458eb937871373db85c9f392e86554') build() { cd "$srcdir/$pkgbase-$pkgver" - patch -p1 -i "$srcdir/libofx-gcc47.patch" ./configure --prefix=/usr make } diff --git a/extra/libofx/libofx-gcc47.patch b/extra/libofx/libofx-gcc47.patch deleted file mode 100644 index 899fe09e0..000000000 --- a/extra/libofx/libofx-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff ---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp 2011-03-30 22:30:50.000000000 +0000 -+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp 2012-04-17 06:08:38.711940892 +0000 -@@ -37,6 +37,7 @@ - #include <vector> - #include <algorithm> - #include <string.h> -+#include <unistd.h> - - using std::string; - using std::vector; diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD index 718869420..92283fb24 100644 --- a/extra/libplist/PKGBUILD +++ b/extra/libplist/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 156914 2012-04-23 09:08:57Z ibiru $ +# $Id: PKGBUILD 183073 2013-04-17 10:22:07Z tomegun $ +# Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libplist -pkgver=1.8 -pkgrel=2 +pkgver=1.10 +pkgrel=1 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" url="http://libimobiledevice.org/" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +13,6 @@ license=('GPL2' 'LGPL2.1') depends=('glib2' 'libxml2' 'python2') makedepends=('cmake' 'swig') source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) -sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec') build() { mkdir build @@ -28,3 +28,4 @@ package() { cd build make DESTDIR="$pkgdir" install } +md5sums=('fe642d0c8602d70c408994555c330dd1') diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index c1027932f..f11ef2bd8 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 181123 2013-03-31 19:16:47Z stephane $ +# $Id: PKGBUILD 183115 2013-04-17 16:05:23Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libpst pkgname=('libpst' 'libpst-docs') -pkgver=0.6.54 -pkgrel=4 +pkgver=0.6.58 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.five-ten-sg.com/libpst/" license=('GPL') -makedepends=('python2' 'boost') +makedepends=('python2' 'boost' 'libgsf') source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) -sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') +sha1sums=('c398d58b8b5106725f1659c900305c6385c0773e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -21,7 +21,7 @@ build() { package_libpst() { pkgdesc="Outlook .pst file converter" - depends=('gcc-libs') + depends=('gcc-libs' 'libgsf') optdepends=('boost-libs: for libpst python interface') options=('!libtool' '!docs') @@ -31,7 +31,7 @@ package_libpst() { package_libpst-docs() { pkgdesc="Documentation for Outlook .pst file converter" - options=('!libtool') + options=('!libtool' 'docs') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install-htmlDATA diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index 46394ed83..26476cc91 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173800 2012-12-24 00:28:32Z andyrtr $ +# $Id: PKGBUILD 183190 2013-04-18 16:15:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('glibc' 'texinfo') options=('!libtool') install=libtasn1.install source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('1b07629163025b9693aae9b8957842b2' - '67bdae9b78ac7bbfa2ab24c7d46bd577') +md5sums=('2bdd687f487c50a0382b99553866a6e0' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD index bfaa468b1..785d92ef6 100644 --- a/extra/libwpd/PKGBUILD +++ b/extra/libwpd/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 156639 2012-04-22 00:00:22Z andyrtr $ +# $Id: PKGBUILD 183192 2013-04-18 16:39:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libwpd -pkgver=0.9.4 -pkgrel=1.1 +pkgver=0.9.6 +pkgrel=1 pkgdesc="Library for importing WordPerfect (tm) documents" arch=('i686' 'x86_64' 'mips64el') url="http://libwpd.sourceforge.net/" license=('LGPL') -depends=('gcc-libs') -makedepends=('libgsf>=1.14.20') +depends=('gcc-libs' 'zlib') +makedepends=('libgsf>=1.14.26') options=('!libtool' '!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d30d1726c3b113db70daaae423dd4448') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('63f476b892bf783072854b98d2fc4fa2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD new file mode 100644 index 000000000..cd31148ff --- /dev/null +++ b/extra/mediastreamer/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Adrià Arrufat <swiftscythe@gmail.com> + +pkgname=mediastreamer +pkgver=2.8.2 +pkgrel=5 +pkgdesc="A library written in C that allows you to create and run audio and video streams" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.linphone.org/" +license=('GPL') +depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') +makedepends=('intltool') +options=('!libtool') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + mediastreamer-ffmpeg.patch) +md5sums=('e51ea9d5fce1396b374d10473dfbadec' + '805da7def98f367e621363fa0c951fe8' + '553d5d47ea4a8c8dfeabdc0281849d5f') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch new file mode 100644 index 000000000..3304e9f56 --- /dev/null +++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch @@ -0,0 +1,57 @@ +commit f586917ea4d66f9ba8910f0967a8830e54d50784 +Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> +Date: Tue Jun 5 11:07:48 2012 +0200 + + Fixes for new versions of ffmpeg + +diff --git a/src/h264dec.c b/src/h264dec.c +index c4a84ee..5229b5e 100644 +--- a/src/h264dec.c ++++ b/src/h264dec.c +@@ -45,7 +45,9 @@ typedef struct _DecData{ + static void ffmpeg_init(){ + static bool_t done=FALSE; + if (!done){ ++#ifdef FF_API_AVCODEC_INIT + avcodec_init(); ++#endif + avcodec_register_all(); + done=TRUE; + } +diff --git a/src/videoenc.c b/src/videoenc.c +index 21d016f..fb35760 100644 +--- a/src/videoenc.c ++++ b/src/videoenc.c +@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + static bool_t avcodec_initialized=FALSE; + ++#ifndef FF_I_TYPE ++#define FF_I_TYPE AV_PICTURE_TYPE_I ++#endif ++ + #ifdef ENABLE_LOG_FFMPEG + + void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) +@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) + + void ms_ffmpeg_check_init(){ + if(!avcodec_initialized){ ++#ifdef FF_API_AVCODEC_INIT + avcodec_init(); ++#endif + avcodec_register_all(); + avcodec_initialized=TRUE; + #ifdef ENABLE_LOG_FFMPEG +@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ + if (s->profile==0){ + s->codec=CODEC_ID_H263; + }else{ ++ /* + c->flags|=CODEC_FLAG_H263P_UMV; + c->flags|=CODEC_FLAG_AC_PRED; + c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; +- /* + c->flags|=CODEC_FLAG_OBMC; + c->flags|=CODEC_FLAG_AC_PRED; + */ diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index e6037d242..ad5376595 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179311 2013-03-05 11:12:31Z tpowa $ +# $Id: PKGBUILD 182919 2013-04-16 07:09:21Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=mp3splt -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" @@ -22,4 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('c0c66be0058cbc26ed52cfd2b50659fd') +md5sums=('cd8eb9f866dddb934357b7cdefb5a370') diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index 1c3adfd90..a2c8d0df7 100644 --- a/extra/neverball/PKGBUILD +++ b/extra/neverball/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 148860 2012-02-05 11:53:11Z ibiru $ +# $Id: PKGBUILD 183160 2013-04-18 02:16:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=neverball pkgver=1.5.4 -pkgrel=4 +pkgrel=5 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64' 'mips64el') url="http://neverball.org/" license=('GPL') -depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs') +depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \ + 'hicolor-icon-theme' 'xdg-utils') makedepends=('mesa') +install=neverball.install source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch) sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' 'f71982b7187d569c57b30c4c40fedd6c0e72baca') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../neverball-1.5.4-underlink.patch +} - if [ "${CARCH}" = "i686" ] ;then - make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" - else - make ENABLE_NLS=1 DATADIR=/usr/share/neverball - fi +build() { + cd ${pkgname}-${pkgver} + make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \ + CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS" } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball} + install -d "${pkgdir}"/usr/share/{neverball,locale,applications,doc/neverball} install -d "${pkgdir}"/usr/share/man/man{1,6} install -m755 neverball neverputt mapc "${pkgdir}/usr/bin" @@ -37,11 +38,13 @@ package(){ cp -r data/* "${pkgdir}/usr/share/neverball/" install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" - install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1" install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6" - ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" - ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" - find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \; + for i in 16 24 32 48 64 128 256; do + install -D -m644 dist/neverball_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverball.png" + install -D -m644 dist/neverputt_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverputt.png" + done + + chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball" } diff --git a/extra/neverball/neverball.install b/extra/neverball/neverball.install new file mode 100644 index 000000000..1c0de2e4f --- /dev/null +++ b/extra/neverball/neverball.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 183dbf253..920638e82 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,9 +1,8 @@ -# Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 160527 2012-06-02 10:27:33Z bluewind $ +# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $ pkgname=perl-ev -pkgver=4.11 -pkgrel=2 +pkgver=4.15 +pkgrel=1 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) @@ -11,36 +10,24 @@ options=(!emptydirs) depends=(perl-common-sense) url=https://metacpan.org/release/EV source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz") -md5sums=(405c6d74f9dff12918b12560c1a57877) -sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8) -_dir="$srcdir/EV-$pkgver" +md5sums=('546d10fb5901f2af937e53b41a92b2bb') -build() -( - cd "$_dir" +build() { + cd EV-$pkgver export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL + perl Makefile.PL make -) +} -check() -( - cd "$_dir" +check() { + cd EV-$pkgver export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test -) +} -package() -( - cd "$_dir" +package() { + cd EV-$pkgver make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -) - -# Local Variables: -# mode: shell-script -# sh-basic-offset: 2 -# End: -# vim:set ts=2 sw=2 et: +} diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 1ed93e03f..4abb00e0e 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 160535 2012-06-02 10:27:46Z bluewind $ +# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis # Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.69 -pkgrel=2 +pkgver=3.70 +pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.12.1') -options=(!emptydirs) +depends=('perl-html-tagset' 'perl') +checkdepends=('perl-test-pod') +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('d22cc6468ce670a56034be907e4e7c54') +md5sums=('efe7699f5ece3a230d730a3682359c08') build() { cd "${srcdir}/${_realname}-${pkgver}" @@ -32,4 +33,3 @@ package() { cd "${srcdir}/${_realname}-${pkgver}" make install DESTDIR="${pkgdir}" } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index 10f344716..ac9570fc9 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 160537 2012-06-02 10:27:49Z bluewind $ +# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=perl-libintl-perl _realname=libintl-perl -pkgver=1.20 -pkgrel=4 +pkgver=1.23 +pkgrel=1 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://search.cpan.org/dist/${_realname}/" depends=('gettext' 'perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) -md5sums=('cb36f58a7d2e15974f25b35381548b1b') +md5sums=('2e79dc842af1c9efc14fbe6664dc89bf') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 3ba2bccbb..0b4acc826 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' 'mips64el') @@ -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 2c074bd60..516b4cc6b 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' 'mips64el') @@ -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/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 5d76be07a..06dfbcde1 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 179941 2013-03-13 02:09:45Z jgc $ +# $Id: PKGBUILD 182931 2013-04-16 08:33:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.7.0 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.numpy.org/" makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('4fa54e40b6a243416f0248123b6ec332') +md5sums=('0ab72b3b83528a7ae79c6df9042d61c6') build() { cd "${srcdir}" @@ -62,6 +62,7 @@ package_python-numpy() { conflicts=('python3-numpy') _pyver=3.3 + _pyinc=3.3m export ATLAS=None export LDFLAGS="$LDFLAGS -shared" @@ -72,6 +73,6 @@ package_python-numpy() { install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy" install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/" - install -m755 -d "${pkgdir}/usr/include/python${_pyver}" - ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy" + install -m755 -d "${pkgdir}/usr/include/python${_pyinc}" + ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyinc}/numpy" } diff --git a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch deleted file mode 100644 index 072afbc0e..000000000 --- a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c -index 00c71f9..0afdc17 100644 ---- a/numpy/core/src/multiarray/scalarapi.c -+++ b/numpy/core/src/multiarray/scalarapi.c -@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - itemsize = (((itemsize - 1) >> 2) + 1) << 2; - } - } -+#if PY_VERSION_HEX >= 0x03030000 -+ if (type_num == NPY_UNICODE) { -+ PyObject *u, *args; -+ char *buffer; -+ if (swap) { -+ buffer = malloc(itemsize); -+ if (buffer == NULL) { -+ PyErr_NoMemory(); -+ return NULL; -+ } -+ memcpy(buffer, data, itemsize); -+ byte_swap_vector(buffer, itemsize >> 2, 4); -+ } else { -+ buffer = data; -+ } -+ u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer, -+ itemsize >> 2); -+ if (swap) { -+ free(buffer); -+ } -+ if (u == NULL) { -+ return NULL; -+ } -+ args = Py_BuildValue("(O)", u); -+ if (args == NULL) { -+ Py_DECREF(u); -+ return NULL; -+ } -+ obj = type->tp_new(type, args, NULL); -+ Py_DECREF(u); -+ Py_DECREF(args); -+ return obj; -+ } -+#endif - if (type->tp_itemsize != 0) { - /* String type */ - obj = type->tp_alloc(type, itemsize); -@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - memcpy(destptr, data, itemsize); - return obj; - } -+#if PY_VERSION_HEX < 0x03030000 - else if (type_num == PyArray_UNICODE) { - /* tp_alloc inherited from Python PyBaseObject_Type */ - PyUnicodeObject *uni = (PyUnicodeObject*)obj; -@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) - #endif - return obj; - } -+#endif // PY_VERSION_HEX < 0x03030000 - else { - PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj; - vobj->base = NULL; -diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src -index e547071..12745d7 100644 ---- a/numpy/core/src/multiarray/scalartypes.c.src -+++ b/numpy/core/src/multiarray/scalartypes.c.src -@@ -2592,7 +2592,11 @@ finish: - *((npy_@name@ *)dest) = *((npy_@name@ *)src); - #elif @default@ == 1 /* unicode and strings */ - if (itemsize == 0) { /* unicode */ -+#if PY_VERSION_HEX >= 0x03030000 -+ itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj); -+#else - itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE); -+#endif - } - memcpy(dest, src, itemsize); - /* @default@ == 2 won't get here */ -diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c -index c4147ef..119056c 100644 ---- a/numpy/core/src/multiarray/methods.c -+++ b/numpy/core/src/multiarray/methods.c -@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args) - if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) { - int swap=!PyArray_ISNOTSWAPPED(self); - self->data = datastr; -- if (!_IsAligned(self) || swap) { -+ if (!_IsAligned(self) || swap || (len <= 1000)) { - intp num = PyArray_NBYTES(self); - self->data = PyDataMem_NEW(num); - if (self->data == NULL) { --- -1.7.12.3 diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 0e7e09ec3..f915357f2 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179325 2013-03-05 14:58:22Z tpowa $ +# $Id: PKGBUILD 182925 2013-04-16 07:40:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') @@ -17,13 +17,18 @@ source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 replaces=('qemu-kvm') options=(!strip) -build() +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld # fix building with tex version 5.0 # https://bugs.launchpad.net/qemu/+bug/1130533 patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +} + +build () +{ + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ @@ -52,6 +57,6 @@ package() { done } -md5sums=('78f13b774814b6b7ebcaf4f9b9204318' +md5sums=('eb2d696956324722b5ecfa46e41f9a75' 'b431782f310bfc6af4ef21a8068f866b' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index 47d9f24f2..bd6e705e5 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' 'mips64el') @@ -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/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD index 0193e9812..7f3df04c8 100644 --- a/extra/qsynth/PKGBUILD +++ b/extra/qsynth/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 178984 2013-03-01 10:24:07Z andrea $ +# $Id: PKGBUILD 183182 2013-04-18 15:40:20Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=qsynth -pkgver=0.3.6 -pkgrel=3 +pkgver=0.3.7 +pkgrel=1 pkgdesc="Qt GUI for FluidSynth" arch=('i686' 'x86_64' 'mips64el') url="http://qsynth.sourceforge.net/" license=('GPL') depends=('fluidsynth' 'qt4') -options=('!makeflags') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('3cba3c87463be75ac188ebc3c3023d12') +md5sums=('a101a50a7ecfb7319482a5022df1d58b') build() { - . /etc/profile.d/qt4.sh - cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr @@ -25,7 +22,8 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index cc8afee2a..f8c9c8f52 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,41 +1,39 @@ -# $Id: PKGBUILD 160573 2012-06-02 10:28:53Z bluewind $ +# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=razor -pkgver=2.84 -pkgrel=7 +pkgver=2.85 +pkgrel=1 pkgdesc="A distributed, collaborative, spam detection and filtering network" arch=('i686' 'x86_64' 'mips64el') url="http://razor.sourceforge.net" license=('PerlArtistic') depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl') options=('!emptydirs') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2") -md5sums=('8b9a11a6ce020383c32c45d1530d77c2') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2" + razor-2.85-cosmetic-pv-fix.patch) +md5sums=('014d08db40187cb1316482191566b012' + '850645e088b21845f4b6653623d59515') -build() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - - # skip install_razor_agents (we'll do the linking later) - # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile +prepare() { + cd ${pkgname}-agents-${pkgver} + patch -p1 -i "$srcdir/razor-2.85-cosmetic-pv-fix.patch" +} +build() { + cd ${pkgname}-agents-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} + cd ${pkgname}-agents-${pkgver} make test } package() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} + cd ${pkgname}-agents-${pkgver} make DESTDIR="${pkgdir}" install - - # cd ${pkgdir}/usr/bin - # for i in razor-check razor-report razor-revoke razor-admin; do - # /bin/ln -sf razor-client $i; - # done } diff --git a/extra/razor/razor-2.85-cosmetic-pv-fix.patch b/extra/razor/razor-2.85-cosmetic-pv-fix.patch new file mode 100644 index 000000000..c391d48fb --- /dev/null +++ b/extra/razor/razor-2.85-cosmetic-pv-fix.patch @@ -0,0 +1,22 @@ +--- a/lib/Razor2/Client/Version.pm 2007-05-10 22:32:10.000000000 +0200 ++++ b/lib/Razor2/Client/Version.pm 2010-03-25 11:11:36.911409707 +0100 +@@ -14,7 +14,7 @@ + + $PROTOCOL = 3; + +-$VERSION = '2.84'; ++$VERSION = '2.85'; + + 1; + +--- a/META.yml 2007-05-23 20:29:34.000000000 +0200 ++++ b/META.yml 2010-03-25 11:11:43.691408628 +0100 +@@ -1,7 +1,7 @@ + # http://module-build.sourceforge.net/META-spec.html + #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# + name: razor-agents +-version: 2.84 ++version: 2.85 + version_from: lib/Razor2/Client/Version.pm + installdirs: site + requires: diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 9f4e85cd6..223544f00 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' 'mips64el') @@ -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/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD index 1b2a0e39d..64e4aeb46 100644 --- a/extra/sharutils/PKGBUILD +++ b/extra/sharutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181164 2013-04-02 02:28:47Z bisson $ +# $Id: PKGBUILD 182986 2013-04-16 16:21:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sharutils -pkgver=4.13.4 +pkgver=4.13.5 pkgrel=1 pkgdesc='Makes so-called shell archives out of many files' url='http://www.gnu.org/software/sharutils/' @@ -12,7 +12,7 @@ license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'gettext' 'texinfo') source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('9becdd47dd03a6e139f29c9a2ab311a541409553') +sha1sums=('8c2e352860994332fa03f2a6c92d789097fb2e52') install=install diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 7a8e1502c..fd9e78d72 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 182124 2013-04-08 00:32:17Z eric $ +# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'boost') optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support' 'telepathy-haze: all protocols supported by libpurple') groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('8951573b54d5d940687c3c2b7b77fb441b0fddd9') +sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index f05c8b861..dc8ab8ad2 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182126 2013-04-08 00:43:14Z eric $ +# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('340cd26c37297540c0f70e75adbb43bcab0889c7') +sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 8947bb6ca..6acf90197 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182128 2013-04-08 00:45:51Z eric $ +# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('392ee2e0146e445950ecad1b0cae27ece77b7a3e') +sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index c6c601506..540a69f78 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 182129 2013-04-08 00:46:52Z eric $ +# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64' 'mips64el') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') -makedepends=('cmake' 'automoc4') +depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') +makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('93ef0f8498c44b86dc25539f0b4f55354dc566ec') +sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index bae5f452d..a47e7f087 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 182131 2013-04-08 00:47:59Z eric $ +# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') depends=('telepathy-kde-common-internals' 'kdebase-runtime') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('2cb4bf8f7b5df1660027eab606d513b9cccebad5') +sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 0f62878a2..391ed90b7 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182133 2013-04-08 00:48:26Z eric $ +# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('576642c35f2d03b7859e15a004590ed6cc321ebd') +sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index d4d7dd3ac..1d228d835 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182019 2013-04-05 09:11:00Z andrea $ +# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('890ea9e21b56d794c079e6437ef8a3d356eeb4af') +sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 4e240e467..431f0701d 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182135 2013-04-08 00:49:01Z eric $ +# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6c061a13f483fd14d3ef184d1008e4f8002e46a8') +sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 7b9f3f293..02605f9dc 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182137 2013-04-08 00:49:44Z eric $ +# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('eb1fc514199587b018036bc307d385766fc40094') +sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 775bf6534..888539576 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182139 2013-04-08 00:50:17Z eric $ +# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('bc3b7832c88a866b396d5358c20c3a1f3a0048d2') +sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index ebe0e20a5..bce31e164 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182141 2013-04-08 00:51:21Z eric $ +# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('87a519f132cc338b7f1f47aa8997e89f9f566bfd') +sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b') build() { mkdir build diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 8d35420c9..dbe4ca569 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180543 2013-03-23 00:31:47Z tomegun $ +# $Id: PKGBUILD 182997 2013-04-16 18:42:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.0.6 +pkgver=1.1.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64' 'mips64el') @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('936a2590aea69fa3c0cf234d54b9137c') +md5sums=('d2dc9398a83692cafc16eba6e45f85d8') diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index ade9eedff..2ce3dc6ab 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182671 2013-04-12 14:13:36Z andyrtr $ +# $Id: PKGBUILD 183093 2013-04-17 14:08:02Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vmware -pkgver=13.0.0 -pkgrel=3 +pkgver=13.0.1 +pkgrel=1 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) -sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6' - '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fixes.patch ./configure --prefix=/usr --enable-vmwarectrl-client make } diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch deleted file mode 100644 index f1cde34aa..000000000 --- a/extra/xf86-video-vmware/git-fixes.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001 -From: Zack Rusin <zackr@vmware.com> -Date: Thu, 14 Feb 2013 22:33:01 +0000 -Subject: Kill mibstore - -It was a noop for at least 5 years and it has been removed. - -Signed-off-by: Zack Rusin <zackr@vmware.com> ---- -diff --git a/saa/saa_priv.h b/saa/saa_priv.h -index 6652054..5d81453 100644 ---- a/saa/saa_priv.h -+++ b/saa/saa_priv.h -@@ -48,7 +48,6 @@ - #include "pixmapstr.h" - #include "windowstr.h" - #include "servermd.h" --#include "mibstore.h" - #include "colormapst.h" - #include "gcstruct.h" - #include "input.h" -diff --git a/src/vmware.c b/src/vmware.c -index 41201f1..6b74e14 100644 ---- a/src/vmware.c -+++ b/src/vmware.c -@@ -23,7 +23,6 @@ char rcsId_vmware[] = - #include "xf86Pci.h" /* pci */ - - #include "mipointer.h" /* sw cursor */ --#include "mibstore.h" /* backing store */ - #include "micmap.h" /* mi color map */ - #include "vgaHW.h" /* VGA hardware */ - #include "fb.h" -@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) - * If backing store is to be supported (as is usually the case), - * initialise it. - */ -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index 9959ffb..7863ba2 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL) - (ms->only_hw_presents) ? "enabled" : "disabled"); - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); --- -cgit v0.9.0.2-2-gbebe -From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001 -From: Loïc Yhuel <loic.yhuel@gmail.com> -Date: Thu, 11 Apr 2013 09:29:10 +0000 -Subject: vmwgfx: Use myGlyphs to fix crashes - -Tested-by: Christian Hesse <mail@eworm.de> -Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> -Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com> -Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> ---- -diff --git a/saa/saa_render.c b/saa/saa_render.c -index c69f2c9..c6ce68c 100644 ---- a/saa/saa_render.c -+++ b/saa/saa_render.c -@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen) - saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids); - saa_wrap(sscreen, ps, Triangles, saa_triangles); - saa_wrap(sscreen, ps, Composite, saa_composite); -+ saa_wrap(sscreen, ps, Glyphs, miGlyphs); -+ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph); - } - } - -@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen) - saa_unwrap(sscreen, ps, Trapezoids); - saa_unwrap(sscreen, ps, Triangles); - saa_unwrap(sscreen, ps, Composite); -+ saa_unwrap(sscreen, ps, Glyphs); -+ saa_unwrap(sscreen, ps, UnrealizeGlyph); - } - } - #endif --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 409ee567c..398e39971 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180178 2013-03-18 16:08:50Z andyrtr $ +# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.0 -pkgrel=2 +pkgver=1.14.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -24,7 +24,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 10-quirks.conf loongson.patch git-fixes.patch) -sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630' +sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' |