From f4dcb5cb43b68e265512a03a160bdda634818b43 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Dec 2011 23:14:49 +0000 Subject: Tue Dec 13 23:14:49 UTC 2011 --- libre/abs-libre/PKGBUILD | 9 ++++-- libre/python2-libre/PKGBUILD | 45 ++++++++++++++--------------- libre/python2-libre/SRCBUILD | 36 +++++++++++++++++++++++ libre/python2-libre/gdbm-magic-values.patch | 14 +++++++++ libre/python2-libre/linux2.patch | 24 +++++++++++++++ libre/texlive-bin-libre/PKGBUILD | 17 ++++++----- 6 files changed, 112 insertions(+), 33 deletions(-) create mode 100644 libre/python2-libre/SRCBUILD create mode 100644 libre/python2-libre/gdbm-magic-values.patch create mode 100644 libre/python2-libre/linux2.patch (limited to 'libre') diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD index a9be5a541..1abcd02dc 100644 --- a/libre/abs-libre/PKGBUILD +++ b/libre/abs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101993 2010-12-03 13:48:19Z allan $ +# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $ # Maintainer: Allan McRae _pkgname=abs pkgname=abs-libre -#CARCH=x86_64 +#CARCH=mips64el pkgver=2.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities to download and work with the Arch Build System (ABS)" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/abs.git/" @@ -14,6 +14,9 @@ depends=('bash' 'rsync') backup=(etc/abs.conf) source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz) md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd') +provides=("${_pkgname}=${pkgver}") +replaces=("${_pkgname}") +conflicts=("${_pkgname}") build() { cd ${srcdir}/${_pkgname} diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD index 78550b63f..c4f09188d 100644 --- a/libre/python2-libre/PKGBUILD +++ b/libre/python2-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=python2 pkgname=python2-libre pkgver=2.7.2 -pkgrel=2 +pkgrel=4 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') @@ -17,30 +17,15 @@ makedepends=('tk') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://repo.parabolagnulinux.org/other/Python-${pkgver}.tar.xz +source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz doc_license_change.patch - WDAS.patch) -md5sums=('5f8a18361784411b16dbb1cdcd6f6664' - '1e6595f85a1da7f42b69456119924d50' - '3f8c0e310a0be0bd8b319d6c46bbd427') + WDAS.patch + linux2.patch + gdbm-magic-values.patch) provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") replaces=("$_pkgname") -mksource() { - [ ! -d "Python-${pkgver}" ] && \ - wget -O - http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz |\ - tar -xJf - - - cd "Python-${pkgver}" -# http://bugs.python.org/issue12417 - patch -Np1 -i ../WDAS.patch || return 1 - patch -Np0 -i ../doc_license_change.patch || return 1 - - cd .. - tar -cJf Python-${pkgver}.tar.xz "Python-${pkgver}" -} - build() { cd "${srcdir}/Python-${pkgver}" @@ -54,6 +39,14 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + # Make sure sys.platform is set to linux2, even on kernel 3.X + # cf http://bugs.python.org/issue12326 + patch -Np1 -i ../linux2.patch + + # gdbm has new magic that whichdb does not recognize + # http://bugs.python.org/issue13007 + patch -Np1 -i ../gdbm-magic-values.patch + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -62,9 +55,10 @@ build() { export OPT="${CFLAGS}" ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ - --enable-unicode=ucs4 --with-system-expat --with-system-ffi + --enable-unicode=ucs4 --with-system-expat --with-system-ffi \ + --with-dbmliborder=gdbm:ndbm - make + make MACHDEP=linux2 } package() { @@ -101,5 +95,10 @@ package() { "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" # license - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('456d053a5d418adc913a4971e95fe918' + '1e6595f85a1da7f42b69456119924d50' + '3f8c0e310a0be0bd8b319d6c46bbd427' + '74c04694573e0d331e2a99d7b9179460' + '2874e9d93f4f46c1460605a5c7751372') diff --git a/libre/python2-libre/SRCBUILD b/libre/python2-libre/SRCBUILD new file mode 100644 index 000000000..f021d6624 --- /dev/null +++ b/libre/python2-libre/SRCBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $ +# Maintainer: AndyRTR +# Maintainer (Parabola): xihh + +pkgname=python2-libre +pkgver=2.7.2 +pkgrel=4 +pkgdesc="A high-level scripting language" +arch=('any') +license=('PSF') +url="http://www.python.org/" +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz + doc_license_change.patch + WDAS.patch) +md5sums=('75c87a80c6ddb0b785a57ea3583e04fa' + '1e6595f85a1da7f42b69456119924d50' + '3f8c0e310a0be0bd8b319d6c46bbd427') +options=(!strip docs libtool emptydirs !zipman !purge) + +build() { + cd "${srcdir}/Python-${pkgver}" + + export PKGEXT=.src.tar.xz + + patch -Np1 -i ../WDAS.patch + patch -Np0 -i ../doc_license_change.patch + +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${startdir} + + mv "${srcdir}/Python-${pkgver}" ${pkgdir} + +} diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch new file mode 100644 index 000000000..5613ae35c --- /dev/null +++ b/libre/python2-libre/gdbm-magic-values.patch @@ -0,0 +1,14 @@ +diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py +--- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Lib/whichdb.py 2011-09-30 15:45:21.778872290 -0400 +@@ -91,7 +91,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "gdbm" + + # Check for old Berkeley db hash file format v2 +diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS + diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch new file mode 100644 index 000000000..74ae2aa12 --- /dev/null +++ b/libre/python2-libre/linux2.patch @@ -0,0 +1,24 @@ +http://hg.python.org/cpython/rev/c816479f6aaf/ +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -2995,6 +2995,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -293,6 +293,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 76c2de5e4..8ca94ddab 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -5,15 +5,15 @@ pkgname=texlive-bin-libre pkgver=2011.1 _luatex_ver=0.70.1 -pkgrel=4 +pkgrel=5 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') -depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18.1' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'poppler>=0.18.1' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19') +conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.18.2') replaces=('texlive-bin') options=('!libtool') url='http://tug.org/texlive/' @@ -52,8 +52,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147' build() { cd $srcdir # Remove bundled packages available in Parabola or not needed. - # TODO remove also icu - rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog} + rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler},utils/dialog} rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler} # Building LuaTeX # cd luatex-beta-${_luatex_ver} @@ -71,7 +70,7 @@ build() { --disable-ptex \ --enable-luatex \ --without-system-ptexenc \ - --with-system-graphite \ + --without-system-graphite \ --without-system-icu \ --without-system-kpathsea \ --with-system-freetype2 \ @@ -99,6 +98,8 @@ build() { cd "$srcdir" # this patch removes spurious error message with locale "xx_YY.utf8" patch -p0 -i fix-fontforge-encoding.patch + # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) + sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c ############################################################# ### configure cd source @@ -134,7 +135,7 @@ build() { --with-system-poppler \ --with-system-xpdf \ --with-system-freetype2 \ - --with-system-graphite \ + --without-system-graphite \ --with-system-icu \ --with-freetype2-libdir=/usr/lib \ --with-freetype2-include=/usr/include/freetype2 \ @@ -222,6 +223,8 @@ package() { # clean updmap.cfg sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg + # Don't list formats which need removed packages to work. + sed -i '/csplain\|mex\|jadetex/d' $pkgdir/etc/texmf/web2c/fmtutil.cnf ############################################################# ### install -- cgit v1.2.3-54-g00ecf