diff options
Diffstat (limited to 'community')
81 files changed, 907 insertions, 922 deletions
diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index ef67ef3fe..4fc1ab793 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52280 2011-07-23 09:29:14Z spupykin $ +# $Id: PKGBUILD 53371 2011-08-03 09:47:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> pkgname=apcupsd pkgver=3.14.9 -pkgrel=1 +pkgrel=2 pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines." arch=(i686 x86_64 'mips64el') url="http://www.apcupsd.org" @@ -19,7 +19,7 @@ backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz apcupsd) md5sums=('aa5e2c2954a81c2f07e0a356e38fe853' - '5eae3c4d921eeb81798a0250fe3dd111') + '8bc674da24188c69b0ad5d7fe7510f73') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd index 3cd5c9dc8..73ca2b4bf 100755 --- a/community/apcupsd/apcupsd +++ b/community/apcupsd/apcupsd @@ -13,8 +13,6 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - PID=`pidof -o %PPID /sbin/apcupsd` - echo $PID > /var/run/apcupsd.pid add_daemon apcupsd stat_done fi @@ -25,7 +23,6 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm /var/run/apcupsd.pid rm_daemon apcupsd stat_done fi @@ -39,6 +36,6 @@ case "$1" in /sbin/apcaccess status ;; *) - echo "usage: $0 {start|stop|restart|status}" + echo "usage: $0 {start|stop|restart|status}" esac exit 0 diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 5041a2d79..3d7b7dbb7 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.12.0 +pkgver=1.12.1 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://aria2.sourceforge.net/' license=('GPL') depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -sha1sums=('5bc6f07f84f6ad1d0e222d2b5c78cd3118e1a569') +md5sums=('9f3bf96d92bc8b70b74817ed10c2c7e7') build() { cd aria2-${pkgver} diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index 6d13e9d8b..e90b708d0 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 48143 2011-05-28 23:23:26Z lfleischer $ +# $Id: PKGBUILD 53403 2011-08-03 11:06:10Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=2.9.0 -pkgrel=1 +pkgver=2.9.1 +pkgrel=2 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64' 'mips64el') url='http://calcurse.org/' license=('BSD') depends=('ncurses') +makedepends=('asciidoc') source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('3ff0229581060d43232a6fb56b0cd07a') +md5sums=('3a1af304a55a87169c425099b4886dc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5b904acd8..5190d90c6 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52910 2011-07-29 19:53:49Z giovanni $ +# $Id: PKGBUILD 53589 2011-08-06 08:10:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.12 +pkgver=0.8.13 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('03060d381cc3090fc42d5a646f926afe' +md5sums=('5612e030dce1cd5e46762d0dcaed00b0' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index c89e33ba1..83b84bdba 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 42474 2011-03-16 21:46:25Z spupykin $ +# $Id: PKGBUILD 52427 2011-07-25 09:33:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=14 +pkgrel=15 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64 'mips64el') url="http://www.elis.UGent.be/~ronsse/cdfs/" license=('GPL') +makedepends=('linux-headers') install=cdfs.install -source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2") -md5sums=('ac64c014a90e3c488394832ea29605b3') +source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2" + "cdfs-3.0.0.patch") +md5sums=('ac64c014a90e3c488394832ea29605b3' + 'aba7da94a9dcbb8a93ea423cb6958fef') build() { - _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -` - depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`") + _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` + depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") cd $srcdir/$pkgname-$pkgver - - patch cddata.c <<EOF -85c85 -< .sendfile = generic_file_sendfile ---- -> // .sendfile = generic_file_sendfile -EOF - + patch -p1 <$srcdir/cdfs-3.0.0.patch make mkdir -p $pkgdir/lib/modules/`uname -r`/extra cp cdfs.ko $pkgdir/lib/modules/`uname -r`/extra diff --git a/community/cdfs/cdfs-3.0.0.patch b/community/cdfs/cdfs-3.0.0.patch new file mode 100644 index 000000000..20194b848 --- /dev/null +++ b/community/cdfs/cdfs-3.0.0.patch @@ -0,0 +1,274 @@ +diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c +--- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300 ++++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400 +@@ -83,7 +83,7 @@ + #else + .mmap = generic_file_readonly_mmap, + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) +- .sendfile = generic_file_sendfile ++// .sendfile = generic_file_sendfile + #else + .splice_read = generic_file_splice_read + #endif +diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c +--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 ++++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400 +@@ -32,19 +30,14 @@ + * Added code to transform /proc/cdfs into a sequential synthetic file. * + *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ + +- + #include <linux/seq_file.h> +- +-#ifndef OLD_KERNEL + #include <linux/statfs.h> +-#endif ++#include <linux/sched.h> + + extern struct seq_operations cdfs_operations; + extern struct _track_info *dummy_track_p; + +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); +-#endif + /*============================================================================* + * cdfs_open() * + * Description: * +@@ -115,15 +108,8 @@ + + /********************************************************************/ + +-#ifdef OLD_KERNEL +-static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){ +- kdev_t dev = sb->s_dev; +- int i, j, t; +- struct cdrom_tochdr hdr; +-#else + static int cdfs_fill_super(struct super_block *sb, void *data, int silent){ + int i, t; +-#endif + struct cdrom_tocentry entry; + int no_audio=0, no_data=0; + cd * this_cd; +@@ -131,24 +117,13 @@ + + PRINT("cdfs_mount\n"); + +-#ifdef OLD_KERNEL +- MOD_INC_USE_COUNT; +- +- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd +-#else + sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd +-#endif + + sb->s_blocksize = CD_FRAMESIZE; + sb->s_blocksize_bits = 11; + + if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){ +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + return -ENOMEM; +-#endif + } + + this_cd->mode = MODE; +@@ -160,13 +135,8 @@ + + // Initialize cache for maximum sector size + if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) { +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + kfree(cdfs_info(sb)); + return -ENOMEM; +-#endif + } + + // Cache is still invalid +@@ -183,23 +153,13 @@ + if (this_cd->toc_scsi){ + if (cdfs_toc_read_full(sb)){ + printk("TOC read failed\n"); +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + goto invalid; +-#endif + } + } else { + //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){ + if (cdfs_toc_read(sb)){ + printk("cdfs_toc_read failed\n"); +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + goto invalid; +-#endif + } + } + +@@ -365,11 +325,7 @@ + sb->s_flags |= MS_RDONLY; + sb->s_op = &cdfs_ops; + /* always get inode status */ +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + retinode=cdfs_iget(sb, 0); +-#else +- retinode=iget(sb, 0); +-#endif + if ( IS_ERR(retinode) ) + return PTR_ERR(retinode); + +@@ -379,16 +335,12 @@ + + cdfs_proc_cd = this_cd; + +-#ifdef OLD_KERNEL +- return sb; +-#else + return 0; + + invalid: + kfree(this_cd->cache); + kfree(cdfs_info(sb)); + return -EINVAL; +-#endif + } + + /************************************************************************/ +@@ -410,27 +362,12 @@ + // Remove /proc entry + cdfs_proc_cd = NULL; + kfree(cdfs_info(sb)); +- +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +-#endif +- + } + + /************************************************************************/ + +-#ifdef OLD_KERNEL +-static int cdfs_statfs(struct super_block *sb, struct statfs *buf) { +- cd * this_cd = cdfs_info(sb); +-#else +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) + static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) { + cd * this_cd = cdfs_info(d->d_sb); +-#else +-static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) { +- cd * this_cd = cdfs_info(sb); +-#endif +-#endif + PRINT("rmfs_statfs\n"); + + buf->f_type = CDFS_MAGIC; +@@ -460,11 +397,7 @@ + + /************************************************************************/ + +-#ifdef OLD_KERNEL +-static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){ +-#else + static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ +-#endif + struct inode * inode; + int i; + cd * this_cd = cdfs_info(dir->i_sb); +@@ -480,15 +413,9 @@ + /* Use goto and read inode with iget()/cdfs_iget() */ + /* Thanks to David Howells for patch and Master class in his mail */ + found: +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + inode = cdfs_iget(dir->i_sb, i); + if (IS_ERR(inode)) + return ERR_CAST(inode); +-#else +- inode = iget(dir->i_sb, i); +- if (!inode) +- return ERR_PTR(-ENOMEM); +-#endif + d_add(dentry, inode); + return NULL; + } +@@ -529,12 +456,8 @@ + i->i_fop = &cdfs_dir_operations; + } else { /* file */ + i->i_size = this_cd->track[i->i_ino].size; +-#ifdef OLD_KERNEL +- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time; +-#else + i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time; + i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0; +-#endif + i->i_mode = this_cd->mode; + if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) { + i->i_fop = &cdfs_cddata_file_operations; +@@ -587,33 +510,21 @@ + /******************************************************************/ + + static struct super_operations cdfs_ops = { +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +- .read_inode = cdfs_read_inode, +-#endif + .put_super = cdfs_umount, + .statfs = cdfs_statfs + }; + +-#ifdef OLD_KERNEL +-static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount); +-#else +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) +-static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { +- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); +-#else +-static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { +- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super); +-#endif +-} ++//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { ++// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); ++//} + + static struct file_system_type cdfs_fs_type = { + .owner = THIS_MODULE, + .name = "cdfs", +- .get_sb = cdfs_get_sb, ++// .get_sb = cdfs_get_sb, + .kill_sb = kill_block_super, + .fs_flags = FS_REQUIRES_DEV + }; +-#endif + + /******************************************************/ + +@@ -621,10 +532,6 @@ + MODULE_DESCRIPTION("CDfs: a CD filesystem"); + MODULE_LICENSE("GPL"); + +-#ifdef OLD_KERNEL +-EXPORT_NO_SYMBOLS; +-#endif +- + /******************************************************************/ + + static int __init cdfs_init(void) { +@@ -676,11 +583,7 @@ + + if (!options) return; + +-#ifdef OLD_KERNEL +- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { +-#else + while ((this_char = strsep(&options,",")) != NULL) { +-#endif + + if (!strcmp(this_char,"single")) + this_cd->single=TRUE; diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index 6d0e9535f..7f536231d 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52856 2011-07-29 11:59:24Z spupykin $ +# $Id: PKGBUILD 53245 2011-08-02 14:54:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -7,7 +7,8 @@ pkgname=cgit pkgver=0.9.0.2 -pkgrel=1 +_gitver=1.7.4 +pkgrel=2 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') url="http://hjemli.net/git/cgit" @@ -15,19 +16,30 @@ license=('GPL') depends=('openssl') makedepends=('git' 'zlib' 'curl' 'asciidoc') install=cgit.install -source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2") -md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2') +source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2" + "http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2" + "apache.example.conf") +md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2' + 'fa24dc1ef0b663327ea0fe1981365b39' + 'bd5696bea0654bfcf98f249b1a36737d') build() { cd "$pkgname-$pkgver" - make get-git + _cgit_gitver=`grep 'GIT_VER = ' Makefile | cut -f3 -d\ ` + [ "x${_gitver}" == "x${_cgit_gitver}" ] || { msg "Bad git version"; return 1; } + rm -rf git/* + mv ../git-${_gitver}/* git/ make make doc-man } package() { cd "$pkgname-$pkgver" - make CGIT_SCRIPT_PATH=/srv/http/cgit DESTDIR="$pkgdir" install install-man + make CGIT_SCRIPT_PATH=/usr/share/webapps/cgit DESTDIR="$pkgdir" install install-man install -vDm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -vd "$pkgdir/var/cache/$pkgname" + install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/cgit/apache.example.conf + mkdir -p $pkgdir/usr/lib/cgit + mv $pkgdir/usr/share/webapps/cgit/cgit.cgi $pkgdir/usr/lib/cgit + ln -sf ../../../lib/cgit/cgit.cgi $pkgdir/usr/share/webapps/cgit/cgit.cgi } diff --git a/community/cgit/apache.example.conf b/community/cgit/apache.example.conf new file mode 100644 index 000000000..9beb27db3 --- /dev/null +++ b/community/cgit/apache.example.conf @@ -0,0 +1,25 @@ +ScriptAlias /cgit/ "/usr/lib/cgit/cgit.cgi/" + +Alias /cgit-css "/usr/share/webapps/cgit/" + +<Directory "/usr/share/webapps/cgit/"> + AllowOverride None + Options None + Order allow,deny + Allow from all + AuthType Basic + AuthName cgit + AuthUserFile /etc/httpd/conf/passwd + Require user root +</Directory> + +<Directory "/usr/lib/cgit/"> + AllowOverride None + Options ExecCGI FollowSymlinks + Order allow,deny + Allow from all + AuthType Basic + AuthName cgit + AuthUserFile /etc/httpd/conf/passwd + Require user root +</Directory> diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index ecf47ffe7..84777187e 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 52518 2011-07-26 00:31:17Z svenstaro $ +# $Id: PKGBUILD 53615 2011-08-07 02:05:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=2.2.10 +pkgver=2.3.1 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') url="http://clanlib.org/" license=('zlib') -depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2') +depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3') makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('61b7200ba8b895fc480850f4721dbc14') +md5sums=('af9f16543fa3da43f49b4a52634d2e82') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/clipgrab/PKGBUILD b/community/clipgrab/PKGBUILD index 043f10c00..e7ad135ca 100644 --- a/community/clipgrab/PKGBUILD +++ b/community/clipgrab/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: thacrazze <thacrazze|googlemail|com> # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=clipgrab -pkgver=3.1.0.1 +pkgver=3.1.0.2 pkgrel=1 pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...' arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ license=('GPL') depends=('qt') optdepends=('ffmpeg: for some encodings') source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop) -md5sums=('87df4d8fdc4c1097eb78cf064561db24' +md5sums=('1250e1fb29cd88b7ce1a37d937de0146' 'ef030502ae0922e632742f47283313f4' '9a141791f6952917c441050c3dac81ce') diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD index 60ed8faad..8f5e14815 100644 --- a/community/compiz/PKGBUILD +++ b/community/compiz/PKGBUILD @@ -9,14 +9,14 @@ pkgname=('compiz-core' 'compiz-decorator-kde' 'compiz-decorator-gtk') pkgver=0.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="Composite manager for Aiglx and Xgl" url="http://www.compiz.org/" license=('GPL' 'LGPL' 'MIT') arch=('i686' 'x86_64' 'mips64el') groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse') + 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity') options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') replaces=('compiz') @@ -65,7 +65,7 @@ package_compiz-core() package_compiz-decorator-gtk() { pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'libwnck' 'compiz-core') + depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity') install=compiz-decorator-gtk.install cd $srcdir/compiz-$pkgver diff --git a/community/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD index c72583cfb..722cd9659 100644 --- a/community/curlftpfs/PKGBUILD +++ b/community/curlftpfs/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 17286 2010-05-22 17:59:00Z cbrannon $ +# $Id: PKGBUILD 53536 2011-08-05 12:01:25Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Philip Nilsson <leffeman@gmail.com> pkgname=curlftpfs pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl." url="http://curlftpfs.sourceforge.net/" license=('GPL') depends=('curl>=7.15.4' 'fuse' 'glib2') makedepends=('pkgconfig>=0.9.0') arch=('i686' 'x86_64' 'mips64el') -source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz) -md5sums=('b452123f755114cd4461d56c648d9f12') +source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz + ioerror.patch) +md5sums=('b452123f755114cd4461d56c648d9f12' + '7a8db686293463ba3148c7032871c883') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 < "$srcdir/ioerror.patch" ./configure --prefix=/usr || return 1 make || return 1 } diff --git a/community/curlftpfs/ioerror.patch b/community/curlftpfs/ioerror.patch new file mode 100644 index 000000000..6ca1afb4f --- /dev/null +++ b/community/curlftpfs/ioerror.patch @@ -0,0 +1,11 @@ +--- curlftpfs-0.9.2.orig/ftpfs.c 2008-04-30 03:05:47.000000000 +0400 ++++ curlftpfs-0.9.2.orig/ftpfs.c 2011-01-20 20:33:38.000000000 +0300 +@@ -503,7 +503,7 @@ static void *ftpfs_write_thread(void *da + + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); +- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); ++ curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, (curl_off_t)-1); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index b6a8f9919..d7d5563a1 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 39526 2011-02-11 12:10:41Z spupykin $ +# $Id: PKGBUILD 53594 2011-08-06 09:09:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=cython -pkgver=0.14.1 +pkgver=0.15 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') @@ -11,7 +11,7 @@ url="http://www.cython.org" license=('APACHE') depends=('python2') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('6341bf3b2c49a39b8046219f6696f5c4') +md5sums=('794b93c4c1c4cc031f90302cacd834ca') build() { cd $srcdir/Cython-$pkgver diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD index 39e08b180..cc80362f8 100644 --- a/community/directfb/PKGBUILD +++ b/community/directfb/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 33711 2010-11-27 20:33:08Z jlichtblau $ +# $Id: PKGBUILD 53472 2011-08-03 20:58:54Z ebelanger $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=directfb -pkgver=1.4.11 +pkgver=1.4.14 pkgrel=1 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" arch=('i686' 'x86_64' 'mips64el') url="http://www.directfb.org" license=('LGPL') -depends=('libjpeg' 'libxext' 'sdl' 'sysfsutils' 'libpng' 'freetype2') +depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2') options=('!libtool') changelog=$pkgname.changelog source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz) -md5sums=('94735ccec21120794adcce93a61445d2') +md5sums=('de0745d25a6ac9e337d4d5572df85471') build() { - cd ${srcdir}/DirectFB-${pkgver} - + cd "${srcdir}/DirectFB-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \ --enable-x11 --enable-sdl --disable-vnc --disable-osx \ --enable-video4linux2 --enable-voodoo @@ -26,7 +24,6 @@ build() { } package() { - cd ${srcdir}/DirectFB-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/DirectFB-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index accd41527..91b5643de 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44186 2011-04-04 13:07:03Z spupykin $ +# $Id: PKGBUILD 53655 2011-08-07 17:18:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam -pkgver=3.9.0 -pkgrel=4 +pkgver=3.10.0 +pkgrel=1 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64' 'mips64el') url="http://dspam.nuclearelephant.com/" @@ -22,7 +22,7 @@ source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam dspam.logrotated dspam) install=$pkgname.install -md5sums=('10d092b57d628d8c91655fee5dc0d0cd' +md5sums=('2e83e98a03af492df82532441e4ce335' '2163ca41de383f09f4d754e2d35cb158' 'bb2300eff5b2a6eb987750c71a2c2169') diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index aa6f6b634..548f07735 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=fotoxx -pkgver=11.08 +pkgver=11.08.1 pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" @@ -9,8 +9,8 @@ license=('GPL3') depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('928368cfa250f6aab60c9a92aa27fefa') install=fotoxx.install +md5sums=('95aab93caf87dc24e5e6dd9abef2bc73') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index 696a079c6..dbcb963fe 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49734 2011-06-20 19:34:19Z ibiru $ +# $Id: PKGBUILD 53650 2011-08-07 16:53:25Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.2.8.12 +pkgver=1.2.8.13 pkgrel=1 pkgdesc="A graphical two-pane filemanager for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') options=(!libtool) install=gnome-commander.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('3431f28c7ff1dd882e4b5d6e6b2351929138cc123be4027e20b767eb5725bfee') +sha256sums=('d5fd6da276a21046c73ae9ebdc676ee3c82b4a2149e6dc6d38006f8b364a5893') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index d062da154..c85dccd6c 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Christian Himpel <chressie at gmail dot com> pkgname=go -pkgver=r58 +pkgver=r59 pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' @@ -53,6 +53,14 @@ build() { . ./make.bash } +check() { + export GOROOT="$srcdir/$_hgrepo-build" + export GOOS=linux + export GOBIN="$GOROOT/bin" + cd "$GOROOT/src/pkg" + gomake -k test || true +} + package() { cd "$srcdir/release-build" diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD index 90b5006bd..9fedb3c66 100644 --- a/community/ibus-hangul/PKGBUILD +++ b/community/ibus-hangul/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 53477 2011-08-03 21:36:31Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Radim Hvizdák <hvizdakr at gmail dot com> pkgname=ibus-hangul -pkgver=1.3.0.20100329 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc='Korean input engine for IBus' arch=('i686' 'x86_64' 'mips64el') url='http://ibus.googlecode.com' @@ -11,10 +12,10 @@ license=('GPL') depends=('ibus' 'libhangul') makedepends=('intltool') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('3464c98626685c8e23f6b0b580de2d08') +md5sums=('b71565bba3a1439a47212611b774ecf7') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ @@ -24,7 +25,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make NO_INDEX=true DESTDIR=${pkgdir} install + make NO_INDEX=true DESTDIR="${pkgdir}" install } diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD index 0c283d589..725c0d616 100644 --- a/community/ibus-m17n/PKGBUILD +++ b/community/ibus-m17n/PKGBUILD @@ -1,20 +1,21 @@ +# $Id: PKGBUILD 53482 2011-08-03 22:10:35Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Lonfucius <Lonfucius@gmail.com> # Contributor: Jesse Jaara <jesse.jaara@gmail.com> pkgname=ibus-m17n -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc='M17N engine for IBus' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/ibus/' license=('LGPL') depends=('python-pyenchant' 'ibus' 'm17n-db' 'm17n-lib') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('38ff41207518812945c60084deba0080') +md5sums=('4c406147318f94e5e805c408c4be075e') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ @@ -24,7 +25,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index cd8f7c0b9..6c7714e33 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,8 +6,8 @@ pkgname=john pkgver=1.7.8 -pkgrel=2 -_jumbover=4 +pkgrel=3 +_jumbover=5 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64') url="http://www.openwall.com/$pkgname/" @@ -19,7 +19,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('e6d7f261829610d6949c706ebac0517c' - '978d9e6753c2e9b6bd3be283121a0d76' + '4dc38d4539fa019301c98a7a4094d6af' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index b9d7c736c..653274e4d 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20110723 +pkgver=20110803 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('604ae154cb29cee8369df465794872ec') +md5sums=('d14f012d6e9acf2c0ccc355fcd53c6fd') build() { cd "$srcdir/$pkgname" diff --git a/community/kiwi/ChangeLog b/community/kiwi/ChangeLog deleted file mode 100644 index 0574c29ff..000000000 --- a/community/kiwi/ChangeLog +++ /dev/null @@ -1,36 +0,0 @@ -2009-04-17 Brad Fanella <bradfanella@archlinux.us> - - * Updated for i686 and x86_64: Python fixes - -2009-04-17 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 1.9.25 - -2009-02-06 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 1.9.24 - -2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for python 2.6 - -2008-06-25 Mateusz Herych <heniekk@gmail.com> - - * Updated for x86_64 - 1.9.22 - -2008-06-25 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.9.22 - -2008-06-02 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.9.21 - -2008-02-17 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated to newer version - 1.9.20 - -2007-12-19 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated to newer version - 1.9.19 - diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD index 6ac9689e0..ad0fbeac0 100644 --- a/community/kiwi/PKGBUILD +++ b/community/kiwi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 26968 2010-09-16 03:55:06Z bfanella $ +# $Id: PKGBUILD 53351 2011-08-03 06:50:46Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=kiwi -pkgver=1.9.26 -pkgrel=3 +pkgver=1.9.29 +pkgrel=1 pkgdesc="A set of classes and wrappers for PyGTK" arch=('i686' 'x86_64' 'mips64el') url="http://www.async.com.br/projects/kiwi" @@ -13,7 +13,7 @@ license=("LGPL") depends=('pygtk') makedepends=('gettext') source=(http://download.gnome.org/sources/$pkgname/1.9/$pkgname-$pkgver.tar.bz2) -md5sums=('43c2aab9acf8d95321ee1ccec2c5e4e4') +sha256sums=('0ffa912cd180b3092b3ff636c582ab2c40f0f8eb541ada07b1432631a2d49e90') build() { cd $srcdir/$pkgname-$pkgver @@ -27,5 +27,6 @@ build() { } package() { cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir } diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index d9ec9fc06..84b7aea15 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44066 2011-04-01 20:42:30Z lcarlier $ +# $Id: PKGBUILD 53704 2011-08-07 21:16:33Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> pkgname=knemo -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install options=('libtool') source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2") -md5sums=('e9a129917dfc6515c992ee1de3c08c16') +md5sums=('4f90d81e2d0980ed3ae4e4fefc4bf20b') build() { cd ${srcdir} diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index a53dbed2c..47f99a313 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 47455 2011-05-23 15:33:39Z tdziedzic $ +# $Id: PKGBUILD 53306 2011-08-02 18:26:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" -depends=('python2' 'esound' 'qt' 'libxss') -optdepends=('esound: needed for snd plugin') +depends=('python2' 'qt' 'libxss') arch=(i686 x86_64) makedepends=('cmake') license=('GPL') diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD index 50e1096e5..cce3884de 100644 --- a/community/libinfinity/PKGBUILD +++ b/community/libinfinity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45226 2011-04-18 13:01:37Z spupykin $ +# $Id: PKGBUILD 53361 2011-08-03 09:42:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gregory Haynes <greg@greghaynes.net> pkgname=libinfinity -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="An implementation of the Infininote protocol written in GObject-based C" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('avahi: zeroconf support' 'gtk2: gtk support') options=('!libtool') source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2b25de033c3a4c9975340300b09b84b0') +md5sums=('85e6d75e101fe25503653d2202054eff') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 96e5b4f2e..07606be97 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52905 2011-07-29 19:20:46Z giovanni $ +# $Id: PKGBUILD 53366 2011-08-03 09:43:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.3 -pkgrel=3 +pkgver=0.9.4 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -24,7 +24,8 @@ optdepends=('bridge-utils: for briged networking (default)' 'user-mode-linux' 'virtualbox_bin' 'virtualbox-ose' - 'xen') + 'xen' + 'radvd') options=('emptydirs' '!libtool') backup=('etc/conf.d/libvirtd' 'etc/libvirt/libvirtd.conf' @@ -37,10 +38,10 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) -md5sums=('04f47fad7d0c614af9dcc5d1351c2148' - '018d97dafc0049075fba6f2850f17a12' +md5sums=('86b411b11bd23d4af20611699f372af7' + 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - 'ebb78cda893ca7991e0c22588a63132b' + 'ee7052f3929d5d918236c646a59edebf' 'db95aecdf2ccf3693fef5821cdcb7eba' '5745bb8d0b254abb7a3528c66e03b0f9') diff --git a/community/libvirt/libvirtd.rc.d b/community/libvirt/libvirtd.rc.d index 2f949ab9d..193bffa9c 100755 --- a/community/libvirt/libvirtd.rc.d +++ b/community/libvirt/libvirtd.rc.d @@ -14,6 +14,7 @@ PID=`pidof -o %PPID /usr/sbin/libvirtd` case "$1" in start) stat_busy "Starting libvirtd" + export RADVD=/usr/sbin/radvd for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do [ -d $i ] || mkdir -p $i done diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch index 29f05b34f..c7543c5a4 100644 --- a/community/libvirt/openbsd-netcat-default.patch +++ b/community/libvirt/openbsd-netcat-default.patch @@ -1,7 +1,7 @@ -diff -wbBur libvirt-0.9.3/src/qemu/qemu_migration.c libvirt-0.9.3.my/src/qemu/qemu_migration.c ---- libvirt-0.9.3/src/qemu/qemu_migration.c 2011-07-04 06:45:14.000000000 +0400 -+++ libvirt-0.9.3.my/src/qemu/qemu_migration.c 2011-07-04 15:03:15.000000000 +0400 -@@ -1763,7 +1763,7 @@ +diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c +--- libvirt-0.9.4.org/src/qemu/qemu_migration.c 2011-08-03 05:36:34.000000000 +0400 ++++ libvirt-0.9.4/src/qemu/qemu_migration.c 2011-08-03 13:29:56.000000000 +0400 +@@ -1612,7 +1612,7 @@ ret = qemuMonitorMigrateToUnix(priv->mon, background_flags, unixfile); } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { @@ -10,24 +10,24 @@ diff -wbBur libvirt-0.9.3/src/qemu/qemu_migration.c libvirt-0.9.3.my/src/qemu/qe ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args); } else { ret = -1; -diff -wbBur libvirt-0.9.3/src/remote/remote_driver.c libvirt-0.9.3.my/src/remote/remote_driver.c ---- libvirt-0.9.3/src/remote/remote_driver.c 2011-07-01 10:59:10.000000000 +0400 -+++ libvirt-0.9.3.my/src/remote/remote_driver.c 2011-07-04 15:03:32.000000000 +0400 -@@ -571,7 +571,7 @@ - command, +diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c +--- libvirt-0.9.4.org/src/remote/remote_driver.c 2011-07-29 09:14:03.000000000 +0400 ++++ libvirt-0.9.4/src/remote/remote_driver.c 2011-08-03 13:30:05.000000000 +0400 +@@ -588,7 +588,7 @@ username, - no_tty, + !tty, + !verify, - netcat ? netcat : "nc", + netcat ? netcat : "nc.openbsd", + keyfile, sockname))) goto failed; - -diff -wbBur libvirt-0.9.3/src/rpc/virnetsocket.c libvirt-0.9.3.my/src/rpc/virnetsocket.c ---- libvirt-0.9.3/src/rpc/virnetsocket.c 2011-07-01 10:59:10.000000000 +0400 -+++ libvirt-0.9.3.my/src/rpc/virnetsocket.c 2011-07-04 15:03:00.000000000 +0400 -@@ -597,7 +597,7 @@ - virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes", - "-e", "none", NULL); +diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c +--- libvirt-0.9.4.org/src/rpc/virnetsocket.c 2011-08-01 05:32:35.000000000 +0400 ++++ libvirt-0.9.4/src/rpc/virnetsocket.c 2011-08-03 13:29:46.000000000 +0400 +@@ -629,7 +629,7 @@ + if (noVerify) + virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); virCommandAddArgList(cmd, nodename, - netcat ? netcat : "nc", + netcat ? netcat : "nc.openbsd", diff --git a/community/listen/PKGBUILD b/community/listen/PKGBUILD index 82995bff0..5bb3f4313 100644 --- a/community/listen/PKGBUILD +++ b/community/listen/PKGBUILD @@ -4,7 +4,7 @@ pkgname=listen pkgver=0.6.5 -pkgrel=6 +pkgrel=7 pkgdesc="Music player and management for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://www.listen-project.org/" @@ -15,7 +15,6 @@ depends=('python2-egg' 'python2-libgnome' 'mutagen' makedepends=('gettext' 'pkgconfig' 'intltool' 'docbook2x' 'docbook-xml') optdepends=('python-musicbrainz2: musicbrainz & cd support' 'libgpod: iPod support' - 'hal: hal support' 'python-daap: DAAP support' 'tunepimp: tagging support') source=("http://download.listen-project.org/0.6/${pkgname}-${pkgver}.tar.gz") diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index ae5234e74..808c66d11 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,21 +1,21 @@ -#$Id: PKGBUILD 52925 2011-07-29 21:34:54Z angvp $ +#$Id: PKGBUILD 53436 2011-08-03 17:25:08Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxappearance pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk3' 'intltool') +depends=('gtk2' 'intltool') makedepends=('pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 + ./configure --sysconfdir=/etc --prefix=/usr make } diff --git a/community/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD index dea1d7caf..2bf03bb55 100644 --- a/community/lxde-common/PKGBUILD +++ b/community/lxde-common/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# $Id: PKGBUILD 53456 2011-08-03 20:00:26Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=lxde-common -pkgver=0.5.0 -pkgrel=3 +pkgver=0.5.5 +pkgrel=1 pkgdesc="Common files of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -15,16 +15,12 @@ url="http://lxde.org/" makedepends=(automake) optdepends=(lxsession-lite) backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart}) -source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz" - "${pkgname}-arch.patch" "${pkgname}-invalid-distfile.patch") -md5sums=('23606ab3d6e1039386d62a4b68b4ffc6' - '21657157d9ab377de55deb19a42d68e8' - '24938631783683fd98dfd533023e6d4e') +source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz") +md5sums=('e51a6b2a815a89fda1f497b509465a97') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ${srcdir}/${pkgname}-arch.patch autoreconf ./configure --sysconfdir=/etc --prefix=/usr } diff --git a/community/lxde-common/lxde-common-arch.patch b/community/lxde-common/lxde-common-arch.patch deleted file mode 100644 index 3aa1a8992..000000000 --- a/community/lxde-common/lxde-common-arch.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index ba4149c..61cf4c5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -31,9 +31,9 @@ openbox_DATA= \ - openbox/rc.xml \ - openbox/menu.xml - --pcmanfmdir=$(datadir)/lxde/pcmanfm -+pcmanfmdir=$(sysconfdir)/xdg/pcmanfm - pcmanfm_DATA= \ -- pcmanfm/main.lxde -+ pcmanfm/lxde.conf - - EXTRA_DIST = \ - autostart \ -@@ -45,7 +45,7 @@ EXTRA_DIST = \ - openbox/rc.xml.in \ - openbox/menu.xml \ - openbox-lxde.in \ -- pcmanfm/main.lxde.in \ -+ pcmanfm/lxde.conf.in \ - $(lxpanel_DATA) \ - lxpanel/panel.in - -diff --git a/autostart b/autostart -index 17d7b58..d5b6514 100644 ---- a/autostart -+++ b/autostart -@@ -1,3 +1,3 @@ --@xscreensaver -no-splash - @lxpanel --profile LXDE --@pcmanfm -d -+@pcmanfm --desktop --profile lxde -+@xscreensaver -no-splash -diff --git a/configure.ac b/configure.ac -index 3b62903..f90b4c5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,5 @@ - AC_PREREQ([2.57]) --AC_INIT(lxde-common,[0.5.0], [],lxde-common) -+AC_INIT(lxde-common,[0.5.5], [],lxde-common) - AM_INIT_AUTOMAKE() - dnl AC_PROG_INTLTOOL(, [no-xml]) - dnl AM_MAINTAINER_MODE -@@ -48,7 +48,16 @@ AC_OUTPUT([ - lxpanel/panel - openbox/rc.xml - openbox-lxde -- pcmanfm/main.lxde -+ pcmanfm/lxde.conf - man/Makefile - ]) - -+if test x"$sysconfdir" != x'/etc'; then -+ echo -+ echo -+ echo 'Error: sysconfdir is not /etc.' -+ echo 'Please consider passing --sysconfdir=/etc to configure.'; -+ echo 'Otherwise default config files will be installed to wrong place.' -+ echo -+ echo -+fi -diff --git a/lxpanel/config b/lxpanel/config -index 1911551..cb7f06d 100644 ---- a/lxpanel/config -+++ b/lxpanel/config -@@ -1,4 +1,4 @@ - [Command] - FileManager=pcmanfm %s --Terminal=xterm -e -+Terminal=lxterminal - Logout=lxde-logout -diff --git a/openbox-lxde b/openbox-lxde -old mode 100755 -new mode 100644 -diff --git a/openbox/menu.xml b/openbox/menu.xml -index 78099e6..a7768a5 100644 ---- a/openbox/menu.xml -+++ b/openbox/menu.xml -@@ -25,7 +25,7 @@ - <item label="Desktop Settings"> - <action name="Execute"> - <startupnotify><enabled>yes</enabled></startupnotify> -- <command>pcmanfm --show-pref 2</command> -+ <command>pcmanfm --desktop-pref</command> - </action> - </item> - <item label="Window Management Settings"> -@@ -43,4 +43,4 @@ - </item> - </menu> - --</openbox_menu> -\ No newline at end of file -+</openbox_menu> -diff --git a/pcmanfm/lxde.conf.in b/pcmanfm/lxde.conf.in -new file mode 100644 -index 0000000..6799e1f ---- /dev/null -+++ b/pcmanfm/lxde.conf.in -@@ -0,0 +1,20 @@ -+[config] -+bm_open_method=0 -+su_cmd=xdg-su -c '%s' -+ -+[desktop] -+wallpaper_mode=1 -+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg -+desktop_bg=#000000 -+desktop_fg=#ffffff -+desktop_shadow=#000000 -+ -+[ui] -+always_show_tabs=0 -+hide_close_btn=0 -+win_width=640 -+win_height=480 -+view_mode=0 -+show_hidden=0 -+sort_type=0 -+sort_by=0 -diff --git a/pcmanfm/main.lxde.in b/pcmanfm/main.lxde.in -deleted file mode 100644 -index a619852..0000000 ---- a/pcmanfm/main.lxde.in -+++ /dev/null -@@ -1,3 +0,0 @@ --[Desktop] --show_wallpaper=1 --wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg -diff --git a/startlxde.in b/startlxde.in -index 8372d3a..f493e28 100755 ---- a/startlxde.in -+++ b/startlxde.in -@@ -1,28 +1,43 @@ - #!/bin/sh - - if [ -z "$XDG_CONFIG_HOME" ]; then -- export XDG_CONFIG_HOME="$HOME/.config" -+ export XDG_CONFIG_HOME="$HOME/.config" - fi - - # Ensure the existance of pcmanfm config file - PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm" --if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then -- mkdir -p "$PCMANFM_CONF_DIR" -- cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde" -+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then -+ mkdir -p "$PCMANFM_CONF_DIR" -+ cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" - fi - - # Ensure the existance of openbox config file - OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" - if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then -- mkdir -p "$OPENBOX_CONF_DIR" -- cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml" -+ mkdir -p "$OPENBOX_CONF_DIR" -+ cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml" - fi - -+# Ensure the existance of the 'Desktop' folder -+if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then -+ . "$XDG_CONFIG_HOME/user-dirs.dirs" -+else -+ XDG_DESKTOP_DIR="$HOME/Desktop" -+fi -+mkdir -p "$XDG_DESKTOP_DIR" -+ - # Clean up after GDM (GDM sets the number of desktops to one) - xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null - - # Enable GTK+2 integration for OpenOffice.org, if available. - export SAL_USE_VCLPLUGIN=gtk - -+# Launch DBus if needed -+if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then -+ eval "$(dbus-launch --sh-syntax --exit-with-session)" -+fi -+ -+export XDG_MENU_PREFIX="lxde-" -+ - # Start the LXDE session - exec @prefix@/bin/lxsession -s LXDE -e LXDE diff --git a/community/lxde-common/lxde-common-invalid-distfile.patch b/community/lxde-common/lxde-common-invalid-distfile.patch deleted file mode 100644 index df5d68084..000000000 --- a/community/lxde-common/lxde-common-invalid-distfile.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ub lxde-common-0.5.0.dist/startlxde.in lxde-common-0.5.0/startlxde.in ---- lxde-common-0.5.0.dist/startlxde.in 2009-09-04 11:46:53.000000000 +0200 -+++ lxde-common-0.5.0./startlxde.in 2010-01-18 21:47:18.000000000 +0100 -@@ -25,4 +25,4 @@ - export SAL_USE_VCLPLUGIN=gtk - - # Start the LXDE session --exec @prefix@/bin/lxsession -s LXDE -+exec @prefix@/bin/lxsession -s LXDE -e LXDE - diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 2dac261bd..4384cc31d 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52900 2011-07-29 19:07:23Z angvp $ +# $Id: PKGBUILD 53431 2011-08-03 17:17:03Z angvp $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" @@ -13,7 +13,7 @@ groups=('lxde') depends=('gtk2' 'xorg-server' 'consolekit') makedepends=('intltool') install=${pkgname}.install -backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc') +backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm') # 'etc/lxdm/xinitrc') source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz" Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' diff --git a/community/lxsession-lite/PKGBUILD b/community/lxsession/PKGBUILD index f27e3fd26..db8719774 100644 --- a/community/lxsession-lite/PKGBUILD +++ b/community/lxsession/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# $Id: PKGBUILD 53453 2011-08-03 19:42:00Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> -pkgname=lxsession-lite -pkgver=0.4.5 +pkgname=lxsession +pkgver=0.4.6.1 pkgrel=1 pkgdesc="Session manager of the LXDE Desktop (light version)" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') license=('GPL2') url="http://lxde.org/" groups=('lxde') depends=('gtk2' 'dbus') makedepends=('pkgconfig' 'intltool') -replaces=("lxde-settings-daemon") -conflicts=('lxsession' 'lxde-settings-daemon') +replaces=('lxde-settings-daemon' 'lxsession-lite') +conflicts=('lxsession-lite' 'lxde-settings-daemon') source=(http://downloads.sourceforge.net/lxde/lxsession-${pkgver}.tar.gz) -md5sums=('d5cd0cb733748191b2c7371c9efda155') +md5sums=('e456b64c5ab3652a4dec661ec706dc6e') build() { cd "$srcdir/lxsession-$pkgver" diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD index 36b6bb4c4..b3c9a2874 100644 --- a/community/lxtask/PKGBUILD +++ b/community/lxtask/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 52423 2011-07-24 22:29:09Z angvp $ +# $Id: PKGBUILD 53426 2011-08-03 17:15:52Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxtask pkgver=0.1.4 -pkgrel=2 +pkgrel=3 pkgdesc="Task manager of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk3') +depends=('gtk2') makedepends=('pkgconfig' 'intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') @@ -17,7 +17,7 @@ md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') build() { cd "$srcdir/$pkgname-$pkgver" autoreconf - ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 + ./configure --sysconfdir=/etc --prefix=/usr make } package() { diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 1583ae5f1..36b604d2a 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=15.6.2 +pkgver=15.6.3 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'bash: for running a test script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('96b64d056c6ab3c72338ff7566b6b11e') +md5sums=('afe923c5164b2d8746ef8dc87b868ba0') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index 7d0947b93..7dc26edb8 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 46788 2011-05-11 17:19:25Z svenstaro $ +# $Id: PKGBUILD 53640 2011-08-07 04:39:00Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrew Belitsky <belitsky.a@gmail.com> pkgbase=mygui pkgname=('mygui' 'mygui-docs') -pkgver=3.0.1 -pkgrel=7 +pkgver=3.2.0rc1 +pkgrel=8 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64' 'mips64el') url="http://mygui.info/" license=('LGPL') depends=('boost-libs' 'ogre' 'ois') -makedepends=('boost' 'cmake' 'doxygen' 'graphviz') +makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu') install=mygui.install -source=("http://downloads.sourceforge.net/project/my-gui/MyGUI/MyGUI_3.0.1/MyGUI_3.0.1_source.zip") -md5sums=('e9e82bf60081be58fea3f64d32e2ab3a') +source=("http://downloads.sourceforge.net/my-gui/MyGUI_3.2.0_RC1.zip") +md5sums=('1ac1340148e81ad49a26c8a87acefc6b') build() { - cd $srcdir/MyGUI3.0 + cd $srcdir/MyGUI_3.2.0_RC1 # change CMake config so demos install to /opt sed -i 's:"bin:"../opt/MYGUI:' CMake/Utils/MyGUIConfigTargets.cmake @@ -26,8 +26,7 @@ build() { # get a clean build dir [[ -d build ]] && rm -rf build - mkdir build - cd build + mkdir build && cd build # generate CMake Makefile cmake .. \ @@ -50,7 +49,9 @@ build() { package_mygui() { optdepends=('mygui-docs: documentation') - cd $srcdir/MyGUI3.0/build + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build # install the whole bunch make DESTDIR="$pkgdir" install @@ -64,7 +65,9 @@ package_mygui-docs() { pkgdesc="Documentation for mygui" depends=() - cd $srcdir/MyGUI3.0 + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build # install docs install -d $pkgdir/usr/share/doc/ diff --git a/community/nas/PKGBUILD b/community/nas/PKGBUILD index dd6d3ad6c..6f5d3ce60 100644 --- a/community/nas/PKGBUILD +++ b/community/nas/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 21701 2010-07-16 22:42:31Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 53530 2011-08-05 06:06:18Z bfanella $ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=nas -pkgver=1.9.2 -pkgrel=2 +pkgver=1.9.3 +pkgrel=1 pkgdesc='Network Audio System is a network transparent, client/server audio transport system' arch=('i686' 'x86_64' 'mips64el') url='http://radscan.com/nas.html' @@ -13,23 +14,20 @@ depends=('libxaw') makedepends=('imake') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tar.gz" 'license.txt') -md5sums=('ed7864f55b384452167959022cfb403b' +md5sums=('ecd01a3b4e17a9d464efa83a03618025' 'f11eb8c3fb83946e66e60f7532e8d5da') build() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} - xmkmf - - make World + xmkmf + make World } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} USRLIBDIR=/usr/lib install - - chmod 644 ${pkgdir}/usr/include/audio/* + cd ${pkgname}-${pkgver} - install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license + make DESTDIR=${pkgdir} USRLIBDIR=/usr/lib install + chmod 644 ${pkgdir}/usr/include/audio/* + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license } diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index a9e4c3305..ee6e5ad4b 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 49143 2011-06-11 22:40:49Z spupykin $ +# $Id: PKGBUILD 52418 2011-07-24 20:40:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules -pkgver=2011.05.27 -_pkgsubver=420096 +pkgver=2011.07.19 +_pkgsubver=450511 pkgrel=1 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." +pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" license=('GPL') -makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers') -depends=("kernel26") +makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') +depends=("linux") install=$pkgname.install -source=(http://kent.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz) -md5sums=('3e43d4857d412d02115e69db193830b5') +source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") +md5sums=('efe9b078045e9f7ea1e1311bf11857e6') build() { cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" @@ -24,9 +24,9 @@ build() { } package() { - _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -` - depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`") - KERNEL_VERSION="2.6.${_kernver}-ARCH" + _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` + depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") + KERNEL_VERSION=`uname -r` msg "Kernel = $KERNEL_VERSION" cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install index 7f44b03ef..8de8d6ec5 100644 --- a/community/open-vm-tools-modules/open-vm-tools-modules.install +++ b/community/open-vm-tools-modules/open-vm-tools-modules.install @@ -14,7 +14,7 @@ post_install() { echo ">>>" echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" - echo ">>> disable loading of pcnet32 driver by blacklisting it in /etc/rc.conf." + echo ">>> disable loading of pcnet32 driver" echo ">>>" } @@ -29,6 +29,6 @@ post_remove() { sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf echo ">>>" - echo ">>> Remember to un-blacklist pcnet32 driver in /etc/rc.conf." + echo ">>> Remember to un-blacklist pcnet32 driver" echo ">>>" } diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index d20c69e85..27f6fa7b5 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49148 2011-06-11 22:48:15Z spupykin $ +# $Id: PKGBUILD 52415 2011-07-24 20:39:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools -pkgver=2011.05.27 -_pkgsubver=420096 +pkgver=2011.07.19 +_pkgsubver=450511 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('3e43d4857d412d02115e69db193830b5' +md5sums=('efe9b078045e9f7ea1e1311bf11857e6' '06f7448e274db2a911f582e276088fc9' 'b183ec265200d68431a5e4eb1b0c8cf5' '8c333a979578bdc0c3134c1dd6bb7353' diff --git a/community/orange/PKGBUILD b/community/orange/PKGBUILD index 64bc17274..0a19f823c 100644 --- a/community/orange/PKGBUILD +++ b/community/orange/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 21425 2010-07-16 12:03:23Z spupykin $ +# $Id: PKGBUILD 53301 2011-08-02 17:49:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=orange pkgver=0.4 -pkgrel=2 +pkgrel=3 pkgdesc="a helper tool for synce" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" license=("GPL") -depends=(dynamite synce-libsynce file unshield) +depends=('dynamite' 'synce-libsynce' 'file' 'unshield') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/synce/liborange-$pkgver.tar.gz) md5sums=('40e9ac3de389c74a60007f7493e072a5') @@ -17,6 +17,6 @@ md5sums=('40e9ac3de389c74a60007f7493e072a5') build() { cd $srcdir/liborange-$pkgver ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index d83649895..f5e95e73d 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,32 +1,37 @@ -# $Id: PKGBUILD 36678 2011-01-05 23:16:19Z bluewind $ +# $Id: PKGBUILD 53275 2011-08-02 16:11:02Z bluewind $ +# Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=oss pkgver=4.2_2004 -pkgrel=1 +pkgrel=2 pkgdesc="Open Sound System UNIX audio architecture" arch=('i686' 'x86_64' 'mips64el') url="http://developer.opensound.com/" license=('GPL2') depends=('gcc' 'make' 'kernel26-headers' 'module-init-tools' 'libtool' 'sed') makedepends=('pkgconfig' 'gawk' 'gtk2' 'findutils') -optdepends=('gtk2: for graphical mixer (ossxmix)' - 'hal: for automatic USB audio configuration') +optdepends=('gtk2: for graphical mixer (ossxmix)') conflicts=('oss-linux' 'oss-linux-free' 'oss-testing' 'libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') replaces=('libflashsupport-oss') install=oss.install backup=('usr/lib/oss/soundon.user') source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - 'oss.rm-init-scripts.patch' 'oss.rc' 'oss.soundon.patch') + "rm-init-scripts.patch" + "rc-script" + "soundon.patch" + "remove-hal.patch" + ) md5sums=('256aba264d523fb8ee444aaacfb8d3da' 'b9a380a0ac8896390d71ac13676f27e1' - '8ca7cdf94c56ab02890eb4aba6a4995f' - '65f07fe241bfbf912f76d8b6d8f276b5') + 'cbcbce5c03b127df5eafa8faa091492c' + '65f07fe241bfbf912f76d8b6d8f276b5' + 'cd7f1dc6166bba8c94d96f3a28e948a5') build() { _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - cd ${srcdir}/${_dir} + cd "${srcdir}/${_dir}" # Avoid these flags conflicting with OSS build system. unset CFLAGS @@ -42,43 +47,41 @@ build() { gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so msg "Preparing the build environment." - cd ${srcdir} + cd "${srcdir}" - if [ ! -d build ]; then - # Create build directory and configure - mkdir build && cd build - ${srcdir}/${_dir}/configure --enable-libsalsa=NO - else - # Change to existing build directory - cd build - fi + # Create build directory and configure + rm -rf build + mkdir build && cd build + "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm msg "Building OSS." make build msg "Patching init scripts." - cd ${srcdir}/build/prototype + cd "${srcdir}/build/prototype" rm usr/lib/oss/etc/S89oss - patch -b -p0 < ${srcdir}/oss.rm-init-scripts.patch - patch -b -p0 < ${srcdir}/oss.soundon.patch - + patch -p0 -i "${srcdir}/rm-init-scripts.patch" + patch -p0 -i "${srcdir}/soundon.patch" + # remove hal dependency + patch -p0 -i "${srcdir}/remove-hal.patch" + rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi } package() { _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - cd ${srcdir}/${_dir} + cd "${srcdir}/${_dir}" msg "Copying files." # Install libflashsupport.so - install -Dm755 oss/lib/libflashsupport.so \ - ${pkgdir}/usr/lib/libflashsupport.so - rm -f oss/lib/{flashsupport.c,libflashsupport.so} + install -dm755 "$pkgdir/usr/lib" + ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" + + cd "${srcdir}/build/prototype" + cp -a * "${pkgdir}" - cd ${srcdir}/build/prototype - cp -a * ${pkgdir} - chmod -R a+r ${pkgdir} # All files can have read permission (FS#13815) - find ${pkgdir} -type d -exec chmod a+x '{}' \; # Make namcap happy - install -Dm755 ${srcdir}/oss.rc ${pkgdir}/etc/rc.d/oss + chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815) + find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy + install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" } diff --git a/community/oss/oss.rc b/community/oss/oss.rc deleted file mode 100644 index 3f63378c6..000000000 --- a/community/oss/oss.rc +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Open Sound System' - if /usr/sbin/soundon - then - add_daemon oss - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy 'Stopping Open Sound System' - if /usr/sbin/soundoff - then - rm_daemon oss - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" -esac diff --git a/community/oss/rc-script b/community/oss/rc-script new file mode 100644 index 000000000..5c930107c --- /dev/null +++ b/community/oss/rc-script @@ -0,0 +1,30 @@ +#!/bin/bash +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy 'Starting Open Sound System' + if /usr/sbin/soundon; then + add_daemon oss + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy 'Stopping Open Sound System' + if /usr/sbin/soundoff; then + rm_daemon oss + stat_done + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart}" +esac diff --git a/community/oss/remove-hal.patch b/community/oss/remove-hal.patch new file mode 100644 index 000000000..27e2ef2de --- /dev/null +++ b/community/oss/remove-hal.patch @@ -0,0 +1,20 @@ +Date: Tue Aug 2 16:37:31 CEST 2011 +Author: Florian Pritz <bluewind@xinu.at> +This removes all hal dependencies + +References: +http://www.archlinux.org/todo/92/ + +--- usr/lib/oss/build/install_2011-08-02_162647.sh 2011-08-02 16:26:47.000000000 +0200 ++++ usr/lib/oss/build/install.sh 2011-08-02 16:27:13.000000000 +0200 +@@ -336,10 +336,4 @@ + echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs + fi + +-# Hal 0.5.0+ hotplug +-mkdir -p /usr/lib/hal/scripts +-ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/ +-mkdir -p /usr/share/hal/fdi/policy/20thirdparty/ +-ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/ +- + exit 0 diff --git a/community/oss/oss.rm-init-scripts.patch b/community/oss/rm-init-scripts.patch index 981ff605f..981ff605f 100644 --- a/community/oss/oss.rm-init-scripts.patch +++ b/community/oss/rm-init-scripts.patch diff --git a/community/oss/oss.soundon.patch b/community/oss/soundon.patch index 4702b8680..4702b8680 100644 --- a/community/oss/oss.soundon.patch +++ b/community/oss/soundon.patch diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index bb65fc14e..f8e2457a2 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 51085 2011-07-05 07:17:46Z jconder $ +# $Id: PKGBUILD 53398 2011-08-03 10:39:01Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') -pkgver=0.6.16 +pkgver=0.6.17 pkgrel=1 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'shared-mime-info' 'sqlite3' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz") -sha256sums=('28fc2149e2dac4bed5b6b0479488dacc8af7e8a18556851711502b26de567e67') +sha256sums=('7d6e0d0c63d0a0ef9b393a80ae3711e073cd4b884ff4996d5622f688e28d63c3') build() { cd "$srcdir/PackageKit-$pkgver" diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD index 9b99ac4eb..c5d2cbad4 100644 --- a/community/python2-pyopencl/PKGBUILD +++ b/community/python2-pyopencl/PKGBUILD @@ -1,28 +1,25 @@ -# $Id: PKGBUILD 42723 2011-03-19 23:12:59Z stephane $ +# $Id: PKGBUILD 53500 2011-08-04 16:53:43Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=python2-pyopencl -pkgver=0.92 -pkgrel=2 +pkgver=2011.1.2 +pkgrel=1 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64' 'mips64el') url="http://mathema.tician.de/software/pyopencl" license=('custom') -depends=('python2' 'boost' 'python2-numpy' 'libcl' 'opencl-headers') +depends=('python2' 'python2-numpy' 'python-mako' 'libcl' 'opencl-headers') makedepends=('ctags' 'python2-distribute') provides=('pyopencl=${pkgver}') replaces=('pyopencl') conflicts=('pyopencl') source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz" 'LICENSE.txt') -sha1sums=('5f683638328bc452e8ae5dceaf49c6059735fbca' +sha1sums=('5ecc476b86317ed065c75c1d8efb2a53d1d8f075' '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7') build() { cd "${srcdir}/pyopencl-${pkgver}" - python2 ./configure.py --boost-inc-dir=/usr/include \ - --boost-lib-dir=/usr/lib \ - --boost-python-libname=boost_python \ - --cl-inc-dir=/usr/include \ + python2 ./configure.py --cl-inc-dir=/usr/include \ --cl-lib-dir=/usr/lib \ --cl-libname=OpenCL python2 setup.py build diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 07bc8e0ff..ec4711370 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.8.2 -pkgrel=2 +pkgver=2.8.3 +pkgrel=1 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" @@ -16,7 +16,7 @@ optdepends=('python2: needed for search' install='qbittorrent.install' source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz" 'python2.patch') -md5sums=('58008b6b0233c7997067a61cf07af50d' +md5sums=('2e977ece476a83116beee5bf9df7a6c1' 'db0d79fee8ce3470ad3741d36b02a94c') build() { diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 55dbf6837..8faf76d93 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52439 2011-07-25 17:38:27Z stativ $ +# $Id: PKGBUILD 53541 2011-08-05 12:13:39Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=3.1.1 +pkgver=4.0.0 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index cb8d48f99..d7c653ad9 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51232 2011-07-06 10:22:03Z spupykin $ +# $Id: PKGBUILD 53250 2011-08-02 14:55:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.11 +pkgver=2.2.12 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('5501c90ca02ae7ea93c34f067b3e0619' +md5sums=('61b287860cab3e89c49390b8f5ffb697' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index cfea810b2..d85a132a4 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.30.00 -pkgrel=2 +pkgrel=5 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' @@ -40,7 +40,15 @@ build() { # python2 switch find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; - sed -i 's/python 2/python2 2/g' configure + sed \ + -e 's/python 2/python2 2/g' \ + -i configure + sed \ + -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ + -i cint/reflex/python/genreflex/Makefile.am + sed \ + -e 's/python /python2 /' \ + -i config/genreflex.in config/genreflex-rootcint.in ./configure \ ${TARGET} \ @@ -58,7 +66,8 @@ build() { --enable-roofit \ --enable-python \ --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib + --with-python-libdir=/usr/lib \ + --enable-explicitlink # move from aur #--disable-builtin-afterimage \ diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD index 86047c4b2..1d295ea75 100644 --- a/community/scantailor/PKGBUILD +++ b/community/scantailor/PKGBUILD @@ -1,22 +1,35 @@ -# $Id: PKGBUILD 33966 2010-11-29 21:42:36Z spupykin $ +# $Id: PKGBUILD 53336 2011-08-03 00:10:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com> pkgname=scantailor -pkgver=0.9.9.2 +pkgver=0.9.10 pkgrel=1 pkgdesc="Interactive post-processing tool for scanned pages" arch=(i686 x86_64 'mips64el') url="http://scantailor.sourceforge.net" license="GPL" depends=('qt') -makedepends=('cmake boost') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('0944b12c936019fe12269c7a356d60d0') +makedepends=('cmake' 'boost') +options=('!makeflags') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('f962c93a2d63b449fa3f6612ade3b028' + '0aeb1bae724b5cae208ae8af95e8ed9b') build() { cd $srcdir/$pkgname-$pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + patch -p1 <$srcdir/build-fix.patch + cmake . + cmake \ + -DCMAKE_CXX_FLAGS="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_CXX_FLAGS_DEBUG="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_CXX_FLAGS_RELEASE="-DBOOST_NO_MEMBER_TEMPLATE_FRIENDS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release . make make DESTDIR="$pkgdir" install } diff --git a/community/scantailor/build-fix.patch b/community/scantailor/build-fix.patch new file mode 100644 index 000000000..85b620020 --- /dev/null +++ b/community/scantailor/build-fix.patch @@ -0,0 +1,16 @@ +diff -wbBur scantailor-0.9.10/zones/EditableZoneSet.h scantailor-0.9.10.my/zones/EditableZoneSet.h +--- scantailor-0.9.10/zones/EditableZoneSet.h 2011-07-31 00:47:25.000000000 +0400 ++++ scantailor-0.9.10.my/zones/EditableZoneSet.h 2011-08-03 01:59:40.000000000 +0400 +@@ -76,6 +77,12 @@ + + EditableZoneSet(); + ++ EditableZoneSet(const EditableZoneSet& zs) ++ { ++ m_splineMap = zs.m_splineMap; ++ m_defaultProps = zs.m_defaultProps; ++ } ++ + const_iterator begin() const { return iterator(m_splineMap.begin()); } + + const_iterator end() const { return iterator(m_splineMap.end()); } diff --git a/community/scrotwm/PKGBUILD b/community/scrotwm/PKGBUILD index cd6c2363a..a120b9f65 100644 --- a/community/scrotwm/PKGBUILD +++ b/community/scrotwm/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=scrotwm -pkgver=0.9.32 -pkgrel=2 +pkgver=0.9.33 +pkgrel=1 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.scrotwm.org" @@ -15,7 +15,7 @@ backup=(etc/scrotwm.conf) source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('43053b82962f6629ffa487bfb1c3195d' +md5sums=('fcfd0aba8e48217e26db823226640547' 'a67cfe51079481e5b0eab1ad371379e3' '6132ba773ee00f39d8f67ac0347a9814') diff --git a/community/synce-hal/PKGBUILD b/community/synce-hal/PKGBUILD deleted file mode 100644 index 4b1e4849f..000000000 --- a/community/synce-hal/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 46079 2011-05-03 10:20:22Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: ansgras <ataflinski@uni-koblenz.de> - -pkgname=synce-hal -pkgver=0.15 -pkgrel=1 -pkgdesc="hal based alternative for SynCE dccm" -arch=('i686' 'x86_64') -url="http://synce.sourceforge.net/" -license=('GPL') -depends=('synce-libsynce' 'gnet' 'dhclient' 'hal' 'dbus') -source=(http://switch.dl.sf.net/sourceforge/synce/synce-hal-$pkgver.tar.gz) -md5sums=('796eca27a2ce561247e7a71375c242b6') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ - --with-hal-addon-dir=/usr/lib/hal/scripts - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir/" install -} diff --git a/community/synce-librapi/PKGBUILD b/community/synce-librapi/PKGBUILD index 0902d7d15..b8c8123c0 100644 --- a/community/synce-librapi/PKGBUILD +++ b/community/synce-librapi/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 51603 2011-07-12 06:27:16Z spupykin $ +# $Id: PKGBUILD 53263 2011-08-02 15:19:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-librapi pkgver=0.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="provide a means of communication with a Windows CE device - libraries and tools for making remote calls to pocket pc" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" license=('GPL') -depends=('synce-libsynce' 'hal') +depends=('synce-libsynce') makedepends=('pyrex') source=(http://downloads.sourceforge.net/sourceforge/synce/librapi2-$pkgver.tar.gz) md5sums=('0a15bc22ee02794ca4714799611b4746') build() { cd $srcdir/librapi2-$pkgver - ./configure --prefix=/usr + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --enable-udev-support --disable-hal-support make make DESTDIR=$pkgdir install } diff --git a/community/synce-odccm/PKGBUILD b/community/synce-odccm/PKGBUILD deleted file mode 100644 index dc121a5cd..000000000 --- a/community/synce-odccm/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 20945 2010-07-12 20:22:41Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: SmackleFunky <smacklefunky@optusnet.com.au> - -pkgname=synce-odccm -pkgver=0.13 -pkgrel=4 -pkgdesc="provide a means of communication with a Windows CE device - daemon to communicate with a handheld device" -arch=('i686' 'x86_64' 'mips64el') -url="http://synce.sourceforge.net/" -license=('GPL') -depends=('synce-libsynce' 'gnet' 'hal') -backup=(etc/dbus/system.d/odccm.conf) -source=(http://downloads.sourceforge.net/synce/odccm-$pkgver.tar.gz - synce-odccm.rc - dbus-error-fix.patch) -md5sums=('8f12585398f1a79518887d5f94cf122d' - '5759fb86bb2af46d632c3807616c8999' - '4eea398fe356fe0d8c57d65d6f24b3db') - -build() { - cd $srcdir/odccm-$pkgver - - patch -p1 <$srcdir/dbus-error-fix.patch - - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 - - install -D -m 644 $srcdir/odccm-$pkgver/src/odccm.conf $pkgdir/etc/dbus-1/system.d/odccm.conf - install -D -m 755 $srcdir/synce-odccm.rc $pkgdir/etc/rc.d/synce-odccm -} diff --git a/community/synce-odccm/dbus-error-fix.patch b/community/synce-odccm/dbus-error-fix.patch deleted file mode 100644 index 28af59372..000000000 --- a/community/synce-odccm/dbus-error-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -wbBur odccm-0.13/src/odccm-device-manager.c odccm-0.13.my/src/odccm-device-manager.c ---- odccm-0.13/src/odccm-device-manager.c 2007-11-21 20:00:26.000000000 +0000 -+++ odccm-0.13.my/src/odccm-device-manager.c 2010-07-12 10:49:26.000000000 +0000 -@@ -485,9 +485,9 @@ - int result = 0; - - DBusError error; -- dbus_error_init (&error); - - /* Be sure it is a network interface */ -+ dbus_error_init (&error); - gchar *ifname = libhal_device_get_property_string (ctx, udi, "net.interface", - &error); - if (ifname == NULL) goto DONE; -@@ -495,11 +495,13 @@ - libhal_free_string (ifname); - - /* We'll then check some properties of its parent */ -+ dbus_error_init (&error); - gchar *parentname = libhal_device_get_property_string (ctx, udi, - "info.parent", &error); - if (parentname == NULL) goto DONE; - - /* Check the parent's device driver name (for usb-rndis-lite) */ -+ dbus_error_init (&error); - gchar *drvname = libhal_device_get_property_string (ctx, parentname, - "info.linux.driver", &error); - if (drvname != NULL) -@@ -509,6 +511,7 @@ - } - - /* Check pda.platform property (for usb-rndis-ng) */ -+ dbus_error_init (&error); - gchar *pdaplatform = libhal_device_get_property_string (ctx, parentname, - "pda.platform", &error); - if (pdaplatform != NULL) -@@ -626,6 +628,7 @@ - if (!libhal_ctx_set_dbus_connection (priv->hal_ctx, conn)) - goto OUT; - -+ dbus_error_init (&error); - if (!libhal_ctx_init (priv->hal_ctx, &error)) - { - func_name = "libhal_ctx_init"; diff --git a/community/synce-odccm/synce-odccm.rc b/community/synce-odccm/synce-odccm.rc deleted file mode 100755 index 61e71a77d..000000000 --- a/community/synce-odccm/synce-odccm.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting SynCE odccm daemon" - /usr/sbin/odccm >/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon synce-odccm - stat_done - fi - ;; - stop) - stat_busy "Stopping SynCE odccm daemon" - PID=`pidof odccm` - if [ -z $PID ]; then - stat_fail - else - kill $PID - rm_daemon synce-odccm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/synce-rra/PKGBUILD b/community/synce-rra/PKGBUILD index 89bb0f9d3..aad00d2a7 100644 --- a/community/synce-rra/PKGBUILD +++ b/community/synce-rra/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 27254 2010-09-18 22:01:47Z schuay $ +# $Id: PKGBUILD 53286 2011-08-02 17:26:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-rra pkgver=0.14 -pkgrel=3 +pkgrel=4 pkgdesc="provide a means of communication with a Windows CE device - rra libraries for synce" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" license=('GPL') depends=('glibc' 'synce-librapi' 'synce-libmimedir') makedepends=('python2' 'pyrex') -source=(http://downloads.sourceforge.net/synce/librra-$pkgver.tar.gz \ - build-fix.diff) -md5sums=('3a608174a3a476c96dd4dd4929448fe8' - '8c898d226653cbbb8b778aa0587d66aa') +source=(http://downloads.sourceforge.net/synce/librra-$pkgver.tar.gz) +md5sums=('3a608174a3a476c96dd4dd4929448fe8') build() { cd $srcdir/librra-$pkgver ./configure --prefix=/usr sed -i s/-Werror// lib/Makefile src/Makefile -# patch -p2 python/pyrra.pyx <../build-fix.diff make make DESTDIR=$pkgdir install } diff --git a/community/synce-vdccm/PKGBUILD b/community/synce-vdccm/PKGBUILD index eb511cb6f..d2e7c3d0b 100644 --- a/community/synce-vdccm/PKGBUILD +++ b/community/synce-vdccm/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 17750 2010-05-24 21:46:24Z spupykin $ +# $Id: PKGBUILD 53376 2011-08-03 10:12:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-vdccm pkgver=0.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="provide a means of communication with a Windows CE device - daemon to communicate with a handheld device" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" license=('GPL') depends=('synce-libsynce') -source=(http://downloads.sourceforge.net/synce/vdccm-$pkgver.tar.gz) -md5sums=('43bca4c2fdb658f99b07549fa03832e0') +source=(http://downloads.sourceforge.net/synce/vdccm-$pkgver.tar.gz + build-fix.patch) +md5sums=('43bca4c2fdb658f99b07549fa03832e0' + 'b90e1f8b46e70cd7f8f66f7ef041f3ac') build() { cd $srcdir/vdccm-$pkgver + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr - sed -i 's#-pedantic-errors##' Makefile.in src/Makefile.in Makefile src/Makefile - sed -i '1,1i#include <string.h>' lib/tcpsocket.cpp lib/tcpconnectedsocket.cpp lib/tcpclientsocket.cpp lib/udpsocket.cpp src/rapiclient.cpp - sed -i '1,1i#include <stdint.h>' lib/udpsocket.h src/rapiclient.h - sed -i '1,1i#include <limits.h>' src/rapiclient.h - sed -i '1,1i#include <stdio.h>' src/rapiconnection.cpp - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make + make DESTDIR=$pkgdir install } diff --git a/community/synce-vdccm/build-fix.patch b/community/synce-vdccm/build-fix.patch new file mode 100644 index 000000000..f3bd32cff --- /dev/null +++ b/community/synce-vdccm/build-fix.patch @@ -0,0 +1,123 @@ +diff -wbBur vdccm-0.10.1/lib/continousnode.cpp vdccm-0.10.1.my/lib/continousnode.cpp +--- vdccm-0.10.1/lib/continousnode.cpp 2006-03-28 02:40:15.000000000 +0400 ++++ vdccm-0.10.1.my/lib/continousnode.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <stdio.h> + /*************************************************************************** + * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net> * + * * +diff -wbBur vdccm-0.10.1/lib/localclientsocket.cpp vdccm-0.10.1.my/lib/localclientsocket.cpp +--- vdccm-0.10.1/lib/localclientsocket.cpp 2006-03-22 22:59:14.000000000 +0300 ++++ vdccm-0.10.1.my/lib/localclientsocket.cpp 2011-08-03 14:09:42.000000000 +0400 +@@ -68,6 +68,7 @@ + raddr.sun_family = AF_LOCAL; + strncpy(raddr.sun_path, path.c_str(), sizeof(raddr.sun_path)); + ++#define offsetof(type, member) __builtin_offsetof (type, member) + size_t size = (offsetof (struct sockaddr_un, sun_path) + strlen(raddr.sun_path) + 1); + + if (::connect(fd, (struct sockaddr *) &raddr, size) < 0) { +diff -wbBur vdccm-0.10.1/lib/localsocket.cpp vdccm-0.10.1.my/lib/localsocket.cpp +--- vdccm-0.10.1/lib/localsocket.cpp 2006-03-28 02:40:15.000000000 +0400 ++++ vdccm-0.10.1.my/lib/localsocket.cpp 2011-08-03 14:09:16.000000000 +0400 +@@ -78,6 +78,7 @@ + localAddress.sun_family = AF_LOCAL; + strncpy(localAddress.sun_path, path.c_str(), sizeof(localAddress.sun_path)); + ++#define offsetof(type, member) __builtin_offsetof (type, member) + size_t size = (offsetof (struct sockaddr_un, sun_path) + strlen(localAddress.sun_path) + 1); + + if (::bind(getDescriptor(), (struct sockaddr *) &localAddress, size) < 0) { +diff -wbBur vdccm-0.10.1/lib/tcpclientsocket.cpp vdccm-0.10.1.my/lib/tcpclientsocket.cpp +--- vdccm-0.10.1/lib/tcpclientsocket.cpp 2006-03-22 22:59:14.000000000 +0300 ++++ vdccm-0.10.1.my/lib/tcpclientsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <string.h> + /*************************************************************************** + * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net> * + * * +diff -wbBur vdccm-0.10.1/lib/tcpconnectedsocket.cpp vdccm-0.10.1.my/lib/tcpconnectedsocket.cpp +--- vdccm-0.10.1/lib/tcpconnectedsocket.cpp 2006-06-29 23:01:48.000000000 +0400 ++++ vdccm-0.10.1.my/lib/tcpconnectedsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <string.h> + /*************************************************************************** + * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net> * + * * +diff -wbBur vdccm-0.10.1/lib/tcpsocket.cpp vdccm-0.10.1.my/lib/tcpsocket.cpp +--- vdccm-0.10.1/lib/tcpsocket.cpp 2006-06-29 23:01:48.000000000 +0400 ++++ vdccm-0.10.1.my/lib/tcpsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <string.h> + /*************************************************************************** + * Copyright (c) 2003 Volker Christian <voc@users.sourceforge.net> * + * * +diff -wbBur vdccm-0.10.1/lib/udpsocket.cpp vdccm-0.10.1.my/lib/udpsocket.cpp +--- vdccm-0.10.1/lib/udpsocket.cpp 2006-05-07 19:49:36.000000000 +0400 ++++ vdccm-0.10.1.my/lib/udpsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <string.h> + // + // C++ Implementation: udpsocket + // +diff -wbBur vdccm-0.10.1/lib/udpsocket.h vdccm-0.10.1.my/lib/udpsocket.h +--- vdccm-0.10.1/lib/udpsocket.h 2006-05-06 17:07:32.000000000 +0400 ++++ vdccm-0.10.1.my/lib/udpsocket.h 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <stdint.h> + // + // C++ Interface: udpsocket + // +diff -wbBur vdccm-0.10.1/Makefile.in vdccm-0.10.1.my/Makefile.in +--- vdccm-0.10.1/Makefile.in 2007-12-19 22:59:02.000000000 +0300 ++++ vdccm-0.10.1.my/Makefile.in 2011-08-03 14:05:21.000000000 +0400 +@@ -186,9 +186,9 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + SUBDIRS = lib src tools +-AM_CFLAGS = -O2 -Werror -pedantic-errors -Wall +-AM_CXXFLAGS = -O2 -Werror -pedantic-errors -Wall +-AM_FFLAGS = -O2 -Werror -pedantic-errors -Wall ++AM_CFLAGS = -O2 -Werror -Wall ++AM_CXXFLAGS = -O2 -Werror -Wall ++AM_FFLAGS = -O2 -Werror -Wall + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +diff -wbBur vdccm-0.10.1/src/Makefile.in vdccm-0.10.1.my/src/Makefile.in +--- vdccm-0.10.1/src/Makefile.in 2007-12-19 22:59:01.000000000 +0300 ++++ vdccm-0.10.1.my/src/Makefile.in 2011-08-03 14:05:21.000000000 +0400 +@@ -250,7 +250,7 @@ + rapiproxy.cpp rapiproxyfactory.cpp rapiproxyconnection.cpp \ + $(am__append_3) + AM_CFLAGS = -Wall +-AM_CXXFLAGS = -pedantic-errors -Wall ++AM_CXXFLAGS = -Wall + man_MANS = vdccm.1 + EXTRA_DIST = $(man_MANS) + all: $(BUILT_SOURCES) +diff -wbBur vdccm-0.10.1/src/rapiclient.cpp vdccm-0.10.1.my/src/rapiclient.cpp +--- vdccm-0.10.1/src/rapiclient.cpp 2006-05-06 17:07:32.000000000 +0400 ++++ vdccm-0.10.1.my/src/rapiclient.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <string.h> + // + // C++ Implementation: rapiclient + // +diff -wbBur vdccm-0.10.1/src/rapiclient.h vdccm-0.10.1.my/src/rapiclient.h +--- vdccm-0.10.1/src/rapiclient.h 2006-05-06 17:07:32.000000000 +0400 ++++ vdccm-0.10.1.my/src/rapiclient.h 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,5 @@ ++#include <limits.h> ++#include <stdint.h> + // + // C++ Interface: rapiclient + // +diff -wbBur vdccm-0.10.1/src/rapiconnection.cpp vdccm-0.10.1.my/src/rapiconnection.cpp +--- vdccm-0.10.1/src/rapiconnection.cpp 2007-05-10 22:27:03.000000000 +0400 ++++ vdccm-0.10.1.my/src/rapiconnection.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include <stdio.h> + // + // C++ Implementation: rapiconnection + // diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index feda347eb..7548d09b7 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 49447 2011-06-16 13:09:25Z dreisner $ -# Maintainer: Dave Reisner <d@falconindy.com> +# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd -pkgver=29 +pkgver=33 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') -depends=('dbus-core' 'sysvinit' 'util-linux>=2.19') -makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify') +depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172') +makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' 'gtk2: systemadm' @@ -20,29 +20,42 @@ optdepends=('cryptsetup: required for encrypted block devices' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') groups=('systemd') options=('!libtool') -backup=(etc/systemd/system.conf - etc/tmpfiles.d/console.conf - usr/lib/tmpfiles.d/legacy.conf - usr/lib/tmpfiles.d/systemd.conf - usr/lib/tmpfiles.d/x11.conf) +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) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('e91ffd208c5f03e5c11966eee7b684b0' +md5sums=('361cad7c3debbdd81c211527509ba181' '752636def0db3c03f121f8b4f44a63cd') build() { cd "$srcdir/$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 --prefix=/usr \ - --with-rootdir= \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ + --libdir=/usr/lib \ --localstatedir=/var \ + --with-rootdir= \ + --with-rootlibdir=/lib \ --disable-audit \ --disable-tcpwrap make + + # fix .so links in manpages + sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8 } package() { @@ -51,7 +64,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf" + printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" # fix systemd-analyze for python2 sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" @@ -61,5 +74,5 @@ package() { for manpage in telinit halt reboot poweroff runlevel shutdown; do mv {,systemd.}"$manpage.8" done -} +} diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install index 7ec58682a..34f902276 100644 --- a/community/systemd/systemd.install +++ b/community/systemd/systemd.install @@ -1,13 +1,21 @@ #!/bin/sh checkgroups() { - getent group lock >/dev/null || groupadd -g 54 lock + if usr/bin/getent group lock >/dev/null; then + usr/sbin/groupadd -g 54 lock + fi +} + +sd_booted() { + [ -e sys/fs/cgroups/systemd ] } post_install() { checkgroups - [ -f /etc/machine-id ] || systemd-machine-id-setup + if [ -f etc/machine-id ]; then + bin/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." @@ -16,16 +24,28 @@ post_install() { post_upgrade() { checkgroups - [ -f /etc/machine-id ] || systemd-machine-id-setup - systemctl daemon-reexec >/dev/null || : -} + if [ -f etc/machine-id ]; then + bin/systemd-machine-id-setup + fi + + if sd_booted; then + bin/systemctl daemon-reexec >/dev/null + fi + + newpkgver=${1%-*} + oldpkgver=${2%-*} -pre_remove() { - rm -f /etc/systemd/system/default.target + # 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 + bin/systemctl try-restart systemd-logind.service + fi + fi } post_remove() { - getent group lock >/dev/null && groupdel lock + usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock } # vim:set ts=2 sw=2 et: diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD index 70c4d0c3a..cdb7ee936 100644 --- a/community/unifdef/PKGBUILD +++ b/community/unifdef/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 1000 2009-08-11 09:12:57Z spupykin $ +# $Id: PKGBUILD 53255 2011-08-02 14:56:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=unifdef -pkgver=1.0 -pkgrel=2 +pkgver=2.6 +pkgrel=1 pkgdesc="Remove #ifdef'ed lines" arch=(i686 x86_64 'mips64el') -url="http://www.cs.cmu.edu/~ajw/public/dist/" +url="http://dotat.at/prog/unifdef/" license=('GPL') depends=() -source=(http://www.cs.cmu.edu/~ajw/public/dist/unifdef-$pkgver.tar.gz) -md5sums=('825240622f35c7b002f11ece1af4ba22') +source=("http://dotat.at/prog/unifdef/unifdef-$pkgver.tar.gz") +md5sums=('18b832baea2c7b6b00bd7d4f3db38f62') build() { - cd "$startdir/src/$pkgname-$pkgver" - + cd "$srcdir/$pkgname-$pkgver" make clean - make || return 1 - - mkdir -p $startdir/pkg/usr/bin $startdir/pkg/usr/share/man/man1 && \ - install -m 0755 unifdef $startdir/pkg/usr/bin/ && \ - install -m 0644 unifdef.1 $startdir/pkg/usr/share/man/man1/ + make + mkdir -p $pkgdir/usr/bin $startdir/pkg/usr/share/man/man1 + install -m 0755 unifdef $pkgdir/usr/bin/ + install -m 0644 unifdef.1 $pkgdir/usr/share/man/man1/ } diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD index c3e4c667d..98e006db0 100644 --- a/community/uzbl/PKGBUILD +++ b/community/uzbl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 51925 2011-07-18 08:18:29Z lcarlier $ +# $Id: PKGBUILD 53737 2011-08-07 22:05:14Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') -pkgver=2011.07.17 +pkgver=2011.07.25 pkgrel=1 arch=('i686' 'x86_64') url="http://www.uzbl.org" license=('GPL3') makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13') source=(uzbl-$pkgver.tar.gz::https://github.com/Dieterbe/uzbl/tarball/$pkgver) -md5sums=('c4f441d25c1edf7dddc5b8ce40994e64') +md5sums=('96fed3e0c690df6bf4b46af6a9cd0194') build() { cd "$srcdir"/Dieterbe-uzbl-* diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 5091d201e..a611a4b92 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 53171 2011-07-31 11:38:59Z ibiru $ +# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk') pkgver=4.1.0 -pkgrel=2.1 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2' +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2' 'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 @@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh change_default_driver_dir.patch fix-kernel-panic.patch) -_kernver=2.6.39-LIBRE +_kernver=3.0-LIBRE build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -45,7 +45,7 @@ build() { package_virtualbox() { pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make') + depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make') optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-sdk: developer kit') @@ -173,7 +173,7 @@ package_virtualbox-archlinux-modules(){ pkgdesc="Additions only for Arch Linux guests (kernel modules)" license=('GPL') install=virtualbox-archlinux-modules.install - depends=('kernel26>=2.6.39' 'kernel26<2.6.40') + depends=('linux-libre>=3.0' 'linux-libre<3.1') replaces=('virtualbox-guest-modules') conflicts=('virtualbox-guest-modules') diff --git a/community/virtualbox/virtualbox-archlinux-modules.install b/community/virtualbox/virtualbox-archlinux-modules.install index 8faef400e..40e979b05 100644 --- a/community/virtualbox/virtualbox-archlinux-modules.install +++ b/community/virtualbox/virtualbox-archlinux-modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION='2.6.39-ARCH' +KERNEL_VERSION='3.0-ARCH' post_install() { cat << EOM diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD deleted file mode 100644 index b71a1557d..000000000 --- a/community/wine/PKGBUILD +++ /dev/null @@ -1,145 +0,0 @@ -# $Id: PKGBUILD 49102 2011-06-11 03:15:30Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Eduardo Romero <eduardo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=wine -pkgver=1.3.22 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('46f313013644d31ad37b8fc5c2c16467') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64) -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - mesa lib32-mesa - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxxf86dga lib32-libxxf86dga - libxi lib32-libxi - alsa-lib lib32-alsa-lib - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libxpm lib32-libxpm - libpng lib32-libpng - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libxslt lib32-libxslt - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib \ - --with-x \ - --enable-win64 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-x \ - "${_wine32opts[@]}" - - make -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install deleted file mode 100644 index f71262186..000000000 --- a/community/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - echo "If you are on x86_64, the default WINEARCH will be win64." - echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index f67683b53..9a0bcbfc5 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44028 2011-04-01 16:50:43Z spupykin $ +# $Id: PKGBUILD 53519 2011-08-04 21:10:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd -pkgver=1.2.8 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xelerance.com" @@ -17,20 +17,17 @@ source=(ftp://ftp.xelerance.com/$pkgname/$pkgname-$pkgver.tar.gz xl2tpd.conf.client-example xl2tpd.conf.server-example options.l2tpd - as-needed.patch ipparam.patch) -md5sums=('8748ac5e2f5289963d9a908eede546b5' +md5sums=('28264284552c442b24cf421755a2bb48' '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' - '867ec7085f61ae129748325a08561776' '4d258a58cc109d5c4d96af8f81d481cf') build() { cd "$srcdir/$pkgname-$pkgver" -# patch -p0 <$srcdir/as-needed.patch patch -p1 <$srcdir/ipparam.patch make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr diff --git a/community/xl2tpd/as-needed.patch b/community/xl2tpd/as-needed.patch deleted file mode 100644 index 8976d298f..000000000 --- a/community/xl2tpd/as-needed.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./Makefile_orig 2010-10-08 15:28:50.310000058 +0400 -+++ ./Makefile 2010-10-08 15:29:57.666666723 +0400 -@@ -113,8 +113,7 @@ - - pfc: - $(CC) $(CFLAGS) -c contrib/pfc.c -- $(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o -- -+ $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS) - romfs: - $(ROMFSINST) /bin/$(EXEC) - diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index d842e6199..1de99d190 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 42698 2011-03-19 21:23:28Z spupykin $ +# $Id: PKGBUILD 53311 2011-08-02 18:29:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore pkgver=5.33 -pkgrel=1 +pkgrel=2 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') license=('BSD') -depends=(freetype2 gtk2 libxpm lesstif pam mesa esound libxmu) +depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu) url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ @@ -18,15 +18,13 @@ md5sums=('8ae31d03f836e768cd888198c5f1a5f8' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-setuid \ - --enable-appdefaultdir=/usr/share/X11/app-defaults \ - --enable-pam --with-gtk2 --with-esound --without-ftgl + --enable-appdefaultdir=/usr/share/X11/app-defaults \ + --enable-pam --with-gtk2 --without-esound --without-ftgl make make xapploaddir=$pkgdir/usr/share/X11/app-defaults \ mandir=$pkgdir/usr/man/man1 \ prefix=$pkgdir/usr install - install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE mv $pkgdir/usr/man $pkgdir/usr/share/ } |