diff options
Diffstat (limited to 'extra')
35 files changed, 394 insertions, 172 deletions
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 6cbe89360..675e52389 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 155885 2012-04-08 22:21:02Z bisson $ +# $Id: PKGBUILD 163519 2012-07-14 13:10:00Z allan $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=bitlbee pkgver=3.0.5 -pkgrel=3 +pkgrel=4 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -21,25 +22,28 @@ optdepends=('skype4py: to use skyped' source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'sbindir.patch' 'xinetd' - 'rc.d') + 'rc.d' + 'bitlbee.tmpfiles') sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6' '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - 'be09d29af3853825778331df451f16ca9e452d03') - -backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee') -install=install + '02423c500ac64f673ba26a3395c7c7036c17343e' + '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') +backup=('etc/bitlbee/bitlbee.conf' + 'etc/bitlbee/motd.txt' + 'etc/xinetd.d/bitlbee') +install=bitlbee.install build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" patch -p1 -i ../sbindir.patch ./configure \ --prefix=/usr \ --etcdir=/etc/bitlbee \ - --pidfile=/var/run/bitlbee/bitlbee.pid \ - --ipcsocket=/var/run/bitlbee/bitlbee.sock \ + --pidfile=/run/bitlbee/bitlbee.pid \ + --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ --ssl=openssl \ --strip=0 \ @@ -49,13 +53,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - 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 + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev} - make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}" install-etc - make DESTDIR="${pkgdir}" install-dev + 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/bitlbee.install b/extra/bitlbee/bitlbee.install new file mode 100644 index 000000000..aa5a81a70 --- /dev/null +++ b/extra/bitlbee/bitlbee.install @@ -0,0 +1,15 @@ +post_install() { + getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null + getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null + systemd-tmpfiles --create bitlbee.conf +} + +post_upgrade() { + post_install +} + +post_remove() { + getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null + getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null + true +} diff --git a/extra/bitlbee/bitlbee.tmpfiles b/extra/bitlbee/bitlbee.tmpfiles new file mode 100644 index 000000000..da72a0a79 --- /dev/null +++ b/extra/bitlbee/bitlbee.tmpfiles @@ -0,0 +1 @@ +d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d index bd9248173..ade85221a 100644 --- a/extra/bitlbee/rc.d +++ b/extra/bitlbee/rc.d @@ -3,38 +3,47 @@ . /etc/rc.conf . /etc/rc.d/functions -name=bitlbee -PID=$(pidof -o %PPID /usr/sbin/bitlbee) -install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee +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 $name daemon" - [[ -z "$PID" ]] && { - rm -f /var/run/bitlbee/bitlbee.pid - su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee - } && { - add_daemon $name - stat_done - } || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && { - kill $PID &>/dev/null - } && { - rm -f /var/run/bitlbee/bitlbee.pid - rm_daemon $name - stat_done - } || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 3 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; +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/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 45bb6f432..dc7d127d2 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 162028 2012-06-19 01:01:27Z dan $ +# $Id: PKGBUILD 163499 2012-07-13 14:44:33Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.1.1 +pkgver=1.8.1.2 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('a08c43c5675f79e0787e700c2d39ee33') -sha1sums=('51184af9f27d6572826581de0da5b6b044e34d94') +md5sums=('9c62259c34d51d839dafd1f0d5d85f17') +sha1sums=('a11e65a597019510051290d2af0e6f379838b9c5') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 317253296..47f7b8241 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162371 2012-06-26 03:37:25Z dan $ +# $Id: PKGBUILD 163497 2012-07-13 14:43:17Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.11.1 +pkgver=1.7.11.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -100,7 +100,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('d09664978931d215e43241689eb09371b509c7ce' - 'e2defbf75ff15d7684d70457e41bc45fb22f0e1f' +sha1sums=('f67b4f6c0277250411c6872ae7b8a872ae11d313' + '78b46ca7b5037c61a58086879869dadeac9eea3e' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD index 7ab1f49f7..331982b14 100644 --- a/extra/gnome-screensaver/PKGBUILD +++ b/extra/gnome-screensaver/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162983 2012-07-04 16:51:30Z ibiru $ +# $Id: PKGBUILD 163480 2012-07-12 19:58:42Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver -pkgver=3.4.2 +pkgver=3.4.3 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=('17e6585e27019200dd059f9f9495427b64aded8efa51c71018fe66f9ba45df6d' +sha256sums=('76bea2526c6065e5d182e23fda8e75eb2e0afe9d1d40301b019a3cfc39d95a3e' 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') build() { diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index f821eec42..afa6e4e8b 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155954 2012-04-09 22:55:13Z giovanni $ +# $Id: PKGBUILD 163532 2012-07-14 18:17:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted -pkgver=0.12.1 +pkgver=0.13.0 pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') -md5sums=('8e07e7d8cf3add3d1facc68993122cf0' +md5sums=('6977d89ade1c81ccb8310dae0a0d3509' '27c264cfad8fa413d75954dda7a2dd50') build() { diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD index 036a60751..3160ca11b 100644 --- a/extra/hyphen/PKGBUILD +++ b/extra/hyphen/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 162738 2012-06-29 10:59:41Z andyrtr $ +# $Id: PKGBUILD 163474 2012-07-12 19:03:03Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase=hyphen pkgname=('hyphen' 'hyphen-en') -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://hunspell.sf.net" license=('GPL' 'LGPL' 'MPL') -groups=() makedepends=('glibc' 'perl') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz) -md5sums=('a2f6010987e1c601274ab5d63b72c944') +md5sums=('15cf1c2e54869fefcdc4b8f9cca68633') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 1dade1377..351d6bac9 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161113 2012-06-08 06:35:06Z andrea $ +# $Id: PKGBUILD 163530 2012-07-14 17:18:19Z dreisner $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.8.4 -pkgrel=1 +pkgrel=3 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -28,13 +28,14 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kscreensaver') options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') sha1sums=('a732ceacf34dfb79c8ab243f17cd5a70b9183212' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514') @@ -65,13 +66,17 @@ package() { cd "${srcdir}"/build make DESTDIR="${pkgdir}" install - install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver + install -d -m755 "${pkgdir}"/usr/share/xsessions/ - ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \ + "${pkgdir}"/usr/share/xsessions/ install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm + install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm + install -Dm644 "${srcdir}"/kdm.service \ + "${pkgdir}"/usr/lib/systemd/system/kdm.service } diff --git a/extra/kdebase-workspace/kdm.service b/extra/kdebase-workspace/kdm.service new file mode 100644 index 000000000..c57aba920 --- /dev/null +++ b/extra/kdebase-workspace/kdm.service @@ -0,0 +1,9 @@ +[Unit] +Description=K Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/bin/kdm -nodaemon + +[Install] +Alias=display-manager.service diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index b8deb8e84..00ecec7de 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163171 2012-07-08 10:16:42Z giovanni $ +# $Id: PKGBUILD 163534 2012-07-14 19:08:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.07.06 +pkgver=2012.07.14 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=('7b483136bf58203b4371178da1e530a7') +md5sums=('9496fd1cf093be9a95f47ef0184bef03') build() { cd ${srcdir}/live diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 4670d4f7a..4073d4cc6 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161903 2012-06-16 12:11:28Z ibiru $ +# $Id: PKGBUILD 163468 2012-07-12 16:40:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -14,9 +14,9 @@ if [ "${_git}" = "true" ]; then pkgver=7.10.99.git20110709 #pkgver=7.11 else - pkgver=8.0.3 + pkgver=8.0.4 fi -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev>=183') @@ -36,10 +36,6 @@ if [ "${_git}" = "true" ]; then ) fi source+=(mesa-loongson.patch) -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171' - '598c24dccfcdcc99c07d883f7c09f36a') build() { cd ${srcdir}/?esa-* diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index be3ef6888..b7b774084 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140462 2011-10-15 08:19:09Z andyrtr $ +# $Id: PKGBUILD 163476 2012-07-12 19:05:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.4 -pkgrel=1.1 +pkgver=2.5 +pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64' 'mips64el') url="http://www.lysator.liu.se/~nisse/nettle/" @@ -12,7 +12,7 @@ license=('GPL2') install=$pkgname.install depends=('gmp') source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=(''450be8c4886d46c09f49f568ad6fa013'') +md5sums=('d66882e6ad31a9f651b73d7a1a93bd4c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD index e4066e945..ad1daa62a 100644 --- a/extra/nouveau-dri/PKGBUILD +++ b/extra/nouveau-dri/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161906 2012-06-16 12:11:45Z ibiru $ +# $Id: PKGBUILD 163472 2012-07-12 17:49:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=nouveau-dri -pkgver=8.0.3 -pkgrel=3 +pkgver=8.0.4 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') @@ -16,7 +16,7 @@ source=(LICENSE ) md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171') + 'd546f988adfdf986cff45b1efa2d8a46') build() { cd ${srcdir}/?esa-* diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index 39171d05d..672ef1fb2 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160521 2012-06-02 10:27:22Z bluewind $ +# $Id: PKGBUILD 163571 2012-07-16 03:09:15Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Matt Thompson <mattt@defunct.ca> pkgname=perl-dbi _realname=DBI -pkgver=1.618 -pkgrel=2 +pkgver=1.622 +pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') @@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('5ad29b56f7457f22bd1ca1c871b30719') +md5sums=('9836bcf1b9acc842089aa10b16736909') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index aca3d6fb5..83b0f382a 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 160547 2012-06-02 10:28:06Z bluewind $ +# $Id: PKGBUILD 163577 2012-07-16 03:34:25Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-netaddr-ip _realname=NetAddr-IP -pkgver=4.058 -pkgrel=2 +pkgver=4.062 +pkgrel=1 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64 'mips64el') license=('PerlArtistic' 'GPL') @@ -14,7 +14,7 @@ depends=('perl') options=('!emptydirs') url="http://search.cpan.org/dist/${_realname}/" source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) -md5sums=('8829958dd84a8b36e3cd10347564739d') +md5sums=('01503542903fe09fe078130f3b1bb3af') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD index 9ac29a82c..4fed16b65 100644 --- a/extra/phonon-gstreamer/PKGBUILD +++ b/extra/phonon-gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 150265 2012-02-16 07:51:52Z andrea $ +# $Id: PKGBUILD 163506 2012-07-14 10:11:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-gstreamer -pkgver=4.6.0 +pkgver=4.6.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://phonon.kde.org/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'phonon' 'mesa') provides=('phonon-backend') install="${pkgname}.install" source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz") -md5sums=('cc380c7612aaaa87294185ded702f88a') +md5sums=('c0c8a1064e32c83dd6976187dcc491a3') build() { cd "${srcdir}" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 925d1e498..ba254f514 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162358 2012-06-25 18:51:22Z foutrelis $ +# $Id: PKGBUILD 163501 2012-07-13 16:26:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.1 +pkgver=0.20.2 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('a61e3b844061f5324512a16d6d16984c' +md5sums=('45dd2c16c8c4d1a39e830e45745c4e25' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index b3ef1a2f1..565acfb04 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 161651 2012-06-13 12:26:10Z tpowa $ +# $Id: PKGBUILD 163504 2012-07-13 16:36:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.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') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng') backup=('etc/qemu/target-x86_64.conf') install=qemu.install -source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}-1.tar.bz2 - 65-kvm.rules) +source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 + 65-kvm.rules + qemu-glibc-2.16-build.patch) options=(!strip) build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' x86_64.ld + # patch from fedora git: http://pkgs.fedoraproject.org/gitweb/?p=qemu.git + # fix changes from glibc-2.16 + patch -Np1 -i ../qemu-glibc-2.16-build.patch ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ @@ -42,5 +46,6 @@ package() { done } -md5sums=('f5c85c229b780bc39268845b6f365fc1' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') +md5sums=('f691baa30e8fb40f37f2797fba892e12' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf' + '8687179e77ab954c4a43017d030f7349') diff --git a/extra/qemu/qemu-glibc-2.16-build.patch b/extra/qemu/qemu-glibc-2.16-build.patch new file mode 100644 index 000000000..08948fec6 --- /dev/null +++ b/extra/qemu/qemu-glibc-2.16-build.patch @@ -0,0 +1,70 @@ +From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" <rjones@redhat.com> +Date: Thu, 5 Jul 2012 14:28:03 +0100 +Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'. + +glibc 2.16 will remove the undocumented definition of 'struct siginfo' +from <bits/siginfo.h>. + +This change is already present in glibc 2.15.90, so qemu compilation +of certain targets (eg. cris-user) breaks. + +This struct was always typedef'd to be the same as 'siginfo_t' which +is what POSIX documents, so use that instead. + +Signed-off-by: Richard W.M. Jones <rjones@redhat.com> +--- + linux-user/signal.c | 8 ++++---- + user-exec.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/linux-user/signal.c b/linux-user/signal.c +index 43346dc..108dff9 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, + * Arguments to signal handler: + * + * a0 = signal number +- * a1 = pointer to struct siginfo ++ * a1 = pointer to siginfo_t + * a2 = pointer to struct ucontext + * + * $25 and PC point to the signal handler, $29 points to the +@@ -3255,7 +3255,7 @@ struct target_signal_frame { + }; + + struct rt_signal_frame { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + uint32_t tramp[2]; + }; +@@ -3474,9 +3474,9 @@ struct target_signal_frame { + }; + + struct rt_signal_frame { +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + uint8_t retcode[8]; /* Trampoline code. */ + }; +diff --git a/user-exec.c b/user-exec.c +index b2a4261..1a9c276 100644 +--- a/user-exec.c ++++ b/user-exec.c +@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { +- struct siginfo *info = pinfo; ++ siginfo_t *info = pinfo; + struct ucontext *uc = puc; + unsigned long pc = uc->uc_mcontext.sc_iaoq[0]; + uint32_t insn = *(uint32_t *)pc; +-- +1.7.10.4 + diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 35d7fa342..70b1ef56a 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 160692 2012-06-03 19:17:38Z tpowa $ +# $Id: PKGBUILD 163488 2012-07-13 10:14:32Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Hugo Ideler <hugoideler@dse.nl> pkgname=slim -pkgver=1.3.3 -pkgrel=5 +pkgver=1.3.4 +pkgrel=1 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64' 'mips64el') url='http://slim.berlios.de/' @@ -19,17 +19,15 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'pam.d' 'logrotate' 'slim.service' - 'ptr_pam.patch' 'session-name.patch' - 'fix-numlock-1.3.3.patch') + 'libpng-1.4+-support.patch') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM patch -p1 -i ../session-name.patch # FS#26693: fix default session name - patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling + patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build cd ${srcdir} mkdir build cd build @@ -55,11 +53,10 @@ package() { # install systemd files install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service } -md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8' +md5sums=('51543533e492b41007811f7d880720fa' 'd8ea9c4dee2811524b67f4f666311a1f' 'd33edc74724c6ca00445767ce38fc732' '43da096480bf72c3ccec8ad8400f34f0' - '7c0bf1fb6292537e2c63ec04f8532079' - 'ae4b237d472ec5d373e30080aa0ff804' + 'a5d6bde9e63899df7d2081e1585bbe54' 'ebcb6829028615686de7b64ceeaaf8ed' - '6c29c93370e44ed310ff30132424b619') + '6d19bd7a91592ed2bb902b22b9594565') diff --git a/extra/slim/libpng-1.4+-support.patch b/extra/slim/libpng-1.4+-support.patch new file mode 100644 index 000000000..57b39272b --- /dev/null +++ b/extra/slim/libpng-1.4+-support.patch @@ -0,0 +1,14 @@ +--- a/image.cpp 2012-06-26 04:20:14.000000000 -0400 ++++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400 +@@ -781,7 +781,11 @@ + (png_infopp) NULL); + } + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png_ptr)))) { ++#else + if (setjmp(png_ptr->jmpbuf)) { ++#endif + goto png_destroy; + } + diff --git a/extra/slim/slim.service b/extra/slim/slim.service index 18d8c99be..b894085a0 100644 --- a/extra/slim/slim.service +++ b/extra/slim/slim.service @@ -6,4 +6,4 @@ After=systemd-user-sessions.service ExecStart=/usr/bin/slim -nodaemon [Install] -WantedBy=graphical.target +Alias=display-manager.service diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 41c4f6391..f997734ef 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 162164 2012-06-22 12:59:46Z dreisner $ +# $Id: PKGBUILD 163539 2012-07-15 05:04:36Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> # Contributor: Ralf Barth <archlinux.org@haggy.org> pkgname=smartmontools -pkgver=5.42 -pkgrel=4 +pkgver=5.43 +pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') @@ -17,7 +17,7 @@ backup=('etc/smartd.conf' source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'smartd.conf' 'smartd.rc') -md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a' +md5sums=('a1cb2c3d8cc2de377037fe9e7cef40a9' '28c1b80c41dac52d433961dcfb4f70e0' 'fb30e07f87f2c1d99532e018291ad3e8') diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD index fe150edb8..e17f9eb91 100644 --- a/extra/stardict/PKGBUILD +++ b/extra/stardict/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 131980 2011-07-18 15:27:26Z bisson $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 163464 2012-07-12 12:42:33Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Neil Lin <neil@vip.url.com.tw> pkgname=stardict pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='International dictionary software' arch=('i686' 'x86_64' 'mips64el') url='http://www.stardict.org/' license=('GPL') depends=('enchant' 'gtk2' 'libsigc++' 'libsm') -makedepends=('intltool' 'popt' 'gnome-doc-utils' 'libmysqlclient') +makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient') options=('!libtool' '!emptydirs') source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2" - 'NetDictRequests.patch' - 'gcc46.patch') + 'crash-empty-dict.patch' + 'gcc46.patch' + 'glib2.patch' + 'zlib.patch') sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f' '97af8fdb73c8f04674234b629c6867254e9bd043' - '6605a9cdfc4abc2a0ab4462d1228233d34806f0a') + '6605a9cdfc4abc2a0ab4462d1228233d34806f0a' + '467880bca5e89aa25cb4a57a9e1caba9a8841822' + '024ac5eb75a11c96569e31021a4bd65463b3cf5b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # ugly hack to avoid crashing with empty dictionaries - patch -p1 -i ../NetDictRequests.patch + patch -p1 -i ../crash-empty-dict.patch patch -p1 -i ../gcc46.patch - automake + patch -p1 -i ../glib2.patch + patch -p1 -i ../zlib.patch + ./autogen.sh # gnome-autogen.sh requires gnome-common ./configure \ PKG_CONFIG=/usr/bin/pkg-config \ diff --git a/extra/stardict/crash-empty-dict.patch b/extra/stardict/crash-empty-dict.patch new file mode 100644 index 000000000..4d6fe145a --- /dev/null +++ b/extra/stardict/crash-empty-dict.patch @@ -0,0 +1,12 @@ +diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp +--- old/dict/src/lib/compositelookup.cpp 2011-07-02 23:58:40.000000000 -0700 ++++ new/dict/src/lib/compositelookup.cpp 2011-07-18 07:40:01.795710505 -0700 +@@ -50,7 +50,7 @@ + void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) + { + NetDictRequest request(dict_id, key); +- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); ++ std::find(NetDictRequests.begin(), NetDictRequests.end(), request); + NetDictRequests.push_back(request); + } + diff --git a/extra/stardict/glib2.patch b/extra/stardict/glib2.patch new file mode 100644 index 000000000..6296dab0d --- /dev/null +++ b/extra/stardict/glib2.patch @@ -0,0 +1,36 @@ +diff -Naur old/dict/configure.ac new/dict/configure.ac +--- old/dict/configure.ac 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/configure.ac 2012-07-12 22:31:52.875176842 +1000 +@@ -266,6 +266,9 @@ + fi + AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR) + ++GMODULE2_LIBS=`pkg-config --libs gmodule-2.0` ++AC_SUBST([GMODULE2_LIBS]) ++ + dnl ================================================================ + dnl main program checks. + dnl ================================================================ +diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am +--- old/dict/src/Makefile.am 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/src/Makefile.am 2012-07-12 22:29:53.714870692 +1000 +@@ -33,7 +33,7 @@ + stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE) + stardict_LDFLAGS = + ## place libstardict.la before any system library, otherwise build with --as-needed linker option may fail +-stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) ++stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) $(GMODULE2_LIBS) + + if !GNOME_SUPPORT + if MAEMO_SUPPORT +diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h +--- old/dict/src/tomboykeybinder.h 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/src/tomboykeybinder.h 2012-07-12 22:28:04.337920391 +1000 +@@ -21,7 +21,6 @@ + #ifndef __TOMBOY_KEY_BINDER_H__ + #define __TOMBOY_KEY_BINDER_H__ + +-#include <glib/gtypes.h> + + G_BEGIN_DECLS + diff --git a/extra/stardict/zlib.patch b/extra/stardict/zlib.patch new file mode 100644 index 000000000..eb5a9a12a --- /dev/null +++ b/extra/stardict/zlib.patch @@ -0,0 +1,35 @@ +diff -Naur old/lib/src/libcommon.cpp new/lib/src/libcommon.cpp +--- old/lib/src/libcommon.cpp 2012-07-12 11:33:30.343333334 +0000 ++++ new/lib/src/libcommon.cpp 2012-07-12 11:34:05.006568754 +0000 +@@ -614,7 +614,7 @@ + return EXIT_FAILURE; + } + while(true) { +- len = gzread(get_impl(in), buf, buffer_size); ++ len = gzread((gzFile)get_impl(in), buf, buffer_size); + if(len < 0) { + g_critical(read_file_err, arch_file_name, ""); + return EXIT_FAILURE; +@@ -871,3 +871,8 @@ + return res; + } + } ++ ++int gzclose_compat(void * file) ++{ ++ return gzclose ((gzFile)file); ++} +diff -Naur old/lib/src/libcommon.h new/lib/src/libcommon.h +--- old/lib/src/libcommon.h 2012-07-12 11:33:30.343333334 +0000 ++++ new/lib/src/libcommon.h 2012-07-12 11:34:05.006568754 +0000 +@@ -187,8 +187,9 @@ + typedef ResourceWrapper<FILE, FILE*, int, fclose> File; + } + ++extern int gzclose_compat(void * file); + namespace zip { +-typedef ResourceWrapper<void, void*, int, gzclose> gzFile; ++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile; + } + + /* Create a new temporary file. Return file name in file name encoding. diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 8a6cb114a..b94a42764 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163229 2012-07-11 13:09:39Z andrea $ +# $Id: PKGBUILD 163541 2012-07-15 10:41:34Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ conflicts=('telepathy-qt4') replaces=('telepathy-qt4') provides=('telepathy-qt4') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('e49df0c6d19bbac622209d0f87f0d1b2') +md5sums=('94ac93aedf5f6fff49837bc8368e5a37') build() { cd "$srcdir" @@ -24,7 +24,8 @@ build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_TESTS=OFF make } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 36af94236..fc79496e7 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160931 2012-06-07 03:39:59Z tdziedzic $ +# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=547 -__hgrev=6f2497d0c277 +_patchlevel=600 +__hgrev=11d40fc82f11 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -sha1sums=('2c4f78a66b6ad7a759122d1f66c74079b678f39c' - '999f527d82a4c7818d017e3b8230e27950e87718' +sha1sums=('a1c54bde75476ace5d24d4c17f7a81818e80dfda' + '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 88c4fc79a..b6fdf89b4 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158905 2012-05-12 20:58:34Z andyrtr $ +# $Id: PKGBUILD 163478 2012-07-12 19:09:28Z andyrtr $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.15.0 +pkgver=0.16.0 pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') @@ -17,8 +17,8 @@ conflicts=('xorg-server<1.12.0') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 70-wacom.rules) -sha1sums=('6e8e4fa2ccc2448cae97119c6f2842fe283f9b29' - '7cebb94459f9cf49693e65215f3af59cea5e2b73') +md5sums=('aeee2bd339c825a9b1215df6a2e5e50b' + '10db4f8272286690255c1bcc18bfdd92') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD index b8dcd5168..f8687e4f3 100644 --- a/extra/xfce4-netload-plugin/PKGBUILD +++ b/extra/xfce4-netload-plugin/PKGBUILD @@ -1,33 +1,36 @@ -# $Id: PKGBUILD 157869 2012-04-30 04:20:41Z foutrelis $ -# Maintainer: aurelien <aurelien@archlinux.org> +# $Id: PKGBUILD 163558 2012-07-15 17:45:02Z foutrelis $ +# Maintainer: # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-netload-plugin -pkgver=1.1.0 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="A netload plugin for the Xfce panel" arch=('i686' 'x86_64' 'mips64el') -license=('GPL') url="http://xfce-goodies.berlios.de/" +license=('GPL') groups=('xfce4-goodies') depends=('xfce4-panel') makedepends=('intltool') options=('!libtool') install=xfce4-netload-plugin.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('8029daacf1602275c75ab07d1e2cccea0993caab') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('c824f09e2d3860011b44d8272d661c458237786828027f3d9ad6a1d4f0096845') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-debug + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-debug make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-netload-plugin/xfce4-netload-plugin.install b/extra/xfce4-netload-plugin/xfce4-netload-plugin.install index b7e9ea08e..e4f8fd06c 100644 --- a/extra/xfce4-netload-plugin/xfce4-netload-plugin.install +++ b/extra/xfce4-netload-plugin/xfce4-netload-plugin.install @@ -7,6 +7,7 @@ post_upgrade() { } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } +# vim:set ts=2 sw=2 et: diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD index ef12a75d4..7c8f2ba23 100644 --- a/extra/xorg-xdm/PKGBUILD +++ b/extra/xorg-xdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161610 2012-06-12 11:02:41Z jgc $ +# $Id: PKGBUILD 163529 2012-07-14 17:17:56Z dreisner $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdm pkgver=1.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="X Display Manager" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -46,6 +46,10 @@ build() { --with-xdmscriptdir=/etc/X11/xdm \ --with-pixmapdir=/usr/share/xdm/pixmaps make +} + +package() { + cd "${srcdir}/xdm-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/var/lib/xdm" install -m755 -d "${pkgdir}/etc/pam.d" @@ -54,4 +58,7 @@ build() { install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* + + sed -i 's|^Alias=.*|Alias=display-manager.service|' \ + "$pkgdir/usr/lib/systemd/system/xdm.service" } |