diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-15 21:04:51 -0600 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-15 21:04:51 -0600 |
commit | b3ff1c22a93664f083589a10e30e1f96ca2a15af (patch) | |
tree | 5c693c0c80a9a5f06f7af0a2330f0bae74179698 /extra | |
parent | d562099d4844c7dbd49830bce70524e8eabad0fc (diff) | |
parent | ecec4d4d3ca64d7929f1f63857e82268798e066b (diff) |
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'extra')
119 files changed, 559 insertions, 2990 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 29e066dae..c39f376ab 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 148674 2012-02-05 11:46:28Z ibiru $ +# $Id: PKGBUILD 149910 2012-02-11 17:42:56Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10708 -pkgrel=2 +pkgver=10750 +pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('3c1c2a03b24c9ec7ba6fd675382f26a3') +md5sums=('997ec360385b7c44ca427f67e078835a') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 113a15c07..5b41fe9ff 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149398 2012-02-07 13:58:02Z jgc $ +# $Id: PKGBUILD 149928 2012-02-11 23:28:51Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache pkgver=2.2.22 -pkgrel=2 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') @@ -54,12 +54,12 @@ md5sums=('9fe3093194c8a57f085ff7c3fc43715f' '6382331e9700ed9e8cc78ea51887b537' 'c7e300a287ef7e2e066ac7639536f87e' '3d659d41276ba3bfcb20c231eb254e0c' - 'f74652f3169baaae595026116ef54599') + 'fde5121e32b5aeef5a7eedb5a97009ff') build() { cd "${srcdir}/httpd-${pkgver}" - #patch -p1 -i "${srcdir}/pcre_info.patch" + patch -p1 -i "${srcdir}/pcre_info.patch" patch -Np0 -i "${srcdir}/apachectl-confd.patch" # set default user diff --git a/extra/apache/pcre_info.patch b/extra/apache/pcre_info.patch index f1774db63..906a3159e 100644 --- a/extra/apache/pcre_info.patch +++ b/extra/apache/pcre_info.patch @@ -1,11 +1,22 @@ ---- httpd-2.2.22/server/util_pcre.c 2005-11-11 01:20:05.000000000 +1000 -+++ httpd-2.2.22/server/util_pcre.c 2012-02-06 23:45:37.687946748 +1000 -@@ -137,7 +137,7 @@ +--- httpd-2.2.22/server/util_pcre.c 2005-11-10 16:20:05.000000000 +0100 ++++ httpd-2.2.22/server/util_pcre.c 2012-02-08 11:23:56.273855663 +0100 +@@ -128,6 +128,7 @@ + const char *errorptr; + int erroffset; + int options = 0; ++int nsub; - if (preg->re_pcre == NULL) return AP_REG_INVARG; + if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS; + if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE; +@@ -136,8 +137,9 @@ + preg->re_erroffset = erroffset; + if (preg->re_pcre == NULL) return AP_REG_INVARG; +- -preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); -+preg->re_nsub = pcre_fullinfo((const pcre *)preg->re_pcre, NULL, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &nsub); ++preg->re_nsub = nsub; return 0; } diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD new file mode 100644 index 000000000..b41471824 --- /dev/null +++ b/extra/appmenu-qt/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 149893 2012-02-11 12:05:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=appmenu-qt +pkgver=0.2.4 +pkgrel=4 +pkgdesc="Allows Qt applications to export menus over DBus to a menu applet" +arch=('i686' 'x86_64') +url='https://launchpad.net/appmenu-qt' +license=('GPL') +depends=('libdbusmenu-qt') +makedepends=('cmake') +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") +md5sums=('5266d3e77e424bce19f4bcd8f4ffd4bf') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE="Release" + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index 78753328d..52e386797 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125814 2011-05-30 09:11:42Z jgc $ +# $Id: PKGBUILD 149942 2012-02-11 23:30:26Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr pkgver=1.4.5 -pkgrel=1 +pkgrel=2.1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64' 'mips64el') url="http://apr.apache.org/" @@ -24,5 +24,14 @@ build() { --enable-nonportable-atomics \ --with-devrandom=/dev/urandom make +} + +check() { + cd "${srcdir}/apr-${pkgver}" + make -j1 check +} + +package() { + cd "${srcdir}/apr-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/basket/PKGBUILD b/extra/basket/PKGBUILD index f8f652191..adfb8d063 100644 --- a/extra/basket/PKGBUILD +++ b/extra/basket/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 149623 2012-02-08 20:36:29Z pierre $ +# $Id: PKGBUILD 150150 2012-02-13 15:03:16Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=basket pkgver=1.81 -pkgrel=2 +pkgrel=3 pkgdesc="All-purpose notes taker for KDE." arch=('i686' 'x86_64' 'mips64el') url="http://basket.kde.org/" -depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme') +depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme' 'kdebase-runtime') makedepends=('cmake' 'automoc4') install=$pkgname.install license=('GPL') source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.bz2) -md5sums=('cbb1bc5ca7c2ad1485c433c00a8f65a1') +sha1sums=('209d92048523f341259d79510fa56977690e5dfc') build() { - cd $srcdir/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -27,6 +27,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$startdir/pkg install + cd $srcdir/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/extra/basket/basket.install b/extra/basket/basket.install index 3e1f2f1f5..2308e6e3e 100644 --- a/extra/basket/basket.install +++ b/extra/basket/basket.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index 3a6e3f964..fdcc7fc9e 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,49 +1,47 @@ -# $Id: PKGBUILD 142442 2011-11-09 21:20:39Z guillaume $ +# $Id: PKGBUILD 150160 2012-02-13 19:59:22Z ibiru $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.3 -pkgrel=1 +pkgrel=4 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://mielke.cc/brltty" license=('GPL' 'LGPL') -depends=('libxaw' 'at-spi' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst') -makedepends=('pyrex' 'bluez') +depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex') +makedepends=('bluez') optdepends=('bluez: bluetooth support') backup=(etc/brltty.conf etc/conf.d/brltty.conf) options=('!makeflags' '!emptydirs') -source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz +install=brltty.install +source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz 'brltty' 'brltty.conf') -# 'brltty-4.2-S_ISCHR.patch' md5sums=('5ada573f88df32b6150db3b9a620e20b' '831ebaf0c56091702929c68805d20c4f' 'a8ab8b3dd059e96e1734bc9cdcf844fc') -# '5954b289efaf2ff17676d06de9a88854' build() { - cd "${srcdir}/${pkgname}-${pkgver}" - CFLAGS+="${CFLAGS} -D_GNU_SOURCE" \ + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ + --with-screen-driver=a2 \ --enable-gpm \ --disable-java-bindings \ --disable-caml-bindings \ PYTHON=/usr/bin/python2 -# patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_ROOT="${pkgdir}" install - install -D -m755 ${srcdir}/brltty ${pkgdir}/etc/rc.d/brltty - install -D -m644 ${srcdir}/brltty.conf ${pkgdir}/etc/conf.d/brltty.conf - install -D -m644 Documents/brltty.conf ${pkgdir}/etc/brltty.conf + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install + install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty" + install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf" + install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf" } diff --git a/extra/brltty/brltty-4.2-S_ISCHR.patch b/extra/brltty/brltty-4.2-S_ISCHR.patch deleted file mode 100644 index eddac9616..000000000 --- a/extra/brltty/brltty-4.2-S_ISCHR.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up brltty-4.2/Programs/sys_linux.c.BAD brltty-4.2/Programs/sys_linux.c ---- brltty-4.2/Programs/sys_linux.c.BAD 2010-05-21 09:04:10.003122084 -0400 -+++ brltty-4.2/Programs/sys_linux.c 2010-05-21 09:04:19.376198268 -0400 -@@ -23,6 +23,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <sys/ioctl.h> -+#include <sys/stat.h> - #include <linux/kd.h> - - #ifdef HAVE_LINUX_INPUT_H diff --git a/extra/brltty/brltty.install b/extra/brltty/brltty.install new file mode 100644 index 000000000..952ae58ff --- /dev/null +++ b/extra/brltty/brltty.install @@ -0,0 +1,20 @@ +post_install () { + getent group brlapi &>/dev/null || groupadd -r brlapi + if [ ! -e /etc/brlapi.key ]; then + mcookie >/etc/brlapi.key + chmod 0640 /etc/brlapi.key + chgrp brlapi /etc/brlapi.key + echo "Please add your user to the brlapi group." + fi +} + +post_upgrade () { + post_install +} + +post_remove () { + getent group brlapi >/dev/null 2>&1 && groupdel brlapi + if [ -e /etc/brlapi.key ]; then + rm -f /etc/brlapi.key + fi +} diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index f96f8c71b..fa5098c03 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142242 2011-11-07 05:35:59Z bisson $ +# $Id: PKGBUILD 150215 2012-02-15 03:04:18Z bisson $ # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Partha Chowdhury <kira.laucas@gmail.com> @@ -6,7 +6,7 @@ pkgname=conky pkgver=1.8.2git20111107 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' license=('BSD' 'GPL') @@ -44,5 +44,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim + install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim } diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake index 7f980868f..a4d50d737 100644 --- a/extra/conky/PKGBUILD.cmake +++ b/extra/conky/PKGBUILD.cmake @@ -44,4 +44,6 @@ package() { make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim + install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim } diff --git a/extra/dansguardian/PKGBUILD b/extra/dansguardian/PKGBUILD index 75314e45e..41ec639e9 100644 --- a/extra/dansguardian/PKGBUILD +++ b/extra/dansguardian/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70467 2010-02-26 21:24:54Z dgriffiths $ +# $Id: PKGBUILD 149944 2012-02-11 23:30:32Z allan $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=dansguardian pkgver=2.10.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Squid plugin for web content filtering." url="http://dansguardian.org" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,10 @@ license=('GPL2') depends=('squid' 'pcre' 'zlib') install=${pkgname}.install source=(http://dansguardian.org/downloads/2/Stable/${pkgname}-${pkgver}.tar.gz -dansguardian dg2.10.1.1-missing.stdio.patch) -md5sums=('0987a1c9bfbdf398118386f10279611a' 'a65a2cb6309670ad8978f1544907d290' + dansguardian + dg2.10.1.1-missing.stdio.patch) +md5sums=('0987a1c9bfbdf398118386f10279611a' + 'a65a2cb6309670ad8978f1544907d290' '3444718c00cc17337cba711ceaa1c0e5') build() { @@ -21,7 +23,11 @@ build() { patch -Np0 -i ${srcdir}/dg2.10.1.1-missing.stdio.patch ./configure --prefix="/usr" --with-proxyuser=proxy --with-proxygroup=proxy \ --sysconfdir=/etc --localstatedir=/var --enable-email - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D data/scripts/dansguardian ${pkgdir}/etc/logrotate.d/dansguardian diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD index cf1503d61..9a54c27ef 100644 --- a/extra/davfs2/PKGBUILD +++ b/extra/davfs2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111470 2011-02-27 10:09:32Z thomas $ +# $Id: PKGBUILD 149924 2012-02-11 22:48:34Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=davfs2 pkgver=1.4.6 -pkgrel=1 -pkgdesc="File system driver that allows you to mount a WebDAV server as a local disk drive." +pkgrel=2 +pkgdesc="File system driver that allows you to mount a WebDAV folder" arch=(i686 x86_64 'mips64el') url="http://savannah.nongnu.org/projects/davfs2" license=('GPL') diff --git a/extra/ddd/ChangeLog b/extra/ddd/ChangeLog deleted file mode 100644 index b3d8b00af..000000000 --- a/extra/ddd/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2010-08-11 Eric Belanger <eric@archlinux.org> - - * ddd 3.3.12-2 - * Built against elfutils - * Added gcc build patch - * Fixed install script - -2009-03-22 Eric Belanger <eric@archlinux.org> - - * ddd 3.3.12-1 - * Upstream update - * Updated license - -2008-11-11 Eric Belanger <eric@archlinux.org> - - * ddd 3.3.11-5 - * Rebuilt against libxaw 1.0.5 (close FS#12074) - * Added info file support - * Added ChangeLog diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index d54633b23..e1c39c45e 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146277 2012-01-07 21:39:13Z andyrtr $ +# $Id: PKGBUILD 150139 2012-02-13 12:13:16Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.0.17 +pkgver=2.0.18 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,8 +24,9 @@ backup=(etc/dovecot/dovecot.conf etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext etc/ssl/dovecot-openssl.cnf) install=$pkgname.install -source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('41c10dffa56e228b9176833db2efaac5' +source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) +md5sums=('4fdee96b390a287d75b51ffcf6abe30f' + 'c317125fd613a6ed207fbaf7d7543163' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/ecasound/ecasound.changelog b/extra/ecasound/ecasound.changelog deleted file mode 100644 index a735f70c1..000000000 --- a/extra/ecasound/ecasound.changelog +++ /dev/null @@ -1,49 +0,0 @@ -2011-05-14 Ray Rashif <schiv@archlinux.org> - - * ecasound 2.8.0 - * upstream release - -2010-08-22 Ray Rashif <schiv@archlinux.org> - - * ecasound 2.7.2-1 - * python(3) rebuild - * python(2) is optional [1] - * added new liboil depend [2] - * added some optdepends [1] - - [1] http://eca.cx/ecasound/README (or see source archive) - [2] http://eca.cx/relnotes/ecasound_v2_7_2_relnotes.txt - -2010-07-10 Ray Rashif <schiv@archlinux.org> - - * ecasound 2.7.1-2 - * added jack support [1] - * added OSC (liblo) support - - [1] http://bugs.archlinux.org/task/20113 - -2010-02-21 Eric Belanger <eric@archlinux.org> - - * ecasound 2.7.1-1 - * Upstream update - * Improved description - -2010-01-23 Eric Belanger <eric@archlinux.org> - - * ecasound 2.7.0-1 - * Upstream update - -2009-06-18 Eric Belanger <eric@archlinux.org> - - * ecasound 2.6.0-1 - * Upstream update - * Built against readline 6.0.00 - -2009-01-14 Eric Belanger <eric@archlinux.org> - - * ecasound 2.5.2-1 - * Upstream update - * Enabled alsa support - * Added ruby makedepends - * Corrected license - * Added ChangeLog diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index fb5f7afb0..58e67d2af 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144996 2011-12-13 22:16:57Z eric $ +# $Id: PKGBUILD 149946 2012-02-11 23:30:37Z allan $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -6,7 +6,7 @@ pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') pkgver=NG_0.7.4.2 _origver=${pkgver/_/-} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.sourceforge.net/" license=('GPL') diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD index 4badc4ab2..98c07df7c 100644 --- a/extra/garcon/PKGBUILD +++ b/extra/garcon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143709 2011-11-28 15:22:07Z foutrelis $ +# $Id: PKGBUILD 150129 2012-02-13 08:08:25Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=garcon -pkgver=0.1.9 +pkgver=0.1.10 pkgrel=1 pkgdesc="Implementation of the freedesktop.org menu specification" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools') replaces=('libxfce4menu') options=('!libtool' '!makeflags') source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2) -sha256sums=('485e23c8ec1af0d3af423aa244e05467dd2f96afbb66efc70ca7689222cf31d5') +sha256sums=('c2497a2991101fc1e621dc712ef72aba7c238f6e5f5a1733c9572f9b23761316') build() { cd "$srcdir/garcon-$pkgver" diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 31f32a86b..351938883 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148586 2012-02-04 00:07:32Z bisson $ +# $Id: PKGBUILD 149828 2012-02-11 09:25:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.7.2 +pkgver=2.7.3 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('f5b4468d8696af114fa95f46a680bee0182ae1ec' +sha1sums=('d27a236f7d3a3cf54a688ecaeb576325dca4f89f' '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70') install=install diff --git a/extra/gimp-gap/PKGBUILD b/extra/gimp-gap/PKGBUILD index 41f576c52..4e1226000 100644 --- a/extra/gimp-gap/PKGBUILD +++ b/extra/gimp-gap/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gimp-gap pkgver=2.6.0 -pkgrel=3 +pkgrel=3.1 pkgdesc="A Plug-In collection to edit and create animations for the Gimp" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,7 +17,8 @@ md5sums=('249ed829de8b78675c0fe4ef4212089f') build() { cd "$srcdir/$pkgname-$pkgver" - [ "$CARCH" = "x86_64" ] && CFLAGS+="-fPIC" + [ "$CARCH" != "i686" ] && CFLAGS+=" -fPIC" + sed -ri 's/^gap_(plugins|morph)_LDADD .+$/& -lm/' gap/Makefile.in ./configure --prefix=/usr make } diff --git a/extra/gimp/gimp-poppler-0.18.patch b/extra/gimp/gimp-poppler-0.18.patch deleted file mode 100644 index 0715460bc..000000000 --- a/extra/gimp/gimp-poppler-0.18.patch +++ /dev/null @@ -1,476 +0,0 @@ -From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <nils@redhat.com> -Date: Fri, 6 May 2011 11:58:44 +0200 -Subject: [PATCH] patch: poppler-0.17 - -Squashed commit of the following: - -commit 529d940222dfc352d41fbf72de29134421aa4002 -Author: Nils Philippsen <nils@redhat.com> -Date: Fri May 6 11:50:30 2011 +0200 - - use code based on pixbufs instead of cairo surfaces - - this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for - hints how to do this - -commit f8671d8767d4cdab830dc06310e96c63a88ec0fd -Author: Mukund Sivaraman <muks@banu.com> -Date: Thu Apr 21 13:57:13 2011 +0530 - - file-pdf-load: Update attribution, removing bogus copyright - (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019) - -commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70 -Author: Nils Philippsen <nils@redhat.com> -Date: Thu Apr 21 13:52:18 2011 +0200 - - file-pdf-load: Use better API + cleanups - - * fixes issues with poppler 0.17 completely - * uses new libgimp API to pass surfaces instead of pixbufs - * uses GTK+ 3 API to convert surfaces to pixbufs where available - (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2) - -commit 4e92302c4a14a961f112587a0ad86696c88da2f8 -Author: Nils Philippsen <nils@redhat.com> -Date: Thu Apr 21 13:38:08 2011 +0200 - - file-pdf-load: Don't use deprecated API (bug #646947) - - (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237) - - Conflicts: - - plug-ins/common/file-pdf.c ---- - plug-ins/common/file-pdf.c | 323 ++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 283 insertions(+), 40 deletions(-) - -diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c -index a43b459..43c2b7d 100644 ---- a/plug-ins/common/file-pdf.c -+++ b/plug-ins/common/file-pdf.c -@@ -4,6 +4,9 @@ - * - * Copyright (C) 2005 Nathan Summers - * -+ * Some code in render_page_to_surface() borrowed from -+ * poppler.git/glib/poppler-page.cc. -+ * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or -@@ -80,16 +83,20 @@ static gboolean load_dialog (PopplerDocument *doc, - static PopplerDocument * open_document (const gchar *filename, - GError **error); - --static GdkPixbuf * get_thumbnail (PopplerDocument *doc, -+static cairo_surface_t * get_thumb_surface (PopplerDocument *doc, -+ gint page, -+ gint preferred_size); -+ -+static GdkPixbuf * get_thumb_pixbuf (PopplerDocument *doc, - gint page, - gint preferred_size); - - static gint32 layer_from_pixbuf (gint32 image, -- const gchar *layer_name, -- gint position, -- GdkPixbuf *buf, -- gdouble progress_start, -- gdouble progress_scale); -+ const gchar *layer_name, -+ gint position, -+ GdkPixbuf *pixbuf, -+ gdouble progress_start, -+ gdouble progress_scale); - - /** - ** the following was formerly part of -@@ -433,11 +440,12 @@ run (const gchar *name, - } - else - { -- gdouble width = 0; -- gdouble height = 0; -- gdouble scale; -- gint32 image = -1; -- GdkPixbuf *pixbuf = NULL; -+ gdouble width = 0; -+ gdouble height = 0; -+ gdouble scale; -+ gint32 image = -1; -+ gint num_pages = 0; -+ GdkPixbuf *pixbuf = NULL; - - /* Possibly retrieve last settings */ - gimp_get_data (LOAD_PROC, &loadvals); -@@ -455,7 +463,10 @@ run (const gchar *name, - g_object_unref (page); - } - -- pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32); -+ num_pages = poppler_document_get_n_pages (doc); -+ -+ pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32); -+ - g_object_unref (doc); - } - -@@ -548,6 +559,187 @@ open_document (const gchar *filename, - return doc; - } - -+/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */ -+ -+#if (!GTK_CHECK_VERSION (3, 0, 0)) -+ -+static cairo_format_t -+gdk_cairo_format_for_content (cairo_content_t content) -+{ -+ switch (content) -+ { -+ case CAIRO_CONTENT_COLOR: -+ return CAIRO_FORMAT_RGB24; -+ case CAIRO_CONTENT_ALPHA: -+ return CAIRO_FORMAT_A8; -+ case CAIRO_CONTENT_COLOR_ALPHA: -+ default: -+ return CAIRO_FORMAT_ARGB32; -+ } -+} -+ -+static cairo_surface_t * -+gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, -+ cairo_content_t content, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ cairo_surface_t *copy; -+ cairo_t *cr; -+ -+ copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), -+ width, -+ height); -+ -+ cr = cairo_create (copy); -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_set_source_surface (cr, surface, -src_x, -src_y); -+ cairo_paint (cr); -+ cairo_destroy (cr); -+ -+ return copy; -+} -+ -+static void -+convert_alpha (guchar *dest_data, -+ int dest_stride, -+ guchar *src_data, -+ int src_stride, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ int x, y; -+ -+ src_data += src_stride * src_y + src_x * 4; -+ -+ for (y = 0; y < height; y++) { -+ guint32 *src = (guint32 *) src_data; -+ -+ for (x = 0; x < width; x++) { -+ guint alpha = src[x] >> 24; -+ -+ if (alpha == 0) -+ { -+ dest_data[x * 4 + 0] = 0; -+ dest_data[x * 4 + 1] = 0; -+ dest_data[x * 4 + 2] = 0; -+ } -+ else -+ { -+ dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; -+ dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; -+ dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; -+ } -+ dest_data[x * 4 + 3] = alpha; -+ } -+ -+ src_data += src_stride; -+ dest_data += dest_stride; -+ } -+} -+ -+static void -+convert_no_alpha (guchar *dest_data, -+ int dest_stride, -+ guchar *src_data, -+ int src_stride, -+ int src_x, -+ int src_y, -+ int width, -+ int height) -+{ -+ int x, y; -+ -+ src_data += src_stride * src_y + src_x * 4; -+ -+ for (y = 0; y < height; y++) { -+ guint32 *src = (guint32 *) src_data; -+ -+ for (x = 0; x < width; x++) { -+ dest_data[x * 3 + 0] = src[x] >> 16; -+ dest_data[x * 3 + 1] = src[x] >> 8; -+ dest_data[x * 3 + 2] = src[x]; -+ } -+ -+ src_data += src_stride; -+ dest_data += dest_stride; -+ } -+} -+ -+/** -+ * gdk_pixbuf_get_from_surface: -+ * @surface: surface to copy from -+ * @src_x: Source X coordinate within @surface -+ * @src_y: Source Y coordinate within @surface -+ * @width: Width in pixels of region to get -+ * @height: Height in pixels of region to get -+ * -+ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A) -+ * representation inside a #GdkPixbuf. This allows you to efficiently read -+ * individual pixels from cairo surfaces. For #GdkWindows, use -+ * gdk_pixbuf_get_from_window() instead. -+ * -+ * This function will create an RGB pixbuf with 8 bits per channel. -+ * The pixbuf will contain an alpha channel if the @surface contains one. -+ * -+ * Return value: (transfer full): A newly-created pixbuf with a reference -+ * count of 1, or %NULL on error -+ */ -+static GdkPixbuf * -+gdk_pixbuf_get_from_surface (cairo_surface_t *surface, -+ gint src_x, -+ gint src_y, -+ gint width, -+ gint height) -+{ -+ cairo_content_t content; -+ GdkPixbuf *dest; -+ -+ /* General sanity checks */ -+ g_return_val_if_fail (surface != NULL, NULL); -+ g_return_val_if_fail (width > 0 && height > 0, NULL); -+ -+ content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; -+ dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, -+ !!(content & CAIRO_CONTENT_ALPHA), -+ 8, -+ width, height); -+ -+ surface = gdk_cairo_surface_coerce_to_image (surface, content, -+ src_x, src_y, -+ width, height); -+ cairo_surface_flush (surface); -+ if (cairo_surface_status (surface) || dest == NULL) -+ { -+ cairo_surface_destroy (surface); -+ return NULL; -+ } -+ -+ if (gdk_pixbuf_get_has_alpha (dest)) -+ convert_alpha (gdk_pixbuf_get_pixels (dest), -+ gdk_pixbuf_get_rowstride (dest), -+ cairo_image_surface_get_data (surface), -+ cairo_image_surface_get_stride (surface), -+ 0, 0, -+ width, height); -+ else -+ convert_no_alpha (gdk_pixbuf_get_pixels (dest), -+ gdk_pixbuf_get_rowstride (dest), -+ cairo_image_surface_get_data (surface), -+ cairo_image_surface_get_stride (surface), -+ 0, 0, -+ width, height); -+ -+ cairo_surface_destroy (surface); -+ return dest; -+} -+ -+#endif -+ - static gint32 - layer_from_pixbuf (gint32 image, - const gchar *layer_name, -@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32 image, - return layer; - } - -+static cairo_surface_t * -+render_page_to_surface (PopplerPage *page, -+ int width, -+ int height, -+ double scale) -+{ -+ cairo_surface_t *surface; -+ cairo_t *cr; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); -+ cr = cairo_create (surface); -+ -+ cairo_save (cr); -+ cairo_translate (cr, 0.0, 0.0); -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ return surface; -+} -+ -+static GdkPixbuf * -+render_page_to_pixbuf (PopplerPage *page, -+ int width, -+ int height, -+ double scale) -+{ -+ GdkPixbuf *pixbuf; -+ cairo_surface_t *surface; -+ -+ surface = render_page_to_surface (page, width, height, scale); -+ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, -+ cairo_image_surface_get_width (surface), -+ cairo_image_surface_get_height (surface)); -+ cairo_surface_destroy (surface); -+ -+ return pixbuf; -+} -+ - static gint32 - load_image (PopplerDocument *doc, - const gchar *filename, -@@ -597,7 +837,7 @@ load_image (PopplerDocument *doc, - gdouble page_width; - gdouble page_height; - -- GdkPixbuf *buf; -+ GdkPixbuf *pixbuf; - gint width; - gint height; - -@@ -627,15 +867,13 @@ load_image (PopplerDocument *doc, - gimp_image_set_resolution (image_ID, resolution, resolution); - } - -- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); -- -- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); -+ pixbuf = render_page_to_pixbuf (page, width, height, scale); - -- layer_from_pixbuf (image_ID, page_label, i, buf, -+ layer_from_pixbuf (image_ID, page_label, i, pixbuf, - doc_progress, 1.0 / pages->n_pages); - - g_free (page_label); -- g_object_unref (buf); -+ g_object_unref(pixbuf); - - doc_progress = (double) (i + 1) / pages->n_pages; - gimp_progress_update (doc_progress); -@@ -676,30 +914,22 @@ load_image (PopplerDocument *doc, - return image_ID; - } - --static GdkPixbuf * --get_thumbnail (PopplerDocument *doc, -- gint page_num, -- gint preferred_size) -+static cairo_surface_t * -+get_thumb_surface (PopplerDocument *doc, -+ gint page_num, -+ gint preferred_size) - { - PopplerPage *page; -- GdkPixbuf *pixbuf; -+ cairo_surface_t *surface; - - page = poppler_document_get_page (doc, page_num); - - if (! page) - return NULL; - -- /* XXX: Remove conditional when we depend on poppler 0.8.0, but also -- * add configure check to make sure POPPLER_WITH_GDK is enabled! -- */ --#ifdef POPPLER_WITH_GDK -- pixbuf = poppler_page_get_thumbnail_pixbuf (page); --#else -- pixbuf = poppler_page_get_thumbnail (page); --#endif -- -+ surface = poppler_page_get_thumbnail (page); - -- if (! pixbuf) -+ if (! surface) - { - gdouble width; - gdouble height; -@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc, - width *= scale; - height *= scale; - -- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, -- width, height); -- -- poppler_page_render_to_pixbuf (page, -- 0, 0, width, height, scale, 0, pixbuf); -+ surface = render_page_to_surface (page, width, height, scale); - } - - g_object_unref (page); - -+ return surface; -+} -+ -+static GdkPixbuf * -+get_thumb_pixbuf (PopplerDocument *doc, -+ gint page_num, -+ gint preferred_size) -+{ -+ cairo_surface_t *surface; -+ GdkPixbuf *pixbuf; -+ -+ surface = get_thumb_surface (doc, page_num, preferred_size); -+ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, -+ cairo_image_surface_get_width (surface), -+ cairo_image_surface_get_height (surface)); -+ cairo_surface_destroy (surface); -+ - return pixbuf; - } - -@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data) - idle_data->page_no = i; - - /* FIXME get preferred size from somewhere? */ -- idle_data->pixbuf = get_thumbnail (thread_data->document, i, -- THUMBNAIL_SIZE); -+ idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i, -+ THUMBNAIL_SIZE); - - g_idle_add (idle_set_thumbnail, idle_data); - --- -1.7.5 diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 4bf9b096d..be706a15c 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 148010 2012-01-29 20:12:07Z dan $ +# $Id: PKGBUILD 150206 2012-02-14 20:14:21Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.9 +pkgver=1.7.9.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -22,8 +22,6 @@ optdepends=('tk: gitk and git gui' replaces=('git-core') provides=('git-core') backup=('etc/conf.d/git-daemon.conf') -#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" -# "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2" source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" git-daemon @@ -80,7 +78,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('ed51ef5ef250daaa6e98515cf2641820cd268d4c' - '1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a' +sha1sums=('bd85327627f96c4e98071a4d1d32c30f210aa54a' + '8c6ee031b39da5c5e53f927952838796e0959ce9' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 32ac50fb7..7740d1fae 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -12,7 +12,7 @@ url="http://spruce.sourceforge.net/gmime/" depends=('glib2' 'gpgme' 'zlib') makedepends=('gtk-sharp-2' 'pkgconfig') [ "$CARCH" = "mips64el" ] && \ -unset makedepend +unset makedepends options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('2e85076c223fe8bf1392a7c1affa4454cb3bb6dec83016ad6e3230c65533f163') diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index 7edd769fe..fcb4433af 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gnome-online-accounts pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url="http://www.gnome.org" license=('GPL') depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme') diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index 0d91ed969..7a8dd4f77 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -3,7 +3,7 @@ pkgname=gnome-power-manager pkgver=3.2.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="Power management tools." arch=(i686 x86_64 'mips64el') url="http://www.gnome.org/projects/gnome-power-manager/" diff --git a/extra/gnugo/gnugo.install b/extra/gnugo/gnugo.install deleted file mode 100644 index b0271070c..000000000 --- a/extra/gnugo/gnugo.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=/usr/share/info -filelist=(gnugo.info.gz gnugo.info-1.gz gnugo.info-2.gz gnugo.info-3.gz) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 6a15d34cf..295bf5e8a 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142040 2011-11-04 20:43:48Z andrea $ +# $Id: PKGBUILD 150180 2012-02-14 08:19:26Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.3 +pkgver=3.4 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') @@ -21,8 +21,8 @@ options=('!libtool') install="${pkgname}.install" source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} 'gpsd' 'gpsd.conf.d') -md5sums=('4cfdcfd88e925f4d0d6c2272fc573ab5' - '90086315ed6f266748b9acb338b903a5' +md5sums=('c01353459faa68834309109d4e868460' + '8aea27e1b0c23f254f94861f7d898106' '1f3402f8e33a7032b9ae6dfd077234f7' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index d88467e7b..96937b678 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=('gstreamer0.10-base') pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') pkgver=0.10.35 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD index f6277c090..87c77013a 100644 --- a/extra/gtk-xfce-engine/PKGBUILD +++ b/extra/gtk-xfce-engine/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147260 2012-01-25 08:34:39Z foutrelis $ +# $Id: PKGBUILD 149817 2012-02-11 08:22:29Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgbase=gtk-xfce-engine pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine') -pkgver=2.99.0 -pkgrel=2 +pkgver=2.99.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" license=('GPL2') @@ -13,7 +13,7 @@ groups=('xfce4') makedepends=('gtk2' 'gtk3') options=('!libtool') source=(http://archive.xfce.org/src/xfce/$pkgbase/2.99/$pkgbase-$pkgver.tar.bz2) -sha256sums=('27bee5a68527d214cfda9b99d4ba68d39b6d341202bc728d0ddd170a73cde154') +sha256sums=('077a3d68bb560371af902d4aa35ad949c70974e923ecdf2ec946801a480dece2') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/extra/gtk2/cups-custom-print.patch b/extra/gtk2/cups-custom-print.patch deleted file mode 100644 index ffc89aa32..000000000 --- a/extra/gtk2/cups-custom-print.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 8170436e61ea68c713d75ad374d22c3261be9203 Mon Sep 17 00:00:00 2001 -From: Benjamin Berg <benjamin@sipsolutions.net> -Date: Sat, 24 Dec 2011 16:26:32 +0000 -Subject: Set cups Custom print options correctly (bug #543520, patch by Marek Kašík) - -This patch fixes the cups print backend to pass Custom options with -the "Custom." prefix to cups if neccessary. ---- -diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c -index 14a1b5d..2751ee4 100644 ---- a/modules/printbackends/cups/gtkprintbackendcups.c -+++ b/modules/printbackends/cups/gtkprintbackendcups.c -@@ -483,22 +483,44 @@ cups_print_cb (GtkPrintBackendCups *print_backend, - GDK_THREADS_LEAVE (); - } - -+typedef struct { -+ GtkCupsRequest *request; -+ GtkPrinterOptionSet *options; -+} CupsOptionsData; -+ - static void - add_cups_options (const gchar *key, - const gchar *value, - gpointer user_data) - { -- GtkCupsRequest *request = user_data; -+ CupsOptionsData *data = (CupsOptionsData *) user_data; -+ GtkCupsRequest *request = data->request; -+ GtkPrinterOptionSet *options = data->options; -+ GtkPrinterOption *option = NULL; -+ gchar *new_value = NULL; - - if (!g_str_has_prefix (key, "cups-")) - return; - - if (strcmp (value, "gtk-ignore-value") == 0) - return; -+ -+ option = gtk_printer_option_set_lookup (options, key); - - key = key + strlen ("cups-"); - -- gtk_cups_request_encode_option (request, key, value); -+ /* Add "Custom." prefix to custom values */ -+ if (value && option && -+ !gtk_printer_option_has_choice (option, value)) -+ new_value = g_strdup_printf ("Custom.%s", value); -+ -+ if (new_value) -+ { -+ gtk_cups_request_encode_option (request, key, new_value); -+ g_free (new_value); -+ } -+ else -+ gtk_cups_request_encode_option (request, key, value); - } - - static void -@@ -511,8 +533,12 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend *print_backend, - { - GtkPrinterCups *cups_printer; - CupsPrintStreamData *ps; -+ CupsOptionsData *options_data; - GtkCupsRequest *request; - GtkPrintSettings *settings; -+ GtkPrinterOptionSet *options; -+ GtkPrintCapabilities capabilities; -+ GtkPageSetup *page_setup; - const gchar *title; - char printer_absolute_uri[HTTP_MAX_URI]; - -@@ -521,6 +547,8 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend *print_backend, - - cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job)); - settings = gtk_print_job_get_settings (job); -+ capabilities = cups_printer_get_capabilities (GTK_PRINTER (cups_printer)); -+ page_setup = gtk_printer_get_default_page_size (GTK_PRINTER (cups_printer)); - - request = gtk_cups_request_new_with_username (NULL, - GTK_CUPS_POST, -@@ -558,8 +586,18 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend *print_backend, - IPP_TAG_NAME, "job-name", - NULL, title); - -- gtk_print_settings_foreach (settings, add_cups_options, request); -- -+ options = cups_printer_get_options (GTK_PRINTER (cups_printer), settings, page_setup, capabilities); -+ -+ options_data = g_new0 (CupsOptionsData, 1); -+ options_data->request = request; -+ options_data->options = options; -+ -+ gtk_print_settings_foreach (settings, add_cups_options, options_data); -+ -+ g_object_unref (page_setup); -+ g_object_unref (options); -+ g_free (options_data); -+ - ps = g_new0 (CupsPrintStreamData, 1); - ps->callback = callback; - ps->user_data = user_data; --- -cgit v0.9.0.2 diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index a428719fc..df7da3c71 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149151 2012-02-06 00:39:05Z eric $ +# $Id: PKGBUILD 149825 2012-02-11 09:11:58Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick @@ -12,6 +12,8 @@ depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'libjpeg-turbo' makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) +sha1sums=('b6cee59cb380f38572ec40769c438901dcc7500e' + '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} @@ -80,5 +82,3 @@ package_imagemagick-doc() { install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" } -md5sums=('86a82ccb7907aecfc1e8cf5203e07048' - 'ff9974decbfe9846f8e347239d87e4eb') diff --git a/extra/imlib/libpng14.patch b/extra/imlib/libpng14.patch deleted file mode 100644 index 2cc174e29..000000000 --- a/extra/imlib/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c ---- imlib-1.9.15-orig/Imlib/load.c 2010-01-18 20:58:27.000000000 -0500 -+++ imlib-1.9.15/Imlib/load.c 2010-01-18 21:02:04.000000000 -0500 -@@ -1619,7 +1619,7 @@ - return 0; - fread(buf, 1, 8, f); - rewind(f); -- return (int)png_check_sig(buf, 8); -+ return (int)png_sig_cmp(buf, 0, 8)==0; - #else - return 0; - #endif diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index f3f0e26c6..979641624 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147780 2012-01-28 10:32:45Z andrea $ +# $Id: PKGBUILD 150178 2012-02-14 07:57:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index 4b1862b2f..888aa10f3 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148802 2012-02-05 11:51:08Z ibiru $ +# $Id: PKGBUILD 149952 2012-02-11 23:30:53Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=12 +pkgrel=13 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index edd6adaf0..4239608af 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123234 2011-05-09 12:19:16Z angvp $ +# $Id: PKGBUILD 149954 2012-02-11 23:30:59Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Juergen Hoetzel <jason@archlinux.org> @@ -6,7 +6,7 @@ pkgname=kismet pkgver=2011_03_R2 _realver="${pkgver//_/-}" -pkgrel=2.1 +pkgrel=3 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64' 'mips64el') url="http://www.kismetwireless.net/" @@ -14,15 +14,14 @@ license=('GPL') depends=('libcap' 'libnl' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') makedepends=() # already in core: ('grep' 'gcc-libs') optdepends=('gpsd: log coordinates of detected networks' - 'wireshark: provide OUI files used to determine device manufacturer' - 'wireshark: mergecap, to merge multiple capture files' + 'wireshark-cli: provide OUI files used to determine device manufacturer' + 'wireshark-cli: mergecap, to merge multiple capture files' 'sox: provide the default kismet sound playback binary' 'festival: text-to-speech support' 'flite: alternative/lightweight text-to-speech support' 'mac80211-driver: full rfmon support' 'ruby: ruby interface') backup=('etc/kismet.conf' 'etc/kismet_drone.conf') -options=() install=kismet.install changelog=kismet.changelog source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz") @@ -57,4 +56,3 @@ package() { # Our own suid-install, first half (see kismet.install) install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/" } - diff --git a/extra/ksensors/PKGBUILD b/extra/ksensors/PKGBUILD deleted file mode 100644 index 6db8e7e85..000000000 --- a/extra/ksensors/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 64746 2010-01-22 03:14:29Z eric $ -# Contributor: Torsten Evers <tevers@onlinehome.de> -# Maintainer: Thomas Baechler <thomas@archlinux.org> -pkgname=ksensors -pkgver=0.7.3 -pkgrel=5 -pkgdesc="ksensors is nice lm_sensors frontend for KDE" -arch=('i686' 'x86_64') -url="http://ksensors.sourceforge.net/" -license=("GPL") -depends=("lm_sensors>=3.0.0" 'kdelibs3') -source=(#http://mesh.dl.sourceforge.net/sourceforge/ksensors/$pkgname-$pkgver.tar.gz \ - http://people.atrpms.net/~hdegoede/ksensors-0.7.3-fedora-14.tar.gz) -md5sums=('7c64a2ef836c13d72b5711791819072e') - -build() { - cd $startdir/src/$pkgname-$pkgver - . /etc/profile.d/qt3.sh - . /etc/profile.d/kde3.sh - ./configure --prefix=/opt/kde --without-arts - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/extra/ksensors/ksensors.patch b/extra/ksensors/ksensors.patch deleted file mode 100644 index 299458f0d..000000000 --- a/extra/ksensors/ksensors.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- admin/cvs.sh 2003-07-11 23:00:30.000000000 +0800 -+++ admin/cvs.sh 2006-08-28 14:54:23.000000000 +0800 -@@ -29,7 +29,7 @@ - { - AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` - case $AUTOCONF_VERSION in -- Autoconf*2.5* | autoconf*2.5* ) : ;; -+ Autoconf*2.[56]* | autoconf*2.[56]* ) : ;; - "" ) - echo "*** AUTOCONF NOT FOUND!." - echo "*** KDE requires autoconf 2.52, 2.53 or 2.54" -@@ -44,7 +44,7 @@ - - AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` - case $AUTOHEADER_VERSION in -- Autoconf*2.5* | autoheader*2.5* ) : ;; -+ Autoconf*2.[56]* | autoheader*2.[56]* ) : ;; - "" ) - echo "*** AUTOHEADER NOT FOUND!." - echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)" ---- src/hdsensorslist.cpp 2004-08-09 02:30:05.000000000 +0800 -+++ src/hdsensorslist.cpp 2006-08-28 15:27:02.000000000 +0800 -@@ -206,13 +206,17 @@ - - bool HDSensorsList::getDisks(QStringList &disks ) - { -- DIR *dir= opendir("/proc/ide"); -- if(!dir) return false; -+ DIR *dir; -+ -+ /* Get a listing of the hard drives looking under sysfs first before falling back to /proc/ide */ -+ if((dir = opendir ("/sys/block")) == NULL) -+ if ((dir = opendir ("/proc/ide")) == NULL) -+ return false; - QString str; - struct dirent *ptr; - while((ptr= readdir(dir))) { -- if(ptr->d_name[0]=='h' && ptr->d_name[1]=='d') { -- str.sprintf("/dev/hd%c",ptr->d_name[2]); -+ if((ptr->d_name[0] == 'h' || ptr->d_name[0] == 's') && ptr->d_name[1] == 'd') { -+ str.sprintf("/dev/%s", ptr->d_name); - disks << str; - } - } ---- src/lmsensorscfgdesign.ui 2004-08-11 22:36:54.000000000 +0800 -+++ src/lmsensorscfgdesign.ui 2006-08-28 14:54:23.000000000 +0800 -@@ -748,29 +748,13 @@ - <property name="name"> - <cstring>unnamed</cstring> - </property> -- <widget class="QLabel"> -+ <widget class="QButtonGroup"> - <property name="name"> -- <cstring>TextLabel1_3_2_2_2_2</cstring> -+ <cstring>ButtonGroup9</cstring> - </property> -- <property name="text"> -+ <property name="title"> - <string>On reach alarm value:</string> - </property> -- </widget> -- <widget class="QFrame"> -- <property name="name"> -- <cstring>Frame11_2_2_2</cstring> -- </property> -- <property name="frameShape"> -- <enum>HLine</enum> -- </property> -- <property name="frameShadow"> -- <enum>Sunken</enum> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout9</cstring> -- </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> diff --git a/extra/leafpad/PKGBUILD b/extra/leafpad/PKGBUILD index 67317dd6a..14873c3be 100644 --- a/extra/leafpad/PKGBUILD +++ b/extra/leafpad/PKGBUILD @@ -4,7 +4,7 @@ pkgname=leafpad pkgver=0.8.18.1 -pkgrel=2 +pkgrel=3 pkgdesc="A notepad clone for GTK+ 2.0" arch=('i686' 'x86_64' 'mips64el') url="http://tarot.freeshell.org/leafpad/" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 097bf9798..cef678c8a 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146314 2012-01-09 15:57:26Z andyrtr $ +# $Id: PKGBUILD 149819 2012-02-11 08:51:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.30 +pkgver=2.4.31 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 COPYING # git_fixes.diff ) -md5sums=('9f57a68b2c0836b55ebcbc241f6ca175' +md5sums=('b8cf744ec113c6028fe0975b1133b649' 'fb8a15bf4aff5646c517373e8277f440' 'ba65e71c481b94ef0fb6c23c7f21ffa1') diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD index e1c71bf59..53dce90a0 100644 --- a/extra/libglade/PKGBUILD +++ b/extra/libglade/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libglade pkgver=2.6.4 -pkgrel=2 +pkgrel=2.1 pkgdesc="Allows you to load glade interface files in a program at runtime" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 8a601edea..db1519a42 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145273 2011-12-21 01:12:32Z allan $ +# $Id: PKGBUILD 149986 2012-02-12 02:54:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo -pkgver=1.1.1 -pkgrel=4 +pkgver=1.2.0 +pkgrel=1 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64' 'mips64el') url="http://libjpeg-turbo.virtualgl.org/" @@ -16,11 +16,15 @@ conflicts=('libjpeg') replaces=('libjpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('03b9c1406c7bfdc204313c2917ce6962') +md5sums=('5329fa80953938cb4f097afae55059e2') build() { cd $srcdir/$pkgname-$pkgver + # put documentation in a reasonable directory... + sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in + sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in + ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man make } @@ -42,7 +46,10 @@ package() { # do not distributre libturbojpeg as it is unversioned rm $pkgdir/usr/lib/libturbojpeg.{so,a} rm $pkgdir/usr/include/turbojpeg.h - rm $pkgdir/usr/bin/jpgtest - install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE + install -dm755 $pkgdir/usr/share/licenses/libjpeg-turbo/ + ln -s ../../doc/libjpeg-turbo/README \ + $pkgdir/usr/share/licenses/libjpeg-turbo/README + ln -s ../../doc/libjpeg-turbo/README-turbo.txt \ + $pkgdir/usr/share/licenses/libjpeg-turbo/README-turbo.txt } diff --git a/extra/libksba/PKGBUILD b/extra/libksba/PKGBUILD deleted file mode 100644 index 20179c686..000000000 --- a/extra/libksba/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 149501 2012-02-08 10:55:32Z tpowa $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=libksba -pkgver=1.2.0 -pkgrel=2 -pkgdesc="A CMS and X.509 access library" -arch=(i686 x86_64) -license=('GPL') -url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba" -depends=('bash' 'libgpg-error' 'glibc') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) -options=(!libtool) -install=libksba.install - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -check() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} -md5sums=('e797f370b69b4dc776499d6a071ae137') diff --git a/extra/libksba/libksba.install b/extra/libksba/libksba.install deleted file mode 100644 index 3715b8960..000000000 --- a/extra/libksba/libksba.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(ksba.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index af01492ea..ea9597c88 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 131866 2011-07-16 10:20:18Z tpowa $ +# $Id: PKGBUILD 149956 2012-02-11 23:31:02Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt pkgver=0.7 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 pkgdesc="Library for splitting mp3 and ogg files without decoding" -license=('GPL') +arch=('i686' 'x86_64' 'mips64el') url="http://mp3splt.sourceforge.net" -makedepends=('git') +license=('GPL') depends=('libmad' 'libvorbis' 'libid3tag' 'libtool') -source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz) +makedepends=('git') options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz) +md5sums=('dadb166361e2a28955032a1b9f10ed38') build() { cd $srcdir/$pkgname-$pkgver @@ -20,8 +21,8 @@ build() { ./configure --prefix=/usr make } + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('dadb166361e2a28955032a1b9f10ed38') diff --git a/extra/libwmf/libpng14.patch b/extra/libwmf/libpng14.patch deleted file mode 100644 index 3d38c717a..000000000 --- a/extra/libwmf/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c libwmf-0.2.8.4/src/extra/gd/gd_png.c ---- libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c 2005-07-27 23:35:06.000000000 +0300 -+++ libwmf-0.2.8.4/src/extra/gd/gd_png.c 2010-01-17 01:33:58.000000000 +0200 -@@ -136,7 +136,7 @@ - /* first do a quick check that the file really is a PNG image; could - * have used slightly more general png_sig_cmp() function instead */ - gdGetBuf (sig, 8, infile); -- if (!png_check_sig (sig, 8)) -+ if (png_sig_cmp (sig, 0, 8)) - return NULL; /* bad signature */ - - #ifndef PNG_SETJMP_NOT_SUPPORTED diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index ecc76df56..951320590 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146963 2012-01-19 18:03:44Z pierre $ +# $Id: PKGBUILD 149958 2012-02-11 23:31:05Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.30 -pkgrel=2 +pkgrel=3 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 8d63f8280..71595ad27 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144879 2011-12-08 21:06:55Z juergen $ +# $Id: PKGBUILD 150146 2012-02-13 14:36:40Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.25.1 -pkgrel=3 +pkgver=5.26.0 +pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('9c9ea66434c9ca96549092c3640c3ba5a4fba44b' +sha1sums=('bc7448486478b217c333605c6d8f6c0bbdd3526c' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD index ec87ecba0..427a66794 100644 --- a/extra/metalog/PKGBUILD +++ b/extra/metalog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137711 2011-09-10 13:12:33Z pierre $ +# $Id: PKGBUILD 150210 2012-02-14 21:34:23Z juergen $ # Maintainer: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=metalog -pkgver=1.0 -pkgrel=2 +pkgver=2.0 +pkgrel=1 pkgdesc="Metalog is a modern replacement for syslogd and klogd" url="http://metalog.sourceforge.net" license=('GPL') @@ -12,20 +12,19 @@ arch=('i686' 'x86_64' 'mips64el') depends=('pcre') provides=('logger') backup=('etc/metalog.conf' 'etc/conf.d/metalog') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma" - 'metalog' 'metalog.confd') -md5sums=('df4ec89f6a0df24a43f9592ee80ab6be' +source=("http://sourceforge.net/projects/metalog/files/metalog-2.tar.xz/download" 'metalog' 'metalog.confd') +md5sums=('e948d10d780205eae17645c89aee1361' 'cdd1d34eedbfbc2d9e659bf0a0f58f56' '86bccd5a02996921e29eff8a0394d11f') build() { - cd $srcdir/$pkgname-1 + cd $srcdir/$pkgname-2 ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd $srcdir/$pkgname-1 + cd $srcdir/$pkgname-2 make DESTDIR=$pkgdir install install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 336f59ca1..9a83fc925 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mono pkgver=2.10.8 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" -arch=(i686 x86_64 'mips64el') +arch=(i686 x86_64) license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11') url="http://www.mono-project.com/" depends=('zlib' 'libgdiplus>=2.10' 'sh') diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog index b22d95f8d..7e174cfb4 100644 --- a/extra/mpd/ChangeLog +++ b/extra/mpd/ChangeLog @@ -1,3 +1,6 @@ +2012-02-11 Angel Velasquez <angvp@archlinux.org> + * Version bump to 0.16.7 + 2011-12-05 Angel Velasquez <angvp@archlinux.org> * Version bump to 0.16.6 diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 7ce8be828..f7cd9d8df 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 148654 2012-02-05 10:51:32Z bisson $ +# $Id: PKGBUILD 149829 2012-02-11 09:25:31Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.6 -pkgrel=2 +pkgver=0.16.7 +pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -19,7 +19,7 @@ install=${pkgname}.install changelog=ChangeLog source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2" 'mpd') -md5sums=('5489dd327fba12c67f01558d2cfa6d57' +md5sums=('3d0e7c36646e80386b32966bd4268e8d' 'e5669c2bff4031928531e52475addeb1') build() { diff --git a/extra/netpbm/libpng-1.4.patch b/extra/netpbm/libpng-1.4.patch deleted file mode 100644 index c02ded734..000000000 --- a/extra/netpbm/libpng-1.4.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -Naur netpbm-orig/converter/other/pnmtopng.c netpbm/converter/other/pnmtopng.c ---- netpbm-orig/converter/other/pnmtopng.c 2010-01-22 00:13:48.000000000 -0500 -+++ netpbm/converter/other/pnmtopng.c 2010-01-22 00:21:33.000000000 -0500 -@@ -2641,7 +2641,7 @@ - info_ptr->color_type == PNG_COLOR_TYPE_RGB) { - if (transparent > 0) { - info_ptr->valid |= PNG_INFO_tRNS; -- info_ptr->trans_values = -+ info_ptr->trans_color = - xelToPngColor_16(transcolor, maxval, png_maxval); - } - } else { -@@ -2653,10 +2653,10 @@ - if (info_ptr->valid && PNG_INFO_tRNS) - pm_message("Transparent color {gray, red, green, blue} = " - "{%d, %d, %d, %d}", -- info_ptr->trans_values.gray, -- info_ptr->trans_values.red, -- info_ptr->trans_values.green, -- info_ptr->trans_values.blue); -+ info_ptr->trans_color.gray, -+ info_ptr->trans_color.red, -+ info_ptr->trans_color.green, -+ info_ptr->trans_color.blue); - else - pm_message("No transparent color"); - } -diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopnm.c ---- netpbm-orig/converter/other/pngtopnm.c 2010-01-22 00:33:25.000000000 -0500 -+++ netpbm/converter/other/pngtopnm.c 2010-01-22 00:39:21.000000000 -0500 -@@ -569,8 +569,8 @@ - for (i = 0, foundGray = FALSE; - i < info_ptr->num_trans && !foundGray; - ++i) { -- if (info_ptr->trans[i] != 0 && -- info_ptr->trans[i] != maxval) { -+ if (info_ptr->trans_alpha[i] != 0 && -+ info_ptr->trans_alpha[i] != maxval) { - foundGray = TRUE; - } - } -@@ -641,7 +641,7 @@ - unsigned int i; - trans_mix = TRUE; - for (i = 0; i < info_ptr->num_trans; ++i) -- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) { -+ if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) { - trans_mix = FALSE; - break; - } -@@ -1061,7 +1061,7 @@ - setXel(&xelrow[col], fgColor, bgColor, alphaHandling, - (pngxP->info_ptr->valid & PNG_INFO_tRNS) && - index < pngxP->info_ptr->num_trans ? -- pngxP->info_ptr->trans[index] : maxval); -+ pngxP->info_ptr->trans_alpha[index] : maxval); - } - break; - diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index 606fe34d5..bee773096 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110262 2011-02-18 15:25:57Z angvp $ +# $Id: PKGBUILD 149962 2012-02-11 23:31:11Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=nmap pkgver=5.51 -pkgrel=1 +pkgrel=3 pkgdesc="A network exploration tool and security/port scanner" arch=('i686' 'x86_64' 'mips64el') url="http://nmap.org" @@ -15,6 +15,7 @@ makedepends=('python2') optdepends=('pygtk: gui for nmap') options=('!makeflags') source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2) +md5sums=('0b80d2cb92ace5ebba8095a4c2850275') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -22,6 +23,11 @@ build() { echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop + # Force usage of external libpcap + # OSX bug check fails because of missing types + # autoreconf fails because our autotools are too new (?) + sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure + ./configure --prefix=/usr --mandir=/usr/share/man \ --libexecdir=/usr/lib make @@ -37,4 +43,3 @@ package() { # install custom GPL2 license install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } -md5sums=('0b80d2cb92ace5ebba8095a4c2850275') diff --git a/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi b/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi deleted file mode 100644 index 54195d8b3..000000000 --- a/extra/ntfs-3g_ntfsprogs/25-ntfs-config-write-policy.fdi +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deviceinfo version="0.2"> - <device> - <match key="volume.fstype" string="ntfs"> - <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append> - <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge> - <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge> - <merge key="volume.fstype" type="string">ntfs-3g</merge> - <merge key="volume.mount.valid_options" type="strlist">ro</merge> - <append key="volume.mount.valid_options" type="strlist">atime</append> - <append key="volume.mount.valid_options" type="strlist">noatime</append> - <append key="volume.mount.valid_options" type="strlist">relatime</append> - <append key="volume.mount.valid_options" type="strlist">fake_rw</append> - <append key="volume.mount.valid_options" type="strlist">no_def_opts</append> - <append key="volume.mount.valid_options" type="strlist">default_permissions</append> - <append key="volume.mount.valid_options" type="strlist">umask=</append> - <append key="volume.mount.valid_options" type="strlist">fmask=</append> - <append key="volume.mount.valid_options" type="strlist">dmask=</append> - <append key="volume.mount.valid_options" type="strlist">uid=</append> - <append key="volume.mount.valid_options" type="strlist">gid=</append> - <append key="volume.mount.valid_options" type="strlist">show_sys_files</append> - <append key="volume.mount.valid_options" type="strlist">silent</append> - <append key="volume.mount.valid_options" type="strlist">force</append> - <append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append> - <append key="volume.mount.valid_options" type="strlist">locale=</append> - <append key="volume.mount.valid_options" type="strlist">streams_interface=</append> - <append key="volume.mount.valid_options" type="strlist">debug</append> - <append key="volume.mount.valid_options" type="strlist">no_detatch</append> - <append key="volume.mount.valid_options" type="strlist">sync</append> - <append key="volume.mount.valid_options" type="strlist">dirsync</append> - <append key="volume.mount.valid_options" type="strlist">nodiratime</append> - <append key="volume.mount.valid_options" type="strlist">noexec</append> - <append key="volume.mount.valid_options" type="strlist">quiet</append> - <append key="volume.mount.valid_options" type="strlist">remount</append> - <append key="volume.mount.valid_options" type="strlist">exec</append> - <append key="volume.mount.valid_options" type="strlist">recover</append> - <append key="volume.mount.valid_options" type="strlist">norecover</append> - <merge key="volume.unmount.valid_options" type="strlist">lazy</merge> - <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge> - </match> - </device> -</deviceinfo> diff --git a/extra/ntrack/dead-loop-fix.patch b/extra/ntrack/dead-loop-fix.patch deleted file mode 100644 index 133bb4ace..000000000 --- a/extra/ntrack/dead-loop-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== modified file 'modules/ntrack-libnl.c' ---- modules/ntrack-libnl.c 2011-04-25 16:28:19 +0000 -+++ modules/ntrack-libnl.c 2011-04-25 17:25:24 +0000 -@@ -394,6 +394,9 @@ - if (rtnl_link_get_ifindex(link) > iindex) - break; - i = i->next; -+ -+ if (i == linklist) -+ break; - } - return result; - } - diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 8f94e064b..3ed70cd8f 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141254 2011-10-27 14:28:28Z ronald $ +# $Id: PKGBUILD 150143 2012-02-13 14:12:46Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.4.3 +pkgver=3.6.0 pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('texinfo: for help-support in octave' source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") options=('!emptydirs') install=octave.install -sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679') +sha1sums=('62116e090d257a601e9d605f969dd87b7de1ffce') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/openjdk6/glibc2_15.diff b/extra/openjdk6/glibc2_15.diff deleted file mode 100644 index 8fe1b077a..000000000 --- a/extra/openjdk6/glibc2_15.diff +++ /dev/null @@ -1,236 +0,0 @@ -# HG changeset patch -# User never -# Date 1319555835 25200 -# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28 -# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926 -7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc -Reviewed-by: never -Contributed-by: Omair Majid <omajid@redhat.com> - -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp ---- openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -34,8 +34,6 @@ - - // Portions of code courtesy of Clifford Click - --#define MAXFLOAT ((float)3.40282346638528860e+38) -- - // Classic Add functionality. This covers all the usual 'add' behaviors for - // an algebraic ring. Add-integer, add-float, add-double, and binary-or are - // all inherited from this class. The various identity values are supplied -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jniCheck.cpp ---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -107,7 +107,7 @@ - if (env != xenv) { \ - NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ - } \ -- __ENTRY(result_type, header, thr) -+ VM_ENTRY_BASE(result_type, header, thr) - - - #define UNCHECKED() (unchecked_jni_NativeInterface) -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnter.xsl ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 08:17:15 2011 -0700 -@@ -426,7 +426,7 @@ - <xsl:value-of select="$space"/> - <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> - <xsl:value-of select="$space"/> -- <xsl:text>__ENTRY(jvmtiError, </xsl:text> -+ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> - <xsl:apply-templates select="." mode="functionid"/> - <xsl:text> , current_thread)</xsl:text> - <xsl:value-of select="$space"/> -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnv.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -173,7 +173,7 @@ - // from native so as to resolve the jthread. - - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) -+ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - oop thread_oop = JNIHandles::resolve_external_guard(thread); -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiExport.cpp ---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 08:17:15 2011 -0700 -@@ -373,7 +373,7 @@ - JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); - // transition code: native to VM - ThreadInVMfromNative __tiv(current_thread); -- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) -+ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) - debug_only(VMNativeEntryWrapper __vew;) - - JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); -diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/runtime/interfaceSupport.hpp ---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700 -+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700 -@@ -72,9 +72,9 @@ - } - }; - --// InterfaceSupport provides functionality used by the __LEAF and __ENTRY --// macros. These macros are used to guard entry points into the VM and --// perform checks upon leave of the VM. -+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and -+// VM_ENTRY_BASE macros. These macros are used to guard entry points into -+// the VM and perform checks upon leave of the VM. - - - class InterfaceSupport: AllStatic { -@@ -433,7 +433,7 @@ - - // LEAF routines do not lock, GC or throw exceptions - --#define __LEAF(result_type, header) \ -+#define VM_LEAF_BASE(result_type, header) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - /* begin of body */ -@@ -441,7 +441,7 @@ - - // ENTRY routines may lock, GC and throw exceptions - --#define __ENTRY(result_type, header, thread) \ -+#define VM_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - HandleMarkCleaner __hm(thread); \ - Thread* THREAD = thread; \ -@@ -450,7 +450,7 @@ - - // QUICK_ENTRY routines behave like ENTRY but without a handle mark - --#define __QUICK_ENTRY(result_type, header, thread) \ -+#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \ - TRACE_CALL(result_type, header) \ - debug_only(NoHandleMark __hm;) \ - Thread* THREAD = thread; \ -@@ -463,20 +463,20 @@ - #define IRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define IRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(No_Safepoint_Verifier __nspv(true);) - - - #define IRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Another special case for nmethod_entry_point so the nmethod that the -@@ -487,7 +487,7 @@ - result_type header { \ - nmethodLocker _nmlock(nm); \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - #define IRT_END } - -@@ -497,20 +497,20 @@ - #define JRT_ENTRY(result_type, header) \ - result_type header { \ - ThreadInVMfromJava __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - - #define JRT_LEAF(result_type, header) \ - result_type header { \ -- __LEAF(result_type, header) \ -+ VM_LEAF_BASE(result_type, header) \ - debug_only(JRT_Leaf_Verifier __jlv;) - - - #define JRT_ENTRY_NO_ASYNC(result_type, header) \ - result_type header { \ - ThreadInVMfromJavaNoAsyncException __tiv(thread); \ -- __ENTRY(result_type, header, thread) \ -+ VM_ENTRY_BASE(result_type, header, thread) \ - debug_only(VMEntryWrapper __vew;) - - // Same as JRT Entry but allows for return value after the safepoint -@@ -543,11 +543,11 @@ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - // Ensure that the VMNativeEntryWrapper constructor, which can cause --// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY). -+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE). - #define JNI_QUICK_ENTRY(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ -@@ -555,7 +555,7 @@ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JNI_LEAF(result_type, header) \ -@@ -563,7 +563,7 @@ - result_type JNICALL header { \ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - // Close the routine and the extern "C" -@@ -579,7 +579,7 @@ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_ENTRY_NO_ENV(result_type, header) \ -@@ -588,7 +588,7 @@ - JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __ENTRY(result_type, header, thread) -+ VM_ENTRY_BASE(result_type, header, thread) - - - #define JVM_QUICK_ENTRY(result_type, header) \ -@@ -597,14 +597,14 @@ - JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - ThreadInVMfromNative __tiv(thread); \ - debug_only(VMNativeEntryWrapper __vew;) \ -- __QUICK_ENTRY(result_type, header, thread) -+ VM_QUICK_ENTRY_BASE(result_type, header, thread) - - - #define JVM_LEAF(result_type, header) \ - extern "C" { \ - result_type JNICALL header { \ - VM_Exit::block_if_vm_exited(); \ -- __LEAF(result_type, header) -+ VM_LEAF_BASE(result_type, header) - - - #define JVM_END } }
\ No newline at end of file diff --git a/extra/pathological/ChangeLog b/extra/pathological/ChangeLog deleted file mode 100644 index 3cd114178..000000000 --- a/extra/pathological/ChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -2010-08-24 Eric Belanger <eric@archlinux.org> - - * pathological 1.1.3-6 - * Rebuilt against python2 - -2009-07-10 Eric Belanger <eric@archlinux.org> - - * pathological 1.1.3-5 - * Removed binary from /usr/share (close FS#15302) - * Moved saved games to /var - * Fixed segmentation fault - * FHS man pages - * Added docs - * Added ChangeLog diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index b04762592..230fdc8e5 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148876 2012-02-05 11:53:48Z ibiru $ +# $Id: PKGBUILD 149966 2012-02-11 23:31:22Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.10 _suhosinver=5.3.9-0.9.10 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' @@ -35,7 +35,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm') + 'logrotate.d.php-fpm' 'pcre_info.patch') md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' 'c099b3d7eac95018ababd41ded7f3066' 'c15d18f846be1d69144a5d0056ee6506' @@ -43,7 +43,8 @@ md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' '740ec5fe2ecfd9d7febd4081c90ec65b' - '07c4e412909ac65a44ec90e7a2c4bade') + '07c4e412909ac65a44ec90e7a2c4bade' + '8d3806bbb19e390f9b32ccf21611d937') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -136,6 +137,8 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/pcre_info.patch + # apply suhosin patch patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch diff --git a/extra/php/pcre_info.patch b/extra/php/pcre_info.patch new file mode 100644 index 000000000..e6d10df06 --- /dev/null +++ b/extra/php/pcre_info.patch @@ -0,0 +1,43 @@ +--- php-5.3.10/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100 +@@ -241,6 +241,7 @@ + char *pattern; + int do_study = 0; + int poptions = 0; ++ int count = 0; + unsigned const char *tables = NULL; + #if HAVE_SETLOCALE + char *locale = setlocale(LC_CTYPE, NULL); +@@ -252,10 +252,10 @@ + back the compiled pattern, otherwise go on and compile it. */ + if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { + /* +- * We use a quick pcre_info() check to see whether cache is corrupted, and if it ++ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it + * is, we flush it and compile the pattern from scratch. + */ +- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { ++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { + zend_hash_clean(&PCRE_G(pcre_cache)); + } else { + #if HAVE_SETLOCALE +--- php-5.3.10/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100 +@@ -4,7 +4,6 @@ + php_pcre_exec + php_pcre_get_substring + php_pcre_get_substring_list +-php_pcre_info + php_pcre_maketables + php_pcre_study + php_pcre_version +--- php-5.3.10/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100 +@@ -34,7 +34,6 @@ + #define pcre_exec php_pcre_exec + #define pcre_get_substring php_pcre_get_substring + #define pcre_get_substring_list php_pcre_get_substring_list +-#define pcre_info php_pcre_info + #define pcre_maketables php_pcre_maketables + #define pcre_study php_pcre_study + #define pcre_version php_pcre_version diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index a9b00ebe1..b8701ec9b 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148446 2012-02-01 03:47:09Z bisson $ +# $Id: PKGBUILD 149968 2012-02-11 23:31:26Z allan $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.9.0 -pkgrel=1 +pkgrel=2 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 30d565001..cb09eccda 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) pkgver=3.0.3 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://live.gnome.org/PyGObject" license=('LGPL') makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index e44555352..db25947aa 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 145605 2011-12-23 14:48:45Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 150176 2012-02-14 07:57:37Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.9 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') @@ -15,14 +14,15 @@ makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" 'fix-qthelp-build.patch') -md5sums=('61619500d09d87b6c2a25bd3ea994504' - '356a453331a33c507b1baba4a9771764') +md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c' + '6acfe0a5a00779f946c29d5fac647ce1') build() { - cd "${srcdir}" - - patch -p0 -i "${srcdir}"/fix-qthelp-build.patch + # Build QtHelp (FS#27665) + cd "${srcdir}"/PyQt-x11-gpl-${pkgver} + patch -p1 -i "${srcdir}"/fix-qthelp-build.patch + cd "${srcdir}" cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch index cd565e646..6055f9f35 100644 --- a/extra/pyqt/fix-qthelp-build.patch +++ b/extra/pyqt/fix-qthelp-build.patch @@ -1,6 +1,6 @@ ---- PyQt-x11-gpl-4.9/configure.py~ 2011-12-23 14:53:07.981490550 +0100 -+++ PyQt-x11-gpl-4.9/configure.py 2011-12-23 14:52:38.384984221 +0100 -@@ -1264,7 +1264,7 @@ +--- PyQt-x11-gpl-4.9.1/configure.py~ 2012-02-13 20:16:11.418786488 +0000 ++++ PyQt-x11-gpl-4.9.1/configure.py 2012-02-13 20:16:50.561809527 +0000 +@@ -1261,7 +1261,7 @@ opengl = (mname == "QtOpenGL") qt = [mname] diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 47e381721..9d424235f 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 145611 2011-12-23 20:54:15Z andrea $ +# $Id: PKGBUILD 150137 2012-02-13 11:40:55Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.6 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=('python2-pyqt' 'chrpath') source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('0605a8006ea752ec2d1d7fc4791d1c75' +md5sums=('39a1d0567a20b416177eb1a8afe225a7' '8cf9c06252e2f11ab00e62848e322fd3') - build() { cd "${srcdir}/QScintilla-gpl-${pkgver}" patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" diff --git a/extra/qt3/mysql.patch b/extra/qt3/mysql.patch deleted file mode 100644 index 5f61edc67..000000000 --- a/extra/qt3/mysql.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- src/sql/drivers/mysql/qsql_mysql.cpp -+++ src/sql/drivers/mysql/qsql_mysql.cpp -@@ -37,7 +37,6 @@ - #include "qsql_mysql.h" - #include <private/qsqlextension_p.h> - --#include <qapplication.h> - #include <qdatetime.h> - #include <qvaluevector.h> - #include <qsqlrecord.h> -@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() - } - - ///////////////////////////////////////////////////////// --static void qServerEnd() --{ --#ifndef Q_NO_MYSQL_EMBEDDED --# if MYSQL_VERSION_ID >= 40000 -- mysql_server_end(); --# endif // MYSQL_VERSION_ID --#endif // Q_NO_MYSQL_EMBEDDED --} - - static void qServerInit() - { -@@ -366,9 +357,7 @@ static void qServerInit() - qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); - # endif - } -- qAddPostRoutine(qServerEnd); - init = TRUE; -- - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED - } -@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() - QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); - delete ext; - } -+#ifndef Q_NO_MYSQL_EMBEDDED -+# if MYSQL_VERSION_ID > 40000 -+ mysql_server_end(); -+# endif -+#endif - } - - bool QMYSQLDriver::hasFeature( DriverFeature f ) const diff --git a/extra/qt3/qt-font-default-subst.diff b/extra/qt3/qt-font-default-subst.diff deleted file mode 100644 index 3e286f74e..000000000 --- a/extra/qt3/qt-font-default-subst.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- src/kernel/qfontdatabase_x11.cpp -+++ src/kernel/qfontdatabase_x11.cpp -@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese){ -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } -@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c - FcPatternPrint(pattern); - #endif - -+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use -+ // FcFontMatch/Sort here we have to do it manually. - FcConfigSubstitute(0, pattern, FcMatchPattern); -+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); -+ - // qDebug("1: pattern contains:"); - // FcPatternPrint(pattern); - -@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c - value.u.s = (const FcChar8 *)cs.data(); - FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); - } --#ifdef FONT_MATCH_DEBUG -- printf("final pattern contains:\n"); -- FcPatternPrint(pattern); --#endif - } - - if (script != QFont::Unicode) { -@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c - if (script == QFont::Latin) - // add Euro character - FcCharSetAddChar(cs, 0x20ac); -- if (script == QFont::Han_SimplifiedChinese) -- FcCharSetAddChar(cs, 0x3400); -- if (script == QFont::Han_TraditionalChinese) { -- FcCharSetAddChar(cs, 0x3435); -- FcCharSetAddChar(cs, 0xE000); -- FcCharSetAddChar(cs, 0xF6B1); -- } -- if (script == QFont::MiscellaneousSymbols) -- FcCharSetAddChar(cs, 0x2714); - FcPatternAddCharSet(pattern, FC_CHARSET, cs); - FcCharSetDestroy(cs); - } - -+#ifdef FONT_MATCH_DEBUG -+ printf("final pattern contains:\n"); -+ FcPatternPrint(pattern); -+#endif -+ - QFontEngine *fe = 0; - - for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { ---- src/kernel/qfontdatabase.cpp -+++ src/kernel/qfontdatabase.cpp -@@ -554,7 +554,7 @@ static const unsigned short sample_chars - // GeometricSymbols, - { 0x2500, 0x0 }, - // MiscellaneousSymbols, -- { 0x2640, 0x0 }, -+ { 0x2640, 0x2714, 0x0 }, - // EnclosedAndSquare, - { 0x2460, 0x0 }, - // Braille, diff --git a/extra/qt3/qt3-png14.patch b/extra/qt3/qt3-png14.patch deleted file mode 100644 index e8a194529..000000000 --- a/extra/qt3/qt3-png14.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.000000000 +0100 -+++ src/kernel/qpngio.cpp 2010-01-16 22:03:56.000000000 +0100 -@@ -159,7 +159,7 @@ - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { -- const int g = info_ptr->trans_values.gray; -+ const int g = info_ptr->trans_color.gray; - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -187,7 +187,7 @@ - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr->trans_alpha[i] - ) - ); - i++; -@@ -321,9 +321,9 @@ - png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) - if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { - QRgb trans = 0xFF000000 | qRgb( -- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); -+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); - for (uint y=0; y<height; y++) { - for (uint x=0; x<info_ptr->width; x++) { - if (((uint**)jt)[y][x] == trans) { diff --git a/extra/qt3/utf8-bug-qt3.diff b/extra/qt3/utf8-bug-qt3.diff deleted file mode 100644 index 43e84a99f..000000000 --- a/extra/qt3/utf8-bug-qt3.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- src/codecs/qutfcodec.cpp -+++ src/codecs/qutfcodec.cpp -@@ -154,6 +154,7 @@ - - class QUtf8Decoder : public QTextDecoder { - uint uc; -+ uint min_uc; - int need; - bool headerDone; - public: -@@ -167,8 +168,9 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uchar ch; -+ int error = -1; - for (int i=0; i<len; i++) { -- ch = *chars++; -+ ch = chars[i]; - if (need) { - if ( (ch&0xc0) == 0x80 ) { - uc = (uc << 6) | (ch & 0x3f); -@@ -182,6 +184,8 @@ - *qch++ = QChar(high); - *qch++ = QChar(low); - headerDone = TRUE; -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ *qch++ = QChar::replacement; - } else { - if (headerDone || QChar(uc) != QChar::byteOrderMark) - *qch++ = uc; -@@ -190,6 +194,7 @@ - } - } else { - // error -+ i = error; - *qch++ = QChar::replacement; - need = 0; - } -@@ -200,12 +205,21 @@ - } else if ((ch & 0xe0) == 0xc0) { - uc = ch & 0x1f; - need = 1; -+ error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; -+ error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; -+ error = i; -+ min_uc = 0x10000; -+ } else { -+ // error -+ *qch++ = QChar::replacement; - } - } - } ---- src/tools/qstring.cpp -+++ src/tools/qstring.cpp -@@ -5805,6 +5805,7 @@ - result.setLength( len ); // worst case - QChar *qch = (QChar *)result.unicode(); - uint uc = 0; -+ uint min_uc = 0; - int need = 0; - int error = -1; - uchar ch; -@@ -5822,6 +5823,12 @@ - unsigned short low = uc%0x400 + 0xdc00; - *qch++ = QChar(high); - *qch++ = QChar(low); -+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // overlong seqence, UTF16 surrogate or BOM -+ i = error; -+ qch = addOne(qch, result); -+ *qch++ = QChar(0xdbff); -+ *qch++ = QChar(0xde00+((uchar)utf8[i])); - } else { - *qch++ = uc; - } -@@ -5844,14 +5851,17 @@ - uc = ch & 0x1f; - need = 1; - error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; - error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; - error = i; -+ min_uc = 0x10000; - } else { - // Error - qch = addOne(qch, result); diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 4805bafba..685558262 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138832 2011-09-28 19:15:53Z angvp $ +# $Id: PKGBUILD 149915 2012-02-11 20:09:00Z ibiru $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rsync pkgver=3.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64' 'mips64el') url="http://samba.anu.edu.au/rsync/" @@ -13,7 +13,7 @@ license=('GPL3') depends=('acl') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') changelog=ChangeLog -source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \ +source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \ rsyncd.conf rsyncd rsync.xinetd) md5sums=('5ee72266fe2c1822333c407e1761b92b' '4395c0591638349b1a7aeaaa4da1f03a' @@ -25,17 +25,18 @@ sha1sums=('c64c8341984aea647506eb504496999fd968ddfc' 'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./prepare-source + cd "$srcdir/$pkgname-$pkgver" + ./prepare-source ./configure --prefix=/usr --with-included-popt \ - --enable-acl-support --enable-xattr-support - make + --enable-acl-support --enable-xattr-support + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm755 ../rsyncd ${pkgdir}/etc/rc.d/rsyncd - install -Dm644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf - install -Dm644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd" + install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" + install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" + install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync" } diff --git a/extra/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 b/extra/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 deleted file mode 100644 index 30a556acf..000000000 --- a/extra/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 +++ /dev/null @@ -1,3 +0,0 @@ -if /bin/sh ../libtool --silent --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../src -I/opt/kde/include -I/opt/qt/include -I. -I/opt/kde/include/skim -I/usr/include/scim-1.0 -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -march=i686 -mtune=generic -O2 -pipe -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -MT smartpinyinui.lo -MD -MP -MF ".deps/smartpinyinui.Tpo" -c -o smartpinyinui.lo smartpinyinui.cpp; \ - then mv -f ".deps/smartpinyinui.Tpo" ".deps/smartpinyinui.Plo"; else rm -f ".deps/smartpinyinui.Tpo"; exit 1; fi -smartpinyinui.cpp:26:36: error: skimeditshortcutbutton.h: No such file or directory diff --git a/extra/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch b/extra/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch deleted file mode 100644 index 91a948d5d..000000000 --- a/extra/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp ---- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 2008-02-25 16:27:05.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_phrase.cpp 2008-02-25 16:26:41.000000000 +0800 -@@ -28,6 +28,7 @@ - #define SCIM_PHRASE_MAX_RELATION 1000 - - #include <scim.h> -+#include <cstring> - #include "scim_pinyin_private.h" - #include "scim_phrase.h" - -diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp ---- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 2008-02-25 16:27:55.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_special_table.cpp 2008-02-25 16:28:08.000000000 +0800 -@@ -22,6 +22,7 @@ - - #include <time.h> - #include <scim.h> -+#include <cstring> - #include "scim_pinyin_private.h" - #include "scim_special_table.h" - -diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp ---- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 2008-02-25 16:26:10.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp 2008-02-25 16:26:26.000000000 +0800 -@@ -29,6 +29,7 @@ - #define Uses_SCIM_LOOKUP_TABLE - - #include <scim.h> -+#include <cstring> - #include "scim_pinyin.h" - - // Internal functions -diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp ---- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 2008-02-25 16:27:15.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp 2008-02-25 16:27:28.000000000 +0800 -@@ -27,6 +27,7 @@ - #define Uses_SCIM_LOOKUP_TABLE - - #include <scim.h> -+#include <cstring> - #include "scim_pinyin_private.h" - #include "scim_phrase.h" - #include "scim_pinyin.h" diff --git a/extra/scim-uim/uim-1.5.5-header.diff b/extra/scim-uim/uim-1.5.5-header.diff deleted file mode 100644 index 0e6565827..000000000 --- a/extra/scim-uim/uim-1.5.5-header.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp -+++ scim-uim-0.2.0/src/scim_uim_imengine.cpp -@@ -34,7 +34,8 @@ - - #include <scim.h> - #include "scim_uim_imengine.h" --#include <uim/uim-compat-scm.h> -+#include <uim/uim-scm.h> -+#include <uim/uim-util.h> - - #define scim_module_init uim_LTX_scim_module_init - #define scim_module_exit uim_LTX_scim_module_exit - diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD index 5a72f859e..77343bc02 100644 --- a/extra/sdl_gfx/PKGBUILD +++ b/extra/sdl_gfx/PKGBUILD @@ -17,7 +17,7 @@ md5sums=('fcc3c4f2d1b4943409bf7e67dd65d03a') build() { cd ${srcdir}/SDL_gfx-${pkgver} - if [ "${CARCH}" == "x86_64" ]; then + if [ "${CARCH}" != "i686" ]; then ./configure --prefix=/usr --disable-mmx else ./configure --prefix=/usr diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 9b061a986..0dd0920a3 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 145600 2011-12-23 10:58:52Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 150174 2012-02-14 07:57:34Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('3f61fd39d5b0c8fa9e43b59af04de924') +md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84') build() { cd "${srcdir}" diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD index 12810e517..cdeeaf4d0 100644 --- a/extra/slang/PKGBUILD +++ b/extra/slang/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120537 2011-04-25 07:37:13Z remy $ +# $Id: PKGBUILD 149970 2012-02-11 23:31:28Z allan $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=slang pkgver=2.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="S-Lang is a powerful interpreted language" arch=('i686' 'x86_64' 'mips64el') url="http://www.jedsoft.org/slang/" @@ -12,8 +12,9 @@ license=('GPL') depends=('glibc' 'pcre' 'zlib') backup=('etc/slsh.rc') options=('!makeflags') -source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7fcfd447e378f07dd0c0bae671fe6487') +source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('7fcfd447e378f07dd0c0bae671fe6487' + '0e37091fe52b4ef609c3cee8eda0e101') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/slim/gcc44.patch b/extra/slim/gcc44.patch deleted file mode 100644 index 390ea8a86..000000000 --- a/extra/slim/gcc44.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur slim-1.3.2/switchuser.h slim-1.3.2.a/switchuser.h ---- slim-1.3.2/switchuser.h 2010-07-08 07:04:10.000000000 +0200 -+++ slim-1.3.2.a/switchuser.h 2010-08-21 15:10:34.306212393 +0200 -@@ -13,6 +13,7 @@ - #define _SWITCHUSER_H_ - - #include <stdlib.h> -+#include <stdio.h> /* remove */ - #include <unistd.h> - #include <string.h> - #include <pwd.h> diff --git a/extra/spassgen/PKGBUILD b/extra/spassgen/PKGBUILD deleted file mode 100644 index 653a51f57..000000000 --- a/extra/spassgen/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 77993 2010-04-19 08:07:51Z dgriffiths $ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> - -pkgname=spassgen -pkgver=1.5 -pkgrel=7 -pkgdesc="A small program that generates passwords" -arch=(i686 x86_64) -url="http://spassgen.sourceforge.net/" -license=('GPL2') -depends=('qt3') -options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ed019dda56551fb860c74016baa91fa4') - -build() { - cd ${srcdir}/${pkgname} - . /etc/profile.d/qt3.sh - qmake -project spassgen.pro || return 1 - qmake || return 1 - make || return 1 - install -d ${pkgdir}/opt/kde/{bin,share/icons/crystalsvg} - install -m755 spassgen ${pkgdir}/opt/kde/bin/spassgen || return 1 - cd icons - cp -r * ${pkgdir}/opt/kde/share/icons/crystalsvg || return 1 - rm -r ${pkgdir}/opt/kde/share/icons/crystalsvg/16x16/.xvpics - } diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD index c6268ad4e..88ddbe40e 100644 --- a/extra/ssmtp/PKGBUILD +++ b/extra/ssmtp/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ssmtp pkgver=2.64 -pkgrel=2 +pkgrel=2.1 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -20,6 +20,7 @@ md5sums=('65b4e0df4934a6cd08c506cabcbe584f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -ri 's/-lssl/-lssl -lcrypto/' configure ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index 24b3ea96f..660efcecc 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145878 2012-01-03 17:17:44Z stephane $ +# $Id: PKGBUILD 149972 2012-02-11 23:31:30Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig pkgver=2.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64' 'mips64el') url="http://www.swig.org/" diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD new file mode 100644 index 000000000..7409bba10 --- /dev/null +++ b/extra/systemd/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 150113 2012-02-12 16:04:12Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=systemd +pkgver=42 +pkgrel=1 +pkgdesc="Session and Startup manager" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2') +depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz') +makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers') +optdepends=('cryptsetup: required for encrypted block devices' + 'dbus-python: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') +options=('!libtool') +backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf + etc/systemd/systemd-journald.conf) +install="$pkgname.install" +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + "os-release") +md5sums=('7686b44e368d2523901d3e903ed4dcea' + '752636def0db3c03f121f8b4f44a63cd') + +build() { + cd "$pkgname-$pkgver" + + # Don't unset locale in getty + # https://bugzilla.redhat.com/show_bug.cgi?id=663900 + sed -i -e '/^Environ.*LANG/s/^/#/' \ + -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 + + ./configure --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --libdir=/usr/lib \ + --localstatedir=/var \ + --with-rootprefix= \ + --with-rootlibdir=/lib + + make + + # fix .so links in manpages + sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8 + sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" + printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + # symlink to /bin/systemd for compat and sanity + ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd + + # fix systemd-analyze for python2 + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # rename man pages to avoid conflicts with sysvinit and initscripts + cd "$pkgdir/usr/share/man" + + # not building this with systemd + rm -f "man1/systemadm.1" + + manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 + man5/{hostname,{vconsole,locale}.conf}.5) + + for manpage in "${manpages[@]}"; do + IFS='/' read section page <<< "$manpage" + mv "$manpage" "$section/systemd.$page" + done +} + +# vim: ft=sh syn=sh et diff --git a/extra/systemd/os-release b/extra/systemd/os-release new file mode 100644 index 000000000..5e24a6031 --- /dev/null +++ b/extra/systemd/os-release @@ -0,0 +1,5 @@ +NAME="Arch Linux" +ID=arch +PRETTY_NAME="Arch Linux" +ANSI_COLOR="1;36" + diff --git a/extra/systemd/systemd.install b/extra/systemd/systemd.install new file mode 100644 index 000000000..f31642e13 --- /dev/null +++ b/extra/systemd/systemd.install @@ -0,0 +1,53 @@ +#!/bin/sh + +checkgroups() { + if ! getent group lock >/dev/null; then + groupadd -g 54 lock + fi +} + +sd_booted() { + [ -e sys/fs/cgroups/systemd ] +} + +post_install() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + echo "systemd has been installed to /bin/systemd. Please ensure you append" + echo "init=/bin/systemd to your kernel command line in your bootloader." +} + +post_upgrade() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + if sd_booted; then + systemctl daemon-reexec >/dev/null + fi + + newpkgver=${1%-*} + oldpkgver=${2%-*} + + # catch v31 need for restarting systemd-logind.service + if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then + # but only if systemd is running + if sd_booted; then + systemctl try-restart systemd-logind.service + fi + fi +} + +post_remove() { + if getent group lock >/dev/null; then + groupdel lock + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index 93b83d45a..cb0eab8ee 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143583 2011-11-26 17:25:12Z foutrelis $ +# $Id: PKGBUILD 149974 2012-02-11 23:31:34Z allan $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar pkgver=1.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://thunar.xfce.org" diff --git a/extra/transfig/ChangeLog b/extra/transfig/ChangeLog deleted file mode 100644 index c303c33c0..000000000 --- a/extra/transfig/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -2010-05-26 Jan de Groot <jgc@archlinux.org> - * transfig 3.2.5c-3 - * Rebuilt for libpng 1.4.2, png_set_dither has been renamed - -2010-01-27 Eric Belanger <eric@archlinux.org> - - * transfig 3.2.5c-2 - * Rebuilt for libpng 1.4 and libjpeg 8 - -2010-01-11 Eric Belanger <eric@archlinux.org> - - * transfig 3.2.5c-1 - * Upstream update - * Removed force option - -2009-08-12 Eric Belanger <eric@archlinux.org> - - * transfig 3.2.5a-1 - * Upstream update - * Added force option - -2009-03-21 Eric Belanger <eric@archlinux.org> - - * transfig 3.2.5-2 - * Removed uneeded stderr message (close FS#13825) - -2008-12-14 Eric Belanger <eric@archlinux.org> - - * transfig 3.2.5-1 - * Upstream update - * Added arch tag - * Added license - * Added imake makedepends - * Added man pages - * Removed old patches - * Added ChangeLog diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index f42dd8ab0..22aec705e 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145135 2011-12-17 16:20:46Z ibiru $ +# $Id: PKGBUILD 150115 2012-02-12 18:51:16Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=11.1.0 +pkgver=12.0.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python." arch=('i686' 'x86_64' 'mips64el') @@ -12,10 +12,10 @@ url="http://twistedmatrix.com/" license=('MIT') depends=('python2' 'pycrypto' 'zope-interface') optdepends=('python2-pyopenssl' - 'python-soappy:for twisted.web.soap') + 'python-soappy: for twisted.web.soap') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -md5sums=('972f3497e6e19318c741bf2900ffe31c') +md5sums=('cf49a8676c21c50faf1b42b528049471') build() { cd "$srcdir/Twisted-$pkgver" diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index 5d26828ed..a15264513 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 146641 2012-01-15 08:38:24Z bisson $ +# $Id: PKGBUILD 150199 2012-02-14 13:39:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc='Multilingual input method library' -arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/uim/' license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') depends=('libxft' 'libedit' 'anthy' 'm17n-lib') makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel') optdepends=('qt: immodule and helper applications' @@ -16,8 +16,8 @@ optdepends=('qt: immodule and helper applications' 'gtk3: immodules and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('4982178aca6ee1ae775fc2a9b4bbb7a66e97cbd4') +source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('1c7bb8c6c475dcbc4768bcabac540c42ccfd8185') install=install diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index a9292949c..4a411d6ca 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145793 2012-01-01 02:41:17Z dreisner $ +# $Id: PKGBUILD 149976 2012-02-11 23:31:36Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade @@ -6,7 +6,7 @@ pkgname=varnish pkgver=3.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="High-performance HTTP accelerator" arch=(mips64el) url="http://www.varnish-cache.org/" diff --git a/extra/vorbis-tools/ChangeLog b/extra/vorbis-tools/ChangeLog deleted file mode 100644 index 54e3adcb8..000000000 --- a/extra/vorbis-tools/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ -2010-04-10 Andrea Scarpino <andrea@archlinux.org> - - * vorbis-tools 1.4.0-2 - * libao 1.0 rebuild - -2010-04-10 Andrea Scarpino <andrea@archlinux.org> - - * vorbis-tools 1.4.0-1 - * Upstream release - -2009-10-04 Eric Belanger <eric@archlinux.org> - - * vorbis-tools 1.2.0-4 - * Added vcut tool (close FS#14749) - * Fixed license - -2008-03-15 Travis Willard <travis@archlinux.org> - - * vorbis-tools 1.2.0-3 - * Removed explicit /usr/man usage - -2008-03-15 Travis Willard <travis@archlinux.org> - - * vorbis-tools 1.2.0-1 - * New upstream release. - * Added ChangeLog diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 8b2f70aed..1add7a362 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -6,7 +6,7 @@ pkgname=(vte3 vte-common) pkgver=0.30.1 pkgrel=2 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD deleted file mode 100644 index b8fc20c81..000000000 --- a/extra/wesnoth/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 148958 2012-02-05 11:57:49Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Jacobo Arvelo <unix4all@ya.com> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=wesnoth -pkgver=1.8.6 -pkgrel=4 -pkgdesc="A turn-based strategy game on a fantasy world" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.wesnoth.org/" -depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2') -makedepends=('boost') -install=wesnoth.install -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - wesnoth-libpng-1.4.0.patch - wesnoth-1.8.6-boost-foreach.patch - wesnoth.tmpfiles.conf) -md5sums=('f1c3179869b01b61e253e74aeb241034' - '3b0d2edcb45e8ecc8c790f92bdcb0087' - 'dc414ab7e1334941548e9db6db9c2460' - 'b8122f5054e3895c9c054e87460869dc') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch" - patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch" - ./autogen.sh - ./configure --prefix=/usr --localstatedir=/var --enable-tools \ - --enable-editor --enable-server --with-fifodir=/run/wesnothd - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install-exec - install -dm755 "$pkgdir/usr/lib/tmpfiles.d/" - install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" - - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager" - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent" - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope" - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint" -} diff --git a/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch deleted file mode 100644 index 5aee3118c..000000000 --- a/extra/wesnoth/wesnoth-1.8.6-boost-foreach.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 -+++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 -@@ -238,6 +238,17 @@ void ttree_view_node::clear() - - struct ttree_view_node_implementation - { -+ template<class W, class It> -+ static W* find_at_aux(It begin, It end, -+ const tpoint& coordinate, const bool must_be_active) { -+ for (It it = begin; it != end; ++it) { -+ if(W* widget = it->find_at(coordinate, must_be_active)) { -+ return widget; -+ } -+ } -+ return NULL; -+ } -+ - template<class W> - static W* find_at( - typename tconst_duplicator<W, ttree_view_node>::type& -@@ -255,13 +266,9 @@ struct ttree_view_node_implementation - } - - typedef typename tconst_duplicator<W, ttree_view_node>::type thack; -- foreach(thack& node, tree_view_node.children_) { -- if(W* widget = node.find_at(coordinate, must_be_active)) { -- return widget; -- } -- } -- -- return NULL; -+ return find_at_aux<W>(tree_view_node.children_.begin(), -+ tree_view_node.children_.end(), -+ coordinate, must_be_active); - } - }; - -@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size - return size; - } - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; -@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz - size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; - } - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; -@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s - - DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; diff --git a/extra/wesnoth/wesnoth-libpng-1.4.0.patch b/extra/wesnoth/wesnoth-libpng-1.4.0.patch deleted file mode 100644 index 338f467af..000000000 --- a/extra/wesnoth/wesnoth-libpng-1.4.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp ---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 -+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 -@@ -174,8 +174,8 @@ - //TODO: review whether providing NULL error handlers is something - //sensible - png_struct* png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), -+ NULL, NULL); - if(!png_ptr) - throw exploder_failure("Unable to initialize the png write structure"); - ---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 -+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 -@@ -15,6 +15,7 @@ - #include "exploder_utils.hpp" - #include "game_config.hpp" - #include "serialization/string_utils.hpp" -+#include <zlib.h> - #include <png.h> - - exploder_point::exploder_point(const std::string &s) diff --git a/extra/wesnoth/wesnoth.install b/extra/wesnoth/wesnoth.install deleted file mode 100644 index 4f1e419ae..000000000 --- a/extra/wesnoth/wesnoth.install +++ /dev/null @@ -1,9 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOF -Note: -==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" -==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth -==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. -EOF -} diff --git a/extra/wesnoth/wesnoth.tmpfiles.conf b/extra/wesnoth/wesnoth.tmpfiles.conf deleted file mode 100644 index 3ec0f6013..000000000 --- a/extra/wesnoth/wesnoth.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -D /run/wesnothd 0700 root root - diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 06f438f92..31389560e 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 149306 2012-02-06 18:35:19Z daniel $ +# $Id: PKGBUILD 150208 2012-02-14 20:50:29Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker -pkgver=0.95.1 +pkgver=0.95.2 pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64 'mips64el') @@ -10,14 +10,13 @@ url="http://www.windowmaker.org/" license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('1b0d0aa2ac53a7a98ef80a35e507b082' +source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) +md5sums=('ae62bad9c4dee504066e0f172b565ff0' '2fba97bebfd691836b92b8f0db79ff13') build() { - cd $srcdir/windowmaker-$pkgver + cd $srcdir/WindowMaker-$pkgver [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ --enable-usermenu --enable-modelock --enable-xrandr @@ -25,7 +24,7 @@ build() { } package() { - cd $srcdir/windowmaker-$pkgver + cd $srcdir/WindowMaker-$pkgver make DESTDIR=$pkgdir install install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index 2b38788de..510cb533c 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90602 2010-09-13 18:07:52Z thomas $ +# $Id: PKGBUILD 149922 2012-02-11 22:38:54Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui pkgver=0.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/xaw3d/LICENSE b/extra/xaw3d/LICENSE deleted file mode 100644 index 395de2d9b..000000000 --- a/extra/xaw3d/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 1989 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. diff --git a/extra/xaw3d/Xaw3d-1.5-box.c.patch b/extra/xaw3d/Xaw3d-1.5-box.c.patch deleted file mode 100644 index 252238af8..000000000 --- a/extra/xaw3d/Xaw3d-1.5-box.c.patch +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## box.c.dpatch by Francesco Paolo Lovergine <frankie@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad xaw3d-1.5+E~/lib/Xaw3d/Box.c xaw3d-1.5+E/lib/Xaw3d/Box.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/Box.c 1996-10-15 16:41:18.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/Box.c 2007-04-24 15:28:39.000000000 +0200 -@@ -353,8 +353,16 @@ - else { - width = preferred_width; - do { /* find some width big enough to stay within this height */ -+#if 0 - width *= 2; - if (width > constraint->width) width = constraint->width; -+#endif -+ if (width > constraint->width/2) { /* avoid short int overflow */ -+ width = constraint->width; -+ } -+ else { -+ width *= 2; -+ } - DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); - } while (preferred_height > constraint->height && - width < constraint->width); diff --git a/extra/xaw3d/Xaw3d-1.5-debian-fixes.patch b/extra/xaw3d/Xaw3d-1.5-debian-fixes.patch deleted file mode 100644 index 5593f249b..000000000 --- a/extra/xaw3d/Xaw3d-1.5-debian-fixes.patch +++ /dev/null @@ -1,647 +0,0 @@ -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian 2000-11-27 14:19:36.000000000 +0100 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c 2008-10-06 11:42:13.000000000 +0200 -@@ -51,11 +51,17 @@ in this Software without prior written a - #include <X11/Xaw3d/MultiSrcP.h> - #endif - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - - #if (defined(ASCII_STRING) || defined(ASCII_DISK)) - # include <X11/Xaw3d/AsciiText.h> /* for Widget Classes. */ - #endif - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - - /**************************************************************** - * -@@ -1007,7 +1013,9 @@ InitStringOrFile(src, newString) - AsciiSrcObject src; - Boolean newString; - { -- char * open_mode = NULL; -+ mode_t open_mode = 0; -+ const char *fdopen_mode = NULL; -+ int fd; - FILE * file; - char fileName[TMPSIZ]; - -@@ -1049,7 +1057,8 @@ Boolean newString; - XtErrorMsg("NoFile", "asciiSourceCreate", "XawError", - "Creating a read only disk widget and no file specified.", - NULL, 0); -- open_mode = "r"; -+ open_mode = O_RDONLY; -+ fdopen_mode = "r"; - break; - case XawtextAppend: - case XawtextEdit: -@@ -1057,9 +1066,17 @@ Boolean newString; - src->ascii_src.string = fileName; - (void) tmpnam(src->ascii_src.string); - src->ascii_src.is_tempfile = TRUE; -- open_mode = "w"; -- } else -- open_mode = "r+"; -+ open_mode = O_WRONLY | O_CREAT | O_EXCL; -+ fdopen_mode = "w"; -+ } else { -+/* O_NOFOLLOW is a BSD & Linux extension */ -+#ifdef O_NOFOLLOW -+ open_mode = O_RDWR | O_NOFOLLOW; -+#else -+ open_mode = O_RDWR; /* unsafe; subject to race conditions */ -+#endif -+ fdopen_mode = "r+"; -+ } - break; - default: - XtErrorMsg("badMode", "asciiSourceCreate", "XawError", -@@ -1078,11 +1095,14 @@ Boolean newString; - } - - if (!src->ascii_src.is_tempfile) { -- if ((file = fopen(src->ascii_src.string, open_mode)) != 0) { -- (void) fseek(file, (Off_t)0, 2); -- src->ascii_src.length = (XawTextPosition) ftell(file); -- return file; -- } else { -+ if ((fd = open(src->ascii_src.string, open_mode, 0666))) { -+ if ((file = fdopen(fd, fdopen_mode)) != NULL) { -+ (void)fseek(file, 0, SEEK_END); -+ src->ascii_src.length = (XawTextPosition)ftell(file); -+ return (file); -+ } -+ } -+ { - String params[2]; - Cardinal num_params = 2; - -@@ -1094,7 +1114,7 @@ Boolean newString; - } - } - src->ascii_src.length = 0; -- return((FILE *)NULL); -+ return(NULL); - } - - static void -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h ---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian 1996-10-15 16:41:18.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h 2008-10-06 11:42:13.000000000 +0200 -@@ -85,7 +85,11 @@ SOFTWARE. - #ifdef L_tmpnam - #define TMPSIZ L_tmpnam - #else --#define TMPSIZ 32 /* bytes to allocate for tmpnam */ -+#ifdef PATH_MAX -+#define TMPSIZ PATH_MAX -+#else -+#define TMPSIZ 1024 /* bytes to allocate for tmpnam */ -+#endif - #endif - - #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian 1996-10-15 16:41:20.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c 2008-10-06 11:42:13.000000000 +0200 -@@ -53,6 +53,8 @@ in this Software without prior written a - #include <X11/Xaw3d/XawInit.h> - #include <X11/Xaw3d/MenuButtoP.h> - -+#include "XawAlloc.h" -+ - static void ClassInitialize(); - static void PopupMenu(); - -@@ -179,9 +181,16 @@ Cardinal * num_params; - - if (menu == NULL) { - char error_buf[BUFSIZ]; -- (void) sprintf(error_buf, "MenuButton: %s %s.", -- "Could not find menu widget named", mbw->menu_button.menu_name); -- XtAppWarning(XtWidgetToApplicationContext(w), error_buf); -+ char *err1 = "MenuButton: Could not find menu widget named "; -+ char *perr; -+ int len; -+ -+ len = strlen(err1) + strlen(mbw->menu_button.menu_name) + 1 + 1; -+ perr = XtStackAlloc(len, error_buf); -+ if (perr == NULL) return; -+ sprintf(perr, "%s%s.", err1, mbw->menu_button.menu_name); -+ XtAppWarning(XtWidgetToApplicationContext(w), perr); -+ XtStackFree(perr, error_buf); - return; - } - if (!XtIsRealized(menu)) -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian 2008-10-06 11:42:13.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c 2008-10-06 11:42:13.000000000 +0200 -@@ -74,6 +74,9 @@ in this Software without prior written a - #include <stdio.h> - #include <ctype.h> - #include <errno.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - - /**************************************************************** - * -@@ -1077,7 +1080,9 @@ InitStringOrFile(src, newString) - MultiSrcObject src; - Boolean newString; - { -- char * open_mode = NULL; -+ mode_t open_mode = 0; -+ const char *fdopen_mode = NULL; -+ int fd; - FILE * file; - char fileName[TMPSIZ]; - Display *d = XtDisplayOfObject((Widget)src); -@@ -1128,7 +1133,8 @@ InitStringOrFile(src, newString) - XtErrorMsg("NoFile", "multiSourceCreate", "XawError", - "Creating a read only disk widget and no file specified.", - NULL, 0); -- open_mode = "r"; -+ open_mode = O_RDONLY; -+ fdopen_mode = "r"; - break; - case XawtextAppend: - case XawtextEdit: -@@ -1141,9 +1147,17 @@ InitStringOrFile(src, newString) - - (void) tmpnam(src->multi_src.string); - src->multi_src.is_tempfile = TRUE; -- open_mode = "w"; -- } else -- open_mode = "r+"; -+ open_mode = O_WRONLY | O_CREAT | O_EXCL; -+ fdopen_mode = "w"; -+ } else { -+/* O_NOFOLLOW is a BSD & Linux extension */ -+#ifdef O_NOFOLLOW -+ open_mode = O_RDWR | O_NOFOLLOW; -+#else -+ open_mode = O_RDWR; /* unsafe; subject to race conditions */ -+#endif -+ fdopen_mode = "r+"; -+ } - break; - default: - XtErrorMsg("badMode", "multiSourceCreate", "XawError", -@@ -1162,11 +1176,14 @@ InitStringOrFile(src, newString) - } - - if (!src->multi_src.is_tempfile) { -- if ((file = fopen(src->multi_src.string, open_mode)) != 0) { -- (void) fseek(file, (Off_t)0, 2); -- src->multi_src.length = ftell (file); -- return file; -- } else { -+ if ((fd = open(src->multi_src.string, open_mode, 0666))) { -+ if ((file = fdopen(fd, fdopen_mode)) != NULL) { -+ (void)fseek(file, 0, SEEK_END); -+ src->multi_src.length = (XawTextPosition)ftell(file); -+ return (file); -+ } -+ } -+ { - String params[2]; - Cardinal num_params = 2; - -@@ -1178,7 +1195,7 @@ InitStringOrFile(src, newString) - } - } - src->multi_src.length = 0; -- return((FILE *)NULL); -+ return(NULL); - #undef StrLen - } - -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h ---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian 1996-10-15 16:41:21.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h 2008-10-06 11:42:13.000000000 +0200 -@@ -113,7 +113,11 @@ SOFTWARE. - #ifdef L_tmpnam - #define TMPSIZ L_tmpnam - #else --#define TMPSIZ 32 /* bytes to allocate for tmpnam */ -+#ifdef PATH_MAX -+#define TMPSIZ PATH_MAX -+#else -+#define TMPSIZ 1024 /* bytes to allocate for tmpnam */ -+#endif - #endif - - #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian 2000-11-27 14:19:36.000000000 +0100 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c 2008-10-06 11:42:13.000000000 +0200 -@@ -56,6 +56,8 @@ SOFTWARE. - #include <X11/Xaw3d/SimpleP.h> - #include <X11/Xmu/Drawing.h> - -+#include "XawAlloc.h" -+ - #define offset(field) XtOffsetOf(SimpleRec, simple.field) - - static XtResource resources[] = { -@@ -148,11 +150,17 @@ static void ClassPartInitialize(class) - - if (c->simple_class.change_sensitive == NULL) { - char buf[BUFSIZ]; -- -- (void) sprintf(buf, -- "%s Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.", -- c->core_class.class_name); -- XtWarning(buf); -+ char *pbuf; -+ char *msg1 = " Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited."; -+ int len; -+ -+ len = strlen(msg1) + strlen(c->core_class.class_name) + 1; -+ pbuf = XtStackAlloc(len, buf); -+ if (pbuf != NULL) { -+ sprintf(pbuf, "%s%s", c->core_class.class_name, msg1); -+ XtWarning(pbuf); -+ XtStackFree(pbuf, buf); -+ } - c->simple_class.change_sensitive = ChangeSensitive; - } - -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian 2003-02-17 07:45:07.000000000 +0100 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c 2008-10-06 11:42:13.000000000 +0200 -@@ -51,6 +51,8 @@ in this Software without prior written a - #include <X11/Xmu/Initer.h> - #include <X11/Xmu/CharSet.h> - -+#include "XawAlloc.h" -+ - #define streq(a, b) ( strcmp((a), (b)) == 0 ) - - #define offset(field) XtOffsetOf(SimpleMenuRec, simple_menu.field) -@@ -755,9 +757,17 @@ Cardinal * num_params; - - if ( (menu = FindMenu(w, params[0])) == NULL) { - char error_buf[BUFSIZ]; -- (void) sprintf(error_buf, "%s '%s'", -- "Xaw - SimpleMenuWidget: could not find menu named: ", params[0]); -- XtAppWarning(XtWidgetToApplicationContext(w), error_buf); -+ char *err1 = "Xaw - SimpleMenuWidget: could not find menu named: "; -+ char *perr; -+ int len; -+ -+ len = strlen(err1) + strlen(params[0]) + 2 + 1; -+ perr = XtStackAlloc(len, error_buf); -+ if (perr == NULL) -+ return; -+ sprintf(perr, "%s'%s'", err1, params[0]); -+ XtAppWarning(XtWidgetToApplicationContext(w), perr); -+ XtStackFree(perr, error_buf); - return; - } - -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian 2003-02-10 18:18:00.000000000 +0100 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c 2008-10-06 11:42:13.000000000 +0200 -@@ -315,7 +315,15 @@ XtIntervalId *id; /* unused */ - if (w->strip_chart.points != NULL) { - w->strip_chart.points[0].x = w->strip_chart.interval + s; - XDrawPoints(XtDisplay(w), XtWindow(w), w->strip_chart.hiGC, -- w->strip_chart.points, w->strip_chart.scale, -+ /* -+ * patch: -+ * -+ * w->strip_chart.points, w->strip_chart.scale, -+ * -+ * this to avoid a subdle bug of extra spurios scan -+ * line in this widget. -+ */ -+ w->strip_chart.points, w->strip_chart.scale - 1, - CoordModePrevious); - } - -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Text.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian 2008-10-06 11:42:13.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c 2008-10-06 11:43:16.000000000 +0200 -@@ -76,6 +76,8 @@ SOFTWARE. - #include <ctype.h> /* for isprint() */ - #include <stdlib.h> - -+#include "XawAlloc.h" -+ - #ifndef MAX_LEN_CT - #define MAX_LEN_CT 6 /* for sequence: ESC $ ( A \xx \xx */ - #endif -@@ -521,6 +523,8 @@ Cardinal *num_args; /* unused */ - TextWidget ctx = (TextWidget) new; - char error_buf[BUFSIZ]; - int s; -+ char *perr; /* frankie */ -+ size_t len; /* frankie */ - - ctx->text.threeD = XtVaCreateWidget("threeD", threeDWidgetClass, new, - XtNx, 0, XtNy, 0, -@@ -569,10 +573,17 @@ Cardinal *num_args; /* unused */ - if (ctx->text.scroll_vert != XawtextScrollNever) - if ( (ctx->text.resize == XawtextResizeHeight) || - (ctx->text.resize == XawtextResizeBoth) ) { -- (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name, -- "Vertical scrolling not allowed with height resize.\n", -- "Vertical scrolling has been DEACTIVATED."); -- XtAppWarning(XtWidgetToApplicationContext(new), error_buf); -+ char *err1 = "Xaw Text Widget "; -+ char *err2 = ":\nVertical scrolling not allowed with height resize.\n"; -+ char *err3 = "Vertical scrolling has been DEACTIVATED."; -+ len = strlen(err1) + strlen(err2) + strlen(err3) + -+ strlen(ctx->core.name) + 1; -+ perr = XtStackAlloc(len, error_buf); -+ if (perr != NULL) { -+ (void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3); -+ XtAppWarning(XtWidgetToApplicationContext(new), perr); -+ XtStackFree(perr, error_buf); -+ } - ctx->text.scroll_vert = XawtextScrollNever; - } - else if (ctx->text.scroll_vert == XawtextScrollAlways) -@@ -580,18 +591,32 @@ Cardinal *num_args; /* unused */ - - if (ctx->text.scroll_horiz != XawtextScrollNever) - if (ctx->text.wrap != XawtextWrapNever) { -- (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name, -- "Horizontal scrolling not allowed with wrapping active.\n", -- "Horizontal scrolling has been DEACTIVATED."); -- XtAppWarning(XtWidgetToApplicationContext(new), error_buf); -+ char *err1 = "Xaw Text Widget "; -+ char *err2 = ":\nHorizontal scrolling not allowed with wrapping active."; -+ char *err3 = "\nHorizontal scrolling has been DEACTIVATED."; -+ len = strlen(err1) + strlen(err2) + strlen(err3) + -+ strlen(ctx->core.name) + 1; -+ perr = XtStackAlloc(len, error_buf); -+ if (perr != NULL) { -+ (void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3); -+ XtAppWarning(XtWidgetToApplicationContext(new), perr); -+ XtStackFree(perr, error_buf); -+ } - ctx->text.scroll_horiz = XawtextScrollNever; - } - else if ( (ctx->text.resize == XawtextResizeWidth) || - (ctx->text.resize == XawtextResizeBoth) ) { -- (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name, -- "Horizontal scrolling not allowed with width resize.\n", -- "Horizontal scrolling has been DEACTIVATED."); -- XtAppWarning(XtWidgetToApplicationContext(new), error_buf); -+ char *err1 = "Xaw Text Widget "; -+ char *err2 = ":\nHorizontal scrolling not allowed with width resize.\n"; -+ char *err3 = "Horizontal scrolling has been DEACTIVATED."; -+ len = strlen(err1) + strlen(err2) + strlen(err3) + -+ strlen(ctx->core.name) + 1; -+ perr = XtStackAlloc(len, error_buf); -+ if (perr != NULL) { -+ (void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3); -+ XtAppWarning(XtWidgetToApplicationContext(new), perr); -+ XtStackFree(perr, error_buf); -+ } - ctx->text.scroll_horiz = XawtextScrollNever; - } - else if (ctx->text.scroll_horiz == XawtextScrollAlways) -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian 2000-11-27 14:19:36.000000000 +0100 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c 2008-10-06 11:42:13.000000000 +0200 -@@ -66,6 +66,8 @@ in this Software without prior written a - #include <X11/Xos.h> /* for O_RDONLY */ - #include <errno.h> - -+#include "XawAlloc.h" -+ - #ifdef X_NOT_STDC_ENV - extern int errno; - #endif -@@ -809,6 +811,8 @@ DoSearch(search) - struct SearchAndReplace * search; - { - char msg[BUFSIZ]; -+ char *pmsg; -+ int len; - Widget tw = XtParent(search->search_popup); - XawTextPosition pos; - XawTextScanDirection dir; -@@ -835,9 +839,20 @@ struct SearchAndReplace * search; - /* The Raw string in find.ptr may be WC I can't use here, so I re - call - GetString to get a tame version. */ - -- if (pos == XawTextSearchError) -- (void) sprintf( msg, "Could not find string ``%s''.", GetString( search->search_text ) ); -- else { -+ if (pos == XawTextSearchError) { -+ char *msg1 = "Could not find string ``"; -+ char *msg2 = "''."; -+ len = strlen(msg1) + strlen(msg2) + -+ strlen(GetString( search->search_text )) + 1; -+ pmsg = XtStackAlloc(len, msg); -+ if (pmsg != NULL) { -+ (void) sprintf( pmsg, "%s%s%s", msg1, GetString( search->search_text ), -+ msg2); -+ } else { -+ pmsg = msg; -+ (void) sprintf( pmsg, "Could not find string"); -+ } -+ } else { - if (dir == XawsdRight) - XawTextSetInsertionPoint( tw, pos + text.length); - else -@@ -849,7 +864,8 @@ struct SearchAndReplace * search; - } - - XawTextUnsetSelection(tw); -- SetSearchLabels(search, msg, "", TRUE); -+ SetSearchLabels(search, pmsg, "", TRUE); -+ XtStackFree(pmsg, msg); - return(FALSE); - } - -@@ -982,13 +998,26 @@ Boolean once_only, show_current; - if ( (new_pos == XawTextSearchError) ) { - if (count == 0) { - char msg[BUFSIZ]; -+ char *pmsg; -+ int len; -+ char *msg1 = "*** Error: Could not find string ``"; -+ char *msg2 = "''. ***"; - - /* The Raw string in find.ptr may be WC I can't use here, - so I call GetString to get a tame version.*/ - -- (void) sprintf( msg, "%s %s %s", "*** Error: Could not find string ``", -- GetString( search->search_text ), "''. ***"); -- SetSearchLabels(search, msg, "", TRUE); -+ len = strlen(msg1) + strlen(msg2) + -+ strlen(GetString( search->search_text )) + 1; -+ pmsg = XtStackAlloc(len, msg); -+ if (pmsg != NULL) { -+ (void) sprintf( pmsg, "%s%s%s", msg1, -+ GetString( search->search_text ), msg2); -+ } else { -+ pmsg = msg; -+ (void) sprintf(pmsg, "*** Error: Could not find string ***"); -+ } -+ SetSearchLabels(search, pmsg, "", TRUE); -+ XtStackFree(pmsg, msg); - return(FALSE); - } - else -@@ -1011,9 +1040,22 @@ Boolean once_only, show_current; - - if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) { - char msg[BUFSIZ]; -- -- (void) sprintf( msg, "'%s' with '%s'. ***", find.ptr, replace.ptr); -+ char *pmsg; -+ int len; -+ char *msg1 = "' with '"; -+ char *msg2 = "'. ***"; -+ -+ len = 1 + strlen(msg1) + strlen(msg2) + strlen(find.ptr) + -+ strlen(replace.ptr) + 1; -+ pmsg = XtStackAlloc(len, msg); -+ if (pmsg != NULL) { -+ (void) sprintf( pmsg, "`%s%s%s%s", find.ptr, msg1, replace.ptr, msg2); -+ } else { -+ pmsg = msg; -+ (void) sprintf(pmsg, "string ***"); -+ } - SetSearchLabels(search, "*** Error while replacing", msg, TRUE); -+ XtStackFree(pmsg, msg); - return(FALSE); - } - -@@ -1164,13 +1206,20 @@ XtArgVal value; - { - Widget temp_widget; - char buf[BUFSIZ]; -+ char *pbuf; -+ int len; - -- (void) sprintf(buf, "%s.%s", FORM_NAME, name); -+ len = strlen(FORM_NAME) + strlen(name) + 2; -+ pbuf = XtStackAlloc(len, buf); -+ if (pbuf == NULL) return FALSE; -+ (void) sprintf(pbuf, "%s.%s", FORM_NAME, name); - -- if ( (temp_widget = XtNameToWidget(shell, buf)) != NULL) { -+ if ( (temp_widget = XtNameToWidget(shell, pbuf)) != NULL) { - SetResource(temp_widget, res_name, value); -+ XtStackFree(pbuf, buf); - return(TRUE); - } -+ XtStackFree(pbuf, buf); - return(FALSE); - } - -diff -up /dev/null Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h ---- /dev/null 2008-10-06 08:37:32.418005377 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h 2008-10-06 11:42:13.000000000 +0200 -@@ -0,0 +1,10 @@ -+/* $XFree86: xc/lib/Xaw/XawAlloc.h,v 1.1.2.1 1998/05/16 09:05:23 dawes Exp $ */ -+ -+#define XtStackAlloc(size, stack_cache_array) \ -+ ((size) <= sizeof(stack_cache_array) \ -+ ? (XtPointer)(stack_cache_array) \ -+ : XtMalloc((unsigned)(size))) -+ -+#define XtStackFree(pointer, stack_cache_array) \ -+ if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); else -+ ---- xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c 2003-08-04 17:27:58.000000000 +0200 -+++ xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c 2003-08-07 15:02:39.000000000 +0200 -@@ -52,6 +52,8 @@ - #include <X11/Xaw3d/Cardinals.h> - #include <stdio.h> - -+#include "XawAlloc.h" -+ - /* needed for abs() */ - #ifndef X_NOT_STDC_ENV - #include <stdlib.h> -@@ -712,6 +714,8 @@ - int x, y; - unsigned int width, height, bw; - char buf[BUFSIZ]; -+ char *pbuf; -+ int len; - - if (is_left) { - width = height = 0; -@@ -720,18 +724,24 @@ - if (!XGetGeometry(XtDisplayOfObject(w), - entry->sme_bsb.left_bitmap, &root, &x, &y, - &width, &height, &bw, &entry->sme_bsb.left_depth)) { -- (void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".", -- "Could not get Left Bitmap", -- "geometry information for menu entry", -- XtName(w)); -- XtAppError(XtWidgetToApplicationContext(w), buf); -+ char *err1 = "Xaw SmeBSB Object: Could not get Left Bitmap geometry information for menu entry "; -+ len = strlen(err1) + strlen(XtName(w)) + 3 + 1; -+ pbuf = XtStackAlloc(len, buf); -+ if (pbuf == NULL) return; -+ sprintf(pbuf, "%s\"%s\".", err1, XtName(w)); -+ XtAppError(XtWidgetToApplicationContext(w), pbuf); -+ XtStackFree(pbuf, buf); - } - #ifdef NEVER - if (entry->sme_bsb.left_depth != 1) { -- (void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.", -- "Left Bitmap of entry", XtName(w), -- "is not one bit deep"); -- XtAppError(XtWidgetToApplicationContext(w), buf); -+ char *err1 = "Xaw SmeBSB Object: Left Bitmap of entry "; -+ char *err2 = " is not one bit deep."; -+ len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1; -+ pbuf = XtStackAlloc(len, buf); -+ if (pbuf == NULL) return; -+ sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2); -+ XtAppError(XtWidgetToApplicationContext(w), pbuf); -+ XtStackFree(pbuf, buf); - } - #endif - } -@@ -745,18 +755,24 @@ - if (!XGetGeometry(XtDisplayOfObject(w), - entry->sme_bsb.right_bitmap, &root, &x, &y, - &width, &height, &bw, &entry->sme_bsb.right_depth)) { -- (void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".", -- "Could not get Right Bitmap", -- "geometry information for menu entry", -- XtName(w)); -- XtAppError(XtWidgetToApplicationContext(w), buf); -+ char *err1 = "Xaw SmeBSB Object: Could not get Right Bitmap geometry information for menu entry "; -+ len = strlen(err1) + strlen(XtName(w)) + 3 + 1; -+ pbuf = XtStackAlloc(len, buf); -+ if (pbuf == NULL) return; -+ sprintf(pbuf, "%s\"%s\".", err1, XtName(w)); -+ XtAppError(XtWidgetToApplicationContext(w), pbuf); -+ XtStackFree(pbuf, buf); - } - #ifdef NEVER - if (entry->sme_bsb.right_depth != 1) { -- (void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.", -- "Right Bitmap of entry", XtName(w), -- "is not one bit deep"); -- XtAppError(XtWidgetToApplicationContext(w), buf); -+ char *err1 = "Xaw SmeBSB Object: Right Bitmap of entry "; -+ char *err2 = " is not one bit deep."; -+ len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1; -+ pbuf = XtStackAlloc(len, buf); -+ if (pbuf == NULL) return; -+ sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2); -+ XtAppError(XtWidgetToApplicationContext(w), pbuf); -+ XtStackFree(pbuf, buf); - } - #endif - } diff --git a/extra/xaw3d/Xaw3d-1.5-i18n.patch b/extra/xaw3d/Xaw3d-1.5-i18n.patch deleted file mode 100644 index aa4730238..000000000 --- a/extra/xaw3d/Xaw3d-1.5-i18n.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Xaw3d-1.5/xc/lib/Xaw3d/MultiSrc.c.orig Tue Aug 6 22:51:08 2002 -+++ Xaw3d-1.5/xc/lib/Xaw3d/MultiSrc.c Tue Aug 6 22:51:16 2002 -@@ -735,6 +735,7 @@ - - if ( string_set || (old_src->multi_src.type != src->multi_src.type) ) { - RemoveOldStringOrFile(old_src, string_set); -+ src->multi_src.allocated_string = old_src->multi_src.allocated_string; - file = InitStringOrFile(src, string_set); - - /* Load pieces does this logic for us, but it shouldn't. Its messy.*/ diff --git a/extra/xaw3d/Xaw3d-1.5E-warnings.patch b/extra/xaw3d/Xaw3d-1.5E-warnings.patch deleted file mode 100644 index 8ffa7f8f9..000000000 --- a/extra/xaw3d/Xaw3d-1.5E-warnings.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c 2009-03-15 17:04:35.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/MultiSrc.c 2009-03-15 14:22:05.000000000 +0100 -@@ -77,6 +77,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <wchar.h> - - /**************************************************************** - * ---- Xaw3d-1.5E/xc/lib/Xaw3d/Panner.c 2000-11-27 14:19:24.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Panner.c 2009-03-15 13:50:40.000000000 +0100 -@@ -36,7 +36,7 @@ - #include <X11/Xmu/Misc.h> /* for Min */ - #include <X11/Xmu/Drawing.h> - #include <ctype.h> /* for isascii() etc. */ --#include <math.h> /* for atof() */ -+#include <stdlib.h> /* for atof() */ - - extern Bool XmuDistinguishablePixels(); /* not defined in any Xmu headers */ - ---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c 2009-03-15 17:04:35.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Text.c 2009-03-15 13:54:10.000000000 +0100 -@@ -75,6 +75,7 @@ - #include <X11/Xfuncs.h> - #include <ctype.h> /* for isprint() */ - #include <stdlib.h> -+#include <wchar.h> - - #include "XawAlloc.h" - ---- Xaw3d-1.5E/xc/lib/Xaw3d/TextAction.c 2000-11-27 14:19:36.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextAction.c 2009-03-15 14:19:27.000000000 +0100 -@@ -45,7 +45,9 @@ - #include "XawI18n.h" - #endif - #include <stdio.h> -+#include <stdlib.h> - #include <ctype.h> -+#include <wchar.h> - - #define SrcScan XawTextSourceScan - #define FindDist XawTextSinkFindDistance ---- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c 2009-03-15 17:04:35.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextPop.c 2009-03-15 14:19:44.000000000 +0100 -@@ -65,6 +65,7 @@ - #include <stdio.h> - #include <X11/Xos.h> /* for O_RDONLY */ - #include <errno.h> -+#include <wchar.h> - - #include "XawAlloc.h" - ---- Xaw3d-1.5E/xc/lib/Xaw3d/TextSrc.c 2000-11-27 14:19:36.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/TextSrc.c 2009-03-15 14:19:13.000000000 +0100 -@@ -49,6 +49,7 @@ - #endif - #include <stdio.h> - #include <ctype.h> -+#include <wchar.h> - - /**************************************************************** - * ---- Xaw3d-1.5E/xc/lib/Xaw3d/ThreeD.c 2003-02-11 12:41:56.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/ThreeD.c 2009-03-15 14:21:20.000000000 +0100 -@@ -39,6 +39,7 @@ - #include <X11/Xaw3d/XawInit.h> - #include <X11/Xaw3d/ThreeDP.h> - #include <X11/Xosdefs.h> -+#include <X11/Xmu/CharSet.h> - - /* Initialization of defaults */ - ---- Xaw3d-1.5E/xc/lib/Xaw3d/Tip.c 2003-03-09 01:31:49.000000000 +0100 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/Tip.c 2009-03-15 14:21:36.000000000 +0100 -@@ -41,6 +41,7 @@ - #include <X11/Xmu/Converters.h> - #include <X11/Xaw3d/TipP.h> - #include <X11/Xaw3d/XawInit.h> -+#include <stdlib.h> - - #define TIP_EVENT_MASK (ButtonPressMask | \ - ButtonReleaseMask | \ ---- Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.c 1996-10-15 16:41:25.000000000 +0200 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/XawI18n.c 2009-03-15 14:23:11.000000000 +0100 -@@ -55,6 +55,7 @@ - - */ - -+#include <stdlib.h> - #include <X11/IntrinsicP.h> - #include "XawI18n.h" - ---- Xaw3d-1.5E/xc/lib/Xaw3d/XawIm.c 1998-04-21 15:42:02.000000000 +0200 -+++ Xaw3d-1.5E.new/xc/lib/Xaw3d/XawIm.c 2009-03-15 14:22:41.000000000 +0100 -@@ -59,6 +59,7 @@ - #include <X11/Xos.h> - #include <X11/Xfuncs.h> - #include <X11/ShellP.h> -+#include <X11/ResourceI.h> - #include <X11/Xaw3d/TextP.h> - #include <X11/Xaw3d/MultiSrc.h> - #include <X11/Xaw3d/MultiSinkP.h> -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h~ Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h ---- Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h~ 1996-10-15 16:41:26.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawI18n.h 2009-03-15 17:18:04.000000000 +0100 -@@ -72,7 +72,4 @@ extern wchar_t _Xaw_atowc ( - - #ifndef HAS_ISW_FUNCS - #include <ctype.h> --#ifndef iswspace --#define iswspace(c) (isascii(c) && isspace(toascii(c))) --#endif - #endif diff --git a/extra/xaw3d/Xaw3d-1.5E-xorg-imake.patch b/extra/xaw3d/Xaw3d-1.5E-xorg-imake.patch deleted file mode 100644 index 9d5312e33..000000000 --- a/extra/xaw3d/Xaw3d-1.5E-xorg-imake.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- Imakefile.config 2003-03-08 15:55:18.000000000 +0100 -+++ Imakefile 2005-01-20 14:48:55.630795072 +0100 -@@ -5,24 +5,24 @@ - XCOMM Build options. Have you read the README.XAW3D file yet? - XCOMM - XCOMM For color pixmaps, define MULTIPLANE_PIXMAPS: --#undef MULTIPLANE_PIXMAPS -+#define MULTIPLANE_PIXMAPS - XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES: - #define GRAY_BLKWHT_STIPPLES - XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS: --#undef ARROW_SCROLLBARS -+#define ARROW_SCROLLBARS - --#define DoNormalLib NormalLibXaw --#define DoSharedLib SharedLibXaw --#define DoDebugLib DebugLibXaw --#define DoProfileLib ProfileLibXaw -+#define DoNormalLib NormalLibXaw7 -+#define DoSharedLib SharedLibXaw7 -+#define DoDebugLib DebugLibXaw7 -+#define DoProfileLib ProfileLibXaw7 - #define HasSharedData YES - #define LibName Xaw3d --#define SoRev SOXAWREV -+#define SoRev SOXAW7REV - #define IncSubdir X11 - #define IncSubSubdir Xaw3d - - XCOMM When building outside an X11 source tree: --XCOMM EXTRA_INCLUDES = -I. -+EXTRA_INCLUDES = -I. - - #ifdef SharedXawReqs - REQUIREDLIBS = SharedXawReqs diff --git a/extra/xaw3d/Xaw3d-ia64.patch b/extra/xaw3d/Xaw3d-ia64.patch deleted file mode 100644 index 90ce711e9..000000000 --- a/extra/xaw3d/Xaw3d-ia64.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/List.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/List.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/List.c.prototypes 2000-11-27 14:19:36.000000000 +0100 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/List.c 2008-10-06 10:11:28.000000000 +0200 -@@ -38,6 +38,7 @@ in this Software without prior written a - - #include "Xaw3dP.h" - #include <stdio.h> -+#include <stdlib.h> - #include <ctype.h> - #include <X11/IntrinsicP.h> - #include <X11/StringDefs.h> -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c.prototypes 1996-10-15 16:41:20.000000000 +0200 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSink.c 2008-10-06 10:10:37.000000000 +0200 -@@ -81,6 +81,7 @@ SOFTWARE. - #include <X11/Xaw3d/TextP.h> - #include "XawI18n.h" - #include <stdio.h> -+#include <stdlib.h> - #include <ctype.h> - - #ifdef GETLASTPOS -diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.prototypes Xaw3d-1.5E/xc/lib/Xaw3d/Text.c ---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.prototypes 2003-02-10 18:28:13.000000000 +0100 -+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c 2008-10-06 10:11:11.000000000 +0200 -@@ -74,6 +74,7 @@ SOFTWARE. - #include <X11/Xaw3d/ThreeDP.h> - #include <X11/Xfuncs.h> - #include <ctype.h> /* for isprint() */ -+#include <stdlib.h> - - #ifndef MAX_LEN_CT - #define MAX_LEN_CT 6 /* for sequence: ESC $ ( A \xx \xx */ diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD index ba710c5fd..51570bd6b 100644 --- a/extra/xfce4-mpc-plugin/PKGBUILD +++ b/extra/xfce4-mpc-plugin/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 149252 2012-02-06 16:30:37Z foutrelis $ +# $Id: PKGBUILD 150133 2012-02-13 10:09:13Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: aurelien <aurelien@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-mpc-plugin -pkgver=0.3.6 -pkgrel=2 -pkgdesc="plugin to control the music player daemon from the xfce4-panel" -arch=(i686 x86_64 'mips64el') -license=('GPL2') +pkgver=0.4.0 +pkgrel=1 +pkgdesc="A plugin to control the music player daemon from the xfce4-panel" +arch=('i686' 'x86_64' 'mips64el') +license=('BSD') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'libmpd>=0.16.1') +depends=('xfce4-panel' 'libmpd>=0.16.1') makedepends=('intltool') -options=(!libtool) -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a6366662885d803dcebd82bbb91ed3c7') +options=('!libtool') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('ae9b285e24385e27cfd797ab605a1b7f') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -29,6 +29,7 @@ build() { } package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index a385ea3a8..6cc9f2fd5 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141722 2011-11-02 15:10:56Z foutrelis $ +# $Id: PKGBUILD 150131 2012-02-13 08:12:40Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session -pkgver=4.8.2 -pkgrel=3.1 +pkgver=4.8.3 +pkgrel=1 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -20,7 +20,7 @@ replaces=('xfce4-toys') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) -sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0') +sha256sums=('f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-systemload-plugin/missing_tooltip.diff b/extra/xfce4-systemload-plugin/missing_tooltip.diff deleted file mode 100644 index 96f5c1714..000000000 --- a/extra/xfce4-systemload-plugin/missing_tooltip.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- panel-plugin/systemload.c 2007-01-17 18:01:09.000000000 +0000 -+++ panel-plugin/systemload.c.new 2009-05-14 17:17:24.001076632 +0000 -@@ -315,11 +315,18 @@ - { - int count; - t_global_monitor *global; -+ GtkSettings *settings; - - tooltips = gtk_tooltips_new (); - g_object_ref (tooltips); - gtk_object_sink (GTK_OBJECT (tooltips)); - -+ /* reduce the default tooltip timeout to be smaller than the update interval otherwise -+ * we won't see tooltips on GTK 2.16 or newer */ -+ settings = gtk_settings_get_default(); -+ if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout")) -+ g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL); -+ - global = g_new(t_global_monitor, 1); - global->plugin = plugin; - global->timeout_id = 0; diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD index b60a1c6c4..56cece775 100644 --- a/extra/xfce4-timer-plugin/PKGBUILD +++ b/extra/xfce4-timer-plugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149457 2012-02-08 03:29:26Z eric $ +# $Id: PKGBUILD 150121 2012-02-12 22:43:39Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-timer-plugin -pkgver=0.6.2 +pkgver=0.6.4 pkgrel=1 pkgdesc="plugin to track time for the Xfce4 panel" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,9 @@ groups=('xfce4-goodies') depends=('xfce4-panel' 'libxfcegui4') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('688fe2dde9645bee1855e6a6c9579161') +install=xfce4-timer-plugin.install +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('c2f9e113dcda742cd1559129b79f609b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-timer-plugin/panel48.patch b/extra/xfce4-timer-plugin/panel48.patch deleted file mode 100644 index 056023712..000000000 --- a/extra/xfce4-timer-plugin/panel48.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001 -From: Nick Schermer <nick@xfce.org> -Date: Thu, 27 Jan 2011 21:18:45 +0000 -Subject: Fix segfault when creating plugin in 4.8 panel. - -Used invalid function type to construct the plugin. ---- -diff --git a/src/xfcetimer.c b/src/xfcetimer.c -index c27d37a..de7bd2b 100644 ---- a/src/xfcetimer.c -+++ b/src/xfcetimer.c -@@ -42,7 +42,7 @@ - - #include "xfcetimer.h" - --static gboolean create_plugin_control (XfcePanelPlugin *plugin); -+static void create_plugin_control (XfcePanelPlugin *plugin); - XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control); - - void make_menu(plugin_data *pd); -@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) { - * - * Returns %TRUE on success, %FALSE on failure. - **/ --static gboolean -+static void - create_plugin_control (XfcePanelPlugin *plugin) - { - -@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin) - xfce_panel_plugin_menu_show_configure (plugin); - g_signal_connect (plugin, "configure-plugin", - G_CALLBACK (plugin_create_options), pd); -- return(TRUE); - } - - --- -cgit v0.8.3.4 diff --git a/extra/xfce4-timer-plugin/xfce4-timer-plugin.install b/extra/xfce4-timer-plugin/xfce4-timer-plugin.install new file mode 100644 index 000000000..17ca8f78a --- /dev/null +++ b/extra/xfce4-timer-plugin/xfce4-timer-plugin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/xfce4-verve-plugin/PKGBUILD b/extra/xfce4-verve-plugin/PKGBUILD index afdfbe32c..3f1476451 100644 --- a/extra/xfce4-verve-plugin/PKGBUILD +++ b/extra/xfce4-verve-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104787 2011-01-04 22:36:49Z andyrtr $ +# $Id: PKGBUILD 149978 2012-02-11 23:31:39Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-verve-plugin pkgver=1.0.0 -pkgrel=1.1 +pkgrel=2 pkgdesc="command line plugin Xfce4 panel" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD index d928fd237..48138ee3a 100644 --- a/extra/xmlto/PKGBUILD +++ b/extra/xmlto/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146526 2012-01-12 12:28:33Z giovanni $ +# $Id: PKGBUILD 149980 2012-02-11 23:31:41Z allan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=xmlto pkgver=0.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="Convert xml to many other formats" arch=('i686' 'x86_64' 'mips64el') url="http://cyberelk.net/tim/software/xmlto/" diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD index 55bd8bf0f..ac672f598 100644 --- a/extra/xorg-mkfontscale/PKGBUILD +++ b/extra/xorg-mkfontscale/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 130725 2011-07-07 22:14:26Z andyrtr $ +# $Id: PKGBUILD 149834 2012-02-11 10:04:54Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-mkfontscale -pkgver=1.0.9 +pkgver=1.1.0 pkgrel=1 pkgdesc="Create an index of scalable font files for X" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2) -sha1sums=(''5a8ac438d6d6694dcf1314b74c4d9f029da4f486) +sha1sums=('ba021369ae3b364ba083b9eb5e570e54b21fd583') build() { cd "${srcdir}/mkfontscale-${pkgver}" diff --git a/extra/xorg-oclock/PKGBUILD b/extra/xorg-oclock/PKGBUILD index 0453c41e4..0a1f19efe 100644 --- a/extra/xorg-oclock/PKGBUILD +++ b/extra/xorg-oclock/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: $ +# $Id: PKGBUILD 149836 2012-02-11 10:08:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-oclock -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="Round X clock" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libx11' 'libxmu' 'libxext') +depends=('libx11' 'libxmu' 'libxext' 'libxkbfile') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/oclock-${pkgver}.tar.bz2) -sha1sums=('ba606d39fba6021c4db76d79751779f7b5c862e9') +sha1sums=('1aa05864019a55610aca5471c5206858dde9a34a') build() { cd "${srcdir}/oclock-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/oclock-${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/xorg-xclipboard/PKGBUILD b/extra/xorg-xclipboard/PKGBUILD index 60c4d624b..6685fdd9f 100644 --- a/extra/xorg-xclipboard/PKGBUILD +++ b/extra/xorg-xclipboard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: $ +# $Id: PKGBUILD 149838 2012-02-11 10:11:10Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xclipboard -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X clipboard manager" arch=(i686 x86_64 'mips64el') @@ -11,12 +11,16 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xclipboard-${pkgver}.tar.bz2) -sha1sums=('922ddf89acd0781156e9ccdf191a3e0c6376415a') +sha1sums=('8dc77e1234c1c2853805124536676a4d5f7c7a3b') build() { cd "${srcdir}/xclipboard-${pkgver}" ./configure --prefix=/usr make +} + +package(){ + cd "${srcdir}/xclipboard-${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/xorg-xclock/PKGBUILD b/extra/xorg-xclock/PKGBUILD index f3d2ee24e..ca43b8811 100644 --- a/extra/xorg-xclock/PKGBUILD +++ b/extra/xorg-xclock/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: $ +# $Id: PKGBUILD 149840 2012-02-11 10:13:13Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xclock -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="X clock" arch=(i686 x86_64 'mips64el') @@ -11,12 +11,16 @@ license=('custom') depends=('libx11' 'libxmu' 'libxaw' 'libxrender' 'libxft' 'libxkbfile') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xclock-${pkgver}.tar.bz2) -sha1sums=('1651ac8961c0aa287a6a7412ee5e6d3bfc3bb3e2') +sha1sums=('993817c9e3cc2baaaebe52b29fa2ad26e58b124d') build() { cd "${srcdir}/xclock-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xclock-${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/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD index 982c75feb..8a9e5a7b2 100644 --- a/extra/xorg-xinit/PKGBUILD +++ b/extra/xorg-xinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145242 2011-12-19 22:24:21Z jgc $ +# $Id: PKGBUILD 149821 2012-02-11 08:52:05Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -23,7 +23,7 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 xsession xserverrc) options=(!emptydirs) -md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4' +md5sums=('9c0943cbd83e489ad1b05221b97efd44' 'abd072ec435ce084cf4e89c58f83d45c' '73a597d3fb7f5b9487318ac8cfd4bedf' 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 628be7fe5..14af39a78 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145827 2012-01-02 12:43:36Z pierre $ +# $Id: PKGBUILD 149982 2012-02-11 23:31:46Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=4.3.15 -pkgrel=2 +pkgrel=3 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' |