From 498a4346616c33beac56d48a246cf27fe3812341 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 Aug 2012 00:04:41 +0000 Subject: Wed Aug 29 00:04:40 UTC 2012 --- libre/cdfs-libre/cdfs-3.0.patch | 22 +++++++++++----------- libre/cdfs-libre/cdfs-3.2.patch | 2 +- libre/cdfs-libre/cdfs-3.4.patch | 2 +- libre/kdebase-runtime-libre/PKGBUILD | 2 +- libre/virtualbox-libre-modules-lts/PKGBUILD | 8 ++++---- libre/virtualbox-libre-modules/PKGBUILD | 4 ++-- libre/virtualbox-libre/PKGBUILD | 10 +++++----- 7 files changed, 25 insertions(+), 25 deletions(-) (limited to 'libre') diff --git a/libre/cdfs-libre/cdfs-3.0.patch b/libre/cdfs-libre/cdfs-3.0.patch index 445a28970..20194b848 100644 --- a/libre/cdfs-libre/cdfs-3.0.patch +++ b/libre/cdfs-libre/cdfs-3.0.patch @@ -28,8 +28,8 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c 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); +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); -#endif /*============================================================================* * cdfs_open() * @@ -47,7 +47,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c static int cdfs_fill_super(struct super_block *sb, void *data, int silent){ int i, t; -#endif - struct cdrom_tocentry entry; + struct cdrom_tocentry entry; int no_audio=0, no_data=0; cd * this_cd; @@ -131,24 +117,13 @@ @@ -67,7 +67,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){ -#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; +- MOD_DEC_USE_COUNT; - return NULL; -#else return -ENOMEM; @@ -144,7 +144,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c /************************************************************************/ @@ -410,27 +362,12 @@ // Remove /proc entry - cdfs_proc_cd = NULL; + cdfs_proc_cd = NULL; kfree(cdfs_info(sb)); - -#ifdef OLD_KERNEL @@ -210,7 +210,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c -#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; + i->i_fop = &cdfs_cddata_file_operations; @@ -587,33 +510,21 @@ /******************************************************************/ @@ -251,7 +251,7 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c @@ -621,10 +532,6 @@ MODULE_DESCRIPTION("CDfs: a CD filesystem"); - MODULE_LICENSE("GPL"); + MODULE_LICENSE("GPL"); -#ifdef OLD_KERNEL -EXPORT_NO_SYMBOLS; @@ -261,14 +261,14 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c 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")) + + if (!strcmp(this_char,"single")) this_cd->single=TRUE; diff --git a/libre/cdfs-libre/cdfs-3.2.patch b/libre/cdfs-libre/cdfs-3.2.patch index b4ea610b5..d3300bdbc 100644 --- a/libre/cdfs-libre/cdfs-3.2.patch +++ b/libre/cdfs-libre/cdfs-3.2.patch @@ -2,7 +2,7 @@ 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 2012-01-18 11:23:03.000000000 +0400 @@ -517,7 +517,7 @@ - + i->i_uid = this_cd->uid; i->i_gid = this_cd->gid; - i->i_nlink = 1; diff --git a/libre/cdfs-libre/cdfs-3.4.patch b/libre/cdfs-libre/cdfs-3.4.patch index 8e66bd85c..5c2cb9b24 100644 --- a/libre/cdfs-libre/cdfs-3.4.patch +++ b/libre/cdfs-libre/cdfs-3.4.patch @@ -9,4 +9,4 @@ diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c + sb->s_root = d_make_root(retinode); cdfs_proc_cd = this_cd; - \ No newline at end of file + diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index ea7ec4e00..45ef65005 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgname=kdebase-runtime-libre pkgver=4.9.0 pkgrel=3 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' license=('GPL' 'LGPL') depends=('nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 597406075..565ff1633 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,11 +7,11 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts') pkgver=4.1.20 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-lts' 'linux-libre-lts-headers') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl-libre' 'linux-libre-lts' 'linux-libre-lts-headers') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules os_blag_64.png os_blag.png @@ -107,7 +107,7 @@ package_virtualbox-libre-parabola-modules-lts(){ depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-archlinux-modules-lts') conflicts=('virtualbox-archlinux-modules-lts') - provides=("virtualbox-archlinux-modules-lts=$pkgver" 'virtualbox-archlinux-modules') + provides=("virtualbox-archlinux-modules-lts=$pkgver" 'virtualbox-libre-parabola-modules') source "$srcdir/VirtualBox-${pkgver}/env.sh" @@ -131,7 +131,7 @@ package_virtualbox-libre-modules-lts(){ depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') replaces=('virtualbox-modules-lts') conflicts=('virtualbox-modules-lts') - provides=("virtualbox-modules-lts=$pkgver" 'virtualbox-modules') + provides=("virtualbox-modules-lts=$pkgver" 'virtualbox-libre-modules') source "$srcdir/VirtualBox-${pkgver}/env.sh" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 096fbc594..8497c28b8 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,11 +6,11 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') pkgver=4.1.20 -pkgrel=3 +pkgrel=3.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl-libre' 'linux-libre-headers') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules os_blag_64.png os_blag.png diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 1ac873d98..4a4250e59 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -11,12 +11,12 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-source' 'virtualbox-libre-parabola-source') pkgver=4.1.20 -pkgrel=2 +pkgrel=2.1 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' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2') +'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' '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 @@ -77,7 +77,7 @@ build() { package_virtualbox-libre() { pkgdesc="Powerful x86 virtualization for enterprise as well as home use (without Oracle VM VirtualBox Extension Pack and non-free OS options support)" - depends=('virtualbox-libre-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng') + depends=('virtualbox-libre-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng') optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: developer kit' @@ -165,7 +165,7 @@ package_virtualbox-libre-source() { depends=(dkms gcc make) replaces=('virtualbox-source') conflicts=('virtualbox-source') - provides=("virtualbox-source=$pkgver" 'virtualbox-modules') + provides=("virtualbox-source=$pkgver" 'virtualbox-libre-modules') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-source.install @@ -241,7 +241,7 @@ package_virtualbox-libre-parabola-source() { depends=(dkms gcc make) replaces=('virtualbox-archlinux-source') conflicts=('virtualbox-archlinux-source') - provides=("virtualbox-archlinux-source=${pkgver}" 'virtualbox-archlinux-modules') + provides=("virtualbox-archlinux-source=${pkgver}" 'virtualbox-libre-parabola-modules') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-parabola-source.install -- cgit v1.2.3-54-g00ecf