diff options
Diffstat (limited to 'community')
-rw-r--r-- | community/cdfs/PKGBUILD | 24 | ||||
-rw-r--r-- | community/cdfs/cdfs-3.0.0.patch | 274 | ||||
-rw-r--r-- | community/dspam/PKGBUILD | 8 | ||||
-rw-r--r-- | community/gnome-commander/PKGBUILD | 6 | ||||
-rw-r--r-- | community/knemo/PKGBUILD | 6 | ||||
-rw-r--r-- | community/mygui/PKGBUILD | 6 | ||||
-rw-r--r-- | community/open-vm-tools-modules/PKGBUILD | 22 | ||||
-rw-r--r-- | community/open-vm-tools-modules/open-vm-tools-modules.install | 4 | ||||
-rw-r--r-- | community/open-vm-tools/PKGBUILD | 8 | ||||
-rw-r--r-- | community/uzbl/PKGBUILD | 6 | ||||
-rw-r--r-- | community/virtualbox/PKGBUILD | 12 | ||||
-rw-r--r-- | community/virtualbox/virtualbox-archlinux-modules.install | 2 |
12 files changed, 324 insertions, 54 deletions
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index af18a5dbb..891e3d14f 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) 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/dspam/PKGBUILD b/community/dspam/PKGBUILD index 9da467697..dfa286c56 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') 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/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index a1d83a6bd..6f28671fa 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') @@ -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/knemo/PKGBUILD b/community/knemo/PKGBUILD index 0e8662c8b..576477ef8 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') @@ -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/mygui/PKGBUILD b/community/mygui/PKGBUILD index d9c89d9b7..3f8ff7311 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 53635 2011-08-07 03:07:13Z 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.2.0rc1 -pkgrel=7 +pkgrel=8 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64') 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/my-gui/MyGUI_3.2.0_RC1.zip") md5sums=('1ac1340148e81ad49a26c8a87acefc6b') diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index 127bf5c92..449f8d6cf 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') 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 447d3dedd..92e48c99b 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') @@ -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/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 1cdf18903..9df5a53bf 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-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-ARCH +_kernver=3.0-ARCH 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-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>=3.0' 'linux<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 |