diff options
Diffstat (limited to 'extra')
32 files changed, 322 insertions, 141 deletions
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index f71ae7d95..56a7880d7 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110704 2011-02-21 18:04:49Z tpowa $ +# $Id: PKGBUILD 134698 2011-08-07 16:20:42Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils pkgver=1.0.24.2 -pkgrel=1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -18,11 +18,16 @@ source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 alsa.conf.d 90alsa) backup=(etc/conf.d/alsa) +md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' + '2ba1a1cbf653bf1a69f8a720fd6549da' + '62ebef77d5617d0036012cc541dcf23c' + '4c8ae9f976c7df5e271a4cb91ccc7767' + '529216f6a46e61a546640e08ea7a0879') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ../alsaconf.patch - ./configure --prefix=/usr + ./configure --prefix=/usr --with-systemdsystemunitdir=/lib/systemd/system make } @@ -35,8 +40,3 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' - '2ba1a1cbf653bf1a69f8a720fd6549da' - '62ebef77d5617d0036012cc541dcf23c' - '4c8ae9f976c7df5e271a4cb91ccc7767' - '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD index 959b19cd6..238f6b3b1 100644 --- a/extra/archboot/PKGBUILD +++ b/extra/archboot/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 133615 2011-07-30 06:14:47Z tpowa $ +# $Id: PKGBUILD 133661 2011-07-30 09:38:54Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=archboot -pkgver=2011.07 -pkgrel=2 +pkgver=2011.08 +pkgrel=1 pkgdesc="Advanced, modular arch boot/install image creation utility" arch=(i686 x86_64) license=('GPL') url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1' 'libisoburn>=1.1.2' 'squashfs-tools>=4.2') +depends=('mkinitcpio>=0.7.2-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.07.3-1' 'subversion>=1.6.17-6' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-3' 'cryptsetup>=1.3.1-2' 'dialog>=1.1_20110707-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=4.0.0-1' 'grep>=2.9-1' 'iputils>=20101006-1' 'jfsutils>=1.1.15-2' 'less>=444-1' 'lvm2>=2.02.86-1' 'mdadm>=3.2.2-2' 'module-init-tools>=3.16-1' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-18' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-4' 'psmisc>=22.14-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-3' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P4-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-3' 'openssh>=5.8p2-9' 'hwdetect>=2011.06-1' 'shadow>=4.1.4.3-2' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre2-1' 'dosfstools>=3.0.11-1' 'glibc>=2.14-4' 'linux-api-headers>=2.6.39.1-1' 'linux>=3.0-2' 'kernel26-lts>=2.6.32.43-1' 'xinetd>=2.3.14-7' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-7' 'lilo>=23.2-1' 'iptables>=1.4.12-2' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=003-1' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.86-1' 'screen>=4.0.3-12' 'elfutils>=0.152-1' 'pam>=1.1.3-2' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.4-1' 'nfsidmap>=0.24-2' 'readline>=6.2.001-2' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.266-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-6' 'libldap>=2.4.26-3' 'gpm>=1.20.6-6' 'libevent>=2.0.12-1' 'gcc-libs>=4.6.1-2' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.10-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.6-1' 'dmraid>=1.0.0.rc16.3-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.6.5-1' 'parted>=3.0-3' 'tzdata>=2011h-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.5.0-1' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.39-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-2' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.17-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.3-1' 'libtirpc>=0.2.2-2' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=172-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.3-1' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.2-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-6' 'linux-firmware>=20110727-1' 'iana-etc>=2.30-2' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.5.2-1' 'libisoburn>=1.1.2-1' 'squashfs-tools>=4.2-1') optdepends=('grub2-bios: for grub2 support' 'grub2-efi-i386: for grub2 support' 'grub2-efi-x86_64: for grub2 support' @@ -44,5 +44,5 @@ build() gcc -o vmware-detect vmware-detect.c install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect } -md5sums=('dadac046c8da0c45c7ed55e223b5a0b5' +md5sums=('4b71827d6767c99c1144df9215108349' '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/extra/dirmngr/PKGBUILD b/extra/dirmngr/PKGBUILD index e8faa4a88..f2f6b60e5 100644 --- a/extra/dirmngr/PKGBUILD +++ b/extra/dirmngr/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 87316 2010-08-12 11:57:22Z tpowa $ +# $Id: PKGBUILD 134465 2011-08-04 06:40:27Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=dirmngr pkgver=1.1.0 -pkgrel=1 +pkgrel=3 pkgdesc="A daemon to handle CRL and certificate requests" arch=('i686' 'x86_64') license=('GPL') url="ftp://ftp.gnupg.org/gcrypt/dirmngr" depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +install=dirmngr.install build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/dirmngr/dirmngr.install b/extra/dirmngr/dirmngr.install new file mode 100644 index 000000000..e26e0e7fd --- /dev/null +++ b/extra/dirmngr/dirmngr.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(dirmngr.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/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 02c404210..fb8437925 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 127195 2011-06-11 08:04:12Z ibiru $ +# $Id: PKGBUILD 134800 2011-08-07 20:06:54Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributer: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=2.6.39 +pkgver=3.0 pkgrel=1 epoch=1 -pkgdesc="gkernel ethtool" -arch=(i686 x86_64) +pkgdesc="Utility for controlling network drivers and hardware" +arch=('i686' 'x86_64') url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('97211a1e3a496bc3bd0b75849d0fbae9') +md5sums=('cb129398cbbf39859901b55ecac101da') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnupg2/PKGBUILD b/extra/gnupg2/PKGBUILD index e2711da0d..f237df630 100644 --- a/extra/gnupg2/PKGBUILD +++ b/extra/gnupg2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106675 2011-01-17 20:37:07Z tpowa $ +# $Id: PKGBUILD 134651 2011-08-07 10:18:11Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=gnupg2 -pkgver=2.0.17 +pkgver=2.0.18 pkgrel=1 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" arch=('i686' 'x86_64') @@ -27,4 +27,4 @@ package() { mv ${pkgdir}/usr/share/gnupg{,2} rm -f ${pkgdir}/usr/share/info/dir } -md5sums=('123af099740fd159c73a0352a274ec81') +md5sums=('2f37e0722666a0fedbe4d9f9227ac4d7') diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index 8321c3e82..152171fb6 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 125862 2011-05-30 16:53:31Z andyrtr $ +# $Id: PKGBUILD 134716 2011-08-07 16:47:04Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=4.8 +pkgver=4.8.1 pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64) url="http://www.icu-project.org/" license=('custom:"icu"') depends=('gcc-libs' 'sh') -source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz - #http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz +source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz + http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) -md5sums=('e78194c49d7fd8131353aa180d11b789' +md5sums=('af36f635271a239d76d038d6cf8da8df' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/libassuan/PKGBUILD b/extra/libassuan/PKGBUILD index 468f2b6a3..29aa66536 100644 --- a/extra/libassuan/PKGBUILD +++ b/extra/libassuan/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87326 2010-08-12 11:59:25Z tpowa $ +# $Id: PKGBUILD 131235 2011-07-12 07:35:37Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libassuan -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc="A IPC library used by some GnuPG related software" arch=('i686' 'x86_64') @@ -11,6 +11,7 @@ url="http://www.gnupg.org/related_software/libassuan" depends=('libgpg-error') options=('!libtool') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +install=libassuan.install build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -22,4 +23,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } -md5sums=('53a7d4c22af909d7236d17d454ef935b') +md5sums=('3e7d00fd2ee8a0b9c51ac7616ef3f1ec') diff --git a/extra/libassuan/libassuan.install b/extra/libassuan/libassuan.install new file mode 100644 index 000000000..07e2672db --- /dev/null +++ b/extra/libassuan/libassuan.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(assuan.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/libksba/PKGBUILD b/extra/libksba/PKGBUILD index 4e19d60a7..51f23e123 100644 --- a/extra/libksba/PKGBUILD +++ b/extra/libksba/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 87317 2010-08-12 11:57:33Z tpowa $ +# $Id: PKGBUILD 134460 2011-08-04 06:38:08Z tpowa $ # Maintainer: damir <damir@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=libksba -pkgver=1.0.8 +pkgver=1.2.0 pkgrel=1 -pkgdesc="Libksba is a CMS and X.509 access library" +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 $startdir/src/$pkgname-$pkgver @@ -19,4 +20,4 @@ build() { make make DESTDIR=$startdir/pkg install } -md5sums=('8acac0b3cbd0030dfc6d0f6a58c9b5b2') +md5sums=('e797f370b69b4dc776499d6a071ae137') diff --git a/extra/libksba/libksba.install b/extra/libksba/libksba.install new file mode 100644 index 000000000..3715b8960 --- /dev/null +++ b/extra/libksba/libksba.install @@ -0,0 +1,20 @@ +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/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index a71c5c93e..d6bc1f95d 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130222 2011-07-04 13:03:05Z pierre $ +# $Id: PKGBUILD 134666 2011-08-07 10:50:50Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.29 -pkgrel=1 +pkgrel=2 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -19,9 +19,9 @@ options=('!libtool' 'emptydirs') source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') md5sums=('e6e67b09986cb504db630b5a86b2dd76' - '369f2eea6231342b514ca4777bf395c8' + '268386e71f5748dc1d887b9a0ab65589' '913e2157fa78d990c32146f387d44c2b' - '2803a9ee7f20409c69f1566d2d90720e') + 'acdaa94299e6299cb5085e6d88babeca') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/lighttpd/lighttpd.conf b/extra/lighttpd/lighttpd.conf index 8e8ab69e7..4ca1b23a4 100644 --- a/extra/lighttpd/lighttpd.conf +++ b/extra/lighttpd/lighttpd.conf @@ -6,7 +6,6 @@ server.port = 80 server.username = "http" server.groupname = "http" server.document-root = "/srv/http" -server.pid-file = "/var/run/lighttpd/lighttpd.pid" server.errorlog = "/var/log/lighttpd/error.log" dir-listing.activate = "enable" index-file.names = ( "index.html" ) diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d index 345e889ae..88f0a1474 100644 --- a/extra/lighttpd/lighttpd.rc.d +++ b/extra/lighttpd/lighttpd.rc.d @@ -4,24 +4,13 @@ . /etc/rc.d/functions -get_pid_file() { - /usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | sed -E 's/.*"(.+)"/\1/' -} +pid_file='/var/run/lighttpd/lighttpd-angel.pid' get_pid() { - local pid_file=$(get_pid_file) - local pid=$(pidof -o %PPID lighttpd-angel) - # only needed when updating from 1.4.26 - # TODO: remove in future versions - local old_pid=$(pidof -o %PPID lighttpd) if [ -r "${pid_file}" ]; then cat "${pid_file}" - elif [ -n "${pid}" ]; then - echo "${pid}" - elif [ -n "${old_pid}" ]; then - echo "${old_pid}" else - echo '' + pgrep -f /usr/sbin/lighttpd-angel fi } @@ -43,7 +32,7 @@ test_config() { stat_die fi - local piddir=$(dirname "$(get_pid_file)") + local piddir=$(dirname "${pid_file}") if [ ! -d "${piddir}" ]; then install -d -m755 -o http -g http "${piddir}" fi @@ -60,6 +49,7 @@ start() { if [ $? -gt 0 ]; then stat_die else + echo $! > "${pid_file}" add_daemon lighttpd stat_done fi @@ -75,7 +65,19 @@ stop() { if [ $? -gt 0 ]; then stat_fail else - local pid_file=$(get_pid_file) + [ -f "${pid_file}" ] && rm -f "${pid_file}" + rm_daemon lighttpd + stat_done + fi +} + +gracefull-stop() { + stat_busy 'Stopping lighttpd gracefully' + local PID=$(get_pid) + [ -n "$PID" ] && kill -INT $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else [ -f "${pid_file}" ] && rm -f "${pid_file}" rm_daemon lighttpd stat_done @@ -103,6 +105,10 @@ case "$1" in test_config stop ;; + gracefull-stop) + test_config + stop + ;; reload) test_config reload @@ -120,7 +126,7 @@ case "$1" in ck_status lighttpd ;; *) - echo "usage: $0 {start|stop|reload|restart|status}" + echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}" esac exit 0 diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 201e916fa..c5525ea12 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 127217 2011-06-11 09:10:14Z ibiru $ +# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=4 +pkgrel=6 epoch=1 -_kernver=2.6.39-ARCH +_kernver=3.0-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') +makedepends=('help2man' 'linux-headers>=3.0' 'linux-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -60,7 +60,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40') + depends=('lirc-utils' 'linux>=3.0' 'linux<3.1') replaces=('lirc+pctv') install=lirc.install diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 26fb1391e..0d42e8a5c 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,4 +1,4 @@ -KERNEL_VERSION=2.6.39-ARCH +KERNEL_VERSION=3.0-ARCH post_install() { # updating module dependencies diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 809f53c2e..9d6c1ff6e 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 132325 2011-07-23 00:44:08Z eric $ +# $Id: PKGBUILD 134304 2011-08-02 20:34:25Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -15,7 +15,7 @@ backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ - sensord.rc daemonarg.patch) + sensord.rc daemonarg.patch linux_3.0.patch) md5sums=('8c0eebda8524fc87da1393b4564d279b' 'c370f5e620bfe41113354a1e22c0c18c' '232bedf043dd5dedde82df1a399c682c' @@ -24,7 +24,8 @@ md5sums=('8c0eebda8524fc87da1393b4564d279b' '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7' '41a5c20854bbff00ea7174bd2276b736' - '40c8eb16af8249a0f1d851fc1057ea15') + '40c8eb16af8249a0f1d851fc1057ea15' + '5c1be382963145f7191d9c4e45ca9f67') sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' 'a068ac0a3115a6191a487e11422506baa922b40a' @@ -33,13 +34,15 @@ sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a' 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' '72a60251d1d55a67307dab4105d9f3f01a080af4' - '34241388c4001bfb6e49b7e10da1217e29a258d6') + '34241388c4001bfb6e49b7e10da1217e29a258d6' + '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ - -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/detect/sensors-detect + -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service} patch -p1 < ../daemonarg.patch + patch -p0 < ../linux_3.0.patch make PREFIX=/usr } @@ -47,6 +50,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install + install -D -m644 prog/init/lm_sensors.service "${pkgdir}/lib/systemd/system/lm_sensors.service" install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" diff --git a/extra/lm_sensors/linux_3.0.patch b/extra/lm_sensors/linux_3.0.patch new file mode 100644 index 000000000..da02a3d49 --- /dev/null +++ b/extra/lm_sensors/linux_3.0.patch @@ -0,0 +1,11 @@ +--- prog/detect/sensors-detect 2011-08-02 10:23:46.000000000 +0200 ++++ prog/detect/sensors-detect 2011-08-02 10:24:04.000000000 +0200 +@@ -2472,7 +2472,7 @@ + + sub initialize_kernel_version + { +- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/; ++ `uname -r` =~ /(\d+)\.(\d+)(.*)/; + @kernel_version = ($1, $2, $3, $4); + chomp($kernel_arch = `uname -m`); + diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index 1c245bb45..bcf5e453d 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 124201 2011-05-17 17:28:05Z andyrtr $ +# $Id: PKGBUILD 134671 2011-08-07 11:28:53Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -#_gitdate=20090306 -pkgver=0.3.6 #_git${_gitdate} +pkgver=0.4.0 pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') @@ -15,24 +14,11 @@ install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2 - #midori-${_gitdate}.tar.bz2 -) -md5sums=('c4cb0686601b1c470c317de3d3f8e8fd') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/$pkgname-source - pushd /tmp/$pkgname-source - git clone -v git://git.xfce.org/kalikiana/midori - cd midori - git archive --prefix=midori-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-source/midori-${_gitdate}.tar.bz2 - popd -} +source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) +md5sums=('14aa14ccabf3d003903f1584dab15d7a') build() { cd ${srcdir}/${pkgname}-${pkgver} -# cd ${srcdir}/${pkgname}-${_gitdate} # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index ecfc88f0a..3eb045e5d 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125645 2011-05-27 17:39:58Z ibiru $ +# $Id: PKGBUILD 134721 2011-08-07 16:59:44Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -7,7 +7,7 @@ pkgname=networkmanager pkgver=0.8.9997 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') @@ -43,6 +43,7 @@ build() { --with-dhclient=/usr/sbin/dhclient \ --with-dhcpcd=/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/lib/systemd/system \ --disable-static \ --enable-more-warnings=no \ --disable-wimax diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 964013d1c..2b71ca3f9 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 99925 2010-11-19 14:16:05Z heftig $ +# $Id: PKGBUILD 132457 2011-07-24 17:19:01Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> pkgname=ossp pkgver=1.3.2 -pkgrel=10 +pkgrel=11 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64) url="http://sourceforge.net/projects/osspd" license=(GPL2) -depends=('fuse>=2.8.0' 'kernel26>=2.6.35-2') +depends=('fuse>=2.8.0') makedepends=(libpulse alsa-lib) optdepends=("libpulse: PulseAudio backend" "alsa-lib: ALSA backend") backup=(etc/conf.d/osspd) source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz" osspd.rc.d osspd.conf.d) +md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' + '0c02208ce1dfe74b6e9840f3600678cc' + '5a5a3db1bb3c98d48d4794613cf12ef0') build() { cd "$srcdir/$pkgname-$pkgver" @@ -37,7 +40,3 @@ package() { install -D -m755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd" install -D -m644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd" } - -md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' - '69b745e0c499cd50019266a99082ce8b' - '5a5a3db1bb3c98d48d4794613cf12ef0') diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d index 78d7602ae..c5fabf855 100755 --- a/extra/ossp/osspd.rc.d +++ b/extra/ossp/osspd.rc.d @@ -14,20 +14,13 @@ if [[ -z "$DSP_SLAVE" ]]; then fi fi -preclaim_oss=/sys/module/soundcore/parameters/preclaim_oss - PID=`pidof -o %PPID /usr/sbin/osspd` case "$1" in start) stat_busy "Starting OSS userspace bridge" if [ -z "$PID" ]; then - if [[ -r $preclaim_oss && "$(cat $preclaim_oss)" -eq 1 ]]; then - echo "Must boot with soundcore.preclaim_oss=0" - stat_die - fi - modprobe cuse &>/dev/null - modprobe -r snd-pcm-oss snd-mixer-oss &>/dev/null - sleep 0.1 + /sbin/modprobe cuse &>/dev/null + /sbin/udevadm settle --quiet /usr/sbin/osspd --dsp-slave="$DSP_SLAVE" fi if [ -n "$PID" -o $? -gt 0 ]; then diff --git a/extra/pinentry/PKGBUILD b/extra/pinentry/PKGBUILD index ae742029e..71baf5bdc 100644 --- a/extra/pinentry/PKGBUILD +++ b/extra/pinentry/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 106680 2011-01-17 20:41:54Z tpowa $ +# $Id: PKGBUILD 131244 2011-07-12 07:40:08Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pinentry pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64') license=('GPL') @@ -15,6 +15,7 @@ optdepends=('gtk: for gtk backend' 'qt: for qt4 backend') source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz gtk2-pinentry-segfault.patch) +install=pinentry.install build() { cd $startdir/src/$pkgname-$pkgver diff --git a/extra/pinentry/pinentry.install b/extra/pinentry/pinentry.install new file mode 100644 index 000000000..eed2c7124 --- /dev/null +++ b/extra/pinentry/pinentry.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(pinentry.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/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index 553c69d38..2a9ed84eb 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111724 2011-02-28 21:05:00Z heftig $ +# $Id: PKGBUILD 134840 2011-08-07 20:46:13Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=rtkit pkgver=0.10 -pkgrel=1 +pkgrel=2 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64') url="http://git.0pointer.de/?p=rtkit.git" @@ -18,7 +18,12 @@ md5sums=('9ab7f2a25ddf05584ea2216dfe4cefd4') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --libexecdir=/usr/lib --prefix=/usr --sysconfdir=/etc + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-systemdsystemunitdir=/lib/systemd/system + make } diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD index fec4728e9..ca35f2882 100644 --- a/extra/scim-tables/PKGBUILD +++ b/extra/scim-tables/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 110895 2011-02-22 20:15:32Z bisson $ +# $Id: PKGBUILD 134848 2011-08-07 23:21:19Z bisson $ # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-tables -pkgver=0.5.9 -pkgrel=2 +pkgver=0.5.10 +pkgrel=1 pkgdesc='Generic table input method module for SCIM' arch=('i686' 'x86_64') url='http://www.scim-im.org/' @@ -13,7 +13,7 @@ license=('GPL') depends=('scim') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") -sha1sums=('aeca1c8a2eb10a214edc07fa248cd7450f78e387') +sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index e9755aada..f8d96e585 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 125359 2011-05-26 09:22:50Z bisson $ +# $Id: PKGBUILD 134853 2011-08-08 03:28:47Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.10 +pkgver=1.4.11 pkgrel=1 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('GPL') arch=('i686' 'x86_64') -depends=('gtk2' 'gcc-libs') +options=('!libtool') makedepends=('intltool') +depends=('gtk2' 'libtool') backup=('etc/scim/config' 'etc/scim/global') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz") -sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'wtf.patch') +sha1sums=('dd93094f62e5707db88d4f0e7ebd3392ae75b942' + '14d2be6c8f9f4af6494c3e806d3cadef5803597a') install=install build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../wtf.patch # revert broken commit 303 ./bootstrap ./configure \ @@ -34,7 +37,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/extra/scim/wtf.patch b/extra/scim/wtf.patch new file mode 100644 index 000000000..c0e5ab078 --- /dev/null +++ b/extra/scim/wtf.patch @@ -0,0 +1,93 @@ +diff -aur old/extras/panel/scim_panel_gtk.cpp new/extras/panel/scim_panel_gtk.cpp +--- old/extras/panel/scim_panel_gtk.cpp 2011-08-04 13:21:29.000000000 -0700 ++++ new/extras/panel/scim_panel_gtk.cpp 2011-08-07 16:11:12.977663776 -0700 +@@ -479,12 +479,12 @@ + + static bool _should_exit = false; + ++static bool _panel_is_on = false; + +-static struct timeval _last_menu_deactivate_time = {0, 0}; ++static GThread *_panel_agent_thread = 0; ++ ++static PanelAgent *_panel_agent = 0; + +-// client repository +-static PropertyRepository _frontend_property_repository; +-static HelperPropertyRepository _helper_property_repository; + static std::vector<String> _factory_menu_uuids; + + static std::list<String> _recent_factory_uuids; +@@ -1187,16 +1187,16 @@ + + GtkRequisition ws; + gint pos_x, pos_y; ++ ++ gtk_widget_size_request (_toolbar_window, &ws); ++ ++ pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X), + workarea_x + workarea_width - ws.width); + pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y), + workarea_y + workarea_height - ws.height); + if (pos_x == -1 && pos_y == -1) { + pos_x = workarea_x + workarea_width - ws.width; + pos_y = workarea_y + workarea_height - ws.height; +- workarea_y + workarea_height - ws.height); +- if (pos_x == -1 && pos_y == -1) { +- pos_x = workarea_x + workarea_width - ws.width; +- pos_y = workarea_y + workarea_height - ws.height; + } + + if (_toolbar_auto_snap) { +@@ -1215,6 +1215,10 @@ + else if (pos_y < 0) + pos_y = 0; + ++ if (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y || force) { ++ gtk_window_move (GTK_WINDOW (_toolbar_window), pos_x, pos_y); ++ _toolbar_window_x = pos_x; ++ _toolbar_window_y = pos_y; + } + } + +@@ -1227,9 +1231,9 @@ + #endif + return gdk_screen_width (); + } +- return gdk_screen_get_width (_current_screen); +-#endif +- return gdk_screen_width (); ++ ++static int ++ui_screen_height (void) + { + #if GDK_MULTIHEAD_SAFE + if (_current_screen) +@@ -1237,10 +1241,6 @@ + #endif + return gdk_screen_height (); + } +- return gdk_screen_get_height (_current_screen); +-#endif +- return gdk_screen_height (); +-} + + static void + ui_get_workarea (int &x, int &y, int &width, int &height) +@@ -1929,11 +1929,11 @@ + static gulong motion_handler; + GdkCursor *cursor; + +- if (!_config.null () && +- (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y)) { +- _config->write ( +- SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, pos_x); +- _config->write ( ++ if (click_type == 0 && event->button <= 1) { ++ if (_toolbar_window_draging) ++ return FALSE; ++ ++ // Connection pointer motion handler to this window. + motion_handler = g_signal_connect (G_OBJECT (window), "motion-notify-event", + G_CALLBACK (ui_toolbar_window_motion_cb), + NULL); diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD index c7494e10a..712901cf1 100644 --- a/extra/usermin/PKGBUILD +++ b/extra/usermin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 104514 2011-01-03 20:58:29Z tpowa $ +# $Id: PKGBUILD 134661 2011-08-07 10:26:07Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=usermin -pkgver=1.460 +pkgver=1.480 pkgrel=1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding" arch=(i686 x86_64) @@ -124,6 +124,6 @@ build() { #install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE } -md5sums=('d22452de87891e4012411e3aa86aec1f' +md5sums=('b5fa9938a29b7e83c36249f0b01119a3' 'cfef4490cd1ef9517c0b39a7bd75c968' 'ec37a79f948f778224550930d2a7ca07') diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index d1a55f636..51fd18d68 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 122336 2011-05-03 22:31:36Z tpowa $ +# $Id: PKGBUILD 134656 2011-08-07 10:21:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.550 +pkgver=1.560 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) @@ -210,9 +210,7 @@ build() { # install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE } - - -md5sums=('d892599a6e3e6f102a8261d2804fb1b5' +md5sums=('6a3eb723f991fd8c3004655472352cd7' 'da6bea412a5be8cf82a813078fec5847' 'bfebb75bb94029b48c46b7f1ba1aa811' '0673e51af0e81418b4a6c1e205f7e5cd') diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD index c08a9d259..4aca1ff44 100644 --- a/extra/xfce4-notifyd/PKGBUILD +++ b/extra/xfce4-notifyd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108801 2011-02-03 16:49:52Z andyrtr $ +# $Id: PKGBUILD 134711 2011-08-07 16:35:59Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-notifyd -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="notification daemon for the xfce desktop" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=('notification-daemon-xfce') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/apps/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0a63857901809887b587c73024d1089b') +md5sums=('8687fb7a0f270231ada265e363b6ffcc') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD index 4db623812..9a793fbc4 100644 --- a/extra/xfce4-screenshooter/PKGBUILD +++ b/extra/xfce4-screenshooter/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 104774 2011-01-04 21:47:46Z andyrtr $ +# $Id: PKGBUILD 134703 2011-08-07 16:23:19Z andyrtr $ # Maintainer: tobias <tobias funnychar archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-screenshooter -pkgver=1.7.9 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="plugin that makes screenshots for the Xfce4 panel" arch=(i686 x86_64) license=('GPL2') url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter" groups=('xfce4-goodies') -#depends=('xfce4-panel' 'libxfcegui4' 'libxfce4ui' 'exo' 'libsoup' 'hicolor-icon-theme') -depends=('xfce4-panel' 'libxfcegui4' 'libsoup' 'hicolor-icon-theme') +depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme') makedepends=('intltool') install=${pkgname}.install options=('!libtool') -source=(http://archive.xfce.org/src/apps/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2 +source=(http://archive.xfce.org/src/apps/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2 xfce4-screenshooter-1.7.9-dsofix.patch fix_segfault.diff) conflicts=('xfce4-screenshooter-plugin') replaces=('xfce4-screenshooter-plugin') -md5sums=('c01d1cf3830bf8d60e09c0cdd223034c' +md5sums=('b51ab5725418e7258273c4a6402adb02' '355a7d005bf9200f5a5577f0bc901945' '794d7e0ff18cad369bd50a78e883f986') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/xfce4-screenshooter-1.7.9-dsofix.patch - patch -Np1 -i ${srcdir}/fix_segfault.diff + #patch -Np1 -i ${srcdir}/fix_segfault.diff ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ |