summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-07-09 21:04:53 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-07-09 21:04:53 -0300
commitfd5ff7e53a5b8dbabc85ab6e2ff1342b85e155b1 (patch)
treed2b16d75c64d947545149f37bda7cdb8873a4770 /libre
parent7823c9009a845174746fd0da09af46a138481851 (diff)
parent10aa61ef39e662453e1d817046e359372fe3b326 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/aspell-pl/PKGBUILD community/gloox/PKGBUILD community/libircclient/PKGBUILD community/mashup/PKGBUILD community/omniorb/PKGBUILD community/openbox/PKGBUILD community/patchutils/PKGBUILD community/rxvt-unicode/PKGBUILD extra/mesa/PKGBUILD extra/pygobject2/PKGBUILD extra/qt5/PKGBUILD extra/samba/PKGBUILD extra/tdb/PKGBUILD extra/transmission/PKGBUILD extra/vim/PKGBUILD pcr/python-sfml2/PKGBUILD pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r--libre/ath9k-htc-firmware/LICENSE33
-rw-r--r--libre/ath9k-htc-firmware/PKGBUILD75
-rw-r--r--libre/calibre-libre/PKGBUILD7
-rw-r--r--libre/doublecmd-libre/PKGBUILD40
-rw-r--r--libre/doublecmd-libre/doublecmd.install6
-rw-r--r--libre/dpkg/PKGBUILD23
-rw-r--r--libre/dpkg/dpkg-gpg2.patch11
-rw-r--r--libre/libretools/PKGBUILD6
-rw-r--r--libre/linux-libre-firmware/PKGBUILD48
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/PKGBUILD14
-rw-r--r--libre/linux-libre-manpages/PKGBUILD4
-rw-r--r--libre/linux-libre/PKGBUILD12
-rw-r--r--libre/parabola-keyring/PKGBUILD9
-rw-r--r--libre/syslinux/PKGBUILD22
-rw-r--r--libre/syslinux/syslinux-dont-build-dos-windows-targets.patch6
-rw-r--r--libre/syslinux/syslinux-install_update30
-rw-r--r--libre/syslinux/syslinux.cfg27
-rw-r--r--libre/syslinux/syslinux.install13
-rwxr-xr-xlibre/unar/PKGBUILD8
-rw-r--r--libre/virtualbox-libre-modules-lts/PKGBUILD4
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD6
-rw-r--r--libre/virtualbox-libre/PKGBUILD8
-rw-r--r--libre/virtualbox-libre/free-distros.patch216
-rw-r--r--libre/xbmc-libre/PKGBUILD2
-rw-r--r--libre/xtensa-unknown-elf-gcc/PKGBUILD73
27 files changed, 375 insertions, 336 deletions
diff --git a/libre/ath9k-htc-firmware/LICENSE b/libre/ath9k-htc-firmware/LICENSE
new file mode 100644
index 000000000..7668bcb97
--- /dev/null
+++ b/libre/ath9k-htc-firmware/LICENSE
@@ -0,0 +1,33 @@
+Copyright (c) 2013 Qualcomm Atheros, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the name of Qualcomm Atheros nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
new file mode 100644
index 000000000..6aec27967
--- /dev/null
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -0,0 +1,75 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=ath9k-htc-firmware
+pkgver=1.3.2
+pkgrel=3
+pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
+arch=('any')
+url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
+license=('BSD')
+makedepends=('cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
+source=("https://github.com/qca/open-ath9k-htc-firmware/archive/$pkgver.tar.gz"
+ 'LICENSE')
+md5sums=('73c66751151dd47535cb4142477da480'
+ '5163b2711bc481c77045850610b7dd31')
+
+prepare() {
+
+ cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
+ mkdir -p build/{k2,magpie}
+
+}
+
+build() {
+
+ cd $srcdir/open-ath9k-htc-firmware-$pkgver
+
+ export CTARGET="xtensa-unknown-elf"
+ export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4"
+ export CXXFLAGS="${CFLAGS}"
+
+ cat > target_firmware/build/toolchain.cmake <<EOF
+INCLUDE(CMakeForceCompiler)
+
+SET(CMAKE_SYSTEM_PROCESSOR xtensa)
+SET(COMPILER_PREFIX "xtensa-unknown-elf")
+SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
+
+CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
+EOF
+
+ cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/k2
+
+ cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
+ cd -
+
+ cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/magpie
+
+ cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
+ cd -
+
+ cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
+
+ make -C build/k2
+ make -C build/magpie
+
+}
+
+package() {
+
+ # create firmware folder to put the free firmware files there
+ install -d -m755 $pkgdir/usr/lib/firmware
+
+ cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
+
+ # move firmware files to firmware folder
+ cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware
+
+ # create license folder to put the license file there
+ install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+
+ # put LICENSE to license folder
+ install -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname
+
+}
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 339969ba1..7991897ce 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93260 2013-06-30 12:27:03Z jelle $
+# $Id: PKGBUILD 93610 2013-07-07 09:52:43Z jelle $
# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=0.9.37
+pkgver=0.9.38
pkgrel=1
pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
arch=('i686' 'x86_64' 'mips64el')
@@ -30,10 +30,9 @@ install=calibre.install
source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('76db2eb11fe51d85ae9121203defb677'
+md5sums=('7dac0c5896d3affb87667fe5dbdf9019'
'8353d1878c5a498b3e49eddef473605f'
'675cd87d41342119827ef706055491e7')
-
prepare(){
cd "${srcdir}/${_pkgname}"
#rm -rf src/{cherrypy,pyPdf}
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index 5eee8985c..a311ba26b 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,42 +1,58 @@
-# $Id$
+# vim:set ft=sh:
+# $Id: PKGBUILD 93493 2013-07-04 12:38:15Z idevolder $
# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
# Contributor: (sirocco AT ngs.ru)
_pkgbase=doublecmd
pkgbase=doublecmd-libre
pkgname=('doublecmd-gtk2-libre' 'doublecmd-qt-libre')
-pkgver=0.5.4
-_helpver=0.5.1
-pkgrel=2.1
+pkgver=0.5.5
+_helpver=0.5.5
+pkgrel=1
url="http://doublecmd.sourceforge.net/"
arch=('i686' 'x86_64')
license=('GPL')
install="$_pkgbase.install"
+provides=("$_pkgbase")
makedepends=('lazarus' 'qt4pas' 'gtk2')
-optdepends=('lua: scripting' 'p7zip: support for 7zip archives')
-source=("http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
+optdepends=(
+ 'lua51: scripting'
+ 'p7zip: support for 7zip archives'
+ 'unar: support for rar archives'
+)
+source=(
+ "http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
)
-sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7'
- 'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5')
+sha256sums=('253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434'
+ '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
build() {
cp -a $_pkgbase-$pkgver $_pkgbase-gtk
cp -a $_pkgbase-$pkgver $_pkgbase-qt
cd "$srcdir/$_pkgbase-gtk"
+ if [ "$CARCH" = "i686" ]; then
+ sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-gtk/components/doublecmd/doublecmd_common.lpk"
+ fi
+ sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
./build.sh beta gtk2
cd "$srcdir/$_pkgbase-qt"
+ # dont use fPIC on i686
+ if [ "$CARCH" = "i686" ]; then
+ sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-qt/components/doublecmd/doublecmd_common.lpk"
+ fi
+ sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
./build.sh beta qt
}
package_doublecmd-gtk2-libre() {
- pkgdesc="twin-panel (commander-style) file manager (GTK)"
+ pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
depends=('gtk2')
conflicts=('doublecmd-gtk2')
replaces=('doublecmd-gtk2')
- provides=("doublecmd-gtk2=${pkgver}" 'doublecmd')
+ provides=("doublecmd-gtk2=${pkgver}")
cd "$srcdir/$_pkgbase-gtk"
sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
./install/linux/install.sh --install-prefix="$pkgdir"
@@ -47,11 +63,11 @@ package_doublecmd-gtk2-libre() {
}
package_doublecmd-qt-libre() {
- pkgdesc="twin-panel (commander-style) file manager (QT)"
+ pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
depends=('qt4pas')
conflicts=('doublecmd-qt')
replaces=('doublecmd-qt')
- provides=("doublecmd-qt=${pkgver}" 'doublecmd')
+ provides=("doublecmd-qt=${pkgver}")
cd "$srcdir/$_pkgbase-qt"
sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
./install/linux/install.sh --install-prefix="$pkgdir"
diff --git a/libre/doublecmd-libre/doublecmd.install b/libre/doublecmd-libre/doublecmd.install
index 40d56528f..c27b5bb23 100644
--- a/libre/doublecmd-libre/doublecmd.install
+++ b/libre/doublecmd-libre/doublecmd.install
@@ -3,20 +3,20 @@ update_icons() {
# Setup Menus
if which update-desktop-database
then
- update-desktop-database -q /usr/share/applications
+ update-desktop-database -q /usr/share/applications > /dev/null 2>&1
fi
# Setup MIME types
if which update-mime-database
then
- update-mime-database /usr/share/mime >/dev/null
+ update-mime-database /usr/share/mime > /dev/null 2>&1
fi
# Setup Icons
touch -c /usr/share/icons/hicolor
if which gtk-update-icon-cache
then
- gtk-update-icon-cache -tq /usr/share/icons/hicolor
+ gtk-update-icon-cache -tq /usr/share/icons/hicolor > /dev/null 2>&1
fi
}
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 5d7534534..806194577 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -12,28 +12,30 @@ pkgname=(dpkg-devtools perl-dpkg)
pkgdesc="Debian Package manager and utilities"
license=('GPL2')
-pkgver=1.16.9
+pkgver=1.16.10
url="http://packages.debian.org/source/sid/dpkg"
-_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid
+_debrepo=http://ftp.debian.org/debian/pool/main
+
+pkgrel=1.3
-pkgrel=1.2
-debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
arch=('i686' 'x86_64' 'mips64el')
depends=('bzip2' 'xz' 'zlib' 'ncurses')
checkdepends=('perl-test-pod')
makedepends=('perl-io-string' 'perl-timedate')
-source=("$(debfile ${pkgbase} ${pkgver}).tar.xz"
- dpkg-gzip-rsyncable.patch dpkg-gpg2.patch)
+
+_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
+source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
+ dpkg-gzip-rsyncable.patch)
######################################################################
# This is really gross.
# It uses the debian control files to help us split the package.
# Shame on the dpkg developers for not putting that logic into the build system.
-_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg"
+_destdir="$pkgbase-$pkgver/debian/pkg-makepkg"
_debhelper_install() {
local debname=$1
- cd "$_destdir"
+ cd "$srcdir/$_destdir"
# main files
sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
@@ -80,11 +82,10 @@ build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
- patch -Np1 -i "${srcdir}/dpkg-gpg2.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
make
- make DESTDIR="$_destdir" install
+ make DESTDIR="$srcdir/$_destdir" install
}
check() {
@@ -125,3 +126,5 @@ package_perl-dpkg() {
md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
'5ab63758999e9bb10f84bce79a0307b2'
'74b7ce3045690a8fc290104f10cf8d42')
+md5sums=('a20a06a5272717274a8b009368f237da'
+ '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch
deleted file mode 100644
index 28671c484..000000000
--- a/libre/dpkg/dpkg-gpg2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig 2013-01-09 01:28:47.000000000 -0500
-+++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm 2013-01-09 01:30:51.000000000 -0500
-@@ -344,7 +344,7 @@
- my $dsc = $self->get_filename();
- my @exec;
- if (find_command('gpgv')) {
-- push @exec, "gpgv";
-+ push @exec, "gpgv", "--verify";
- } elsif (find_command('gpg')) {
- push @exec, "gpg", "--no-default-keyring", "-q", "--verify";
- }
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 80b154dff..562692e48 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20130627
-_libretools_commit=08375ed421d18b48388169c7fc7cf4ca076577ba
+pkgver=20130706
+_libretools_commit=de47a853ef515db2b9a775c235239efacd16041b
_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
_packages_url=https://projects.parabolagnulinux.org/packages
@@ -74,5 +74,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('acbdcd22c1b922f943651dbf7c320bbd'
+md5sums=('f30fbc4011acdd9065310f8295267bdd'
'b28b1492fda205be7c577fc03cbc3399')
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 4983604a4..2ddc046b6 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,15 +2,13 @@
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgname=linux-libre-firmware
-_pkgver=3.9
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
+pkgver=3.9
+pkgrel=2
pkgdesc='Free firmware files for Linux-libre'
arch=('any')
-url=('http://linux-libre.fsfla.org/'
- 'http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
-license=('GPL2' 'BSD')
-makedepends=('git' 'xtensa-unknown-elf-gcc')
+url=('http://linux-libre.fsfla.org/')
+license=('GPL2')
+depends=('ath9k-htc-firmware')
provides=('linux-firmware'
'kernel26-firmware=2.6.34.99')
conflicts=('linux-firmware'
@@ -38,46 +36,24 @@ replaces=('linux-firmware'
'rt2870usb-fw'
'rt2x00-rt61-fw'
'rt2x00-rt71w-fw')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/linux-libre-$_pkgver-gnu.tar.xz"
- "git://github.com/qca/open-ath9k-htc-firmware")
-md5sums=('120df29f88622dabf7015a22c7cc8e25'
- 'SKIP')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('120df29f88622dabf7015a22c7cc8e25')
-build() {
-
- cd $srcdir/open-ath9k-htc-firmware
+package() {
# create firmware folder to put the free firmware files there
install -d -m755 $pkgdir/usr/lib/firmware
- # fix path on configure file
- sed -i 's|$PWD/../toolchain/inst|/usr|;
- 's|xtensa-elf|xtensa-unknown-elf|;
- ' target_firmware/configure
-
- # compile ath9k-htc-firmware
- make -C target_firmware
-
- mv htc_{7010,9271}.fw $pkgdir/usr/lib/firmware
-
- cd $srcdir/linux-$_pkgver
+ cd $srcdir/linux-$pkgver
- # compile free firmware files of linux-libre source code
+ # compile free firmware files
make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
-}
-
-package() {
-
# create licenses folder to put the licenses files there
install -d -m755 $pkgdir/usr/share/licenses/$pkgname
- # move LICENSE.TXT from ath9k-htc firmware to linux-firmware license folder
- cd $srcdir/open-ath9k-htc-firmware-1.3.2
- mv LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENCE.atheros_firmware
-
# move WHENCE file to linux-firmware license folder
- cd $srcdir/linux-$_pkgver
- mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+ cd $srcdir/linux-$pkgver
+ install -m644 firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
}
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 56137aaf3..de69239f6 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.9.8
+_kernver=3.9.9
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=9
+pkgrel=10
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 740cb40fd..457227e70 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.83
+_kernver=3.0.85
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=7
+pkgrel=9
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 434a922af..b8127136b 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189000 2013-06-28 06:57:30Z tpowa $
+# $Id: PKGBUILD 189672 2013-07-04 11:25:41Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=84
+_sublevel=85
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.83 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.84 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
md5sums=('f30a562307b6f71204370fcd33756466'
- 'a2ab5e3c758f35d0a2ffe33b23cfe04d'
+ '19d15be63712a9d1508a72062dc3da7e'
'6ab0f1a509481d93117b7630105757cc'
'18dfa330a7da88d7c09c3e24a5cd608f'
'c072b17032e80debc6a8626299245d46'
@@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '1327df75d631529dcf29f46f474cf16d')
+ '4cd1209f2b4eab4f26f82e7208c53d28')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -166,7 +166,7 @@ build() {
}
_package() {
- pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
+ pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel package suitable for servers"
[ "${pkgbase}" = "linux-libre" ] && groups=('base')
depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
@@ -250,7 +250,7 @@ _package() {
}
_package-headers() {
- pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+ pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index f8ce261db..695ea966e 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -5,8 +5,8 @@
pkgname=linux-libre-manpages
pkgver=3.9
-pkgrel=1
-pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel"
+pkgrel=1.1
+pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel"
arch=('any')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 853e77579..ef81f6eca 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188998 2013-06-28 05:50:01Z tpowa $
+# $Id: PKGBUILD 189197 2013-06-29 09:29:53Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,7 +10,7 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.9
-_sublevel=8
+_sublevel=9
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('120df29f88622dabf7015a22c7cc8e25'
- 'b628d7ff09667dc5546993bb83461d45'
+ 'e143fc381f4d2fdfc18686b867a5e6a5'
'5bb868d38a27edafac1eb114cd2f3659'
'c180de34b0450d7eef8e0c1a68433d7c'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -151,7 +151,7 @@ build() {
}
_package() {
- pkgdesc="The ${pkgbase} kernel and modules"
+ pkgdesc="The ${pkgbase^} kernel and modules"
[ "${pkgbase}" = "linux-libre" ] && groups=('base')
depends=('coreutils' 'linux-libre-firmware' 'kmod')
optdepends=('crda: to set the correct wireless channels of your country')
@@ -233,7 +233,7 @@ _package() {
}
_package-headers() {
- pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+ pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
@@ -393,7 +393,7 @@ _package-headers() {
}
_package-docs() {
- pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
+ pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index af130b5c0..212c3beb0 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,18 +1,19 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
pkgname=parabola-keyring
-pkgver=$(LC_ALL=C date -u +%Y%m%d).1
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
pkgrel=1
pkgdesc='Parabola GNU/Linux-libre PGP keyring'
arch=('any')
url='https://projects.parabolagnulinux.org/hackers.git/'
license=('GPL')
install="${pkgname}.install"
-source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig})
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
+ "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
package() {
- cd "${srcdir}/${pkgname}-"*
+ cd "${srcdir}/${pkgname}-${pkgver}"
make PREFIX=/usr DESTDIR=${pkgdir} install
}
-md5sums=('007c35459478f86484f66323bf90b1e0'
+md5sums=('d876a03f772de98905fd7eadf0ad5e1c'
'SKIP')
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index f9907d3f4..ecee94e9b 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=syslinux
-pkgver=5.10
-pkgrel=3
+pkgver=4.06
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
-url="http://www.syslinux.org"
+url="http://syslinux.zytor.com/"
license=('GPL2')
depends=('perl' 'glibc')
optdepends=('perl-passwd-md5: For md5pass'
@@ -25,10 +24,10 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
syslinux.cfg
syslinux-install_update
splash.png)
-md5sums=('8f51d6a5d2730f534ba90e71f3347bff'
- '25af85a05e7b212b7fb8b7587175e492'
- 'e5a69630e3f7083aad2d14362b6117b3'
- '4450792e13a0270c1b89bb6a66ce2fbc'
+md5sums=('0384ef35b724615074e77b1fc89d5b47'
+ '1528c376e43f0eaccaa80d8ad1bc13b4'
+ '31fe4d80ad74b01e5bc8fccc1d32cccd'
+ '8559fb3daf3afa8688600d8a38118918'
'befd0e7c38a03442b791f2a530b4dd2d')
build() {
@@ -46,10 +45,8 @@ build() {
package() {
cd "$srcdir"/$pkgname-${pkgver}
- make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install
+ make INSTALLROOT="$pkgdir" SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux install
- # install docs
- cp -ar "$srcdir"/$pkgname-${pkgver}/doc "$pkgdir"/usr/share/
# Install the default configuration
install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
# Install Parabola splash
@@ -57,7 +54,4 @@ package() {
# Install the installation and update script
# This script is maintained at git://gist.github.com/772138.git
install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update
- # move extlinux binary to /usr/bin
- mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/bin/extlinux
- rmdir "$pkgdir"/sbin
}
diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
index 54151ab87..2b86ab828 100644
--- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
@@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
@@ -54,7 +54,7 @@
# files that depend only on the B phase, but may have to be regenerated
# for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
-- diag libinstaller dos win32 win64 dosutil txt
-+ libinstaller txt
+ BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
+- diag libinstaller dos win32 win64 dosutil
++ libinstaller
ITARGET =
IOBJECTS = $(ITARGET) \
utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 47d4d88be..34fe8e916 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -30,8 +30,8 @@ libpath="/usr/lib/syslinux"
bootpath="/boot/syslinux"
extlinux="/usr/bin/extlinux"
-core_modules=(ldlinux.c32)
autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
+com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
pciids_file=/usr/share/hwdata/pci.ids
## Helper functions ##
@@ -294,10 +294,9 @@ install_mbr() {
}
_install() {
- # Copy all com32 files to /boot
- for file in "${libpath}"/*.c32; do
- file=${file##*/}
- # Symlink files if /boot resides on the same partition as root
+ # Copy files to /boot
+ for file in "${com32_files[@]}"; do
+ # Symlink files even if links exist
if [[ "$boot" = root ]]; then
ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
elif [[ "$boot" = boot ]]; then
@@ -305,8 +304,8 @@ _install() {
fi
done
- # Copy / Symlink pci.ids if pci.ids exists on the FS
- if [[ -f $pciids_file ]]; then
+ # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
+ if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then
if [[ "$boot" = root ]]; then
ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
elif [[ "$boot" = boot ]]; then
@@ -332,10 +331,10 @@ _install() {
}
update() {
- # Update c32 files in /boot, if /boot is not on same fs
+ # Update any com and c32 files in /boot
if [[ "$boot" = boot ]]; then
- for file in "$bootpath"/*.c32; do
- file=${file##*/}
+ for file in "$bootpath"/*.{c32,com}; do
+ file=$(basename "$file")
cp "$libpath/$file" "$bootpath/$file" &> /dev/null
done
if [[ -f "$bootpath/pci.ids" ]]; then
@@ -343,17 +342,6 @@ update() {
fi
fi
- # Ensure core modules exist and if not install them
- for file in "${core_modules[@]}"; do
- if [[ ! -f $bootpath/$file ]]; then
- if [[ "$boot" = root ]]; then
- ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
- elif [[ "$boot" = boot ]]; then
- cp "$libpath/$file" "$bootpath/$file"
- fi
- fi
- done
-
if device_is_raid $bootpart; then
echo "Detected RAID on /boot - installing Syslinux with --raid"
"$extlinux" --update "$bootpath" -r &> /dev/null
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
index e4f8d8e28..cb5afb371 100644
--- a/libre/syslinux/syslinux.cfg
+++ b/libre/syslinux/syslinux.cfg
@@ -7,6 +7,7 @@
# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
# * hdt.c32 - hardware detection tool
# * reboot.c32 - reboots the system
+# * poweroff.com - shutdown the system
#
# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
# If /usr and /boot are on the same file system, symlink the files instead
@@ -49,21 +50,21 @@ MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
#-*
LABEL parabola
- MENU LABEL Parabola GNU/Linux-libre
- LINUX ../vmlinuz-linux-libre
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux-libre.img
+ MENU LABEL Parabola GNU/Linux-libre
+ LINUX ../vmlinuz-linux-libre
+ APPEND root=/dev/sda3 ro
+ INITRD ../initramfs-linux-libre.img
LABEL parabolafallback
- MENU LABEL Parabola GNU/Linux-libre Fallback
- LINUX ../vmlinuz-linux-libre
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux-libre-fallback.img
+ MENU LABEL Parabola GNU/Linux-libre Fallback
+ LINUX ../vmlinuz-linux-libre
+ APPEND root=/dev/sda3 ro
+ INITRD ../initramfs-linux-libre-fallback.img
# If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
-# LABEL memtest
-# MENU LABEL Memtest86+
-# LINUX ../memtest86+/memtest.bin
+# LABEL memtest
+# MENU LABEL Memtest86+
+# LINUX ../memtest86+/memtest.bin
LABEL hdt
MENU LABEL HDT (Hardware Detection Tool)
@@ -72,3 +73,7 @@ LABEL hdt
LABEL reboot
MENU LABEL Reboot
COM32 reboot.c32
+
+LABEL off
+ MENU LABEL Power Off
+ COMBOOT poweroff.com
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index 19caa1026..89dbf4e86 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -8,19 +8,6 @@ post_install() {
post_upgrade() {
# auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
/usr/bin/syslinux-install_update -s
- # update to 5.01 message
- if [ "$(vercmp $2 5.01)" -lt 0 ]; then
- echo "If you used syslinux-install_update to install syslinux:"
- echo "==> If you want to use syslinux with menu and all modules please rerun"
- echo "==> # /usr/bin/syslinux-install_update -i -a -m"
- echo ""
- echo "If you manually installed syslinux:"
- echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
- echo "==> If (/ and /boot on seperate fs):"
- echo "==> # cp /usr/lib/syslinux/*.c32 /boot/syslinux"
- echo "==> If (/ and /boot on same fs):"
- echo "==> # ln -s /usr/lib/syslinux/*.c32 /boot/syslinux"
- fi
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 8fe6b165c..2fa84cdf1 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -4,16 +4,16 @@
pkgname=unar
pkgver=1.6
-pkgrel=2
+pkgrel=3
pkgdesc="An Objective-C application for uncompressing archive files"
arch=('x86_64' 'i686' 'mips64el')
url="http://unarchiver.c3.cx/"
license=('LGPL2.1')
depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
makedepends=('gcc-objc')
-replaces=("unarchiver")
-conflicts=("unarchiver" 'icu<51')
-provides=("unarchiver")
+replaces=('unarchiver' 'unrar')
+conflicts=('unarchiver' 'unrar' 'icu<51')
+provides=('unarchiver' 'unrar')
source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
"native_obj_exceptions.patch")
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 4378a3fdb..07cb8a71e 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93050 2013-06-23 10:32:13Z bpiotrowski $
+# $Id: PKGBUILD 93525 2013-07-05 00:46:26Z seblu $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
@@ -7,7 +7,7 @@
pkgbase=virtualbox-libre-modules-lts
pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.14
+pkgver=4.2.16
pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 5e11fd6df..d5a9a62bd 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93205 2013-06-28 17:53:08Z foutrelis $
+# $Id: PKGBUILD 93523 2013-07-05 00:43:32Z seblu $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer
# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
@@ -6,8 +6,8 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.14
-pkgrel=2
+pkgver=4.2.16
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index d6050ed9d..cab223c30 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93046 2013-06-23 10:17:47Z bpiotrowski $
+# $Id: PKGBUILD 93521 2013-07-05 00:32:42Z seblu $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-guest-dkms'
'virtualbox-libre-sdk'
'virtualbox-libre-guest-utils')
-pkgver=4.2.14
+pkgver=4.2.16
pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
@@ -79,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'os_venenux.png'
'libre.patch'
'free-distros.patch')
-md5sums=('be834de415adaf2f696f7a499f88b4e6'
+md5sums=('c4a36e2099a317f4715cd3861cdae238'
'5f85710e0b8606de967716ded7b2d351'
'ed1341881437455d9735875ddf455fbe'
'58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -107,7 +107,7 @@ md5sums=('be834de415adaf2f696f7a499f88b4e6'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'9e0b199059faa3f99def5b0ba6e74009'
- '2dc83a3286aa8eab080a3a6608ab3f67')
+ '1e2274facace125e6c2c8fcd7966fca7')
prepare() {
cd "VirtualBox-$pkgver"
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index fd6d29f3d..025a2b9f4 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,8 +1,8 @@
diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 8c6ab79..1e048d9 100644
+index 2cd5a81..f234d58 100644
--- a/src/VBox/Main/src-all/Global.cpp
+++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] =
+@@ -33,293 +33,369 @@ const Global::OSType Global::sOSTypes[] =
VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -78,6 +78,14 @@ index 8c6ab79..1e048d9 100644
- VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", "Windows81", "Windows 8.1",
+- VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
+- 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", "Windows81_64", "Windows 8.1 (64 bit)",
+- VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
- { "Windows", "Microsoft Windows", "Windows2012_64", "Windows 2012 (64 bit)",
- VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -376,6 +384,14 @@ index 8c6ab79..1e048d9 100644
+ VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
++ { "Non-free OSs", "Non-free Operating Systems", "Windows81", "Windows 8.1",
++ VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
++ 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
++ { "Non-free OSs", "Non-free Operating Systems", "Windows81_64", "Windows 8.1 (64 bit)",
++ VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+ { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)",
+ VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -496,7 +512,7 @@ index 8c6ab79..1e048d9 100644
#ifdef VBOX_WITH_RAW_RING1
VBOXOSTYPE_QNX, VBOXOSHINT_NONE,
#else
-@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] =
+@@ -327,7 +403,7 @@ const Global::OSType Global::sOSTypes[] =
#endif
512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -506,53 +522,15 @@ index 8c6ab79..1e048d9 100644
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index 25928b9..0fd3a6e 100644
+index bd5bd86..c7a8c87 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,46 +44,32 @@ struct osTypePattern
+@@ -44,10 +44,80 @@ struct osTypePattern
static const osTypePattern gs_OSTypePattern[] =
{
- /* DOS: */
- { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
--
-- /* Windows: */
-- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
-- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
-- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
-- { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
-- { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
-- { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
-- { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
-- { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
-- { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
-- { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
-- { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
-- { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
-- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
-- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
-- { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
-- { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
-- { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
-- { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
-- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
-- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
--
-- /* Solaris: */
-- { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
-- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
-- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
-- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
-- { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
--
-- /* OS/2: */
-- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
-- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
-- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
-- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
-- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
--
-- /* Code names for Linux distributions: */
+ /* Code names for free GNU/Linux distributions */
+ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
+ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
@@ -579,31 +557,39 @@ index 25928b9..0fd3a6e 100644
+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
+
+ /* Code names for non-free GNU/Linux distributions: */
- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
- { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] =
- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
++ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
++ { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
++ { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
++ { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
++ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
++ { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
-- /* Regular names of Linux distributions: */
+- /* Windows: */
+ /* Regular names of non-free GNU/Linux distributions: */
- { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
- { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
- { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -116,15 +102,52 @@ static const osTypePattern gs_OSTypePattern[] =
- { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
-- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
-- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
-- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
-- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
-- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
-- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
-- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
--
-- /* Other: */
++ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
++ { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
++ { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
++ { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
++ { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
++ { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
++ { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
++ { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
++ { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
++ { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
++ { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
++ { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
++ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
++ { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
++ { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
++ { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
++ { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
++ { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
++ { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
++ { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
++ { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
++ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
++ { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
++ { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
+
+ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
@@ -620,40 +606,74 @@ index 25928b9..0fd3a6e 100644
+
+ /* Regular names of non-free operating systems: */
+ { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-+ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
-+ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
-+ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
-+ { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
-+ { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
-+ { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
-+ { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
-+ { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
-+ { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
-+ { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
-+ { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
-+ { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
-+ { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
-+ { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
-+ { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
-+ { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
-+ { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
-+ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
-+ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
-+ { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
-+ { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
-+ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
-+ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
-+ { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
-+ { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
-+ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
-+ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
-+ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
-+ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
-+ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
+ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
+ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
+@@ -70,63 +140,16 @@ static const osTypePattern gs_OSTypePattern[] =
+ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
+ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
+ { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
+-
+- /* Solaris: */
+ { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
+ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
+ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
+ { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
+ { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
+-
+- /* OS/2: */
+ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
+ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
+ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
+ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+-
+- /* Code names for Linux distributions: */
+- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
+- { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+- { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
+- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
+- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
+-
+- /* Regular names of Linux distributions: */
+- { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
+- { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
+- { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
+- { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
+- { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
+- { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
+- { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
+- { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
+- { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
+- { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
+- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
+- { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
+- { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
+- { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
+- { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
+- { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
+- { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
+- { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
+- { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
+- { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
+- { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
+- { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
+- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
+- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
+- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
+- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
+- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
+- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
+- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
+-
+- /* Other: */
{ QRegExp("L4", Qt::CaseInsensitive), "L4" },
{ QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
{ QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -139,6 +162,8 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
{ QRegExp("Net", Qt::CaseInsensitive), "Netware" },
{ QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
@@ -662,7 +682,7 @@ index 25928b9..0fd3a6e 100644
{ QRegExp("Ot", Qt::CaseInsensitive), "Other" },
};
-@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+@@ -233,11 +258,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
/* Create widgets: */
QVBoxLayout *pMainLayout = new QVBoxLayout(this);
{
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 37fae91a9..4bf584f15 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -25,7 +25,7 @@ makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libc
'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
'pulseaudio: pulseaudio support'
- 'lirc: remote controller support'
+ 'lirc-libre: remote controller support'
'udisks: automount external drives'
'upower: used to trigger suspend functionality'
'libarchive: access compressed files without unpacking them'
diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD
index 797f67f9e..02611d173 100644
--- a/libre/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD
@@ -10,11 +10,11 @@ _sysroot="/usr/$CHOST/${_target}"
pkgname=${_target}-gcc
pkgver=4.8.1
pkgrel=1
-pkgdesc="The GNU Compiler Collection for Xtensa processors"
+pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org"
-makedepends=("binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
checkdepends=('dejagnu' 'inetutils')
options=('!libtool' '!emptydirs')
source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
@@ -33,13 +33,16 @@ prepare() {
echo ${pkgver} > gcc/BASE-VER
+ # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
mkdir ${srcdir}/gcc-build
}
build() {
cd ${srcdir}/gcc-build
- ${srcdir}/${_basedir}/configure --prefix=/home/marcio/src/xtensa-elf/tools \
+ ${srcdir}/${_basedir}/configure --prefix=/usr \
--target=${_target} \
--disable-multilib \
--disable-nls \
@@ -48,9 +51,9 @@ build() {
--enable-languages=c \
--disable-libquadmath \
--disable-libssp \
- --with-newlib
-# --disable-werror \
-# --libdir=/usr/lib --libexecdir=/usr/lib \
+ --with-newlib \
+ --disable-werror \
+ --libdir=/usr/lib --libexecdir=/usr/lib
# --mandir=/usr/share/man --infodir=/usr/share/info \
# --with-bugurl=https://labs.parabola.nu/ \
# --disable-shared --enable-threads=posix \
@@ -64,15 +67,11 @@ build() {
# --with-linker-hash-style=gnu --disable-install-libiberty \
# --enable-checking=release \
make all-gcc
-
- # make documentation
- cd ${_target}/libstdc++-v3
- make doc-man-doxygen
}
package()
{
- pkgdesc="The GNU Compiler Collection"
+ pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
groups=("${_target}-devel")
install=${_target}-gcc.install
@@ -81,56 +80,10 @@ package()
make -j1 DESTDIR=${pkgdir} install-gcc
- install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
- mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- rm $pkgdir/usr/bin/{{${_target}-,}gfortran,{${_target}-,}gccgo,gnat*}
- rm $pkgdir/usr/lib/*.so*
- rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
- rm $pkgdir/usr/lib/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/${_target}-/${pkgver}/{ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/${_target}-/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
- rm $pkgdir/usr/lib/gcc/${_target}-/${pkgver}/{libcaf_single,libgfortranbegin}.a
- rm -r $pkgdir/usr/lib/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-
# many packages expect this symlinks
ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc
- # POSIX conformance launcher scripts for c89 and c99
- cat > $pkgdir/usr/bin/${_target}-c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
- case "$opt" in
- -ansi|-std=c89|-std=iso9899:1990) fl="";;
- -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
- exit 1;;
- esac
-done
-exec ${_target}-gcc $fl ${1+"$@"}
-EOF
-
- cat > $pkgdir/usr/bin/${_target}-c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
- case "$opt" in
- -std=c99|-std=iso9899:1999) fl="";;
- -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
- exit 1;;
- esac
-done
-exec ${_target}-gcc $fl ${1+"$@"}
-EOF
-
- chmod 755 $pkgdir/usr/bin/${_target}-c{8,9}9
-
-
- # Install Runtime Library Exception
- install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/${_target}/RUNTIME.LIBRARY.EXCEPTION
+ # Remove unnecessary files and folders
+ rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
+ rm $pkgdir/usr/share/man/man7/* && rmdir $pkgdir/usr/share/man/man7
}