diff options
24 files changed, 241 insertions, 366 deletions
diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD index cdc3483d5..6e2264257 100644 --- a/libre-testing/syslinux/PKGBUILD +++ b/libre-testing/syslinux/PKGBUILD @@ -5,7 +5,7 @@ pkgname="syslinux" pkgver="6.01" -pkgrel="2" +pkgrel="4" arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -22,6 +22,10 @@ optdepends=('perl-passwd-md5: For md5pass' 'util-linux: For isohybrid' 'efibootmgr: For EFI support' 'dosfstools: For EFI support') +md5sums=('5fe8959b92255143a334167ca1c395a6' + '2466fa3fe8c2577acb2a7025d7096c91' + '0e7d47e1f791f0c5e7bd40ed5c6d80cc' + 'cb46ca47c6b6323127d908440057d98f') install="${pkgname}.install" @@ -30,11 +34,6 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve 'syslinux-install_update' 'splash.png') -sha1sums=('d7bc1b188677f77ac2d7060d25491dc29877a9c4' - 'a0238479aa2ed0bbd91d879d35bf7fce2600830f' - 'b1d915045fe3094f5359df043c53e73a4dc32745' - '1be7066848f2d58d67c63436294de5322ca34318') - _build_syslinux_bios() { rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png Binary files differindex f94067681..eac14536b 100644 --- a/libre-testing/syslinux/splash.png +++ b/libre-testing/syslinux/splash.png diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf Binary files differnew file mode 100644 index 000000000..c27d04445 --- /dev/null +++ b/libre-testing/syslinux/splash.xcf diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update index c32ccf18a..4dc09696a 100644 --- a/libre-testing/syslinux/syslinux-install_update +++ b/libre-testing/syslinux/syslinux-install_update @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # -# Sylinux Installer / Updater Scripts -# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# Syslinux Installer / Updater Script (for BIOS only) +# Copyright (C) 2013 Matthew Gyurgyik <pyther@pyther.net> # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -26,13 +26,13 @@ # shopt -s nullglob -libpath="/usr/lib/syslinux/bios" -bootpath="/boot/syslinux" -extlinux="/usr/bin/extlinux" +bios_libpath="/usr/lib/syslinux/bios/" +bios_bootpath="/boot/syslinux/" +EXTLINUX="/usr/bin/extlinux" -core_modules=(ldlinux.c32) -autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -pciids_file=/usr/share/hwdata/pci.ids +bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32) +bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" +pciids_file="/usr/share/hwdata/pci.ids" ## Helper functions ## # Taken from libui-sh @@ -120,7 +120,7 @@ usage() { cat << EOF usage: $0 options -This script will install or upgrade Syslinux +This script will install or upgrade Syslinux (for BIOS only) OPTIONS: -h Show this message @@ -133,16 +133,16 @@ OPTIONS: Arguments Required: -c Chroot install (ex: -c /mnt) -Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) - syslinux-install_update.sh -u (update) +Example Usage: $0 -i -a -m # (install, set boot flag, install mbr) + $0 -u # (update) EOF } # Trys to find the partition that /boot resides on # This will either be on /boot or / (root) getBoot() { - if [[ ! -d "$bootpath" ]]; then - echo "Could not find $bootpath" + if [[ ! -d "$bios_bootpath" ]]; then + echo "Could not find $bios_bootpath" echo "Is boot mounted? Is Syslinux installed?" exit 1 fi @@ -278,9 +278,9 @@ install_mbr() { { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} if [[ "$ptb" = MBR ]]; then - mbrfile="$libpath/mbr.bin" + mbrfile="$bios_libpath/mbr.bin" elif [[ "$ptb" = GPT ]]; then - mbrfile="$libpath/gptmbr.bin" + mbrfile="$bios_libpath/gptmbr.bin" fi if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then @@ -293,79 +293,65 @@ install_mbr() { return 0 } -_install() { +install_modules() { # Copy all com32 files to /boot - for file in "${libpath}"/*.c32; do + for file in "${bios_libpath}"/*.c32; do file=${file##*/} - # Symlink files if /boot resides on the same partition as root + rm "$bios_bootpath/$file" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + # Symlink files if /boot resides on the same partition as root + ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" + cp "$bios_libpath/$file" "$bios_bootpath/$file" fi done # Copy / Symlink pci.ids if pci.ids exists on the FS if [[ -f $pciids_file ]]; then + rm "$bios_bootpath/pci.ids" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null fi fi +} + +_install() { + install_modules if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + echo "Detected RAID on /boot" + "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --install "$bootpath" > /dev/null 2>&1 + "$EXTLINUX" --install "$bios_bootpath" &> /dev/null fi if (( $? )); then - echo "Syslinux install failed" + echo "Syslinux BIOS install failed" exit 2 else - echo "Syslinux install successful" + echo "Syslinux BIOS install successful" fi - touch "$CHROOT/$autoupdate_file" + touch "$CHROOT/$bios_autoupdate_file" } update() { - # Update c32 files in /boot, if /boot is not on same fs - if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.c32; do - file=${file##*/} - cp "$libpath/$file" "$bootpath/$file" &> /dev/null - done - if [[ -f "$bootpath/pci.ids" ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null - 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 + install_modules if device_is_raid $bootpart; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --update "$bootpath" -r &> /dev/null + echo "Detected RAID on /boot" + "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --update "$bootpath" &> /dev/null + "$EXTLINUX" --update "$bios_bootpath" &> /dev/null fi if (($?)); then - echo "Syslinux update failed" + echo "Syslinux BIOS update failed" exit 2 else - echo "Syslinux update successful" + echo "Syslinux BIOS update successful" fi } @@ -400,7 +386,7 @@ while getopts "c:uihmas" opt; do ;; s) # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $autoupdate_file ]]; then + if [[ -f $bios_autoupdate_file ]]; then UPDATE="True" else exit 0 @@ -432,14 +418,14 @@ fi # If a chroot dir is path set variables to reflect chroot if [[ "$CHROOT" ]]; then - libpath="$CHROOT$libpath" - bootpath="$CHROOT$bootpath" - extlinux="$CHROOT$extlinux" + bios_libpath="$CHROOT$bios_libpath" + bios_bootpath="$CHROOT$bios_bootpath" + EXTLINUX="$CHROOT$EXTLINUX" fi # Exit if no /boot path exists -if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bootpath is empty!" +if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bios_bootpath is empty!" echo "Is /boot mounted?" exit 1 fi diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg index 64d6596e3..f88c1a5fe 100644 --- a/libre-testing/syslinux/syslinux.cfg +++ b/libre-testing/syslinux/syslinux.cfg @@ -32,15 +32,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #ff777caa #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -51,13 +51,13 @@ 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 + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 1b030ecd5..af128c250 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94300 2013-07-19 10:21:35Z jelle $ +# $Id: PKGBUILD 94576 2013-07-27 12:09:03Z 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.40 +pkgver=0.9.41 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('f63b0e5697c5e997ecaaeaa82a14cd60' +md5sums=('2037b44c90a66e97823a637edfa194ca' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') prepare(){ diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 56d994beb..2221fb7fe 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=2 +pkgrel=3 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -40,19 +40,20 @@ optdepends=('freetype2: For grub-mkfont usage' source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}" 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' - 'grub.default') + 'grub.default' + 'grub-2.00-mkinitcpio-0.15.patch') +md5sums=('SKIP' + 'b3068b52b6f1dcd2850b5c7585bb185f' + 'be55eabc102f2c60b38ed35c203686d6' + '52d374e0194e3f2e39ff7c92ecd58a6c' + 'd25d2dcf8ba708dcf768fcaea799f59c' + 'SKIP' + 'SKIP') for _DIR_ in 915resolution ntldr-img ; do source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") done -# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' -sha1sums=('SKIP' - '513172d91d1a2e2cda7c0a744c766d5868cb28bf' - '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' - '06b926320cb2add6c157d59d46e553b89dd3aa03' - 'SKIP' - 'SKIP') _build_grub-common_and_bios() { @@ -173,6 +174,9 @@ prepare() { ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo + + ## fix 10_linux + patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac" diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch new file mode 100644 index 000000000..1af848fa3 --- /dev/null +++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch @@ -0,0 +1,11 @@ +--- util/grub.d/10_linux.in.old 2013-07-28 08:55:47.825946239 +0200 ++++ util/grub.d/10_linux.in 2013-07-28 08:56:14.082201512 +0200 +@@ -138,7 +138,7 @@ + message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ++ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args} + EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index d70fde92d..13f61ecec 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188976 2013-06-27 14:29:36Z andyrtr $ +# $Id: PKGBUILD 191569 2013-07-25 20:33:03Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,7 +6,7 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.6 +pkgver=3.13.7 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} hp-mkuri.patch) -md5sums=('3dd5052864052b8cd4ce013bb71f4d6c' +md5sums=('e834c8dd270f441c963f5d883d2d48f3' 'SKIP' '0bd7779fdbc4d7a9386df04dce2cb8d4') diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index bf31c26bd..c362ea2e1 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=20130727 -_libretools_commit=05463eaf611f4784b3693b74029c3f5a6da1d70b +pkgver=20130727.1 +_libretools_commit=b853e0a808ed5c2fe4c1850d46eb2370c967f46d _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f _packages_url=https://projects.parabolagnulinux.org/packages @@ -19,7 +19,7 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta pkgrel=1 arch=('any') -makedepends=(emacs) # emacs --batch is used during the build to process text +makedepends=(emacs ronn) # emacs --batch is used during the build to process text checkdepends=(sh-roundup) build() { @@ -74,5 +74,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('49653793e6bff294661043ed38ac6e43' +md5sums=('8e802315aa3b3437460c11234385db56' 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 6377a9032..a24893a6f 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190022 2013-07-13 02:26:08Z eric $ +# $Id: PKGBUILD 191729 2013-07-29 18:51:12Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.0 +pkgver=1.10.1.a pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -18,22 +18,25 @@ depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 'gnome-icon-theme' 'desktop-file-utils') makedepends=('intltool') optdepends=('gnome-keyring: for keyring plugin support' - 'libgnome-keyring: for keyring plugin support') + 'libgnome-keyring: for keyring plugin support' + 'gst-plugins-base: for media player plugin support' + 'gst-plugins-good: for media player plugin support' + 'gst-plugins-bad-libre: for media player plugin support') options=('!libtool' '!emptydirs') install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver%*.*}a.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('aac8e1dac30361758e3565cfddfd317f9f60b64a' +sha1sums=('c0c8508adb6ccfda46453b6a213c15ab78ad5d2c' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile make } package() { - cd liferea-${pkgver} + cd liferea-${pkgver%*.*}a make DESTDIR="${pkgdir}" install } diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index ecee94e9b..4967097b1 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=syslinux -pkgver=4.06 -pkgrel=2 +pkgver=4.07 +pkgrel=1 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://syslinux.zytor.com/" @@ -24,11 +24,11 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux.cfg syslinux-install_update splash.png) -md5sums=('0384ef35b724615074e77b1fc89d5b47' +md5sums=('9ff6e1b94efab931fb4717b600d88779' '1528c376e43f0eaccaa80d8ad1bc13b4' - '31fe4d80ad74b01e5bc8fccc1d32cccd' + '83649111686c4c58ec05eac324ae711a' '8559fb3daf3afa8688600d8a38118918' - 'befd0e7c38a03442b791f2a530b4dd2d') + 'cb46ca47c6b6323127d908440057d98f') build() { # Do not try to build syslinux with our default LDFLAGS, it will fail diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png Binary files differindex f94067681..eac14536b 100644 --- a/libre/syslinux/splash.png +++ b/libre/syslinux/splash.png diff --git a/libre/syslinux/splash.xcf b/libre/syslinux/splash.xcf Binary files differnew file mode 100644 index 000000000..c27d04445 --- /dev/null +++ b/libre/syslinux/splash.xcf diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index cb5afb371..4a0644956 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -33,15 +33,15 @@ UI vesamenu.c32 # Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu MENU TITLE Parabola GNU/Linux-libre MENU BACKGROUND splash.png -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std +MENU COLOR border 35;40 #ff777caa #a0000000 std +MENU COLOR title 1;35;40 #ff777caa #a0000000 std +MENU COLOR sel 7;35;47 #e0ffffff #20777caa all +MENU COLOR unsel 35;40 #ff777caa #a0000000 std +MENU COLOR help 35;40 #ff777caa #a0000000 std +MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std +MENU COLOR timeout 1;35;40 #ff777caa #00000000 std +MENU COLOR msg07 35;40 #ff777caa #a0000000 std +MENU COLOR tabmsg 35;40 #ff777caa #00000000 std # boot sections follow # @@ -52,13 +52,13 @@ 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 + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre.img LABEL parabolafallback MENU LABEL Parabola GNU/Linux-libre Fallback LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 ro + APPEND root=/dev/sda3 rw INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) diff --git a/pcr/cpptest/PKGBUILD b/pcr/cpptest/PKGBUILD new file mode 100644 index 000000000..df08feb00 --- /dev/null +++ b/pcr/cpptest/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Contributor (aur): Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> +pkgname=cpptest +pkgver=1.1.2 +pkgrel=2 +pkgdesc="CppTest is a portable and powerful unit testing framework for handling automated tests in C++. with focus on usability and extendability." +url="http://cpptest.sourceforge.net/" +depends=(gcc-libs) +makedepends=(pkgconfig) +source=(http://downloads.sourceforge.net/sourceforge/cpptest/$pkgname-$pkgver.tar.gz) +md5sums=('79b9bff371d182f11a3235969f84ccb6') +arch=('i686' 'x86_64') +license="LGPL" + +build() { + cd ${srcdir}/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install +} diff --git a/pcr/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD deleted file mode 100644 index e5e489950..000000000 --- a/pcr/kervalasquish-hg/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# Maintainer: Jorge Araya <jorgean@lavabit.com> - -pkgname=kervalasquish-hg -pkgver=220 -pkgrel=2 -pkgdesc="Free Software DXT compression library, kervala's version" -arch=('i686' 'x86_64') -url="http://code.google.com/p/libsquish/" -license=('MIT') -makedepends=('mercurial' 'gcc-libs' 'cmake') -provides=('libsquish') -conflicts=('libsquish' - 'kervala_libsquish-hg' - 'kervalasquish-hg') - -_hgroot="http://hg.kervala.net" -_hgrepo="packaging" -cmakerepo="cmake" - -build() { - cd "$srcdir" - msg "Connecting to Kervala's Mercurial server for libsquish..." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "${_hgroot}/${_hgrepo}" - fi - - msg "Connecting to Kervala's Mercurial server for cmake modules..." - - if [[ -d $srcdir/$cmakerepo ]]; then - cd $srcdir/$cmakerepo - hg pull -u - msg "The local files are updated." - else - cd $srcdir - hg clone ${_hgroot}/${cmakerepo} - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - if [[ -d $_hgrepo-build ]]; then - rm -rf "$srcdir/$_hgrepo-build" - fi - - cp -r "$srcdir/$_hgrepo/squish" "$srcdir/$_hgrepo-build" - - if [[ ! -d $_hgrepo-build/CMakeModules ]]; then - mkdir "$srcdir/$_hgrepo-build/CMakeModules" - cp $srcdir/cmake/modules/common.cmake $srcdir/$_hgrepo-build/CMakeModules/ - fi - - if [[ -d $srcdir/$_hgrepo-build/build ]]; then - rm -rf $srcdir/$_hgrepo-build/build - fi - - mkdir "$srcdir/$_hgrepo-build/build" - cd "$srcdir/$_hgrepo-build/build" - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make -} - -package() { - cd "$srcdir/$_hgrepo-build/build" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/libsquish-svn/LICENSE b/pcr/libsquish-svn/LICENSE new file mode 100644 index 000000000..dd0f22eb9 --- /dev/null +++ b/pcr/libsquish-svn/LICENSE @@ -0,0 +1,24 @@ +/* ----------------------------------------------------------------------------- + + Copyright (c) 2006 Simon Brown si@sjbrown.co.uk + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + -------------------------------------------------------------------------- */ diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD new file mode 100644 index 000000000..17af64a96 --- /dev/null +++ b/pcr/libsquish-svn/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> +# Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com> +pkgname=libsquish-svn +pkgver=48 +pkgrel=5 +pkgdesc="DXT compression library - svn build" +arch=('i686' 'x86_64') +url="http://code.google.com/p/libsquish" +makedepends=('subversion' ) +license=('MIT') +provides=('libsquish') +conflicts=('libsquish' 'kervalasquish-hg' 'kervala_libsquish-hg') +mksource=("$pkgname-$pkgver"::svn+http://libsquish.googlecode.com/svn/trunk/#revision=$pkgver) +mkmd5sums=('SKIP') + +source=("libre://$pkgname-$pkgver.tar.gz" + LICENSE) + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + # make install + mkdir -p $pkgdir/usr/local/{include,lib} + + install -Dm 644 squish.h $pkgdir/usr/local/include/squish.h + install -Dm 644 libsquish.so.0.0 $pkgdir/usr/local/lib/libsquish.so.0.0 + install -Dm 644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +sha256sums=('d1c057bf105872f50f504584fd7b31fb980ed5e235b14a92c6cb0aa7d7758e8f' + 'ed13029728a637f599833a68be22f3cc356a7f13be8d79284b2c415e172efd75') diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD deleted file mode 100644 index 294e28024..000000000 --- a/pcr/ryzom-hg-client/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Maintainer: Jorge Araya Navarro <jorge@abril> -pkgname=ryzom-hg-client -pkgver=20130706 -pkgrel=2 -pkgdesc="An awesome free software 3D MMORPG game, Game client." -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL') -groups=("ryzom-hg") -depends=('ryzom-hg-nel' 'expat') -makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel') -provides=("ryzom-hg-client") -conflicts=("ryzom-hg-client") -replaces=("ryzom-hg-client") -source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz") -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475') -mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client - -_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client - -build() { - mkdir -p "$srcdir/build-client" - cd "$srcdir/build-client" - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - - make -} - -package() { - cd "$srcdir/build-client" - make DESTDIR="$pkgdir" install - install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD deleted file mode 100644 index c66aaf567..000000000 --- a/pcr/ryzom-hg-nel/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=ryzom-hg-nel -pkgver=20130706 -pkgrel=5 -pkgdesc="An awesome free software 3D MMORPG game, Game client." -arch=('i686' 'x86_64') -url="http://www.ryzom.com/" -license=('AGPL') -groups=("ryzom-hg") -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') -makedepends=('cpptest' 'cmake' 'bison') -provides=("ryzom-hg-nel") -conflicts=("ryzom-hg-nel") -replaces=("ryzom-hg-nel") - -source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz") -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475') - -mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") - -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client - -_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_NEL=ON') - -build() { - mkdir -p "$srcdir/build-nel" - cd "$srcdir/build-nel" - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - - make -} - -package() { - cd "$srcdir/build-nel" - make DESTDIR="$pkgdir" install - # WWWInit.h is in /usr/include/w3c-libwww according to libwww package! - sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h -} - -# vim:set ts=2 sw=2 et: - diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD index 8277ccf17..01722ab34 100644 --- a/pcr/ryzom-hg/PKGBUILD +++ b/pcr/ryzom-hg/PKGBUILD @@ -1,64 +1,53 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> # Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com> -pkgname=('ryzom-hg-nel' 'ryzom-hg-client') -pkgbase="ryzom-hg" -pkgver=20130706 -pkgrel=2 +pkgname='ryzom-hg' +_hgver=ce26956d3a4a +pkgver=20130727 +pkgrel="5" +options=(debug strip) # there is a segmentation fault on ryzom_client executable pkgdesc="An awesome free software 3D MMORPG game" arch=('i686' 'x86_64') url="http://www.ryzom.com/" license=('AGPL3') -groups=('ryzom-hg') -depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql') +depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish-svn' 'lua51' 'lua51-sql-mysql') makedepends=('mercurial' 'cpptest' 'cmake' 'bison') -# ryzom-20130706-2-any.src.tar.gz -source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz" - 'ryzom.sh' +source=("libre://$pkgname-$pkgver.tar.gz" 'ryzom.desktop') -sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475' - 'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') - -mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore") - -_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client -_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON') +mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}" + 'ryzom.desktop') -_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client +_CAMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF') +_CMAKE_BOTH_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=ON' '-DWITH_DRIVER_OPENGL=ON' '-DWITH_DRIVER_OPENAL=ON') -package_ryzom-hg-nel() { - # options and directives that can be overridden - #pkgver=20130706 - #pkgrel=0 - pkgdesc="An awesome free software 3D MMORPG game. NeL library." - #depends=() - - provides=('ryzom-hg-nel') - conflicts=('ryzom-hg-nel') - replaces=('ryzom-hg-nel') +mksource() { + rm -rf "$srcdir/$pkgname-$pkgver" + cp "$srcdir/ryzom.desktop" "$srcdir/.$pkgname-$pkgver/code" + cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}" +} - mkdir -p "$srcdir/build-nel" - cd "$srcdir/build-nel" +build() { + mkdir -p "$srcdir/build" + cd "$srcdir/build" + cmake -b -Wno-dev "$srcdir/${pkgname}-${pkgver}" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_BOTH_ARGS[*]} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DRYZOM_ETC_PREFIX=/etc/ryzom \ + -DRYZOM_SHARE_PREFIX=/usr/share/ryzom \ + -DRYZOM_BIN_PREFIX=/usr/bin \ + -DRYZOM_GAMES_PREFIX=/usr/bin + + make all +} - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make +package() { + cd "$srcdir/build" make DESTDIR="$pkgdir" install + install -Dm 644 "$srcdir/${pkgname}-${pkgver}/ryzom.desktop" "$pkgdir/usr/share/applications/" } -package_ryzom-hg-client() { - # options and directives overrides - pkgdesc="An awesome free software 3D MMORPG game. Game client." - provides=('ryzom-hg-client') - conflicts=('ryzom-hg-client') - replaces=('ryzom-hg-client') - depends=('ryzom-hg-nel') - - mkdir -p "$srcdir/build-client" - cd "$srcdir/build-client" +mksha256sums=('SKIP' + '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') - cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin - make - make DESTDIR="$pkgdir" install -} +sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402' + '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD deleted file mode 100644 index a04662b0d..000000000 --- a/pcr/ryzom-hg/SRCBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -pkgname=("ryzom-hg") -pkgver=20130708 -pkgrel=3 -pkgdesc="An awesome free software 3D MMORPG game" -arch=(any) -url="https://www.ryzom.com/" -license=('AGPL3') -makedepends=('mercurial') - -source=("ryzom.sh" - "ryzom.desktop") - -_hgroot='https://bitbucket.org/ryzom/ryzomcore' -_hgrepo='ryzomcore' - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" -} - -package() { - PKGEXT=${SRCEXT} - PKGDEST=${SRCDEST} - cp ${srcdir}/ryzom.sh ${pkgdir}/ - cp ${srcdir}/ryzom.desktop ${pkgdir}/ - cp -a ${srcdir}/ryzomcore/code ${pkgdir}/ -} -sha256sums=('d3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6' - '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196') diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh deleted file mode 100644 index e3cff2c64..000000000 --- a/pcr/ryzom-hg/ryzom.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -if groups | grep games > /dev/null 2>&1 ; then - ryzom_sync - exec ryzom_client - -else - echo "you need to be in games group to run ryzom" - exit 1 -fi |
