diff options
Diffstat (limited to 'libre')
48 files changed, 513 insertions, 545 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index f5962063a..51668c454 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,14 +1,14 @@ -# $Id$ -# Arch Contributor: Alexander Fehr <pizzapunk gmail com> -# Arch Contributor: William Rea <sillywilly@gmail.com> -# Arch maintainer: Gaetan Bisson <bisson@archlinux.org> -# Parabola maintainer: Brendan Tildesley -# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy> +# $Id: PKGBUILD 162794 2012-06-30 14:17:02Z bisson $ +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: William Rea <sillywilly@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer (Parabola): Brendan Tildesley +# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.2.3 -pkgrel=1 +pkgver=3.2.4 +pkgrel=2 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' arch=('i686' 'x86_64') @@ -60,7 +60,7 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('87a795c4ecf645ad36ffe7bb3a7b5691e0316f71') +sha1sums=('7538a0391504ce4a92967dc7c5bd4948751efa91') build() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure @@ -105,9 +105,9 @@ build() { popd ./configure \ - --prefix=/usr \ - --enable-amidiplug \ - --disable-adplug \ + --prefix=/usr \ + --enable-amidiplug \ + --disable-adplug \ make } diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 466810d2b..d0a7e0d8d 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -3,12 +3,12 @@ #Contributor: BlackEagle <ike.devolder@gmail.com> #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> #Maintainer (Parabola): Kete <kete@ninthfloor.org> -#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +#Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=clementine pkgname=clementine-libre pkgver=1.0.1 -pkgrel=4 +pkgrel=6 pkgdesc="A music player and library organizer, without spotify support" url="http://www.clementine-player.org/" license=('GPL') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 09db17876..662ed4d1a 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -4,12 +4,12 @@ pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.18 -pkgrel=2.1 +pkgrel=3 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler') +depends=('lcms2' 'poppler>=0.20.1') makedepends=('ghostscript') optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD index 1149a2558..87b155c0c 100644 --- a/libre/foomatic-filters-libre/PKGBUILD +++ b/libre/foomatic-filters-libre/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 155770 2012-04-06 10:08:29Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgbase="foomatic" pkgname=('foomatic-filters-libre') arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120406 -_filtersver=4.0.15 +_snapdate=20120626 +_filtersver=4.0.16 pkgver=${_filtersver}_${_snapdate} -pkgrel=1.2 +pkgrel=1 epoch=1 makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') -#_url=http://www.openprinting.org/download/foomatic/ # switch after build -_url=ftp://ftp.archlinux.org/other/foomatic/ -source=(${_url}/$pkgbase-filters-${_filtersver}.tar.gz) +source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz) url="http://www.linuxprinting.org/foomatic.html" options=('!emptydirs') -md5sums=('1b7efcdc57340915647daa5b5c15b0ef') +md5sums=('ec907d9ea17e03bccb91db66e9470586') package_foomatic-filters-libre() { diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 7b9198d8d..d63a33ec9 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> pkgname=grub pkgver=0.97 -pkgrel=21.3 +pkgrel=21.4 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)" arch=('i686' 'x86_64') license=('GPL') diff --git a/libre/grub/menu.lst b/libre/grub/menu.lst index 43d2ac8db..f405baa91 100644 --- a/libre/grub/menu.lst +++ b/libre/grub/menu.lst @@ -26,7 +26,7 @@ # general configuration: timeout 5 default 0 -color light-blue/black light-cyan/blue +color magenta/black white/magenta # boot sections follow # each is implicitly numbered from 0 in the order of appearance below diff --git a/libre/grub/rePKGBUILD b/libre/grub/rePKGBUILD index b14550034..a73289fb5 100644 --- a/libre/grub/rePKGBUILD +++ b/libre/grub/rePKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> -# Contributor: André Silva <andre.paulista@adinet.com.uy> +# Contributor: André Silva <emulatorman@lavabit.com> source PKGBUILD CARCH=i686 unset build package md5sums source diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index 1ef7c3934..5b1769f95 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -2,18 +2,16 @@ # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -_grub_bzr_rev="4232" -_pkgver="2.00~beta6" +_pkgver="2.00~rc1" _grub_lua_ver=24 -_grub_gpxe_ver=12 _grub_ntldr_ver=21 _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase=grub2 -pkgver=2.00beta6 -pkgrel=1 +pkgver=2.00rc1 +pkgrel=1.1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') @@ -24,7 +22,6 @@ makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo' # source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz" source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" 'parabola_grub_mkconfig_fixes.patch' @@ -33,17 +30,15 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz '20_memtest86+') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb' +sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13' '89290031b974780c6df76893836d2477d4add895' - 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' '31aa740fc225b3f3ed4917843038f9e8658a71be' - '348b148d5183825f31a3d24a7ebf2d6a709f4e6a' + '9a81f8bebcbee3d300315a29266ce7a5c9e5881c' '9735043d518e16f147f64ef283eceb2549fed860' 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') @@ -64,9 +59,6 @@ _build_grub2-common_and_bios() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" @@ -125,9 +117,6 @@ _build_grub2-efi-i386() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ - -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" - ## Requires python2 # sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh" diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default index 4ab37bbfc..d0c959059 100644 --- a/libre/grub2/grub.default +++ b/libre/grub2/grub.default @@ -34,8 +34,8 @@ GRUB_DISABLE_RECOVERY=true # Uncomment and set to the desired menu colors. Used by normal and wallpaper # modes only. Entries specified as foreground/background. -#GRUB_COLOR_NORMAL="light-blue/black" -#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" +GRUB_COLOR_NORMAL="magenta/black" +GRUB_COLOR_HIGHLIGHT="white/magenta" # Uncomment one of them for the gfx desired, a image background or a gfxtheme #GRUB_BACKGROUND="/path/to/wallpaper" diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index c2cec2e13..aa7dea706 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -2,60 +2,62 @@ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> -# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy> +# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.4 -pkgrel=4 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +pkgver=3.12.6 +pkgrel=3 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' 'net-snmp>=5.7.1') -makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') optdepends=('cups: for printing support' - 'dbus-python: for dbus support' + 'python2-dbus: for dbus support' 'sane: for scanner support' 'python-imaging: for commandline scanning support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-pyqt: for running hp-toolbox' - 'python2-gobject2: for running hp-toolbox') -replaces=('hpijs' "${_pkgname}") + 'python2-gobject2: for running hp-toolbox' + 'libusbx: for advanced usb support') +replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('a063f76aa47edab55a3f31ff2558df07' - '2fe18f4091afb3dec200271dc7836128') +md5sums=('5303938e8630775ea6fb383af85775e5' + 'b562457e4c713d8609b3d6dd2be10baf') build() { cd "$srcdir/$_pkgname-$pkgver" export PYTHON=python2 - + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py sed -i 's|python ./print.py|python2 ./print.py|' scan.py sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip # The hpcups driver does not use foomatic-rip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || return 1 - mv ${i}.temp ${i} - done - + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + export AUTOMAKE='automake --foreign' autoreconf --force --install @@ -70,7 +72,7 @@ build() { --enable-hpijs-install \ --enable-foomatic-drv-install \ --enable-pp-build \ - --enable-udev-acl-rules + --enable-udev-acl-rules #--help make } diff --git a/libre/hplip-libre/rePKGBUILD b/libre/hplip-libre/rePKGBUILD deleted file mode 100644 index 753b348e3..000000000 --- a/libre/hplip-libre/rePKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# This is an example rePKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> -source PKGBUILD -CARCH=x86_64 -unset build package md5sums source check -_repo=extra -options=(!strip) -source=(PKGBUILD - http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} - # files for pkg modifications - ) - -build() { - cd "${srcdir}/" - rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT || true - # put actions for package modifications below this line -} - -package() { - find ${srcdir} -type l -maxdepth 1 -delete - cp -a ${srcdir}/* ${pkgdir} -} diff --git a/libre/iceweasel-i18n/.directory b/libre/iceweasel-i18n/.directory new file mode 100644 index 000000000..afc87a727 --- /dev/null +++ b/libre/iceweasel-i18n/.directory @@ -0,0 +1,2 @@ +[Dolphin] +Timestamp=2012,6,29,21,18,45 diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 0b66a685c..9e0469437 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -10,7 +10,7 @@ _debname=iceweasel _debver=13.0.1 -_debrel=1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -56,87 +56,87 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('07de8f16a6a2a4bf5fbb0760179b17d1' - 'a98192e2537d6992b6b8a88cbfaf1b49' - '17ed508a8d454ac788f9f164b6b56d6d' - '44dc0cd60fe723188f8e02c427cd263f' - '09717f8e714ebd409d5a1e24f061f623' - '97f5e58e47274d027d7b82da3e6ef03b' - '26e9945f49015f5d9fa9951f4d12145e' - '0eddf320afc250675b481c1095a79652' - 'c4bcaaccff6c54d65a65123ff70efc0f' - '7ff5c522c0d6626e08f3d478a6666ae5' - 'ac184954d813badf15f02bd7836f5743' - '58a1653b8181c43d883b9046e0a77450' - '13a01ceff0e22a62dc8a2789c06419ab' - '7afa0ae711fb4715bc198bce21b608f4' - '5a9f0fa2ab1ca73d066c02b6b44b4a7c' - '6dda3b7858f02b62348555dc5563ea3f' - '4ce588323dd2597d586cfbfe06dc4c6a' - '9b4b79badc1a8c7e5dd86b9bd7d935ba' - 'bccee717e3470517d942da2fde004e3f' - '7b503acbbe9c12904b19d109c282a6e9' - '77acc15abff7211f6ba736f80e1599c6' - 'eb2deeebf4cd679ca186074569569823' - '1e1166b21d96de0d7cce3077eb2b1a22' - '0532ee3a54b8947bb5fd7c5eff465208' - '87b44d3ea3e690d14da39a58d91b434c' - '78c9e42e5052d5dbb5637159dce97b47' - '07f4b9b91e9b8e30d3ffa74648134554' - '9f141d82867364447cde7ec556512944' - 'c49720f13109526ce69dc6406742b835' - '05133846f5f078af41d26a9def62295b' - '95efc32d6dc811ea374c922826dbc645' - 'abdaaa429e40ddd50eade2d85dce2db5' - '326a061b850fa8b66f71460762e6024b' - 'c0b153e30ebb738ba66797b1ea0d6fd1' - '49695dc9a361cd8469ccabc3b398cbff' - 'f2a09eabf09e911f013aff4647bdab2e' - '0eaf712a48a5977cb141dbc6343ed05a' - 'c3e51cdc2cecfa9b31fac42c4c756f86' - 'f8f8657a9067e937bcd05ee69b24927f' - '45b545edca5bd7d9c084c427ff03a4f2' - '26b9dd9f45a66945cb5c9fbb518c1add' - '421c80704ba82406f35d5a3b1f41ce6a' - '5634ecd7cafd3358cefaa3c163081909' - 'ef2a5ea522d22a9abc351d587d86896c' - '41f3bbc82d237fe49b3aafcb37ef00b0' - '72c232686a199d5d277b4fd582955871' - '5387c0b061c4d6edc5a2ce16f4119ed3' - '746f58462e5f71f7d59a1aacf826c2a0' - '054c91c8dc78887ca215d4979bac2a09' - 'fd84d6b4194a470a533078c1d3acab19' - '5da90e0d38472ddd8f52e9a698923fb2' - '7fd67e0e1b6e0cf943e36769acfbfe01' - '947b7fbc3b8c1f7186aebb4ca0e2ad44' - '52788821e7b965933702f6a53f157df0' - 'ecba8c0012139cbdbf9bcda6469bffd7' - 'fd1016b74b3c144cebeb7a16c63c2bce' - '768e136d70d159e2add5c57da4fccc0d' - '485e1346782ea1542c4de7f185580356' - '90926400fa3276a07cd7aec1038b91b0' - '2c0dcc8b714c99d4935e8fda3c64f405' - 'c105c9a26a9a50179214576608239feb' - '01085c57f8eea3ea123176137d358450' - 'd35ff3437edf8401430f7a0b46874560' - '1a6982c3a31535b4fde37f7ad74b1a64' - '1d2e2240610562226bf8ea11b40b5798' - 'bf19ff0e5db922be55bd4671011704b9' - '697fe39a23039e8f9585b93da9c92b7b' - 'cf049968648a5a0405fe806bae793862' - '75e6b45c5b01f6d6625e78ac4f8a33db' - '7076ebd64d047287cd28bfdcbdd2bb76' - '954ad4218b885979e195bd63e3f19167' - 'cce30718534ff1bd2fa5157dcc0716d7' - '0f5af58a538fd95361530411987ca4a4' - '044a6eb119eae529abd45206b20bfe19' - '56eb21683a94f44ae4489565944c2bd3' - 'ce458ae1e8540ba3779f25f0767a95a2' - '949092ed264324730628e0efd79980ce' - '6fa503ded08d55fe023117f51369e495' - '8c1f8e9a30cfe4abc4036f872443214e' - '9b8350839b01308571ff3f06a33ec68f' - 'f0339a009db45334d0d8fcdc2bb75f2c' - 'c2df9fcf1e1afa9442738d7200faf5b1' - 'ca3f98e4d04dfa69fc0dafd0a95cd01e' - '039e06c1d18711becac9ceee56905f1d') +md5sums=('757e700b430500bd1bc4a32531c9c5c2' + 'beb404a571e3e666de849e3ccd6887c4' + '3bef09f6330c11c43eaa3b2349d65172' + '8abaeec4486169bb85be05f289c0eae9' + '55d5c50733a1d08acbd85292cb596589' + '10ed3b7da37259a870507287b026f69c' + '8ef3e6cea973059a328eb5792a507e5d' + '64a37cd546b0e092ddd2495e8ee8fb33' + 'ce9a0bbdc6715ba9350050dcb640201a' + '5506b1e58bb9e8a100b1c7a527f95dcf' + '6920f4fb2d266d5839872a254a41c760' + '73f6d4a70be7b0f0c15627e72685d402' + '695fb3e883e6949d1ad13460389dbec2' + 'c0ed06cb371edb89d2c42f4175dd8ab7' + '074429b21f92d61db196d49d60fef32d' + '9e4b3ecf3ecc9b577e5f8c33df68c006' + '8e3b3090910d5d2b40b5deb0ee589359' + 'a6c969cb9a8c97a548a16422ac4e2664' + '6394347deb1924c46992eb9d5e9498c9' + 'de44e8a2e3e8de215fdf6b6f6399f88f' + '57b8a69ff712d6416160a5c5c61e6ba7' + 'dd453683292ad2f2181e720a6b834f11' + '04d2d05e22208106b67cc136d2b66892' + 'f5474e87498f8da3ed27b11816a64906' + '6d60eabb499c2e672a5ebc5ea32c6c58' + '91b86461bfc8f1728d1b4e55d102622c' + '525e770773177bbdb2c8ad14ffb4534b' + '98139e2c2c1cc11e6d47a46b2483c290' + '295ee591cc1480da7b2adacf470c1ab1' + 'a95c27e109eb5768b1ce4dbf3e58ddca' + 'b8dccb786a16c6ebf8c015997aa96577' + 'a647e17fd8c7c9d039c140e36c3e18a7' + 'd20309e9a6092e9a7a92c1ded0d55f62' + 'e0e5948c8353d3de76912884edc20297' + '8d0bf7dbb40e06495d8c749758163246' + 'f34d9ec431acc2b1178ac3cdbfae3856' + 'cb68c4036bdb9ac69428a035e04668dc' + '2949b4e18de48b29c62ef03b3ba4f94d' + 'aec2a61b12f7e5dac2f46251407c6b47' + '60285cbb93249fea5d5afba3dbaf115f' + 'c3f33724ded35468760aac7816b2b591' + 'dc9b02972a247dc5fbeabcc42942c4ac' + '512bffe5f782e92da15bc4c9b2035ded' + '3c04ca7f6d726e417dc1459eaa8bc068' + 'd8526259b9560e9164862df34db555a7' + 'af3630dbd3a327ce99edf96b8cb35dce' + 'ffeb0437949a5e623b12dbcde41b6d39' + 'c653d9c9101394d29c5f5a3b7bf510e1' + 'b31c230e4cbf3d1f73b499509ff3e805' + '548228527e6772ee5f457fff41826b02' + '40b5e98319effec4f1605a831c393cda' + '09899eacc5d1e61767a87ecd093267d8' + '1907de3acaa8e4c99539f99c0442770e' + 'dc4cdef93b037e40ee6fd3f4c0848e29' + '409e9fa01c0b2982ba7e335d7001b905' + 'c30fed12e22cf16ea86374ca541a32aa' + 'a9cc0798968851f51521399171e1454f' + '6b53e84454a196870e631db5859fa9f3' + '7939907fff93c0b984b445d8ea603baf' + '7370eca015e6ed0289a9db4e5f4cd908' + '84eaa820922b25b9b16724099a78c139' + '23f15310ffd0d70d3aaf9b37436a16bb' + 'a4063289c46317f0d351f11e8a0d1527' + '012417e2c4b0d2e597273f988b9f877b' + '3feaddb7edef32adfc561aa3eeedafe8' + '69fc663f9951867c9139a3a39973e0a5' + 'a9c3fed813c45fd32b17576a32ccf35a' + '01fe030c2949facb8512a667e9e6e9ee' + 'f8d63b2ae7d24753422e266224de32d2' + '335ce46bda9f0a69414dc180ea780a70' + 'a0b4ef73ad4322ea536d08918d630c9f' + '39380afb97827cde59536c81310de562' + '06930aeffde351d14554de1f0f93728b' + '3d1fe2feefd0e44c213360c405006a98' + '3f0af6bbd75b45b7703f35e3e594a7a7' + '89f90e0a35b81423257b113a37a71681' + '24fc060c80197d73585902fec40de1bf' + '7738a9596bf1e198c6de3ec3e694e7eb' + '8fbf72bb8c1d5cfc7dbcb02af506da3c' + '8790e5d8e5317fba199bfb3f135847bc' + 'd768e2190bcea36233625d948d879b39' + '3bac90764599a61b14f82e9a51d72d36' + 'eb3d0fa986f6ffd54f2bb48fc482227e' + '3c8166c380597924871688c8c6bf795c') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 8a407aee3..a54e9d948 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> @@ -15,7 +15,7 @@ _pgo=false # We're getting this from Debian Sid _debname=iceweasel _debver=13.0.1 -_debrel=1 +_debrel=2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -52,7 +52,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('9eb7668e4a5b5be63ccf4d43c212d011' - 'f3ac4e2f52965335ccf13588255e6db4' + 'c5eb6357cecd0d83e75ef37a9dcf3683' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 3a6390613..aee2585d9 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2012.06.11 +pkgver=2012.06.28 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -13,8 +13,7 @@ url="https://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('glibc' 'bash' 'grep' 'coreutils' 'systemd-tools' 'iproute2' - 'ncurses' 'kbd' 'findutils' 'sysvinit') +depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'net-tools: legacy network support' @@ -29,5 +28,5 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -md5sums=('886fba51e5ec348f64604ac91c13548e' +md5sums=('21651eaba1fd34542c78f39c755cd171' '027576534885b8d5dded9be546057b12') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index fed954896..25084c92c 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162049 2012-06-19 08:17:58Z andrea $ +# $Id: PKGBUILD 162798 2012-06-30 15:30:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.4 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index f60e4c99f..c229767b1 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 161268 2012-06-08 11:32:36Z allan $ +# $Id: PKGBUILD 162855 2012-07-02 09:35:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_basekernel=3.3 -_sublevel=8 +_basekernel=3.4 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 pkgdesc="Kernel Libre headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') -provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}") -conflicts=('linux-api-headers' 'kernel-headers') -replaces=('linux-api-headers' 'kernel-headers') +provides=("linux-api-headers=${pkgver}") +conflicts=('linux-api-headers') +replaces=('linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") -md5sums=('5487da14ca81715a469c7594d39722fa' - 'd561c637365f1f0fca29aca39f7a3903') +md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' + 'e9bb311ab329555a61696b1a18df2d34') build() { cd ${srcdir}/linux-${_basekernel} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 9c2909331..17651ce1e 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -2,17 +2,17 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgbase=linux-libre-lts -pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kernel +pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=35 +_sublevel=36 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.34 # nearly always the same as pkgver -pkgrel=1 +_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '7104adc7c0c6ab88820fce6d34ac595c' + '150413437fe54d4822e9e43189e37319' '9cfcf3807201ce44aa720571232a10ce' '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '1a107ca509aec77af60fe8e9612c9fae') + '7102cdd847f0bd7102f0ad01fa43f454') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -106,6 +106,9 @@ build() { # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + # get kernel version make prepare @@ -203,6 +206,12 @@ package_linux-libre-lts() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}/version" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" } package_linux-libre-lts-headers() { @@ -220,10 +229,10 @@ package_linux-libre-lts-headers() { _kernver="$(make kernelrelease)" fi - mkdir -p "${pkgdir}/lib/modules/${_kernver}" + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd "${pkgdir}/lib/modules/${_kernver}" - ln -sf ../../../usr/src/linux-${_kernver} build + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ @@ -348,7 +357,7 @@ package_linux-libre-lts-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index b3426d278..8a688091d 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.35-1-LIBRE-LTS +KERNEL_VERSION=3.0.36-2-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index b7dc50f94..def346093 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,15 +1,15 @@ # $Id$ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=linux-libre-tools -_pkgname=('perf' 'cpupower') -pkgname=('perf-libre' 'cpupower-libre') +_pkgname=('perf' 'cpupower' 'x86_energy_perf_policy') +pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre') _basekernel=3.4 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=2 +pkgrel=3 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -28,13 +28,12 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '20870541e88109d2f153be3c58a277f1') build() { - cd "${srcdir}/linux-${_basekernel}" - + # apply stable patching set if [ "${_basekernel}" != "${pkgver}" ]; then + msg2 'Applying stable patch set' patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi - cd ${srcdir} msg2 'Build perf' pushd linux-$pkgver/tools/perf make \ @@ -47,10 +46,16 @@ build() { popd msg2 'Build cpupower' - cd linux-$pkgver/tools/power/cpupower + pushd linux-$pkgver/tools/power/cpupower # we cannot use --as-needed LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} make VERSION=$pkgver-$pkgrel + popd + + msg2 'Build x86_energy_perf_policy' + pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy + make + popd } package_perf-libre() { @@ -91,4 +96,15 @@ package_cpupower-libre() { install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service" } +package_x86_energy_perf_policy-libre() { + pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS' + replaces=('x86_energy_perf_policy') + conflicts=('x86_energy_perf_policy') + provides=("x86_energy_perf_policy=$pkgver") + + cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy + install -D -m 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy" + install -D -m 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8" +} + # vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch deleted file mode 100644 index db53b3813..000000000 --- a/libre/linux-libre/3.4.2-rpc_pipefs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 0404047..21fde99 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head, - msg->errno = err; - destroy_msg(msg); - } while (!list_empty(head)); -- wake_up(waitq); -+ -+ if (waitq) -+ wake_up(waitq); - } - - static void -@@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work) - } - dentry = dget(pipe->dentry); - spin_unlock(&pipe->lock); -- if (dentry) { -- rpc_purge_list(&RPC_I(dentry->d_inode)->waitq, -- &free_list, destroy_msg, -ETIMEDOUT); -- dput(dentry); -- } -+ rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL, -+ &free_list, destroy_msg, -ETIMEDOUT); -+ dput(dentry); - } - - ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg, --- -1.7.7.6 - diff --git a/libre/linux-libre/3.4.4-fix-backlight-regression.patch b/libre/linux-libre/3.4.4-fix-backlight-regression.patch new file mode 100644 index 000000000..a0cf0b1db --- /dev/null +++ b/libre/linux-libre/3.4.4-fix-backlight-regression.patch @@ -0,0 +1,38 @@ +Subject: Still use ACPI backlight control if _DOS doesn't exist + +This is a regression introduced by commit +ea9f8856bd6d4ed45885b06a338f7362cd6c60e5 + +https://bugzilla.kernel.org/show_bug.cgi?id=43168 + +Some platforms don't have _DOS control method, but the ACPI +backlight still works. +We do not want to lose the backlight control ability on these platforms. + +CC : Igor Murzov <intergalactic.anonymous@gmail.com> +Signed-off-by: Zhang Rui <rui.zhang@intel.com> +--- + drivers/acpi/video.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +Index: rtd3/drivers/acpi/video.c +=================================================================== +--- rtd3.orig/drivers/acpi/video.c ++++ rtd3/drivers/acpi/video.c +@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus + video->dos_setting = arg0.integer.value; + status = acpi_evaluate_object(video->device->handle, "_DOS", + &args, NULL); +- if (ACPI_FAILURE(status)) +- return -EIO; ++ if (ACPI_FAILURE(status)) { ++ /* ++ * some platforms don't have _DOS, but the ACPI ++ * backlight control still works ++ */ ++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _DOS\n")); ++ return 0; ++ } + + return 0; + } diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index a6f62e2cd..b41198fe5 100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,19 +1,24 @@ -2012-05-26 André Silva <andre.paulista@adinet.com.uy> +2012-06-23 André Silva <emulatorman@lavabit.com> + + * linux-libre-3.4.4-1 + * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com. + +2012-05-26 André Silva <emulatorman@lavabit.com> * linux-libre-3.4-1.2 * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116 -2012-04-24 André Silva <andre.paulista@adinet.com.uy> +2012-04-24 André Silva <emulatorman@lavabit.com> * linux-libre-3.3.3-1 * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 -2012-04-08 André Silva <andre.paulista@adinet.com.uy> +2012-04-08 André Silva <emulatorman@lavabit.com> * linux-libre-3.3.1-1.1 * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47 -2012-03-03 André Silva <andre.paulista@adinet.com.uy> +2012-03-03 André Silva <emulatorman@lavabit.com> * linux-libre-2.3.9-2 * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 3c9b2a8cc..08a32eae0 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -5,17 +5,17 @@ # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver -pkgrel=1 +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,10 +32,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - '3.4.2-rpc_pipefs.patch' + '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '0187759260fd998fc2130e069df5b054' + 'e9bb311ab329555a61696b1a18df2d34' '669c3f9d5c6a2109bad8e511287826c3' '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -44,8 +44,8 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '5a7baeab35f968bf9a6ab115d14586c7' - '972b3b460764780ee48f031a043a9c09') + '80a46681386bb87813989faeb92bdd9a' + '86910efeadb5d1e5d5416ff1a9dacb33') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -62,11 +62,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix nfs4 regression - patch -Np1 -i "${srcdir}/3.4.2-rpc_pipefs.patch" - # add latest fixes from stable queue, if needed - # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 @@ -76,7 +71,10 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" - # Patch submitted upstream, waiting for inclusion: + # Fix backlight control on some laptops: + # https://bugzilla.kernel.org/show_bug.cgi?id=43168 + patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch" + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -111,6 +109,9 @@ build() { # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh + # get kernel version make prepare @@ -209,6 +210,12 @@ package_linux-libre() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" } package_linux-libre-headers() { @@ -226,10 +233,10 @@ package_linux-libre-headers() { _kernver="$(make kernelrelease)" fi - mkdir -p "${pkgdir}/lib/modules/${_kernver}" + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd "${pkgdir}/lib/modules/${_kernver}" - ln -sf ../../../usr/src/linux-${_kernver} build + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index b70fd9663..44850230f 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.3-1-LIBRE +KERNEL_VERSION=3.4.4-3-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index d6a294fe6..3b73a9f2f 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,12 +1,12 @@ # $Id$ # Maintainer: Paul Mattal <paul@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=18 +pkgrel=20 epoch=1 _extramodules=extramodules-3.4-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -34,7 +34,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '69d099e6deedfa3c1ee2b6e82d9b8bfb') build() { - _kernver="$(cat /lib/modules/${_extramodules}/version)" + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" cd "${srcdir}/lirc-${pkgver}" patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" @@ -51,7 +51,7 @@ build() { PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ - --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ + --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ --with-transmitter # Remove drivers already in kernel @@ -71,7 +71,7 @@ package_lirc-libre() { install=lirc.install cd "${srcdir}/lirc-${pkgver}/drivers" - make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install + make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install # set the kernel we've built for inside the install script sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" @@ -108,5 +108,5 @@ package_lirc-utils-libre() { install -d "${pkgdir}/etc/lirc" # remove built modules - rm -r "${pkgdir}/lib/" + rm -r "${pkgdir}/usr/lib/modules" } diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install index d6b9e5ff2..c50e384c8 100644 --- a/libre/lirc-libre/lirc.install +++ b/libre/lirc-libre/lirc.install @@ -3,7 +3,7 @@ EXTRAMODULES=extramodules-3.4-LIBRE post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 } post_upgrade() { diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index cf2be2b5f..703d740c4 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,33 +1,27 @@ -# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $ +# $Id: PKGBUILD 160672 2012-06-03 16:16:53Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> - -# libvdpau is currently useful only with proprietary software +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=34799 -pkgrel=2 +pkgver=34992 +pkgrel=1 arch=('i686' 'x86_64') -makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio') license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop - live-media.patch) -md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53' - 'c0d6ef795cf6de48e3b87ff7c23f0319' - 'b6c057633ff7001ee0c102b5f81ec1e3') +source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop) +md5sums=('04642b1eb68671577ff53bb84839253a' + 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { cd "$srcdir/$_pkgbase" - patch -Np0 -i "$srcdir/live-media.patch" - ./configure --prefix=/usr \ --enable-runtime-cpudetection \ --disable-gui \ @@ -45,18 +39,19 @@ build() { --enable-radio \ --enable-radio-capture \ --language=all \ - --confdir=/etc/mplayer + --confdir=/etc/mplayer \ + --extra-cflags="-fpermissive" [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak make } package_mplayer-libre() { - pkgdesc="A movie player for GNU/Linux (no unfree faac support)" + pkgdesc="A movie player for GNU/Linux (without unfree faac support)" install=mplayer.install backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' - 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') provides=("mplayer=$pkgver") replaces=('mplayer') @@ -76,7 +71,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" - depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio') provides=("mencoder=$pkgver") replaces=('mencoder') diff --git a/libre/mplayer-libre/live-media.patch b/libre/mplayer-libre/live-media.patch deleted file mode 100644 index b704b5381..000000000 --- a/libre/mplayer-libre/live-media.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libmpdemux/demux_rtp.cpp -=================================================================== ---- libmpdemux/demux_rtp.cpp (revision 34798) -+++ libmpdemux/demux_rtp.cpp (working copy) -@@ -19,6 +19,8 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 -+ - extern "C" { - // on MinGW, we must include windows.h before the things it conflicts - #ifdef __MINGW32__ // with. they are each protected from diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 3ef5c65ee..9b3ace8f8 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,15 +1,15 @@ # $Id$ -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> +# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=34578 -pkgrel=5.1 -pkgdesc="A movie player, compiled with vaapi support" +pkgrel=6 +pkgdesc="A movie player, compiled with vaapi and without unfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" license=('GPL') diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD index e0dfc9d9c..7ead18cba 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab-libre/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 29478 2010-10-14 14:58:41Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $ +# Maintainer: +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor: borgo <nomail> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=python-reportlab-libre _origname=reportlab pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A proven industry-strength PDF generating solution" arch=('i686' 'x86_64') depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') license=('custom') -source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz +source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz free-fonts.patch) url="http://www.reportlab.org/rl_toolkit.html" md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3' @@ -34,6 +36,6 @@ build() { rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt patch -p1 -i $srcdir/free-fonts.patch - python2 setup.py install --root=$pkgdir + python2 setup.py install --root=$pkgdir --optimize=1 install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt } diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 31b440c9d..68c71284c 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 159191 2012-05-17 14:36:30Z remy $ +# $Id: PKGBUILD 162397 2012-06-26 20:13:46Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=texlive-bin-libre -pkgver=2011.3 -_luatex_ver=0.70.1 -pkgrel=7 +pkgver=2012.0 +pkgrel=1 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2') makedepends=('perl' 'clisp' 'ffcall') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') @@ -23,11 +22,9 @@ install="texlive.install" source=('texmf.cnf' 'fix-fontforge-encoding.patch' '09-texlive-fonts.conf' - 'luatex-poppler-0.20.patch' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20111210.tar.xz' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20111210.tar.xz' - # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" - 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' + 'poppler-0.20.patch' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz' ) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ @@ -46,10 +43,9 @@ backup=(etc/texmf/web2c/texmf.cnf \ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' 'bfb9716aa00c86c08cd31e5b32edeb98' '393a4bf67adc7ca5df2b386759d1a637' - '52ce57c02e30a25036b6a3175c566b78' - 'c7bb38c0ab30c2b64cf4cf83a736b35c' - '5d8f06a3683ce88a3c33e15f5ba6a858' - 'e7f0197559ef865d8c01683dab3b8526') + 'e3a664d5a7f0923f35060fe9d25d2573' + 'ac2c3c3aa765581f8504e21a5edbfb9f' + 'f315a860158cfc952c82a6d759961024') build() { if [ "${CARCH}" != "i686" ]; then @@ -57,50 +53,11 @@ build() { export CXXFLAGS="${CXXFLAGS} -fPIC" fi - cd "$srcdir" - # Building LuaTeX - # cd luatex-beta-${_luatex_ver} - cd luatex - patch -p0 -i ../fix-fontforge-encoding.patch - patch -Np0 -i ../luatex-poppler-0.20.patch - (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh) - mkdir build - cd build - ../source/configure --prefix=/usr -C \ - --disable-native-texlive-build \ - --with-banner-add="/Parabola GNU/Linux-libre" \ - --enable-cxx-runtime-hack \ - --disable-all-pkgs \ - --disable-dump-share \ - --disable-ptex \ - --enable-luatex \ - --without-system-ptexenc \ - --without-system-graphite \ - --without-system-icu \ - --without-system-kpathsea \ - --with-system-freetype2 \ - --with-system-poppler \ - --with-freetype2-libdir=/usr/lib \ - --with-freetype2-include=/usr/include/freetype2 \ - --with-system-gd \ - --with-system-libpng \ - --without-system-teckit \ - --with-system-zlib \ - --with-system-zziplib \ - --with-system-t1lib \ - --disable-shared \ - --disable-largefile \ - --disable-ipc \ - --without-mf-x-toolkit \ - --without-x - make - make -C libs/obsdcompat - make -C texk/kpathsea - make -C texk/web2c luatex - - cd "$srcdir" + cd "$srcdir" # this patch removes spurious error message with locale "xx_YY.utf8" - patch -p0 -i fix-fontforge-encoding.patch + patch -Np0 -i fix-fontforge-encoding.patch + # fix build with poppler >= 0.20 + patch -Np0 -i poppler-0.20.patch # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c ############################################################# @@ -127,22 +84,22 @@ build() { --disable-t1utils \ --disable-bibtexu \ --disable-xz \ - --without-system-zlib \ - --without-system-zziplib \ - --without-system-pnglib \ + --with-system-zlib \ + --with-system-zziplib \ + --with-system-pnglib \ --with-system-ncurses \ --with-system-t1lib \ - --without-system-gd \ - --without-system-poppler \ - --without-system-xpdf \ - --without-system-freetype2 \ + --with-system-gd \ + --with-system-poppler \ + --with-system-xpdf \ + --with-system-freetype2 \ --without-system-graphite \ --with-freetype2-libdir=/usr/lib \ --with-freetype2-include=/usr/include/freetype2 \ --with-xdvi-x-toolkit=xaw \ --disable-dump-share \ --disable-aleph \ - --disable-luatex \ + --enable-luatex \ --with-clisp-runtime=default \ --enable-xindy --disable-xindy-rules --disable-xindy-docs ############################################################# @@ -238,13 +195,6 @@ package() { ## remove aleph from fmtutil.cnf sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf - ## install luatex binary - #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/ - install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/ - cd "$pkgdir"/usr/bin - /bin/ln -s luatex texlua - /bin/ln -s luatex texluac - ## install Perl libraries mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive @@ -256,6 +206,7 @@ package() { # remove dangling symlinks _bibtexextra_scripts=" bibexport +listbib urlbst " _core_scripts=" @@ -263,6 +214,7 @@ afm2afm arlatex autoinst bundledoc +checkcites cmap2enc ctanify ctanupload @@ -277,6 +229,7 @@ installfont-tl latex2man latexdiff latexdiff-vc +latexfileversion latexmk latexrevise listings-ext.sh @@ -315,31 +268,36 @@ texdiff texdirflatten texliveonfly texloganalyser +typeoutfileinfo thumbpdf vpl2ovp vpl2vpl " _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" + _langcjk_scripts="convbkmk updmap-setup-kanji" _langextra_scripts="ebong" _langgreek_scripts="mkgrkindex" - _latexextra_scripts="authorindex \ -makeglossaries \ -pdfannotextractor \ -pdfthumb \ -perltex \ -ppower4 \ -ps4pdf \ -splitindex \ -svn-multi \ + _latexextra_scripts=" +authorindex +exceltex +exceltex +makeglossaries +pdfannotextractor +perltex +ppower4 +ps4pdf +splitindex +svn-multi vpe" - _music_scripts="musixtex musixflx" + _music_scripts="m-tx musixtex musixflx pmx2pdf" _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic" - _pstricks_scripts="pst2pdf" + _pstricks_scripts="pedigree pst2pdf" _science_scripts="ulqda" for s in \ ${_bibtexextra_scripts} \ ${_core_scripts} \ ${_htmlxml_scripts} \ + ${_langcjk_scripts} \ ${_langextra_scripts} \ ${_langgreek_scripts} \ ${_latexextra_scripts} \ diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch new file mode 100644 index 000000000..3bd8183ab --- /dev/null +++ b/libre/texlive-bin-libre/poppler-0.20.patch @@ -0,0 +1,22 @@ +--- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-10-06 06:14:20.000000000 +0000 ++++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-17 11:30:26.327236883 +0000 +@@ -1433,7 +1433,7 @@ + + static int m_Object_getTypeName(lua_State * L) + { +- char *s; ++ const char *s; + udstruct *uin; + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + if (uin->pd != NULL && uin->pd->pc != uin->pc) +--- source/texk/web2c/pdftexdir/pdftosrc.cc.orig 2012-06-24 17:12:34.376329435 +0200 ++++ source/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-24 17:12:25.490003152 +0200 +@@ -134,7 +134,7 @@ + exit(1); + } + if (extract_xref_table) { +- int size = xref->getSize(); ++ int size = xref->getNumObjects(); + int i; + for (i = 0; i < size; i++) { + if (xref->getEntry(i)->offset == 0xffffffff) diff --git a/libre/texlive-core-libre/.directory b/libre/texlive-core-libre/.directory new file mode 100644 index 000000000..9d572f361 --- /dev/null +++ b/libre/texlive-core-libre/.directory @@ -0,0 +1,5 @@ +[Dolphin] +Timestamp=2012,6,26,20,37,17 + +[Settings] +HiddenFilesShown=true diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index eb120c0ad..41021cf24 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -1,11 +1,12 @@ -# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> # Maintainer: Rémy Oudompheng <remy@archlinux.org> +# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=texlive-core-libre _pkgname=texlive-core -pkgver=2011.24722 -_revnr=${pkgver#2011.} -pkgrel=1.1 +pkgver=2012.26892 +_revnr=${pkgver#2012.} +pkgrel=2 pkgdesc="TeX Live core distribution" license=('GPL') arch=(any) @@ -24,35 +25,27 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core') provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver") replaces=('tetex' 'texlive-latex3' 'texlive-core') url='http://tug.org/texlive/' -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" - "${_pkgname}.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" + "$_pkgname.maps") options=(!strip) install=texlive.install #backup=(etc/texmf/tex/context/config/cont-usr.tex) -md5sums=('3cf22c52c9b2719d23ad1479e0ae3b3a' - '490872c9981c40d20721de1e2fccccb8') - -mksource() { - [ -f texlive-core-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/texlive-core-$pkgver-src.zip - mkdir ${pkgname}-${pkgver} - pushd ${pkgname}-${pkgver} - bsdtar xf ../texlive-core-$pkgver-src.zip - # remove nonfree packages - # MeX licensed packages. - rm {cc-pl,cs,ec,mex,pl}.tar.xz - # Public domain, will be relicensed. - rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz - # No specific free license. - rm euro-ce.tar.xz - # Remove them from package list. - sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS - popd - tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver} - rm -rf ${pkgname}-${pkgver} -} +md5sums=('c913b3c01bdcf81da80e4833cd4cc691' + '82c03f7226e1df4440f30c89c05ee653') build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir" + + # remove nonfree packages + # MeX licensed packages. + rm {cc-pl,cs,ec,mex,pl}.tar.xz + # Public domain, will be relicensed. + rm context-{account,algorithmic,fixme,games,letter,ruby}.tar.xz + # No specific free license. + rm euro-ce.tar.xz + # Remove them from package list. + sed -ri '/^(cc-pl|cs|ec|mex|pl|context-(account|algorithmic|fixme|games|letter|ruby)|euro-ce) /d' CONTENTS + echo -n " --> extracting all packages... " for p in *.tar.xz; do bsdtar -xf $p @@ -62,11 +55,10 @@ build() { } package() { - cd "$srcdir/${pkgname}-${pkgver}" install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 ${srcdir}/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do @@ -87,8 +79,13 @@ package() { # $pkgdir/etc/texmf/tex/context/config/cont-usr.tex # remove obsolete stuff (we don't provide the omega and aleph binaries anyway) - #rm -rf $pkgdir/usr/share/texmf-dist/omega rm -f $pkgdir/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini + #sed -i '/cherokee\.map/d; /oinuit\.map/d; /omega\.map/d' \ + # "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg" + + # remove upstream updmap.cfg: it contains too many maps. + rm "${pkgdir}/usr/share/texmf-dist/web2c/updmap.cfg" + # more cleanup rm -rf $pkgdir/usr/share/texmf-dist/scripts/context/stubs/mswin/ @@ -100,6 +97,7 @@ accfonts/vpl2vpl bundledoc/arlatex bundledoc/bundledoc context/perl/mptopdf.pl +checkcites/checkcites.lua ctanify/ctanify ctanupload/ctanupload.pl de-macro/de-macro @@ -108,17 +106,14 @@ epstopdf/epstopdf.pl findhyph/findhyph fontools/afm2afm fontools/autoinst -fontools/cmap2enc -fontools/font2afm fontools/ot2kpx -fontools/pfm2kpx -fontools/showglyphs fragmaster/fragmaster.pl installfont/installfont-tl latex2man/latex2man latexdiff/latexdiff-vc.pl latexdiff/latexdiff.pl latexdiff/latexrevise.pl +latexfileversion/latexfileversion latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua match_parens/match_parens @@ -148,6 +143,7 @@ texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl +typeoutfileinfo/typeoutfileinfo.sh texliveonfly/texliveonfly.py " install -m755 -d $pkgdir/usr/bin diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps index 553d07b72..013f15e94 100644 --- a/libre/texlive-core-libre/texlive-core.maps +++ b/libre/texlive-core-libre/texlive-core.maps @@ -4,6 +4,7 @@ Map fpls.map Map l7x-urwvn.map Map lm.map Map marvosym.map +Map mathpple.map Map original-context-symbol.map Map pazo.map Map pxfonts.map @@ -19,6 +20,7 @@ Map tabvar.map Map troff-updmap.map Map txfonts.map Map utopia.map +MixedMap ccpl.map MixedMap cm-super-t1.map MixedMap cm-super-t2a.map MixedMap cm-super-t2b.map @@ -28,10 +30,14 @@ MixedMap cm-super-x2.map MixedMap cm.map MixedMap cmextra.map MixedMap cmtext-bsr-interpolated.map +MixedMap csother.map +MixedMap cstext.map MixedMap cyrillic.map MixedMap eurosym.map MixedMap latxfont.map MixedMap mflogo.map +MixedMap plother.map +MixedMap pltext.map MixedMap rsfs.map MixedMap stmaryrd.map MixedMap symbols.map diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install index a758c084d..601c4af19 100644 --- a/libre/texlive-core-libre/texlive.install +++ b/libre/texlive-core-libre/texlive.install @@ -23,8 +23,8 @@ post_install() { usr/bin/fmtutil-sys --all 1>/dev/null echo " done." echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" -# echo "NB: To setup ConTeXt and the lua(la)tex font db," -# echo " see http://wiki.archlinux.org/index.php/TeX_Live" + echo "NB: To setup ConTeXt and the lua(la)tex font db," + echo " see http://wiki.archlinux.org/index.php/TeX_Live" } post_upgrade() { @@ -45,8 +45,8 @@ post_upgrade() { usr/bin/fmtutil-sys --all 1>/dev/null echo " done." echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" -# echo "NB: To setup ConTeXt and the lua(la)tex font db," -# echo " see http://wiki.archlinux.org/index.php/TeX_Live" + echo "NB: To setup ConTeXt and the lua(la)tex font db," + echo " see http://wiki.archlinux.org/index.php/TeX_Live" if [[ "$2" == 200* ]]; then echo "Important note. Some directories have moved:" echo " \$TEXMFSYSVAR is now /var/lib/texmf (previously /usr/share/texmf-var)" diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 5565b19b5..cabf58619 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -1,10 +1,11 @@ -# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> # Maintainer: Rémy Oudompheng <remy.archlinux.org> +# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra -pkgver=2011.24706 -_revnr=${pkgver#2011.} +pkgver=2012.26866 +_revnr=${pkgver#2012.} pkgrel=1 pkgdesc="TeX Live - all sorts of extra fonts" license=('GPL') @@ -15,31 +16,20 @@ replaces=('texlive-fontsextra') conflicts=('texlive-fontsextra') provides=('texlive-fontsextra') url='http://tug.org/texlive/' -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" - "${_pkgname}.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('d4bd3dbc8c422d049b082d0e8c70d088' - '6e84e4a8ee6a25adec39cd6310d9bef2') - -mksource() { - [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip - mkdir ${pkgname}-${pkgver} - pushd ${pkgname}-${pkgver} - bsdtar xf ../${_pkgname}-$pkgver-src.zip - # remove nonfree packages - # No specific free license. - rm ogham.tar.xz - # Remove them from package list. - sed -ri '/^ogham /d' CONTENTS - popd - tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver} - rm -rf ${pkgname}-${pkgver} -} +md5sums=('f75e552c4573ce73d3eee03fffee723f' + '4a2f2b3b4527655fb47ab0d59b01bfea') build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir" + # remove nonfree packages + # No specific free license. + rm ogham.tar.xz + # Remove them from package list. + sed -ri '/^ogham /d' CONTENTS for p in *.tar.xz; do bsdtar -xf $p done @@ -47,11 +37,11 @@ build() { } package() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir" install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 $srcdir/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index 4ef977ffa..fbced973a 100644 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps @@ -5,6 +5,7 @@ Map ArtNouv.map Map ArtNouvc.map Map BulletsADF.map Map Carrickc.map +Map CountriesOfEurope.map Map ESSTIX.map Map Eichenla.map Map Eileen.map @@ -31,6 +32,7 @@ Map ap.map Map archaicprw.map Map arev.map Map ascii.map +Map aspectratio.map Map augie.map Map auncial.map Map aurical.map @@ -77,7 +79,9 @@ Map linearA.map Map mathabx.map Map mdbch.map Map mdput.map +Map mdsymbol.map Map mdugm.map +Map ntx.map Map ocrb.map Map opensans.map Map paratype-type1.map @@ -87,6 +91,7 @@ Map prodint.map Map pxtx.map Map recycle.map Map rsfso.map +Map sansmathaccent.map Map sqrcaps.map Map starfont.map Map tfrupee.map diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 2093836c9..d806b73fd 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -1,11 +1,12 @@ -# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> # Maintainer: Firmicus <firmicus āt gmx dōt net> # Maintainer: Rémy Oudompheng <remy@archlinux.org> +# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=texlive-latexextra-libre _pkgname=texlive-latexextra -pkgver=2011.24718 -_revnr=${pkgver#2011.} +pkgver=2012.26807 +_revnr=${pkgver#2012.} pkgrel=1 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX" license=('GPL') @@ -20,44 +21,29 @@ replaces=('texlive-latexextra') conflicts=('texlive-latexextra') groups=('texlive-most') url='http://tug.org/texlive/' -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" - "${_pkgname}.maps") +source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('adab55bb38506c25f3176af64cf30f27' +md5sums=('868dc1824391768e120fdd71ba28e520' '9e4825f47dac663dd62c4bfa67899e84') -mksource() { - [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip - mkdir ${pkgname}-${pkgver} - pushd ${pkgname}-${pkgver} - bsdtar xf ../${_pkgname}-$pkgver-src.zip - # remove nonfree packages - # No specific free license. - rm {authoraftertitle,clock,fltpage,fnpara}.tar.xz - # No explicit modification permission. - rm cmdtrack.tar.xz - # Remove them from package list. - sed -ri '/^(authoraftertitle|clock+fltpage|fnpara|cmdtrack) /d' CONTENTS - popd - tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver} - rm -rf ${pkgname}-${pkgver} -} - build() { - cd "$srcdir/${pkgname}-${pkgver}" + # remove nonfree packages + # No specific free license. + rm {authoraftertitle,clock,fnpara}.tar.xz + # Remove them from package list. + sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS for p in *.tar.xz; do bsdtar -xf $p done rm -rf {tlpkg,doc,source} || true } package() { - cd "$srcdir/${pkgname}-${pkgver}" install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs - install -m644 $srcdir/${_pkgname}.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ + install -m644 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ install -m755 -d $pkgdir/usr/share wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true for dir in $wanteddirs; do @@ -74,11 +60,11 @@ package() { #add symlinks that were in texlive-bin: install -m755 -d $pkgdir/usr/bin ln -s /usr/share/texmf-dist/scripts/authorindex/authorindex $pkgdir/usr/bin/authorindex + ln -s /usr/share/texmf-dist/scripts/exceltex/exceltex $pkgdir/usr/bin/exceltex ln -s /usr/share/texmf-dist/scripts/glossaries/makeglossaries $pkgdir/usr/bin/makeglossaries ln -s /usr/share/texmf-dist/scripts/pax/pdfannotextractor.pl $pkgdir/usr/bin/pdfannotextractor ln -s /usr/share/texmf-dist/scripts/ppower4/pdfthumb.tlu $pkgdir/usr/bin/pdfthumb ln -s /usr/share/texmf-dist/scripts/perltex/perltex.pl $pkgdir/usr/bin/perltex - #ln -s /usr/share/texmf-dist/scripts/ppower4/ppower4.tlu $pkgdir/usr/bin/ppower4 ln -s /usr/share/texmf-dist/scripts/pst-pdf/ps4pdf $pkgdir/usr/bin/ps4pdf ln -s /usr/share/texmf-dist/scripts/splitindex/perl/splitindex.pl $pkgdir/usr/bin/splitindex ln -s /usr/share/texmf-dist/scripts/svn-multi/svn-multi.pl $pkgdir/usr/bin/svn-multi diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 402d1c7fd..942aa5d1c 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> # Changes: # * Adapt to linux-libre # * virtualbox-{archlinux,parabola}-* @@ -11,8 +11,8 @@ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.16 -pkgrel=1 +pkgver=4.1.18 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -26,7 +26,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} vboxweb.conf vboxweb.rc) _extramodules=extramodules-3.4-LIBRE -_kernver="$(cat /lib/modules/${_extramodules}/version)" +_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true build() { cd "$srcdir/VirtualBox-${pkgver}" @@ -194,11 +194,11 @@ package_virtualbox-parabola-additions(){ # install sample config install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service" } -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '5f85710e0b8606de967716ded7b2d351' '755ab0dd9bcacf2c00d2275b1ca69547' 'a1ff1d1b4423556887e48a32978226a6' - '3c96faa76894c182c1bb56bb30d9a17e' + '248078ab922f27424ba9919d4aa90dcc' '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' '208cf5f842eb2e3a5b6dcfc59080d26c' diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild index 4bc8e0c9d..350d0c6ad 100644 --- a/libre/virtualbox-libre/vboxbuild +++ b/libre/virtualbox-libre/vboxbuild @@ -1,13 +1,23 @@ #!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions . /etc/vbox/vbox.cfg MODLIST=() LOG="/var/log/vbox-install.log" >| "$LOG" +stat_busy() { + printf '==> %s ... ' "$1" +} + +stat_done() { + echo 'done' +} + +stat_fail() { + echo 'failed' +} + if [[ $INSTALL_DIR ]]; then VBOXMANAGE=$INSTALL_DIR/VBoxManage BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp @@ -29,7 +39,7 @@ if (( ${#MODLIST[*]} )); then modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail fi -for kdir in /lib/modules/[2-3]*; do +for kdir in /usr/lib/modules/[2-3]*; do if [[ ! -d $kdir/kernel ]]; then # found a stale kernel mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*) @@ -51,8 +61,8 @@ if (( ! $# )); then fi for kernver; do - export KERN_DIR=/lib/modules/$kernver/build - export MODULE_DIR=/lib/modules/$kernver/extramodules + export KERN_DIR=/usr/lib/modules/$kernver/build + export MODULE_DIR=/usr/lib/modules/$kernver/extramodules if [[ ! -d $KERN_DIR ]]; then printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \ "$KERN_DIR" diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD index 8ff59d712..da8583e87 100644 --- a/libre/virtualbox-modules-lts/PKGBUILD +++ b/libre/virtualbox-modules-lts/PKGBUILD @@ -1,13 +1,13 @@ # $Id$ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> -# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> pkgbase=virtualbox-modules-lts pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts') -pkgver=4.1.14 -pkgrel=1 +pkgver=4.1.18 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -15,14 +15,14 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') _extramodules=extramodules-3.0-LIBRE-LTS -_kernver=$(pacman -Ss linux-libre-lts | awk 'NR==1{print $2}')-LIBRE-LTS +_kernver=$(pacman -Q linux-libre-lts | awk '{ printf "%s-LIBRE-LTS", $2; exit }') -export KERN_DIR=/lib/modules/${_kernver}/build +export KERN_DIR=/usr/lib/modules/${_kernver}/build export KERN_INCL=/usr/src/linux-${_kernver}/include/ build() { @@ -65,7 +65,7 @@ package_virtualbox-parabola-modules-lts(){ for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do install -D -m644 ${module} \ - "$pkgdir/lib/modules/${_extramodules}/${module}" + "$pkgdir/usr/lib/modules/${_extramodules}/${module}" done install -D -m 0644 "$srcdir/60-vboxguest.rules" \ @@ -86,16 +86,16 @@ package_virtualbox-modules-lts(){ cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" install -D -m644 vboxdrv.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko" install -D -m644 vboxnetadp.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko" install -D -m644 vboxnetflt.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko" install -D -m644 vboxpci.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko" - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} + } diff --git a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-modules-lts.install index 014fa0b88..5387563a6 100644 --- a/libre/virtualbox-modules-lts/virtualbox-modules-lts.install +++ b/libre/virtualbox-modules-lts/virtualbox-modules-lts.install @@ -5,14 +5,14 @@ post_install() { ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install b/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install index 80d966a9d..54a052390 100644 --- a/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install +++ b/libre/virtualbox-modules-lts/virtualbox-parabola-modules-lts.install @@ -4,13 +4,13 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index e14bf347c..50e9b0721 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ # $Id$ #Maintainer: Ionut Biru <ibiru@archlinux.org> -#Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> -#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +#Maintainer (Parabola): Jorge López <jorginho@lavabit.com> +#Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -pkgver=4.1.16 +pkgver=4.1.18 pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -14,14 +14,14 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('eacfb802ecdd6d3435228eb3d3488719' +md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') _extramodules=extramodules-3.4-LIBRE -_kernver="$(cat /lib/modules/${_extramodules}/version || true)" +_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" -export KERN_DIR=/lib/modules/${_kernver}/build +export KERN_DIR=/usr/lib/modules/${_kernver}/build export KERN_INCL=/usr/src/linux-${_kernver}/include/ build() { @@ -87,18 +87,18 @@ package_virtualbox-modules(){ cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" install -D -m644 vboxdrv.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko" install -D -m644 vboxnetadp.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko" install -D -m644 vboxnetflt.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko" install -D -m644 vboxpci.ko \ - "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko" + "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko" - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install" } diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install index 14242eaf4..b178686e2 100644 --- a/libre/virtualbox-modules/virtualbox-modules.install +++ b/libre/virtualbox-modules/virtualbox-modules.install @@ -4,16 +4,16 @@ post_install() { ===> # modprobe vboxdrv EOF EXTRAMODULES='extramodules-3.4-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { EXTRAMODULES='extramodules-3.4-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { EXTRAMODULES='extramodules-3.4-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install index 0e101aedf..31575fb9d 100644 --- a/libre/virtualbox-modules/virtualbox-parabola-modules.install +++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install @@ -3,15 +3,15 @@ cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF EXTRAMODULES='extramodules-3.4-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { EXTRAMODULES='extramodules-3.4-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { EXTRAMODULES='extramodules-3.4-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |