diff options
Diffstat (limited to 'extra')
84 files changed, 729 insertions, 395 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index b7ba8e120..51d4698e0 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155962 2012-04-10 08:20:47Z andrea $ +# $Id: PKGBUILD 163701 2012-07-18 01:04:54Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org/akonadi' diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index 4bfc687b4..e6db16541 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152200 2012-03-05 08:55:44Z ibiru $ +# $Id: PKGBUILD 163702 2012-07-18 01:05:05Z ibiru $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro pkgver=1.0.3 -pkgrel=5 +pkgrel=6 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64' 'mips64el') url="http://avogadro.openmolecules.net/wiki/Main_Page" diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index bffb64155..493c54c31 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163071 2012-07-06 15:49:36Z ibiru $ +# $Id: PKGBUILD 163703 2012-07-18 01:05:09Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 141f2519a..77eb71628 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156728 2012-04-23 09:04:10Z ibiru $ +# $Id: PKGBUILD 163754 2012-07-19 07:57:34Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.10.2 +pkgver=1.10.4 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) @@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool !emptydirs) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3') +sha256sums=('0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9') build() { cd "$pkgname-$pkgver" diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 082eb962a..a38b1e48a 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163146 2012-07-08 09:30:55Z ibiru $ +# $Id: PKGBUILD 163704 2012-07-18 01:05:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 464fa01ec..f9bfb2142 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 157084 2012-04-23 13:56:25Z allan $ +# $Id: PKGBUILD 163718 2012-07-18 03:05:26Z eric $ # Maintainer: # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=elfutils -pkgver=0.153 +pkgver=0.154 pkgrel=1 pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information" arch=('i686' 'x86_64' 'mips64el') url="https://fedorahosted.org/elfutils/" -license=('GPL2') -depends=('glibc') +license=('LGPL3' 'GPL' 'GPL3') +depends=('gcc-libs' 'zlib' 'bzip2' 'xz') provides=('libelf') replaces=('libelf') conflicts=('libelf') options=('!makeflags') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2 - http://cdn.debian.net/debian/pool/main/e/elfutils/elfutils_${pkgver}-1.debian.tar.gz) -md5sums=('289a146182bc29f0236eaa15d8ebdf98' - '3bcccdf802f0a15a55543b0931c480dd') +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} \ + elfutils-0.154-binutils-pr-ld-13621.patch + http://cdn.debian.net/debian/pool/main/e/elfutils/elfutils_0.153-1.debian.tar.gz) +sha1sums=('3a92a6f636cc3d14d4b3b00ba5c1e88a2a8d510b' + '956461d44b03823e0b448e78b1f4aa25ef269e1e' + '09681b728edb86c77eed47286554bef048f3507f' + 'ff79e1438275dffb2f5b15a58bff9b0d083a3de0') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,13 +31,14 @@ build() { CFLAGS+=" -g" # required for test-suite success + patch -p1 -i "${srcdir}/elfutils-0.154-binutils-pr-ld-13621.patch" + ./configure --prefix=/usr --program-prefix="eu-" make } check() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i "s#./alldts#testrun ./alldts#" tests/run-alldts.sh make check } diff --git a/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch new file mode 100644 index 000000000..06dba1ea6 --- /dev/null +++ b/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch @@ -0,0 +1,10 @@ +diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh +index 8aca9e1..d449416 100755 +--- a/tests/run-elflint-self.sh ++++ b/tests/run-elflint-self.sh +@@ -51,4 +51,4 @@ runtest ../libebl/libebl_sh.so + runtest ../libebl/libebl_sparc.so + runtest ../libebl/libebl_x86_64.so + +-exit $status ++test $status == 0 || echo "binutils PR ld/13621 workaround" diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index f3ce6fd17..0e43d9ecb 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161285 2012-06-08 22:49:59Z ibiru $ +# $Id: PKGBUILD 163768 2012-07-19 08:37:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8dd79cd2118ba6055efc4ebe815bdeeeb3c1310bb915035c1a56ef3188c75d5a') +sha256sums=('66e468f09de4b8097671cb6e56cd057c0e7869d836a2345e640b6cf4c404d5d9') build() { cd "$pkgname-$pkgver" diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 82513034b..0ebf9b40a 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161484 2012-06-11 19:50:28Z eric $ +# $Id: PKGBUILD 163748 2012-07-19 02:30:56Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.4.1 +pkgver=4.2.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" @@ -12,7 +12,7 @@ license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \ 'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) -sha1sums=('835fe4ee7005641a79b4456654e70ed5a5c49b85') +sha1sums=('5fcadf1436f6a1010802449f6ef162cf21fdfccb') build() { cd "${srcdir}" @@ -65,7 +65,7 @@ package_fcitx-gtk3() { package_fcitx-qt() { pkgdesc='QT IM Module for fcitx' - depends=('qt' 'icu' 'fcitx') + depends=('qt' 'fcitx') cd "${srcdir}"/build/src/frontend/qt make DESTDIR="${pkgdir}" install diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 6985e613c..15258d19b 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156794 2012-04-23 09:05:47Z ibiru $ +# $Id: PKGBUILD 163765 2012-07-19 08:32:36Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.32.0 +pkgver=2.32.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('e1806f884c6e9f904ee2af0d39dd8d4de3f91a039f897f54333b0890de06f94b') +sha256sums=('d6ed4d38e8739813941a0f0fec471c00ea93c5ed46179543340821c7ca798a2f') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD index 331982b14..f55fdb6fb 100644 --- a/extra/gnome-screensaver/PKGBUILD +++ b/extra/gnome-screensaver/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163480 2012-07-12 19:58:42Z ibiru $ +# $Id: PKGBUILD 163692 2012-07-17 22:26:51Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver -pkgver=3.4.3 +pkgver=3.4.4 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=(!emptydirs) install=gnome-screensaver.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam) -sha256sums=('76bea2526c6065e5d182e23fda8e75eb2e0afe9d1d40301b019a3cfc39d95a3e' +sha256sums=('dae4be9daa2c3db15f614dd004aa858e32e5fc5d1818a8317167441097b57904' 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') build() { diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index bd21ffc66..f753620bb 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158538 2012-05-04 12:58:08Z ibiru $ +# $Id: PKGBUILD 163901 2012-07-21 19:28:49Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.4.1 -pkgrel=3 +pkgver=3.4.2 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeShell" @@ -17,12 +17,12 @@ install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz recorder.patch) -sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9' +sha256sums=('3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720' 'b00589e867c0ae63b47982145cb4ab366afec84a568e66867f51fa8da13027f1') build() { - cd "$pkgname-$pkgver" - patch -Np1 -i "$srcdir/recorder.patch" + cd $pkgname-$pkgver + patch -Np1 -i ../recorder.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ @@ -31,6 +31,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 27dea602a..1f9c41919 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151599 2012-02-27 21:27:31Z ibiru $ +# $Id: PKGBUILD 163898 2012-07-21 19:20:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.10 -pkgrel=3 +pkgver=2.24.11 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('ea56e31bb9d6e19ed2e8911f4c7ac493cb804431caa21cdcadae625d375a0e89' +sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 0bdb78742..42ecdcf50 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158899 2012-05-12 20:17:26Z ibiru $ +# $Id: PKGBUILD 163899 2012-07-21 19:20:27Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.4.3 +pkgver=3.4.4 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini wacom.patch) -sha256sums=('846010442a96590469cde16ed6a1fdfe09397e435165459f04d31cfa5713799f' +sha256sums=('f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') build() { diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD index fca527229..d82f01193 100644 --- a/extra/hddtemp/PKGBUILD +++ b/extra/hddtemp/PKGBUILD @@ -1,48 +1,54 @@ -# $Id: PKGBUILD 160663 2012-06-03 10:40:04Z bisson $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 163630 2012-07-17 14:24:03Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=hddtemp -pkgver=0.3.beta15.46 _origver=0.3-beta15 -_patchver=46 -pkgrel=3 +_patchver=${_origver}-52 +pkgver=${_patchver//-/.} +pkgrel=1 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information" arch=('i686' 'x86_64' 'mips64el') -url="http://www.guzu.net/linux/hddtemp.php" +url='https://savannah.nongnu.org/projects/hddtemp/' license=('GPL') -depends=('glibc') +arch=('i686' 'x86_64') backup=('etc/conf.d/hddtemp') -source=(http://www.guzu.net/files/hddtemp-${_origver}.tar.bz2 - http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_${_origver}-${_patchver}.diff.gz - 'hddtemp' 'hddtemp.service' 'hddtemp.confd' 'hddtemp-0.3-beta15-reg-eip.patch') -md5sums=('8b829339e1ae9df701684ec239021bb8' - '040437845e28771c560b4bb40e41f933' - 'b7ebb86dfeef3bc4577ed1040307e36b' - 'b6767bdbb03b6cdbc1995418cafdb1e1' - 'fdca5c43900406f0be76534ef2a5a697' - '526ef28549dd0da7e38d32cfc8523592') +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2" + "http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz" + 'rc.d' + 'conf.d' + 'service') +sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b' + 'b9bcdd0537c1540e55e5056445b571ea61d5a4a3' + '71159486b1505ec6acfb7585e0d8fbe78afe54ec' + 'd45e3022f614dbf8904ecb1a3e702bb71fcaa808' + '501fcf4faf8b2689d010f9cbbf39f917211f611f') + options=('!libtool') build() { - cd "$srcdir/$pkgname-${_origver}" + cd "${srcdir}/${pkgname}-${_origver}" + + patch -p1 -i "../${pkgname}_${_patchver}.diff" - patch -Np1 -i "$srcdir/${pkgname}_${_origver}-${_patchver}.diff" - patch -Np1 -i "$srcdir/hddtemp-0.3-beta15-reg-eip.patch" + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-db-path="/usr/share/${pkgname}/hddtemp.db" - ./configure --prefix=/usr --mandir=/usr/share/man --with-db-path=/usr/share/$pkgname/hddtemp.db - make + make } package() { - cd "$srcdir/$pkgname-${_origver}" - make DESTDIR=$pkgdir install - - install -D -m644 "$srcdir/$pkgname-${_origver}/debian/hddtemp.db" \ - "$pkgdir/usr/share/${pkgname}/hddtemp.db" - install -D -m644 "$srcdir/hddtemp.confd" "$pkgdir/etc/conf.d/hddtemp" - install -D -m644 "$srcdir/hddtemp.service" "$pkgdir/usr/lib/systemd/system/hddtemp.service" - install -D -m755 "$srcdir/hddtemp" "$pkgdir/etc/rc.d/hddtemp" + cd "${srcdir}/${pkgname}-${_origver}" + + make DESTDIR="${pkgdir}" install + + install -Dm644 "../${pkgname}-${_origver}/debian/hddtemp.db" "${pkgdir}/usr/share/${pkgname}/hddtemp.db" + install -Dm644 '../service' "${pkgdir}/usr/lib/systemd/system/hddtemp.service" + install -Dm644 '../conf.d' "${pkgdir}/etc/conf.d/hddtemp" + install -Dm755 '../rc.d' "${pkgdir}/etc/rc.d/hddtemp" } diff --git a/extra/hddtemp/conf.d b/extra/hddtemp/conf.d new file mode 100644 index 000000000..6a1e18e0b --- /dev/null +++ b/extra/hddtemp/conf.d @@ -0,0 +1,2 @@ +PARAMS="-q -l 127.0.0.1" +DRIVES="/dev/sda" diff --git a/extra/hddtemp/rc.d b/extra/hddtemp/rc.d new file mode 100644 index 000000000..62f090808 --- /dev/null +++ b/extra/hddtemp/rc.d @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PARAMS= +DRIVES= +[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp +PID=$(pidof -o %PPID /usr/sbin/hddtemp) +case "$1" in + start) + stat_busy "Starting HDDTemp" + [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon hddtemp + stat_done + fi + ;; + stop) + stat_busy "Stopping HDDTemp" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon hddtemp + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/hddtemp/service b/extra/hddtemp/service new file mode 100644 index 000000000..bc56d16b0 --- /dev/null +++ b/extra/hddtemp/service @@ -0,0 +1,9 @@ +[Unit] +Description=Hard drive temperature monitor daemon + +[Service] +EnvironmentFile=/etc/conf.d/hddtemp +ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES + +[Install] +WantedBy=multi-user.target diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index e3ec5fec3..1ba367927 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152206 2012-03-05 08:55:59Z ibiru $ +# $Id: PKGBUILD 163705 2012-07-18 01:05:24Z ibiru $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64' 'mips64el') url="http://hugin.sourceforge.net/" @@ -14,13 +14,17 @@ depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') makedepends=('zip' 'cmake' 'boost' 'tclap') install=hugin.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + gcc47.patch) +sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' + 'aa0fc9425bd7a4b5e270412f4ca72258fac77298') build() { cd "${srcdir}" + patch -Np0 -i gcc47.patch mkdir build cd build + export CXXFLAGS+=" -fpermissive" cmake "${srcdir}/${pkgname}-${pkgver}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/hugin/gcc47.patch b/extra/hugin/gcc47.patch new file mode 100644 index 000000000..3814b871c --- /dev/null +++ b/extra/hugin/gcc47.patch @@ -0,0 +1,11 @@ +diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp +--- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000 ++++ hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000 +@@ -27,6 +27,7 @@ + + #include <math.h> + #include <stdlib.h> ++#include <unistd.h> + #include "Utilities.h" + + using namespace std; diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index e499f4975..df520d619 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163094 2012-07-06 22:39:28Z eric $ +# $Id: PKGBUILD 163750 2012-07-19 04:55:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.8.1 +pkgver=6.7.8.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('b14046ed6dead94ad78a7c710fd214482bf4715a' +sha1sums=('3cca01dad3596502a149229e28226b1b2a037915' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 9cd82a34a..ac288d781 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161171 2012-06-08 06:36:44Z andrea $ +# $Id: PKGBUILD 163706 2012-07-18 01:05:29Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 8f13a64b6..348a6c452 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161189 2012-06-08 06:37:22Z andrea $ +# $Id: PKGBUILD 163707 2012-07-18 01:05:32Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index 4c24091b0..112b0c689 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155443 2012-04-03 18:01:23Z andyrtr $ +# $Id: PKGBUILD 163883 2012-07-21 12:10:06Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.2.2 #.pl01 +pkgver=1.2.4 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,17 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool' '!emptydirs') -md5sums=('7878b3af82752d391f2613fcf1b18d4c' - 'e4903839d6dc3a93b50102b98a5362f4') +md5sums=('25b45b1ccf6921a5bce4e2d88f55a81f' + 'a6749b55ba9ec9dad471e3a2202de390') build() { - cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 9bc10d2c6..26943ec65 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 156888 2012-04-23 09:08:23Z ibiru $ +# $Id: PKGBUILD 163767 2012-07-19 08:35:19Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.2 +pkgver=0.12.3 pkgrel=1 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') options=('!libtool') -depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3') +depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e') +sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658') build() { cd $pkgname-$pkgver diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index e2cfc3a6e..3bebee8e4 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 155447 2012-04-03 18:06:59Z andyrtr $ +# $Id: PKGBUILD 163887 2012-07-21 12:16:22Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('libburn>=1.2.2' 'libisofs>=1.2.2' 'readline') +depends=('libburn>=1.2.4' 'libisofs>=1.2.4' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('2f94e9dc77c4f3b5066371a5870a844b' - 'b5a1957edce278ce18bd0eed1d93a3ae') +md5sums=('d5d78ec840a8bbc7df6582f65a28ca1e' + '39d26239be2e7ed2ec1dd22e214173dd') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index ba2d6224a..d09e3e347 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155445 2012-04-03 18:03:38Z andyrtr $ +# $Id: PKGBUILD 163885 2012-07-21 12:12:07Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool') -md5sums=('5d6bee8276b08019078c19d84ef5485b' - '8bac560e309b4f4ca60098742e53d1a3') +md5sums=('0a86f2cda3b86fc95f7c0efbd793f373' + '8b997974f30da1b7a7f97563df4365a3') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index ba73780f0..c21f7542b 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152214 2012-03-05 08:56:12Z ibiru $ +# $Id: PKGBUILD 163708 2012-07-18 01:05:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libpst pkgname=('libpst' 'libpst-docs') pkgver=0.6.54 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.five-ten-sg.com/libpst/" license=('GPL') diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 9db1106ec..e85ff5367 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157451 2012-04-28 13:13:49Z ibiru $ +# $Id: PKGBUILD 163820 2012-07-20 21:36:20Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.15.10 +pkgver=0.16.2 pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" @@ -14,10 +14,10 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4') +sha1sums=('04da641d21d0867fc103f4f57ffd41b3fce19ead') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \ --enable-python-binding \ --with-libgeoip=system @@ -25,7 +25,7 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index 8de87b701..b9addc072 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152218 2012-03-05 08:56:28Z ibiru $ +# $Id: PKGBUILD 163710 2012-07-18 01:05:42Z ibiru $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq pkgver=1.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 00ecec7de..e4b9e80c0 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163534 2012-07-14 19:08:48Z giovanni $ +# $Id: PKGBUILD 163810 2012-07-20 10:44:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.07.14 +pkgver=2012.07.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('9496fd1cf093be9a95f47ef0184bef03') +md5sums=('71e6624ed5114b8f9199500c01bef569') build() { cd ${srcdir}/live diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index 9fb57713f..458fa414a 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152233 2012-03-05 13:38:37Z ibiru $ +# $Id: PKGBUILD 163711 2012-07-18 01:05:51Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx pkgver=2.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 4a562a48b..621575ebd 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 163223 2012-07-11 09:07:08Z giovanni $ +# $Id: PKGBUILD 163843 2012-07-21 11:04:01Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') pkgver=5.7.0 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('99ea44be570412dadafe4ccaee0cfe6e') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2" + 'mm_io.patch') +md5sums=('99ea44be570412dadafe4ccaee0cfe6e' + '293bd4551ef8529e9d4796c5a201b8fc') build() { cd "${srcdir}/${pkgbase}-${pkgver}" + patch -Np1 -i "${srcdir}/mm_io.patch" + # Disable automagic curl dep used for online update checking sed -i -e '/curl/d' configure.in export CURL_CFLAGS="" CURL_LIBS="" diff --git a/extra/mkvtoolnix/mm_io.patch b/extra/mkvtoolnix/mm_io.patch new file mode 100644 index 000000000..9ee9e018f --- /dev/null +++ b/extra/mkvtoolnix/mm_io.patch @@ -0,0 +1,11 @@ +--- a/src/common/mm_io.cpp 2012-07-08 20:06:02.000000000 +0200 ++++ b/src/common/mm_io.cpp 2012-07-21 11:59:59.000000000 +0200 +@@ -147,7 +147,7 @@ + void + mm_file_io_c::prepare_path(const std::string &path) { + boost::filesystem::path directory = boost::filesystem::path(path).parent_path(); +- if (boost::filesystem::exists(directory)) ++ if (directory.empty() || boost::filesystem::exists(directory)) + return; + + boost::system::error_code error_code; diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD index 4f9e86de4..806f35f4f 100644 --- a/extra/ode/PKGBUILD +++ b/extra/ode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153667 2012-03-17 17:53:37Z giovanni $ +# $Id: PKGBUILD 163893 2012-07-21 19:10:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> pkgname=ode pkgver=0.12 -pkgrel=2 +pkgrel=3 pkgdesc="An open source, high performance library for simulating rigid body dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://www.ode.org" @@ -12,14 +12,15 @@ license=('LGPL' 'BSD') depends=('gcc-libs' 'bash') source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') -md5sums=('83766cae59692c2843d9afccc1768988') +md5sums=('48fdd41fae1a7e7831feeded09826599') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --enable-shared \ - --enable-libccd + --enable-libccd \ + --enable-double-precision make } diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index b1ae41401..78605e7eb 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162040 2012-06-19 05:54:59Z andrea $ +# $Id: PKGBUILD 163736 2012-07-18 10:30:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk2 -pkgver=1.2.5 +pkgver=1.3.0 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ae01b5b42f6d8b9d58c938bb9a61a3ae') +md5sums=('9c9d996904db3f4897772788f3bf1599') build() { cd "${srcdir}" diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index 7bb9d6e85..d307e84e7 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162042 2012-06-19 05:56:17Z andrea $ +# $Id: PKGBUILD 163738 2012-07-18 10:31:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=oxygen-gtk3 -pkgver=1.0.5 +pkgver=1.1.0 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3' 'dbus-glib') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('de7cd8e31c78dd9de9b3ce1132905ba5') +md5sums=('d5c5b5debd3974ea4ea1cc1a7fbe56b9') build() { cd "${srcdir}" diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index dd35eec56..1b5e921cf 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 161426 2012-06-11 09:03:14Z pierre $ +# $Id: PKGBUILD 163778 2012-07-19 22:22:31Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.10 -pkgrel=3 +pkgver=3.1.11 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' url='http://pecl.php.net/package/APC' depends=('php') license=('PHP') -source=("http://pecl.php.net/get/APC-${pkgver}.tgz" - 'svn.patch') +source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9' - 'ce07a1b49b5af496e16362899df3e3c4') +md5sums=('199b69ed1423aa869acafff485ef5f06') build() { cd $srcdir/APC-$pkgver - patch -p0 -i ${srcdir}/svn.patch phpize ./configure --prefix=/usr make diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 6ae1fe83c..5ceae2e78 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161823 2012-06-15 06:04:39Z pierre $ +# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.4 +pkgver=5.4.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,10 +33,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('1fd98dc3f6f3805cd67bff12a26ed77f' +md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'aabda9f3f2f8b9d8fdc9558c31c718db' + '6d46667e00d65933ec0c958279c0a803' '825e580dd5708d959b50944afa1b12b6' 'f56b5bb7e93c802ae8519182fbea3387' '86c73d481f3099e740e602869bacf637' diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm index 3b3ec20de..47f0886ac 100644 --- a/extra/php/rc.d.php-fpm +++ b/extra/php/rc.d.php-fpm @@ -86,7 +86,7 @@ case "$1" in kill -QUIT `cat /run/php-fpm/php-fpm.pid` - wait_for_pid removed /run/php-fpm.pid + wait_for_pid removed /run/php-fpm/php-fpm.pid if [ -n "$try" ] ; then stat_fail diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index bd879c229..075c242cd 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163134 2012-07-08 02:03:27Z bisson $ +# $Id: PKGBUILD 163624 2012-07-17 12:46:32Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.9.3 -pkgrel=2 +pkgrel=3 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -13,11 +13,13 @@ arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'libsasl' 'libldap' 'db' 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ - 'aliases.patch' \ +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" + 'aliases.patch' + 'service' 'rc.d') sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d' '5fc3de6c7df1e5851a0a379e825148868808318b' + 'af621cf064813d9ddb13ffd579fee33e6b82d4be' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') provides=('smtp-server' 'smtp-forwarder') @@ -59,8 +61,11 @@ package() { manpage_directory="/usr/share/man" \ readme_directory="/usr/share/doc/${pkgname}" \ - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files" - cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" + + cd "${pkgdir}" + patch -p0 -i "${srcdir}"/aliases.patch + sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files" } diff --git a/extra/postfix/service b/extra/postfix/service new file mode 100644 index 000000000..6ede53632 --- /dev/null +++ b/extra/postfix/service @@ -0,0 +1,12 @@ +[Unit] +Description=Postfix Mail Transport Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/postfix start +ExecStop=/usr/sbin/postfix stop +ExecReload=/usr/sbin/postfix reload + +[Install] +WantedBy=multi-user.target diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index c549ed671..1d6e88950 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160369 2012-06-01 12:58:42Z dreisner $ +# $Id: PKGBUILD 163774 2012-07-19 19:37:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,8 +7,8 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=2.0 -pkgrel=2 +pkgver=2.1 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -19,17 +19,13 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit [ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch) -sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803') + pulseaudio.xinit) +sha256sums=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { cd $pkgbase-$pkgver - # libudev.so.1.0.0 - patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index c2d6b4ff0..ba1efbddd 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162740 2012-06-29 11:34:16Z andrea $ +# $Id: PKGBUILD 163679 2012-07-17 18:11:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> @@ -6,17 +6,23 @@ pkgbase=pyqt pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') pkgver=4.9.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') - source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('a0b6a820633366365af5124ddbd059c7') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" + 'fix-pyuic4.patch') +md5sums=('a0b6a820633366365af5124ddbd059c7' + '097651aea0bafded5abdfd6d62afd2ad') build() { - cd "${srcdir}" + # FS#30728 + cd "${srcdir}"/PyQt-x11-gpl-${pkgver} + patch -p1 -i "${srcdir}"/fix-pyuic4.patch + cd .. + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" diff --git a/extra/pyqt/fix-pyuic4.patch b/extra/pyqt/fix-pyuic4.patch new file mode 100644 index 000000000..2173443d8 --- /dev/null +++ b/extra/pyqt/fix-pyuic4.patch @@ -0,0 +1,91 @@ +# HG changeset patch +# User Phil Thompson <phil at riverbankcomputing.com> +# Date 2012-07-13 13:39:28 +0100 +# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a +# Parent fd0f3da9d79ca9858d10a20c15fb85456cb832d7 +Fixed a regression in pyuic's handling of custom widgets. + +diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py +--- a/pyuic/uic/Compiler/qobjectcreator.py ++++ b/pyuic/uic/Compiler/qobjectcreator.py +@@ -1,6 +1,6 @@ + ############################################################################# + ## +-## Copyright (C) 2011 Riverbank Computing Limited. ++## Copyright (C) 2012 Riverbank Computing Limited. + ## Copyright (C) 2006 Thorsten Marek. + ## All right reserved. + ## +@@ -100,7 +100,6 @@ + assert widgetClass not in self._widgets + self._widgets[widgetClass] = (baseClass, module) + +- + def _resolveBaseclass(self, baseClass): + try: + for x in range(0, 10): +@@ -114,19 +113,17 @@ + except KeyError: + raise ValueError("unknown baseclass %s" % baseClass) + +- + def search(self, cls): + try: +- self._usedWidgets.add(cls) + baseClass = self._resolveBaseclass(self._widgets[cls][0]) + DEBUG("resolved baseclass of %s: %s" % (cls, baseClass)) +- +- return type(cls, (baseClass,), +- {"module" : ""}) +- + except KeyError: + return None + ++ self._usedWidgets.add(cls) ++ ++ return type(cls, (baseClass, ), {"module" : ""}) ++ + def _writeImportCode(self): + imports = {} + for widget in self._usedWidgets: +diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py +--- a/pyuic/uic/objcreator.py ++++ b/pyuic/uic/objcreator.py +@@ -102,19 +102,26 @@ + self._modules.append(self._customWidgets) + + def createQObject(self, classname, *args, **kwargs): +- # Handle scoped names, typically static factory methods. +- parts = classname.split('.') +- factory = self.findQObjectType(parts[0]) ++ # Handle regular and custom widgets. ++ factory = self.findQObjectType(classname) + +- if factory is not None: +- for part in parts[1:]: +- factory = getattr(factory, part, None) +- if factory is None: +- break +- else: +- return self._cpolicy.instantiate(factory, *args, **kwargs) ++ if factory is None: ++ # Handle scoped names, typically static factory methods. ++ parts = classname.split('.') + +- raise NoSuchWidgetError(classname) ++ if len(parts) > 1: ++ factory = self.findQObjectType(parts[0]) ++ ++ if factory is not None: ++ for part in parts[1:]: ++ factory = getattr(factory, part, None) ++ if factory is None: ++ break ++ ++ if factory is None: ++ raise NoSuchWidgetError(classname) ++ ++ return self._cpolicy.instantiate(factory, *args, **kwargs) + + def invoke(self, rname, method, args=()): + return self._cpolicy.invoke(rname, method, args) diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 895f8531d..0e042029f 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 163002 2012-07-05 07:43:09Z tpowa $ +# $Id: PKGBUILD 163622 2012-07-17 06:22:37Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') @@ -57,5 +57,5 @@ package() esac done } -md5sums=('2e19185b7fdf4c144f4719a88a5bde31' +md5sums=('f8f5629b00f48192cc0467e1d31c4dd2' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD index 02cd679dd..99354e815 100644 --- a/extra/quota-tools/PKGBUILD +++ b/extra/quota-tools/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 131802 2011-07-15 11:55:43Z eric $ +# $Id: PKGBUILD 163746 2012-07-18 22:38:58Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quota-tools -pkgver=4.00_pre1 -pkgrel=1.1 +pkgver=4.00 +pkgrel=1 +epoch=1 pkgdesc="Tools to manage kernel-level quotas in Linux" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/linuxquota/" @@ -11,31 +12,15 @@ license=('GPL' 'BSD') depends=('e2fsprogs') backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins') options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver/_/-}.tar.gz LICENSE \ - quotaon.diff system_inodes.diff repquota.diff nulls.diff) -md5sums=('ef9d66e8a968ecffd2d9df648fa8ada2' - 'dd792440e684043e4e4ef80963d0237b' - '9ac7ca4746de1ad057baee21474b7906' - '92d9f2a4b3e5e3adf2977051391785a7' - 'd1d70d4167e53d1414079b4391f1cfb8' - '094bce5226c4fd1c383bd0b75405ee2c') -sha1sums=('adf29b49dab449078eb6ffdfe8af51fe85419e28' - '57297bdc9e638c500506169bbbe12eb89bcf7d07' - '2304f03cddd06d8791167f621683f7ef54610673' - 'e2a33f1f95a3ff8c741a2067058e898f6054af09' - '8b00e7c4f7af2188ad49a50a616c1d71eee20459' - '0527f761aa869f5d9e463ceab4a3bf82881d05c2') +source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz \ + LICENSE) +sha1sums=('9ef79933bebfd80f007600fd422616ad161c5fd0' + '57297bdc9e638c500506169bbbe12eb89bcf7d07') build() { cd "${srcdir}/${pkgname}" - patch -p1 -i "${srcdir}/quotaon.diff" - patch -p1 -i "${srcdir}/system_inodes.diff" - patch -p1 -i "${srcdir}/repquota.diff" - patch -p1 -i "${srcdir}/nulls.diff" ./configure --prefix=/usr --sysconfdir=/etc - sed -i -e 's/#define HOSTS_ACCESS 1//' -e 's/HOSTS_ACCESS//' config.h - sed -i 's/-lwrap//' Makefile - make + make RPCGEN="rpcgen -Y /usr/bin" } package() { @@ -43,7 +28,6 @@ package() { make ROOTDIR="${pkgdir}" install install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -# remove conflicts with glibc and man-pages +# remove conflicts with glibc rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x} - rm "${pkgdir}/usr/share/man/man2/quotactl.2" } diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 3e562af0d..07e04c98b 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,18 +1,21 @@ -# $Id: PKGBUILD 157417 2012-04-28 09:27:22Z allan $ +# $Id: PKGBUILD 163812 2012-07-20 12:21:50Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.96 -pkgrel=3 +pkgver=2.97 +pkgrel=1 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.rhythmbox.org" -depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3' - 'libnotify' 'libpeas' 'libwebkit3' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser' 'tdb') +depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' + 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz4' 'libnotify' 'libpeas' 'libwebkit3' + 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser' + 'tdb' 'libdiscid') [ "$CARCH" != "mips64el" ] && depends+=('lirc-utils') -makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection') +makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' 'gstreamer0.10-ffmpeg: Extra media codecs' @@ -20,14 +23,14 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' options=('!libtool' '!emptydirs') install=rhythmbox.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('3f93c74b2f7f8d7e1002e288db9abf8f182684277dec0a106d5e38415084b2b6') +sha256sums=('b52567cf45bf13c0452593da7f907920bd4cf31916ca8dcd15d555336b4947e4') build() { cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ - --enable-daap --enable-python \ + --enable-daap --enable-python --enable-musicbrainz \ --with-mdns=avahi --disable-scrollkeeper make } diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index be35ca25c..765696fab 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 159138 2012-05-16 18:32:58Z andrea $ +# $Id: PKGBUILD 163681 2012-07-17 18:38:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano pkgver=2.7.6 -pkgrel=1 +pkgrel=2 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') +depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') makedepends=('cmake' 'openjdk6' 'doxygen') [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD index a987ebcfa..eaa638ae3 100644 --- a/extra/source-highlight/PKGBUILD +++ b/extra/source-highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162797 2012-06-30 14:35:56Z giovanni $ +# $Id: PKGBUILD 163713 2012-07-18 01:06:02Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=source-highlight pkgver=3.1.7 -pkgrel=1 +pkgrel=2 pkgdesc="Convert source code to syntax highlighted document" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/src-highlite/" diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 3a4d51fef..f9557b0ba 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156980 2012-04-23 09:10:31Z ibiru $ +# $Id: PKGBUILD 163824 2012-07-20 23:07:42Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.12.0 +pkgver=5.12.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('libxslt' 'python2') install=telepathy-mission-control.install options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f39dcfef785a37dc21efa9af06be2e61') +md5sums=('79449fd2e1b02fc6cb5c6adc447e2bb6') build() { cd "$pkgname-$pkgver" diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 683508a51..bc0270816 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158542 2012-05-04 17:15:31Z heftig $ +# $Id: PKGBUILD 163766 2012-07-19 08:34:09Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.14.1 +pkgver=0.14.2 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43') +sha256sums=('9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1') build() { cd $pkgbase-$pkgver diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index d505b0ee8..37fa9c3da 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,46 +1,62 @@ -# $Id: PKGBUILD 162805 2012-06-30 17:32:04Z andrea $ +# $Id: PKGBUILD 163689 2012-07-17 19:51:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> -pkgname=virtuoso -pkgver=6.1.5.20120630 -pkgrel=1 +pkgbase=virtuoso +pkgname=('virtuoso' 'virtuoso-base') +pkgver=6.1.5.20120717 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') -pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') -depends=('libldap') -makedepends=('bison' 'flex' 'gperf') +makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2') options=('!libtool') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") -#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") -md5sums=('1364679ffdbc6b0c16eadf6dee0e2676') +source=("ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") +#source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") +md5sums=('bee8d6ad91e888bab8fdd177063ca084') build() { - cd ${srcdir}/${pkgname}-opensource-${pkgver} + cd ${srcdir}/${pkgbase}-opensource-${pkgver} ./autogen.sh - ./configure --prefix=/usr \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-rendezvous \ - --disable-hslookup \ - --disable-all-vads + ./configure --with-layout=debian \ + --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \ + --with-readline make } -package() { +package_virtuoso-base() { + pkgdesc='A scalable cross-platform server of virtuoso (very minimal installation)' + depends=('libldap') + # install server - cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/virtuoso + cd ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/virtuoso make DESTDIR=${pkgdir} install # install driver - cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver + cd ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/driver make DESTDIR=${pkgdir} install - # Install some useful tools; rename to avoid conflicts + # Install some useful tools; rename to avoid conflicts with unixodbc for bin in isql isqlw; do - install -Dm755 ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/tests/$bin \ + install -Dm755 ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/tests/$bin \ ${pkgdir}/usr/bin/$bin-vt done } + +package_virtuoso() { + pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' + depends=('virtuoso-base' 'libxml2') + + cd ${srcdir}/${pkgbase}-opensource-${pkgver} + make DESTDIR=${pkgdir} install + + # remove conflicts with virtuoso-base + rm "${pkgdir}"/usr/bin/isql{,w-vt} + rm "${pkgdir}"/usr/bin/virtuoso-t + rm "${pkgdir}"/usr/lib/libvirtuoso-t.a + rm "${pkgdir}"/usr/lib/virtodbc.{a,so} + rm "${pkgdir}"/usr/lib/virtodbc_r.{a,so} + rm "${pkgdir}"/usr/lib/virtodbcu.{a,so} + rm "${pkgdir}"/usr/lib/virtodbcu_r.{a,so} +} diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 6d183f372..ffd8e3e12 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163162 2012-07-08 09:32:43Z ibiru $ +# $Id: PKGBUILD 163786 2012-07-20 05:22:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.2 -pkgrel=2 +pkgver=2.0.3 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -55,7 +55,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('93e729cc970a4535b3213dbef0e69528') +md5sums=('a7e79565e3df07dcf9abc6cad3ac26bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -75,6 +75,7 @@ build() { --enable-xosd \ --enable-aa \ --enable-vcdx \ + --enable-upnp \ $extraconf make } diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD index 2914e15fc..e7f967a5e 100644 --- a/extra/xf86-video-apm/PKGBUILD +++ b/extra/xf86-video-apm/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 158880 2012-05-12 17:20:17Z andyrtr $ +# $Id: PKGBUILD 163635 2012-07-17 16:04:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-apm -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=1 pkgdesc="X.org Alliance ProMotion video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d792ba6e8c39e60e00e0790b4e08f551044b2f7c') +sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD index ac5b44dff..9b27ec5a1 100644 --- a/extra/xf86-video-ark/PKGBUILD +++ b/extra/xf86-video-ark/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153321 2012-03-12 20:53:11Z andyrtr $ +# $Id: PKGBUILD 163637 2012-07-17 16:08:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-ark -pkgver=0.7.4 +pkgver=0.7.5 pkgrel=1 pkgdesc="X.org ark video driver" arch=(i686 x86_64) @@ -13,14 +13,11 @@ makedepends=('xorg-server-devel>=1.11.99.902') conflicts=('xorg-server<1.11.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #git-fixes.patch - ) -sha1sums=('d95cb9aa56e7db542b3ac8fed9cb519b11f77556') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr make } diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD index 0a876c8a7..9aff71d79 100644 --- a/extra/xf86-video-ast/PKGBUILD +++ b/extra/xf86-video-ast/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162869 2012-07-02 16:09:01Z andyrtr $ +# $Id: PKGBUILD 163639 2012-07-17 16:10:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-ast -pkgver=0.96.0 +pkgver=0.97.0 pkgrel=1 pkgdesc="X.org ASPEED AST Graphics video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('73ac2bc3999add5a77c9d5d38d3651d5e50ab7bbac81d710912ab3125fc1ab3c') +sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD index aea1d769a..90b34de81 100644 --- a/extra/xf86-video-chips/PKGBUILD +++ b/extra/xf86-video-chips/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153327 2012-03-12 20:53:18Z andyrtr $ +# $Id: PKGBUILD 163841 2012-07-21 10:59:26Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-chips -pkgver=1.2.4 -pkgrel=4 +pkgver=1.2.5 +pkgrel=1 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,14 +14,13 @@ makedepends=('xorg-server-devel>=1.11.99.902') conflicts=('xorg-server<1.11.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - chips-1.2.4-git.patch) -sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4' - 'b13ff000e3f6f06c1a7fd55e9e0ad6078f1b4e5b') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h) +sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' + 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/chips-1.2.4-git.patch + cp ${srcdir}/iopl.h util/ ./configure --prefix=/usr make } diff --git a/extra/xf86-video-chips/iopl.h b/extra/xf86-video-chips/iopl.h new file mode 100644 index 000000000..e08207c7f --- /dev/null +++ b/extra/xf86-video-chips/iopl.h @@ -0,0 +1,60 @@ +#ifdef __NetBSD__ +# include <sys/types.h> +# include <machine/pio.h> +# include <machine/sysarch.h> +#else +# if defined(__linux__) +/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc + * # include <sys/io.h> + */ +int iopl(int level); +# endif +# if defined(SVR4) && defined(i386) +# include <sys/types.h> +# ifdef NCR + /* broken NCR <sys/sysi86.h> */ +# define __STDC +# include <sys/sysi86.h> +# undef __STDC +# else +# include <sys/sysi86.h> +# endif +# ifdef SVR4 +# if !defined(sun) +# include <sys/seg.h> +# endif +# endif +# include <sys/v86.h> +# if defined(sun) +# include <sys/psw.h> +# endif +# endif +# include "AsmMacros.h" +#endif /* NetBSD */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> + +#ifdef __NetBSD__ +# define SET_IOPL() i386_iopl(3) +# define RESET_IOPL() i386_iopl(0) +#else +# if defined(SVR4) && defined(i386) +# ifndef SI86IOPL +# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +# else +# define SET_IOPL() sysi86(SI86IOPL,3) +# define RESET_IOPL() sysi86(SI86IOPL,0) +# endif +# else +# ifdef linux +# define SET_IOPL() iopl(3) +# define RESET_IOPL() iopl(0) +# else +# define SET_IOPL() (void)0 +# define RESET_IOPL() (void)0 +# endif +# endif +#endif diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD index af708a937..1e4bbb070 100644 --- a/extra/xf86-video-cirrus/PKGBUILD +++ b/extra/xf86-video-cirrus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162871 2012-07-02 16:11:19Z andyrtr $ +# $Id: PKGBUILD 163641 2012-07-17 16:18:49Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-cirrus -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="X.org Cirrus Logic video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e506a97cce667d71971e8fcc163285b791ca508365593f3dc1e191f3411fdfed') +sha256sums=('a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD index 6309efe4b..92b35be2f 100644 --- a/extra/xf86-video-dummy/PKGBUILD +++ b/extra/xf86-video-dummy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153331 2012-03-12 20:53:23Z andyrtr $ +# $Id: PKGBUILD 163836 2012-07-21 10:34:04Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-dummy -pkgver=0.3.5 +pkgver=0.3.6 pkgrel=1 pkgdesc="X.org dummy video driver" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('41cfcaec986ab13e931d260953c5a3f626fd1d2b') +sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD index 1bb95b86e..bbb6ba655 100644 --- a/extra/xf86-video-glint/PKGBUILD +++ b/extra/xf86-video-glint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153336 2012-03-12 20:53:29Z andyrtr $ +# $Id: PKGBUILD 163643 2012-07-17 16:20:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-glint -pkgver=1.2.7 +pkgver=1.2.8 pkgrel=1 pkgdesc="X.org GLINT/Permedia video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359') +sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD index cd82d6686..4028be160 100644 --- a/extra/xf86-video-i128/PKGBUILD +++ b/extra/xf86-video-i128/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154219 2012-03-24 10:32:19Z jgc $ +# $Id: PKGBUILD 163645 2012-07-17 16:23:32Z andyrtr $ # Maintainer:Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-i128 -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=1 pkgdesc="X.org Number 9 I128 video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3eedeb1e575e96b2ebebdf894c515e8543900aa3f9f85d10120b8240264333ea') +sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD index 6e796ce50..6fd616360 100644 --- a/extra/xf86-video-i740/PKGBUILD +++ b/extra/xf86-video-i740/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 158884 2012-05-12 17:37:01Z andyrtr $ +# $Id: PKGBUILD 163647 2012-07-17 16:25:27Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-i740 -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="X.org Intel i740 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('885660aad0d558ae0fb69f3b639c03f084a7a615') +sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index f83c7c6ba..d15b41d82 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,57 +1,35 @@ -# $Id: PKGBUILD 162867 2012-07-02 14:58:51Z andyrtr $ +# $Id: PKGBUILD 163776 2012-07-19 20:25:09Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgbase=xf86-video-intel -pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna') -pkgver=2.19.0 -pkgrel=6 +pkgname=xf86-video-intel +pkgver=2.20.0 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') +install=$pkgname.install +pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools') makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') +replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna') +provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna') +conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') +source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - mkdir build-{UXA,SNA} - - pushd build-UXA - ../configure --prefix=/usr --enable-dri --enable-uxa - make - popd - - pushd build-SNA - ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-dri make - popd } -package_xf86-video-intel-uxa() { - - pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration" - provides=('xf86-video-intel') - replaces=('xf86-video-intel') - conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -C build-UXA - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_xf86-video-intel-sna() { - - pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration" - provides=('xf86-video-intel') - conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -C build-SNA +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install new file mode 100644 index 000000000..e3ddb5522 --- /dev/null +++ b/extra/xf86-video-intel/xf86-video-intel.install @@ -0,0 +1,8 @@ +post_install() { + echo ">>> This driver now allows to switch" + echo ">>> between several acceleration methods." + echo ">>> Add to the device section in /etc/X11/xorg.conf" + echo ">>> Option \"AccelMethod\" \"sna\"" + echo ">>> use uxa/xaa method if you run into trouble with sna." +} + diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD index b2ac34779..474eab5de 100644 --- a/extra/xf86-video-mach64/PKGBUILD +++ b/extra/xf86-video-mach64/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162875 2012-07-02 16:16:24Z andyrtr $ +# $Id: PKGBUILD 163649 2012-07-17 16:29:33Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mach64 -pkgver=6.9.2 +pkgver=6.9.3 pkgrel=1 pkgdesc="X.org mach64 video driver" arch=(i686 x86_64) @@ -13,9 +13,9 @@ makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') optdepends=('mach64-dri: DRI1 support from community repo') conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') -options=('!libtool') +options=('!libtool' '!emptydirs') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e3967d6ee953cd907c6a9e38b132b90db8173565198f6a65fe1e8c398dc06293') +sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD index 7207a02a6..865b31771 100644 --- a/extra/xf86-video-mga/PKGBUILD +++ b/extra/xf86-video-mga/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162877 2012-07-02 16:18:31Z andyrtr $ +# $Id: PKGBUILD 163651 2012-07-17 16:31:39Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mga -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="X.org mga video driver" arch=(i686 x86_64) @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f0894fd8ddb1984d9212880544b7a7c30294e374df52bcce0c2acc93d434ce15') +sha256sums=('6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD index b04b376ca..ca20ef851 100644 --- a/extra/xf86-video-neomagic/PKGBUILD +++ b/extra/xf86-video-neomagic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154213 2012-03-24 10:25:08Z jgc $ +# $Id: PKGBUILD 163653 2012-07-17 16:33:32Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-neomagic -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc="X.org neomagic video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b19ed2a33e8d9a3e2bfc1ae3e8ff49031b7d34dec786e4a5e060e68e48649888') +sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD index 574579714..54c15d0e0 100644 --- a/extra/xf86-video-nv/PKGBUILD +++ b/extra/xf86-video-nv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155841 2012-04-07 14:46:07Z andyrtr $ +# $Id: PKGBUILD 163675 2012-07-17 16:58:02Z andyrtr $ # Maintainer:Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-nv -pkgver=2.1.18 -pkgrel=6 +pkgver=2.1.20 +pkgrel=1 pkgdesc="X.org nv video driver" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') @@ -13,14 +13,11 @@ makedepends=('xorg-server-devel>=1.11.99.903') conflicts=('xorg-server<1.11.99.903') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git_fixes.patch) -sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2' - '07469140e20751a7366017b116a8c4d7d39eaac0') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index acde9d1b2..e9b5ecbfe 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162879 2012-07-02 16:20:25Z andyrtr $ +# $Id: PKGBUILD 163655 2012-07-17 16:35:34Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 -pkgver=6.8.3 +pkgver=6.8.4 pkgrel=1 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('855e8cf72c3a7704e12f331fe8a4b354518753c6ff3aa61ed156cf6e7530f02b') +sha256sums=('6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD index 31239166c..e7eed6c01 100644 --- a/extra/xf86-video-s3virge/PKGBUILD +++ b/extra/xf86-video-s3virge/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158928 2012-05-13 11:52:51Z andyrtr $ +# $Id: PKGBUILD 163657 2012-07-17 16:37:24Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-s3virge -pkgver=1.10.5 +pkgver=1.10.6 pkgrel=1 pkgdesc="X.org S3 Virge video driver" arch=(i686 x86_64) @@ -15,14 +15,11 @@ conflicts=('xorg-server<1.12.0') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) - #git-fixes.patch) -sha1sums=('ca8aa877ae118b017d5b06951bc1c3b7690ba709') +sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" - #autoreconf -fi ./configure --prefix=/usr make } diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index 588cc3213..8d4c50c33 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162881 2012-07-02 16:22:29Z andyrtr $ +# $Id: PKGBUILD 163659 2012-07-17 16:39:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-savage -pkgver=2.3.5 +pkgver=2.3.6 pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64) @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4b5b52aad9413a9d8717ff0aa3290d110dd5cdb5c93eebda4a5fff1c5ccf63e4') +sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD index f4c075244..d13de83fa 100644 --- a/extra/xf86-video-siliconmotion/PKGBUILD +++ b/extra/xf86-video-siliconmotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154206 2012-03-24 10:14:17Z jgc $ +# $Id: PKGBUILD 163661 2012-07-17 16:43:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-siliconmotion -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="X.org siliconmotion video driver" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 98_sm712_CRT_enable.diff) -sha256sums=('a59f1bd21499351b3703c4b77ec007d1299ccb888434d19fabbbeee0a7a14d07' +sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa' 'd24016e40ee07a0cc1bedc1b9d3832c692b8a78453ac5a84bafab6ace4ff5da3') build() { diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD index 26d4bb96d..c7bf84e1f 100644 --- a/extra/xf86-video-sis/PKGBUILD +++ b/extra/xf86-video-sis/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162832 2012-07-01 07:57:45Z andyrtr $ +# $Id: PKGBUILD 163663 2012-07-17 16:45:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sis -pkgver=0.10.4 -pkgrel=2 +pkgver=0.10.7 +pkgrel=1 pkgdesc="X.org SiS video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4e841080ea524f37d887ef4ee50df5b9f7f5b417abddc9eb8ddad19128c0b10d') +sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD index 2bc90e5d3..436edc120 100644 --- a/extra/xf86-video-sisusb/PKGBUILD +++ b/extra/xf86-video-sisusb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162883 2012-07-02 16:26:42Z andyrtr $ +# $Id: PKGBUILD 163665 2012-07-17 16:47:27Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisusb -pkgver=0.9.5 +pkgver=0.9.6 pkgrel=1 pkgdesc="X.org SiS USB video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6508f0edcbbca978f97665953135fb564e988fed437a7c56611f8355bb4daa6b') +sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD index 2e7c5c008..39b4bc555 100644 --- a/extra/xf86-video-tdfx/PKGBUILD +++ b/extra/xf86-video-tdfx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162838 2012-07-01 08:07:37Z andyrtr $ +# $Id: PKGBUILD 163667 2012-07-17 16:49:31Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-tdfx -pkgver=1.4.4 -pkgrel=2 +pkgver=1.4.5 +pkgrel=1 pkgdesc="X.org tdfx video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e0b931dea0fb1ebfaa628a3dc07bf6945b377d3f7bbfd3a43ca4c80c46d48f88') +sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD index 0092f0b85..001edd620 100644 --- a/extra/xf86-video-trident/PKGBUILD +++ b/extra/xf86-video-trident/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154198 2012-03-24 10:03:48Z jgc $ +# $Id: PKGBUILD 163669 2012-07-17 16:51:34Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-trident -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=1 pkgdesc="X.org Trident video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=(!libtool) source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b') +sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD index cab1cfcda..7c482520f 100644 --- a/extra/xf86-video-tseng/PKGBUILD +++ b/extra/xf86-video-tseng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153376 2012-03-12 20:54:48Z andyrtr $ +# $Id: PKGBUILD 163671 2012-07-17 16:53:38Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-tseng -pkgver=1.2.4 -pkgrel=6 +pkgver=1.2.5 +pkgrel=1 pkgdesc="X.org tseng video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,14 +13,11 @@ makedepends=('xorg-server-devel>=1.11.99.903') conflicts=('xorg-server<1.11.99.903') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - tseng-1.2.4-git.patch) -sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7' - 'd84bb75d62888096da7477b38e8b13f9c23d4e3a') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/tseng-1.2.4-git.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD index b3d59bf09..565aeab9f 100644 --- a/extra/xf86-video-vesa/PKGBUILD +++ b/extra/xf86-video-vesa/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154126 2012-03-23 17:04:49Z andyrtr $ +# $Id: PKGBUILD 163838 2012-07-21 10:36:33Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vesa -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="X.org vesa video driver" arch=(i686 x86_64) @@ -15,8 +15,8 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 revert-kernelcheck.patch) -sha1sums=('acb4f8104f16476d46ceb366aa932783c3644ead' - 'c14454521ac91aaa08aad8a6025d7720a613d54b') +sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3' + 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD index 61689bd1c..581cf0b90 100644 --- a/extra/xf86-video-voodoo/PKGBUILD +++ b/extra/xf86-video-voodoo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153386 2012-03-12 20:55:23Z andyrtr $ +# $Id: PKGBUILD 163673 2012-07-17 16:55:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-voodoo -pkgver=1.2.4 -pkgrel=6 +pkgver=1.2.5 +pkgrel=1 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48') +sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD index 11ec600f6..873f7311b 100644 --- a/extra/xfwm4/PKGBUILD +++ b/extra/xfwm4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157909 2012-04-30 04:21:48Z foutrelis $ +# $Id: PKGBUILD 163772 2012-07-19 16:30:24Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfwm4 pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Xfce window manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -14,12 +14,17 @@ depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch) +sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c' + 'f088a56cc05d1856af8d68dae9e40bc53b724d9dde4d8c2b78a88922c0ee6d1d') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix https://bugzilla.xfce.org/show_bug.cgi?id=8949 (FS#29970) + patch -Np1 -i "$srcdir/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch new file mode 100644 index 000000000..f01b554ce --- /dev/null +++ b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch @@ -0,0 +1,84 @@ +From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <fourdan@xfce.org> +Date: Wed, 18 Jul 2012 20:12:07 +0000 +Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949) + +as gtk+-3.4 now uses it. +--- +diff --git a/src/display.h b/src/display.h +index 1ad2ef8..8797237 100644 +--- a/src/display.h ++++ b/src/display.h +@@ -163,7 +163,8 @@ enum + NET_WM_MOVERESIZE_SIZE_LEFT, + NET_WM_MOVERESIZE_MOVE, + NET_WM_MOVERESIZE_SIZE_KEYBOARD, +- NET_WM_MOVERESIZE_MOVE_KEYBOARD ++ NET_WM_MOVERESIZE_MOVE_KEYBOARD, ++ NET_WM_MOVERESIZE_CANCEL + }; + + enum +diff --git a/src/moveresize.c b/src/moveresize.c +index 9893c30..a98bdf7 100644 +--- a/src/moveresize.c ++++ b/src/moveresize.c +@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data) + eventFilterStatus status = EVENT_FILTER_STOP; + MoveResizeData *passdata = (MoveResizeData *) data; + Client *c = NULL; +- gboolean moving = TRUE; ++ gboolean moving; + XWindowChanges wc; + int prev_x, prev_y; + +@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data) + display_info = screen_info->display_info; + configure_flags = NO_CFG_FLAG; + ++ /* ++ * Clients may choose to end the move operation, ++ * we use XFWM_FLAG_MOVING_RESIZING for that. ++ */ ++ moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING); ++ + /* Update the display time */ + myDisplayUpdateCurrentTime (display_info, xevent); + +@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data) + screen_info = c->screen_info; + display_info = screen_info->display_info; + status = EVENT_FILTER_STOP; +- resizing = TRUE; ++ ++ /* ++ * Clients may choose to end the resize operation, ++ * we use XFWM_FLAG_MOVING_RESIZING for that. ++ */ ++ resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING); + + frame_x = frameX (c); + frame_y = frameY (c); +diff --git a/src/netwm.c b/src/netwm.c +index 545e64a..1352f08 100644 +--- a/src/netwm.c ++++ b/src/netwm.c +@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev) + resize = TRUE; /* Resize */ + break; + case NET_WM_MOVERESIZE_MOVE: +- default: + event->type = ButtonPress; + resize = FALSE; /* Move */ + break; ++ case NET_WM_MOVERESIZE_CANCEL: ++ FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING); ++ /* Walk through */ ++ default: /* Do nothing */ ++ return; ++ break; + } + + if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)) +-- +cgit v0.9.0.3 diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index 9b78d3e26..378041b5f 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 153982 2012-03-21 07:47:25Z eric $ +# $Id: PKGBUILD 163788 2012-07-20 05:26:57Z eric $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=zile -pkgver=2.4.7 +pkgver=2.4.8 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/zile/" -license=('GPL') +license=('GPL3') depends=('acl' 'gc' 'ncurses') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('30c47a399b94b5dce68a178fe98807f86719a466' - 'e22de32794e34eb9e1409d1eecc7aa18b710cf5d') +sha1sums=('763224367472deecf71fb10d61806706a481fd48' + '3a3e0c039e12af62f0de1aae849c486606cd314a') build() { cd "${srcdir}"/${pkgname}-${pkgver} |