diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-11 19:42:13 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-11 19:42:13 -0500 |
commit | c417eb2f5a57eff84128424bd02b92b60615adb0 (patch) | |
tree | fd3e2283eb57a8f75886e5e28cef27487510d6d8 /libre | |
parent | 4af2701db8813ccc17ded58dace627d216dbb9c7 (diff) | |
parent | d575b3eb2b0d121d5ce1816b219ae1c59daca1d1 (diff) | |
download | abslibre-c417eb2f5a57eff84128424bd02b92b60615adb0.tar.gz abslibre-c417eb2f5a57eff84128424bd02b92b60615adb0.tar.bz2 abslibre-c417eb2f5a57eff84128424bd02b92b60615adb0.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rwxr-xr-x | libre/audacious-plugins-libre/PKGBUILD | 7 | ||||
-rwxr-xr-x | libre/linux-libre-lts/PKGBUILD | 13 | ||||
-rwxr-xr-x | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rwxr-xr-x | libre/linux-libre/PKGBUILD | 4 | ||||
-rwxr-xr-x | libre/linux-libre/linux-libre.install | 2 | ||||
-rwxr-xr-x | libre/texlive-core-libre/PKGBUILD | 6 | ||||
-rwxr-xr-x | libre/texlive-core-libre/texlive.install | 4 | ||||
-rwxr-xr-x | libre/texlive-fontsextra-libre/PKGBUILD | 6 | ||||
-rwxr-xr-x | libre/texlive-fontsextra-libre/texlive-fontsextra.maps | 11 | ||||
-rwxr-xr-x | libre/texlive-fontsextra-libre/texlive.install | 4 | ||||
-rwxr-xr-x | libre/texlive-latexextra-libre/PKGBUILD | 55 | ||||
-rwxr-xr-x | libre/texlive-latexextra-libre/texlive.install | 4 |
12 files changed, 60 insertions, 58 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 1644c5576..c59052f0d 100755 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 166974 2012-09-23 22:57:12Z bisson $ +# $Id: PKGBUILD 173107 2012-12-11 04:46:40Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> @@ -7,7 +8,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.3.2 +pkgver=3.3.3 pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' @@ -60,7 +61,7 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('869d3820263ff35609bfc6f2e69885a00d660513') +sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e') build() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 0170fdfac..28fd3d71b 100755 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=54 +_sublevel=56 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.53 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.55 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' - '3.0.54-ptrace-i686-build.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '2fd5511915299a3f60b0494914881e3f' + '49061818ee1c6d38095f5614be9a0eac' 'a5d98603d79d3ab7f979af49b2970f26' '0ed396b368d8cdf8845f7ef2f62fc93c' 'c072b17032e80debc6a8626299245d46' @@ -45,8 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '80889d526d86e516757b52fc99dca64d' - '461adf81c9df997b57bfb3fa07d13746') + '0dbe7bf91cc9461d7394cf46ac37ff68') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -89,9 +87,6 @@ build() { patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch" patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch" - # fix building on i686 platform - patch -Np1 -i "${srcdir}/3.0.54-ptrace-i686-build.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 1251b68c7..a2029fd2e 100755 --- 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.54-1-LIBRE-LTS +KERNEL_VERSION=3.0.56-1-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/PKGBUILD b/libre/linux-libre/PKGBUILD index 9924386ea..b51d91446 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=9 +_sublevel=10 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.9 # nearly always the same as pkgver @@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '2127e118d09154c7a44dd2dfed2cfecd' + 'd0382e715c9ce5f28dea840fd89c6434' 'e4a3a4677e1fac6ecf0e0fb44c41ca08' '68fc36a4efb6ade0eca409b9444fef0c' 'e49ac236dfeef709f91a3d993ea7b62c' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 89024bf96..1e065da77 100755 --- 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.6.9-1-LIBRE +KERNEL_VERSION=3.6.10-1-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/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index 41021cf24..1e3d5534b 100755 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -4,9 +4,9 @@ pkgname=texlive-core-libre _pkgname=texlive-core -pkgver=2012.26892 +pkgver=2012.28273 _revnr=${pkgver#2012.} -pkgrel=2 +pkgrel=1 pkgdesc="TeX Live core distribution" license=('GPL') arch=(any) @@ -30,7 +30,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" options=(!strip) install=texlive.install #backup=(etc/texmf/tex/context/config/cont-usr.tex) -md5sums=('c913b3c01bdcf81da80e4833cd4cc691' +md5sums=('42ce6cf5a7728f2ebb9a1a2bbf9dc4ed' '82c03f7226e1df4440f30c89c05ee653') build() { diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core-libre/texlive.install index 601c4af19..14ca7c531 100755 --- a/libre/texlive-core-libre/texlive.install +++ b/libre/texlive-core-libre/texlive.install @@ -9,7 +9,7 @@ post_install() { TMPFILE=`mktemp` echo ">>> texlive: saving updmap.cfg as $TMPFILE..." cp "$UPDMAP" "$TMPFILE" - echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go" + echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP @@ -31,7 +31,7 @@ post_upgrade() { TMPFILE=`mktemp` echo ">>> texlive: saving updmap.cfg as $TMPFILE..." cp "$UPDMAP" "$TMPFILE" - echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go" + echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index cabf58619..a445de005 100755 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -4,7 +4,7 @@ pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra -pkgver=2012.26866 +pkgver=2012.28268 _revnr=${pkgver#2012.} pkgrel=1 pkgdesc="TeX Live - all sorts of extra fonts" @@ -20,8 +20,8 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('f75e552c4573ce73d3eee03fffee723f' - '4a2f2b3b4527655fb47ab0d59b01bfea') +md5sums=('2c900d7eaa4506b057e25be64b4ad24b' + 'd1d90a08bbea59c2f925a4b07c355828') build() { cd "$srcdir" diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index fbced973a..771bf3607 100755 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps @@ -24,6 +24,8 @@ Map Romantik.map Map Rothdn.map Map RoyalIn.map Map Sanremo.map +Map SourceCodePro.map +Map SourceSansPro.map Map Starburst.map Map Typocaps.map Map Zallman.map @@ -38,7 +40,10 @@ Map auncial.map Map aurical.map Map belleek.map Map bera.map +Map bguq.map +Map biolinum-type1.map Map boondox.map +Map cabin.map Map calligra.map Map cantarell.map Map ccicons.map @@ -69,19 +74,20 @@ Map gfsdidot.map Map gfsneohellenic.map Map gfssolomos.map Map gptimes.map +Map hacm.map Map icelandic.map Map iwona.map Map kpfonts.map Map kurier.map Map lato.map -Map libertine.map +Map libertine-type1.map Map linearA.map Map mathabx.map Map mdbch.map Map mdput.map Map mdsymbol.map Map mdugm.map -Map ntx.map +Map newtx.map Map ocrb.map Map opensans.map Map paratype-type1.map @@ -94,6 +100,7 @@ Map rsfso.map Map sansmathaccent.map Map sqrcaps.map Map starfont.map +Map superiors.map Map tfrupee.map Map uaq.map Map ugq.map diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install index c2c5e8165..6f81bd4ba 100755 --- a/libre/texlive-fontsextra-libre/texlive.install +++ b/libre/texlive-fontsextra-libre/texlive.install @@ -9,7 +9,7 @@ post_install() { TMPFILE=`mktemp` echo ">>> texlive: saving updmap.cfg as $TMPFILE..." cp "$UPDMAP" "$TMPFILE" - echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go" + echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP @@ -25,7 +25,7 @@ post_upgrade() { TMPFILE=`mktemp` echo ">>> texlive: saving updmap.cfg as $TMPFILE..." cp "$UPDMAP" "$TMPFILE" - echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go" + echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index d806b73fd..533a0aa6e 100755 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer: Firmicus <firmicus āt gmx dōt net> +# $Id: PKGBUILD 171569 2012-11-19 07:37:56Z remy $ # 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=2012.26807 +pkgver=2012.28272 _revnr=${pkgver#2012.} pkgrel=1 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX" @@ -25,7 +25,7 @@ source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkg options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('868dc1824391768e120fdd71ba28e520' +md5sums=('75db29b9e9bea30e9b6c1b77c4fca964' '9e4825f47dac663dd62c4bfa67899e84') build() { @@ -40,35 +40,34 @@ build() { rm -rf {tlpkg,doc,source} || true } package() { - install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs + 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 $_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ - install -m755 -d $pkgdir/usr/share + install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs + 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 - find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \; - find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \; + find $dir -type d -exec install -d -m755 "$pkgdir"/usr/share/texmf-dist/'{}' \; + find $dir -type f -exec install -m644 '{}' "$pkgdir"/usr/share/texmf-dist/'{}' \; done if [[ -d texmf-dist ]]; then - find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \; - find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \; + find texmf-dist -type d -exec install -d -m755 "$pkgdir"/usr/share/'{}' \; + find texmf-dist -type f -exec install -m644 '{}' "$pkgdir"/usr/share/'{}' \; fi - if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then - find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \; + if [[ -d "$pkgdir"/usr/share/texmf-dist/scripts ]]; then + find "$pkgdir"/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \; fi #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/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 - ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl $pkgdir/usr/bin/vpe + 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/perltex/perltex.pl "$pkgdir"/usr/bin/perltex + 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 + ln -s /usr/share/texmf-dist/scripts/vpe/vpe.pl "$pkgdir"/usr/bin/vpe # but ppower4 was a symlink to ppower4.tlu, which was broken, but this is far better: ( cat <<"END" @@ -76,8 +75,8 @@ package() { java -jar /usr/share/texmf-dist/scripts/ppower4/pp4p.jar $@ END ) > /tmp/ppower4 - install -m755 /tmp/ppower4 $pkgdir/usr/bin/ - rm $pkgdir/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat - rm $pkgdir/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat* - rm $pkgdir/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat + install -m755 /tmp/ppower4 "$pkgdir"/usr/bin/ + rm "$pkgdir"/usr/share/texmf-dist/scripts/glossaries/makeglossaries.bat + rm "$pkgdir"/usr/share/texmf-dist/scripts/pst-pdf/ps4pdf.bat* + rm "$pkgdir"/usr/share/texmf-dist/scripts/shipunov/biokey2html.bat } diff --git a/libre/texlive-latexextra-libre/texlive.install b/libre/texlive-latexextra-libre/texlive.install index e8878db08..3416a2732 100755 --- a/libre/texlive-latexextra-libre/texlive.install +++ b/libre/texlive-latexextra-libre/texlive.install @@ -9,7 +9,7 @@ post_install() { TMPFILE=`mktemp` echo ">>> texlive: saving updmap.cfg as $TMPFILE..." cp "$UPDMAP" "$TMPFILE" - echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go" + echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP @@ -25,7 +25,7 @@ post_upgrade() { TMPFILE=`mktemp` echo ">>> texlive: saving updmap.cfg as $TMPFILE..." cp "$UPDMAP" "$TMPFILE" - echo ">>> texlive: regenerating updmap.cfg (custom additions shoud go" + echo ">>> texlive: regenerating updmap.cfg (custom additions should go" echo " into /etc/texmf/web2c/updmap-local.cfg" cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP |