From 164067832916c8e59219e1b0f30d7d04618a536e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 22 Jan 2012 23:15:13 +0000 Subject: Sun Jan 22 23:15:13 UTC 2012 --- libre/kdenetwork-libre/PKGBUILD | 126 +++++++++++++++++++++ libre/kdenetwork-libre/kdenetwork.install | 11 ++ libre/kdeutils-libre/PKGBUILD | 33 +++--- libre/kdeutils-libre/rePKGBUILD | 21 ++-- libre/linux-libre/Kbuild | 19 ++++ libre/linux-libre/Kbuild.platforms | 6 + libre/linux-libre/PKGBUILD | 113 ++++++++++++------ libre/linux-libre/config.i686 | 20 ++-- libre/linux-libre/config.x86_64 | 18 ++- libre/linux-libre/i915-gpu-finish.patch | 55 +++++++++ libre/linux-libre/linux-libre.install | 7 +- libre/mozilla-devscripts/PKGBUILD | 31 +++++ libre/texlive-bin-libre/PKGBUILD | 64 ++++++----- libre/texlive-bin-libre/texmf.cnf | 74 +++++++++--- libre/texlive-core-libre/PKGBUILD | 11 +- libre/texlive-fontsextra-libre/PKGBUILD | 6 +- .../texlive-fontsextra.maps | 10 +- libre/texlive-latexextra-libre/PKGBUILD | 4 +- libre/xmlstarlet/PKGBUILD | 29 +++++ libre/your-freedom/PKGBUILD | 13 +-- 20 files changed, 521 insertions(+), 150 deletions(-) create mode 100644 libre/kdenetwork-libre/PKGBUILD create mode 100644 libre/kdenetwork-libre/kdenetwork.install create mode 100644 libre/linux-libre/Kbuild create mode 100644 libre/linux-libre/Kbuild.platforms create mode 100644 libre/linux-libre/i915-gpu-finish.patch create mode 100644 libre/mozilla-devscripts/PKGBUILD create mode 100644 libre/xmlstarlet/PKGBUILD (limited to 'libre') diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD new file mode 100644 index 000000000..14c6448e5 --- /dev/null +++ b/libre/kdenetwork-libre/PKGBUILD @@ -0,0 +1,126 @@ +# $Id: PKGBUILD 144733 2011-12-08 09:21:25Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdenetwork +pkgname=('kdenetwork-filesharing' + 'kdenetwork-kdnssd' + 'kdenetwork-kget' + 'kdenetwork-kopete-libre' + 'kdenetwork-kppp' + 'kdenetwork-krdc' + 'kdenetwork-krfb') +pkgver=4.7.4 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' + 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp' + 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' + 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') +source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz") +sha1sums=('2537c5286a1464008e05974a3fd55ae00740c843') + +# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. +mksource() { + [ -f "${pkgbase}-${pkgver}.tar.bz2" ] || wget "http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + tar xf "${pkgbase}-${pkgver}.tar.bz2" + cd "${pkgbase}-${pkgver}" + sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.txt + rm -rf kopete/protocols/skype + sed 's/, Skype//' -i ./doc/kopete/index.docbook + cd .. + tar cJf "${pkgbase}-libre-${pkgver}.tar.xz" "${pkgbase}-${pkgver}" +} + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ + -DWITH_Xmms=OFF \ + -DWITH_LibMeanwhile=OFF + make +} + +package_kdenetwork-filesharing() { + pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' + depends=('kdelibs' 'smbclient') + install='kdenetwork.install' + cd $srcdir/build/filesharing + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kdnssd() { + pkgdesc='Monitors the network for DNS-SD services' + depends=('kdelibs') + cd $srcdir/build/kdnssd + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kget() { + pkgdesc='Download Manager' + depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') + optdepends=('python2: YouTube plugin') + url="http://kde.org/applications/internet/kget/" + install='kdenetwork.install' + cd $srcdir/build/kget + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kget + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kopete-libre() { + pkgdesc='Instant Messenger' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer') + conflicts=('kdenetwork-kopete') + provides=("kdenetwork-kopete=${pkgver}") + replaces=('kdenetwork-kopete') + url="http://kde.org/applications/internet/kopete/" + install='kdenetwork.install' + cd $srcdir/build/kopete + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kopete + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kppp() { + pkgdesc='Internet Dial-Up Tool' + depends=('kdebase-runtime' 'ppp') + url="http://kde.org/applications/internet/kppp/" + install='kdenetwork.install' + cd $srcdir/build/kppp + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kppp + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krdc() { + pkgdesc='Remote Desktop Client' + depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4') + optdepends=('kdebase-keditbookmarks: to edit bookmarks') + url="http://kde.org/applications/internet/krdc/" + cd $srcdir/build/krdc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krdc + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krfb() { + pkgdesc='Desktop Sharing' + # note on libxdamage: + # not detected by namcap because libgl depends on it + # but nvidia providing libgl does not depend on libxdamage + depends=('kdebase-runtime' 'libvncserver' 'libxdamage') + cd $srcdir/build/krfb + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krfb + make DESTDIR=$pkgdir install +} diff --git a/libre/kdenetwork-libre/kdenetwork.install b/libre/kdenetwork-libre/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/libre/kdenetwork-libre/kdenetwork.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/kdeutils-libre/PKGBUILD b/libre/kdeutils-libre/PKGBUILD index 4337580e3..16fff37d3 100644 --- a/libre/kdeutils-libre/PKGBUILD +++ b/libre/kdeutils-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139746 2011-10-04 21:03:39Z andrea $ +# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -16,8 +16,8 @@ pkgname=('kdeutils-ark-libre' 'kdeutils-printer-applet' 'kdeutils-superkaramba' 'kdeutils-sweeper') -pkgver=4.7.2 -pkgrel=1 +pkgver=4.7.4 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -26,27 +26,37 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4') +sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgbase}-${pkgver} + + # Use Python2 + sed -i 's|/usr/bin/python|/usr/bin/python2|' \ + kcharselect/kcharselect-generate-datafile.py \ + superkaramba/examples/richtext/rtext.py + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py + + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } package_kdeutils-ark-libre() { pkgdesc='Archiving Tool' depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') - optdepends=('p7zip' 'zip') + optdepends=('p7zip' 'zip' 'unzip' 'ununrar') + provides=("kdeutils-ark=$pkgver") + replaces=('kdeutils-ark') + conflicts=('kdeutils-ark') url="http://kde.org/applications/utilities/ark/" - provides=("kdeutils-ark=$pkgver") - replaces=('kdeutils-ark') - conflicts=('kdeutils-ark') cd $srcdir/build/ark make DESTDIR=$pkgdir install cd $srcdir/build/ark/doc @@ -162,9 +172,6 @@ package_kdeutils-printer-applet() { make DESTDIR=$pkgdir install cd $srcdir/build/printer-applet/doc make DESTDIR=$pkgdir install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' } package_kdeutils-superkaramba() { diff --git a/libre/kdeutils-libre/rePKGBUILD b/libre/kdeutils-libre/rePKGBUILD index a8d78bede..9dad18cf0 100644 --- a/libre/kdeutils-libre/rePKGBUILD +++ b/libre/kdeutils-libre/rePKGBUILD @@ -2,8 +2,9 @@ source PKGBUILD #CARCH=x86_64 unset build package md5sums source +pkgname=("kdeutils-ark-libre") _repo=extra # Put the repo here -_mirror=ftp://ftp.archlinux.org # Put mirror here +_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here source=(PKGBUILD "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT" # files for pkg modifications below this line @@ -18,15 +19,15 @@ build() { } package_kdeutils-ark-libre() { - pkgdesc='Archiving Tool' - depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') - optdepends=('p7zip' 'zip') - url="http://kde.org/applications/utilities/ark/" - provides=("kdeutils-ark=$pkgver") - replaces=('kdeutils-ark') - conflicts=('kdeutils-ark') - find ${srcdir} -maxdepth 1 -type l -delete - cp -a ${srcdir}/* ${pkgdir} + pkgdesc='Archiving Tool' + depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') + optdepends=('p7zip' 'zip' 'unzip' 'ununrar') + provides=("kdeutils-ark=$pkgver") + replaces=('kdeutils-ark') + conflicts=('kdeutils-ark') + url="http://kde.org/applications/utilities/ark/" + find ${srcdir} -maxdepth 1 -type l -delete + cp -a ${srcdir}/* ${pkgdir} } diff --git a/libre/linux-libre/Kbuild b/libre/linux-libre/Kbuild new file mode 100644 index 000000000..8a9d7dceb --- /dev/null +++ b/libre/linux-libre/Kbuild @@ -0,0 +1,19 @@ +# Fail on warnings - also for files referenced in subdirs +# -Werror can be disabled for specific files using: +# CFLAGS_ := -Wno-error +subdir-ccflags-y := -Wno-error + +# platform specific definitions +include arch/mips/Kbuild.platforms +obj-y := $(platform-y) + +# make clean traverses $(obj-) without having included .config, so +# everything ends up here +obj- := $(platform-) + +# mips object files +# The object files are linked as core-y files would be linked + +obj-y += kernel/ +obj-y += mm/ +obj-y += math-emu/ diff --git a/libre/linux-libre/Kbuild.platforms b/libre/linux-libre/Kbuild.platforms new file mode 100644 index 000000000..90a226888 --- /dev/null +++ b/libre/linux-libre/Kbuild.platforms @@ -0,0 +1,6 @@ +# All platforms listed in alphabetic order + +platforms += loongson + +# include the platform specific files +include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms)) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e7668ca29..3bd2c7fe6 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -8,48 +8,42 @@ 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=${pkgname#linux-libre} -<<<<<<< HEAD -_basekernel=3.1 -pkgver=${_basekernel}.7 -======= _basekernel=3.2 -pkgver=${_basekernel} ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c +pkgver=${_basekernel}.1 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz" -# "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk "${pkgname}.preset" + 'Kbuild' + 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'usb-add-reset-resume-quirk-for-several-webcams.patch') -md5sums=('d73df15ab1d36fe3c102755d8f42117f' - '47e4a10500ad90694b7f42fb447ab810' - '267ea59695619730032f89ac70bf9391' - '5a415fc0c864dc3f5c4afa63f1506c52' - 'a8a3843046926eb7ab81312cd438c5c5' - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - 'a50c9076012cb2dda49952dc6ec3e9c1' - '52d41fa61e80277ace2b994412a0c856') + 'i915-gpu-finish.patch') build() { cd "${srcdir}/linux-${_basekernel}" -# patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" + fi # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # fix FS#27883 + # drm/i915: Only clear the GPU domains upon a successful finish + patch -Np1 -i "${srcdir}/i915-gpu-finish.patch" + # 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 @@ -59,16 +53,26 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" - # Add the USB_QUIRK_RESET_RESUME for several webcams - # FS#26528 - patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.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) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - cat "${srcdir}/config.${CARCH}" > ./.config # simpler + if [ "$CARCH" == "mips64el" ]; then + sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile + msg2 "Adding loongson-community patches" + patch -Np1 -i ${srcdir}/${_basekernel}.*-*-loongson-community.patch + patch -Np0 -i "${srcdir}/lxo-config.patch" + +# ensure N32, add localversion and remove uevent helper as per +# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README + sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ + -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ + -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config + else + cat "${srcdir}/config.${CARCH}" > ./.config # simpler + fi if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config @@ -98,7 +102,11 @@ build() { yes "" | make config # build! - make ${MAKEFLAGS} bzImage modules + if [ "$CARCH" == "mips64el" ]; then + make ${MAKEFLAGS} vmlinuz modules + else + make ${MAKEFLAGS} bzImage modules + fi } package_linux-libre() { @@ -115,13 +123,19 @@ package_linux-libre() { cd "${srcdir}/linux-${_basekernel}" KARCH=x86 + [ $CARCH = "mips64el" ] && KARCH=mips # get kernel version _kernver="$(make kernelrelease)" mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make INSTALL_MOD_PATH="${pkgdir}" modules_install - cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}" + + if [ "$CARCH" == "mips64el" ]; then + cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}" + else + cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}" + fi # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" @@ -140,6 +154,12 @@ package_linux-libre() { -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \ -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" +# mkinitcpio 0.7 relies on bzImage to find the kernel version + if [ "$CARCH" == "mips64el" ]; then + sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|g" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" + fi + # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware @@ -159,6 +179,15 @@ package_linux-libre-headers() { conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') + KARCH=x86 + [ $CARCH = "mips64el" ] && KARCH=mips + +# In case of repackaging this is empty + if [ -z "${_kernver}" ]; then + cd ${srcdir}/linux-$pkgver + _kernver="$(make kernelrelease)" + fi + mkdir -p "${pkgdir}/lib/modules/${_kernver}" cd "${pkgdir}/lib/modules/${_kernver}" @@ -180,13 +209,19 @@ package_linux-libre-headers() { done # copy arch includes for external modules - mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86" - cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}" + cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" # copy files necessary for later builds cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" + if [ "$CARCH" = "mips64el" ]; then + cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" + fi + # fix permissions on scripts dir chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts" mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions" @@ -281,7 +316,12 @@ package_linux-libre-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,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} + 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,sh,sh64,sparc,sparc64,um,v850,xtensa} + if [ "$CARCH" = "mips64el" ]; then + rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 + else + rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips + fi } package_linux-libre-docs() { @@ -300,14 +340,15 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -<<<<<<< HEAD -======= md5sums=('27c641c4f6785fc647cdd3e44963a55c' - 'eb37c323f6993d6cc963c61a1f482956' - '4e9be096386838d247672963f9af9ea8' + '6e0c99536652e7deb71acbadc980b586' + 'fb12372c5c7bc4e5328b38953616c7a5' + '92f62a90c1df8d74704a510d28146c52' + '576ba68b171efd4a3333736c30f334ef' 'a8a3843046926eb7ab81312cd438c5c5' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '52d41fa61e80277ace2b994412a0c856') ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c + '4cd79aa147825837dc8bc9f6b736c0a0') diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 71783fa50..9aace04bc 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,10 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -<<<<<<< HEAD -# Linux/i386 3.1.6-1 Kernel Configuration -======= # Linux/i386 3.2.0 Kernel Configuration ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1297,7 +1293,8 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=y -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m @@ -2269,13 +2266,11 @@ CONFIG_CARL9170_WPC=y CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2294,7 +2289,10 @@ CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set -# CONFIG_BRCMFMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +# CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set @@ -3318,11 +3316,7 @@ CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_DEBUG is not set +# CONFIG_BCMA is not set # # Multifunction device drivers diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index df37a6f20..42aafc2bb 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.6-1 Kernel Configuration +# Linux/x86_64 3.2.0 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1252,7 +1252,8 @@ CONFIG_SYS_HYPERVISOR=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=y -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m @@ -2151,13 +2152,11 @@ CONFIG_CARL9170_WPC=y CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2176,7 +2175,10 @@ CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set -# CONFIG_BRCMFMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +# CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set @@ -3163,11 +3165,7 @@ CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_DEBUG is not set +# CONFIG_BCMA is not set # # Multifunction device drivers diff --git a/libre/linux-libre/i915-gpu-finish.patch b/libre/linux-libre/i915-gpu-finish.patch new file mode 100644 index 000000000..5840c9181 --- /dev/null +++ b/libre/linux-libre/i915-gpu-finish.patch @@ -0,0 +1,55 @@ +commit 389a55581e30607af0fcde6cdb4e54f189cf46cf +Author: Chris Wilson +Date: Tue Nov 29 15:12:16 2011 +0000 + + drm/i915: Only clear the GPU domains upon a successful finish + + By clearing the GPU read domains before waiting upon the buffer, we run + the risk of the wait being interrupted and the domains prematurely + cleared. The next time we attempt to wait upon the buffer (after + userspace handles the signal), we believe that the buffer is idle and so + skip the wait. + + There are a number of bugs across all generations which show signs of an + overly haste reuse of active buffers. + + Such as: + + https://bugs.freedesktop.org/show_bug.cgi?id=29046 + https://bugs.freedesktop.org/show_bug.cgi?id=35863 + https://bugs.freedesktop.org/show_bug.cgi?id=38952 + https://bugs.freedesktop.org/show_bug.cgi?id=40282 + https://bugs.freedesktop.org/show_bug.cgi?id=41098 + https://bugs.freedesktop.org/show_bug.cgi?id=41102 + https://bugs.freedesktop.org/show_bug.cgi?id=41284 + https://bugs.freedesktop.org/show_bug.cgi?id=42141 + + A couple of those pre-date i915_gem_object_finish_gpu(), so may be + unrelated (such as a wild write from a userspace command buffer), but + this does look like a convincing cause for most of those bugs. + + Signed-off-by: Chris Wilson + Cc: stable@kernel.org + Reviewed-by: Daniel Vetter + Reviewed-by: Eugeni Dodonov + +diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c +index d560175..036bc58 100644 +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -3087,10 +3087,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj) + return ret; + } + ++ ret = i915_gem_object_wait_rendering(obj); ++ if (ret) ++ return ret; ++ + /* Ensure that we invalidate the GPU's caches and TLBs. */ + obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS; +- +- return i915_gem_object_wait_rendering(obj); ++ return 0; + } + + /** diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index bab05ffce..f08840c94 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,11 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -<<<<<<< HEAD -KERNEL_VERSION=3.1.6-1-LIBRE -======= -KERNEL_VERSION=3.2.0-1-LIBRE ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c +KERNEL_VERSION=3.2.1-1-LIBRE post_install () { # updating module dependencies @@ -49,7 +45,6 @@ post_upgrade() { if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." - echo " You probably just broke your system. Congratulations." fi # updating module dependencies diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD new file mode 100644 index 000000000..faa4b3a2a --- /dev/null +++ b/libre/mozilla-devscripts/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Michał Masłowski + +pkgname=mozilla-devscripts +pkgver=0.30 +pkgrel=1.1 +pkgdesc="Development scripts used by Debian Mozilla's addons packages" +arch=("any") +url="http://packages.debian.org/source/unstable/mozilla-devscripts" +license=('GPL' 'custom') +depends=("python2" "zip" "unzip") +_debrepo=http://ftp.debian.org/debian/pool/main/ +source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc" + "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz") +md5sums=("6e517cef69c115356eb808866fd29268" + "4e95fb93d0d93b56543d2a789d457309") + +build() { + cd "$srcdir/$pkgname-$pkgver" + # Adapt it to Arch's Python naming. + find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + # The Makefile expects the system to have standard Python name, so + # do this directly here. + python2 setup.py install --root="$pkgdir/" + install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index b5fb37c85..0074fb878 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -3,12 +3,12 @@ # Contributor: francois pkgname=texlive-bin-libre -pkgver=2011.1 +pkgver=2011.3 _luatex_ver=0.70.1 -pkgrel=5.2 +pkgrel=1 pkgdesc="TeX Live binaries" license=('GPL') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') depends=('t1lib' 'gd' 'poppler>=0.18.2' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') @@ -21,9 +21,8 @@ install="texlive.install" source=('texmf.cnf' 'fix-fontforge-encoding.patch' '09-texlive-fonts.conf' - 'archlinux-build.patch' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' + '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' ) @@ -41,19 +40,18 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/dvipdfm/config/config \ etc/texmf/xdvi/XDvi) -md5sums=('ff30d6813babd2e41c414365eea9c147' +md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae' 'bfb9716aa00c86c08cd31e5b32edeb98' '393a4bf67adc7ca5df2b386759d1a637' - '94ef5571a54262790ab64d6d044dd10c' - '58e8ab64188eaf15897b7acf472dca9f' - '9f7ae1aa24afd9e34289ac10a8f9e87b' + 'c7bb38c0ab30c2b64cf4cf83a736b35c' + '5d8f06a3683ce88a3c33e15f5ba6a858' 'e7f0197559ef865d8c01683dab3b8526') build() { cd $srcdir # Remove bundled packages available in Parabola or not needed. 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} + rm -rf luatex/source/libs/{libpng,zziplib,zlib,poppler} # Building LuaTeX # cd luatex-beta-${_luatex_ver} cd luatex @@ -84,8 +82,7 @@ build() { --with-system-zlib \ --with-system-zziplib \ --with-system-t1lib \ - --disable-static \ - --enable-shared \ + --disable-shared \ --disable-largefile \ --disable-ipc \ --without-mf-x-toolkit \ @@ -103,11 +100,6 @@ build() { ############################################################# ### configure cd source - patch -Np1 -i ${srcdir}/archlinux-build.patch - for _dir in texk/tetex texk/texlive texk/tex4htk \ - utils/ps2eps utils/chktex utils/psutils utils/xindy; do - (cd ${_dir} && automake) || true - done ## prevent compiling Xdvi with libXp sed -i~ 's|-lXp ||' texk/xdvik/configure test ! -d Work && mkdir Work @@ -115,6 +107,7 @@ build() { echo "--> Initial configuration..." # we use temporary prefix to avoid messing the existing $pkgdir/usr/share/texmf tree ../configure --prefix=/usr -C \ + --sysconfdir=/etc \ --datarootdir=/usr/share \ --datadir=/usr/share \ --mandir=/usr/share/man \ @@ -174,16 +167,6 @@ package() { install -d -m755 $pkgdir/etc/texmf/xdvi install -d -m755 $pkgdir/etc/fonts/conf.avail install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/ - # replace upstream texmf.cnf with ours - rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf - install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf - # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c - # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter - ln -s /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf - # fix location of TEXMFCACHE for luatools - sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua - ## remove aleph from fmtutil.cnf - sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf # move man files to /usr/share/man for i in 1 5; do install -d -m755 $pkgdir/usr/share/man/man$i @@ -237,7 +220,18 @@ package() { echo "-------------------------------------------------------" cd Work make DESTDIR=${pkgdir} texmf=$pkgdir/usr/share/texmf install - rm -rf ${pkgdir}/usr/{texmf,texmf-dist} + rm -rf ${pkgdir}/usr/{texmf,share/texmf-dist} + + # replace upstream texmf.cnf with ours + rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf + install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf + # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c + # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter + ln -sf /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf + # fix location of TEXMFCACHE for luatools + sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua + ## remove aleph from fmtutil.cnf + sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf ## install luatex binary cd $srcdir/luatex/build/texk/web2c @@ -255,14 +249,20 @@ package() { LD_PRELOAD="${pkgdir}/usr/lib/libkpathsea.so.6" PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/ ############################################################# # remove dangling symlinks - _bibtexextra_scripts="bibexport" + _bibtexextra_scripts=" +bibexport +urlbst +" _core_scripts=" afm2afm arlatex autoinst bundledoc cmap2enc +ctanify +ctanupload de-macro +dosepsbin dviasm epstopdf findhyph @@ -275,6 +275,8 @@ latexdiff-vc latexmk latexrevise listings-ext.sh +match_parens +mf2pt1 mkjobtexmf mkluatexfontdb mkt1font @@ -306,6 +308,7 @@ texcount texdef texdiff texdirflatten +texliveonfly texloganalyser thumbpdf vpl2ovp @@ -344,4 +347,3 @@ vpe" done ################################################################### } - diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf index 423d93e09..76975ee5c 100644 --- a/libre/texlive-bin-libre/texmf.cnf +++ b/libre/texlive-bin-libre/texmf.cnf @@ -200,6 +200,24 @@ TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}// TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}// +% Omega / Aleph. +TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// +TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// +TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// + +% p(La)TeX. +TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// +TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// + +% epTeX. +TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// + +% pBibTeX bibliographies and style files. +BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// +BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// % ConTeXt. TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// @@ -285,6 +303,10 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// +% .ris and .bltxml bibliography formats. +RISINPUTS = .;$TEXMF/bibtex/ris// +BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// + % MFT style files. MFTINPUTS = .;$TEXMF/mft// @@ -307,7 +329,7 @@ AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// % TrueType outline fonts. TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR// -% Opentype outline fonts. +% OpenType outline fonts. OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR// % Type 42 outline fonts. @@ -331,9 +353,6 @@ CMAPFONTS = .;$TEXMF/fonts/cmap// % Subfont definition files. SFDFONTS = .;$TEXMF/fonts/sfd// -% OpenType outline fonts. -OPENTYPEFONTS = .;$TEXMF/fonts/opentype// - % OpenType feature files (.fea). FONTFEATURES=.;$TEXMF/fonts/fea// @@ -353,11 +372,13 @@ MPSUPPORT = .;$TEXMF/metapost/support MIMELIBDIR = /etc MAILCAPLIBDIR = /etc -% Default settings for fontconfig library, used by Windows versions of -% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this. -FONTCONFIG_FILE=fonts.conf -FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf -FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache +% Default settings for the fontconfig library as used by the Windows +% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores +% this. ConTeXT MkIV (all platforms) also use these values. +% +FONTCONFIG_FILE = fonts.conf +FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf +FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache % TeX documentation and source files, for use with texdoc and kpsewhich. TEXDOCS = $TEXMF/doc// @@ -392,10 +413,19 @@ TW_INIPATH = $TW_LIBPATH % would allow command execution. DVIPDFMXINPUTS = $TEXMF/dvipdfmx -% Find scripts that are distributed/installed in the texmf tree. - % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. -LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS +% +% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in +% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended +% default expansion of TEXINPUTS will not happen and .lua files under +% the /tex/ will not be found. +% +% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. +% The default LUAINPUTS sufficess for luatex and dviluatex. +% +LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// % Lua needs to look for binary lua libraries distributed with packages. CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// @@ -563,7 +593,8 @@ TEX = etex % interactive `e' option. %d is replaced by the line number and %s by % the current filename. The default is specified at compile-time, and % we let that stay in place since different platforms like different values. -%TEXEDIT = vi +%d "%s" +%TEXEDIT = vi +%d '%s' % default for Unix +%TEXEDIT = texworks --position=+%d "%s" % default for Windows %MFEDIT = ${TEXEDIT} %MPEDIT = ${TEXEDIT} @@ -571,6 +602,18 @@ TEX = etex % given as command line option or environment variable. BIBTEX_CSFILE = 88591lat.csf +% This variable is specific to Windows. It must be set to 0 or 1. The +% default is 0. Setting it to 1 tells the Windows script wrappers to +% use an already installed Perl interpreter if one is found on the +% search path, in preference to the Perl shipped with TeX Live. Thus, +% it may be useful if you both (a) installed a full Perl distribution +% for general use, and (b) need to run Perl programs from TL that use +% additional modules we don't provide. The TL Perl does provide all the +% standard Perl modules. +% +%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 + + % Part 3: Array and other sizes for TeX (and Metafont). % % If you want to change some of these sizes only for a certain TeX @@ -644,6 +687,11 @@ param_size = 10000 % simultaneous macro parameters, also applies to MP save_size = 50000 % for saving values outside current group stack_size = 5000 % simultaneous input sources +% These are Omega-specific. +ocp_buf_size = 500000 % character buffers for ocp filters. +ocp_stack_size = 10000 % stacks for ocp computations. +ocp_list_size = 1000 % control for multiple ocps. + % These work best if they are the same as the I/O buffer size, but it % doesn't matter much. Must be a multiple of 8. dvi_buf_size = 16384 % TeX diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index ccf5c480f..be42680ad 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -3,7 +3,7 @@ pkgname=texlive-core-libre _pkgname=texlive-core -pkgver=2011.23170 +pkgver=2011.24722 _revnr=${pkgver#2011.} pkgrel=1 pkgdesc="TeX Live core distribution" @@ -29,7 +29,7 @@ source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" options=(!strip) install=texlive.install #backup=(etc/texmf/tex/context/config/cont-usr.tex) -md5sums=('304e164e22f8dee41bfd6c2f4758e394' +md5sums=('3cf22c52c9b2719d23ad1479e0ae3b3a' '490872c9981c40d20721de1e2fccccb8') mksource() { @@ -100,6 +100,8 @@ accfonts/vpl2vpl bundledoc/arlatex bundledoc/bundledoc context/perl/mptopdf.pl +ctanify/ctanify +ctanupload/ctanupload.pl de-macro/de-macro dviasm/dviasm.py epstopdf/epstopdf.pl @@ -114,11 +116,13 @@ fontools/showglyphs fragmaster/fragmaster.pl installfont/installfont-tl latex2man/latex2man -latexdiff/latexdiff.pl latexdiff/latexdiff-vc.pl +latexdiff/latexdiff.pl latexdiff/latexrevise.pl latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua +match_parens/match_parens +mf2pt1/mf2pt1.pl mkjobtexmf/mkjobtexmf.pl oberdiek/pdfatfi.pl pdfcrop/pdfcrop.pl @@ -144,6 +148,7 @@ texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl +texliveonfly/texliveonfly.py " install -m755 -d $pkgdir/usr/bin for _script in ${_linked_scripts}; do diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 9d296dd35..5565b19b5 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -3,7 +3,7 @@ pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra -pkgver=2011.22691 +pkgver=2011.24706 _revnr=${pkgver#2011.} pkgrel=1 pkgdesc="TeX Live - all sorts of extra fonts" @@ -20,8 +20,8 @@ source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('33f8fc7b7ff98c616a0a7a0b5844e603' - '5150fc36c158776c6317ac14bbd677ab') +md5sums=('d4bd3dbc8c422d049b082d0e8c70d088' + '6e84e4a8ee6a25adec39cd6310d9bef2') mksource() { [ -f ${_pkgname}-$pkgver-src.zip ] || wget ftp://ftp.archlinux.org/other/texlive/${_pkgname}-$pkgver-src.zip diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index 6bc0b19c2..4ef977ffa 100644 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps @@ -19,8 +19,6 @@ Map MnSymbol.map Map MorrisIn.map Map Nouveaud.map Map OrnementsADF.map -Map PTSans-type1.map -Map PTSerif-type1.map Map Romantik.map Map Rothdn.map Map RoyalIn.map @@ -39,6 +37,7 @@ Map aurical.map Map belleek.map Map bera.map Map boondox.map +Map calligra.map Map cantarell.map Map ccicons.map Map clm.map @@ -46,9 +45,11 @@ Map cm-lgc.map Map cmin.map Map comfortaa.map Map cyklop.map +Map dejavu-type1.map Map dictsym.map Map droid.map Map dstroke.map +Map dutchcal.map Map epigrafica.map Map esvect.map Map fdsymbol.map @@ -58,6 +59,7 @@ Map foekfont.map Map fonetika.map Map fourier-utopia-expert.map Map fourier.map +Map frcursive.map Map gfsartemisia.map Map gfsbodoni.map Map gfscomplutum.map @@ -77,10 +79,14 @@ Map mdbch.map Map mdput.map Map mdugm.map Map ocrb.map +Map opensans.map +Map paratype-type1.map Map pbsi.map Map phaistos.map Map prodint.map +Map pxtx.map Map recycle.map +Map rsfso.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 b4c34a637..2093836c9 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -4,7 +4,7 @@ pkgname=texlive-latexextra-libre _pkgname=texlive-latexextra -pkgver=2011.22931 +pkgver=2011.24718 _revnr=${pkgver#2011.} pkgrel=1 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX" @@ -25,7 +25,7 @@ source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz" options=('!emptydirs') options=(!strip) install=texlive.install -md5sums=('243f308790ad95e40a80526fecfdb7c1' +md5sums=('adab55bb38506c25f3176af64cf30f27' '9e4825f47dac663dd62c4bfa67899e84') mksource() { diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD new file mode 100644 index 000000000..a06daf063 --- /dev/null +++ b/libre/xmlstarlet/PKGBUILD @@ -0,0 +1,29 @@ +# From https://aur.archlinux.org/packages.php?ID=20101. +# Maintainer: PyroPeter +# Contributor: BlackEagle +# Contributor: chochem + +pkgname=xmlstarlet +pkgver=1.3.1 +pkgrel=1 +pkgdesc="A set of tools to transform, query, validate, and edit XML documents" +arch=('i686' 'x86_64') +url="http://xmlstar.sourceforge.net/" +license=('custom:MIT') +depends=('libxslt>=1.1.9') +source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") +md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + local xsltlibs=$(pkg-config --libs libxslt libexslt) + local xmllibs=$(pkg-config --libs libxml-2.0) + + LIBXSLT_PREFIX=/usr LIBXML_PREFIX=/usr LIBXSLT_LIBS="${xsltlibs}" LIBXML_LIBS="${xmllibs}" ./configure --prefix=/usr + + make + make DESTDIR="${pkgdir}" install + mkdir -p $pkgdir/usr/share/licenses/$pkgname + cp Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING + ln -s /usr/bin/xml ${pkgdir}/usr/bin/xmlstarlet +} diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index a7f25c7bb..68fe8b673 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -2,22 +2,18 @@ pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 -pkgdesc="This package conflicts with every unfree package known to date." +pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free." arch=('any') url="https://parabolagnulinux.org" -license=('GPL') +license=('GPL3') groups=('base') install=${pkgname}.install -source=() -md5sums=() -noextract=() +source=(https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt) build() { cd ${srcdir} - wget http://repo.parabolagnulinux.org/docs/blacklist.txt - wget http://repo.parabolagnulinux.org/docs/whitelist.txt install -d ${pkgdir}/usr/share/doc/${pkgname} - install -m644 {black,white}list.txt ${pkgdir}/usr/share/doc/${pkgname}/ + install -m644 blacklist.txt ${pkgdir}/usr/share/doc/${pkgname}/ } package() { @@ -27,3 +23,4 @@ package() { sort -u )) } +md5sums=('980d8ab2f9886d648a700a7a909488d9') -- cgit v1.2.3-54-g00ecf