diff options
53 files changed, 1023 insertions, 412 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 334af537c..e1625893a 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '6e59a1e4b891ca5fa8b03d488fa64e04' + 'bd937981937fd3c7a553fc770236e640' '904835a7af0bc5e88007a94cad7c1d9c' 'f302c931bd85309da9d9792b4cc96467' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 9e32610fc..719c9aa05 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' 'i8042-fix-aliases.patch') md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1' - '6e59a1e4b891ca5fa8b03d488fa64e04' + 'bd937981937fd3c7a553fc770236e640' 'be059d4c29dfd9ac55183133938e9242' 'b7c2805bb287a644c0a303bf7721e534' '44260d2cb1a8b51c119d2ce1f83e457a' diff --git a/libre-multilib/wine-libre/30-win32-aliases.conf b/libre-multilib/wine-libre/30-win32-aliases.conf deleted file mode 100644 index 99ae1f7b8..000000000 --- a/libre-multilib/wine-libre/30-win32-aliases.conf +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <alias binding="same"> - <family>MS Shell Dlg</family> - <accept><family>Microsoft Sans Serif</family></accept> - <default><family>sans-serif</family></default> - </alias> - <alias binding="same"> - <family>MS Shell Dlg 2</family> - <accept><family>Tahoma</family></accept> - <default><family>sans-serif</family></default> - </alias> - - <alias binding="same"> - <family>MS Sans Serif</family> - <prefer><family>Microsoft Sans Serif</family></prefer> - <default><family>sans-serif</family></default> - </alias> -</fontconfig> diff --git a/libre-multilib/wine-libre/PKGBUILD b/libre-multilib/wine-libre/PKGBUILD deleted file mode 100644 index 3aa5bb54a..000000000 --- a/libre-multilib/wine-libre/PKGBUILD +++ /dev/null @@ -1,182 +0,0 @@ -# $Id: PKGBUILD 106809 2014-03-08 10:44:24Z bluewind $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Eduardo Romero <eduardo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> - -_pkgname=wine -pkgname=wine-libre -pkgver=1.7.14 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://prdownloads.sourceforge.net/$_pkgname/$_pkgname-$_pkgbasever.tar.bz2{,.sign} - 30-win32-aliases.conf) -md5sums=('75195349b18f6d4d9ec56b9cfa915160' - 'SKIP' - '1ff4e467f59409272088d92173a0f801') - -pkgdesc="A compatibility layer for running Windows programs, with mesa-libcl support" -url="http://www.winehq.com" -arch=(i686 x86_64) -options=(staticlibs) -license=(LGPL) -install=wine.install -provides=$_pkgname=$pkgver -conflicts=$_pkgname -replaces=$_pkgname - -_depends=( - fontconfig lib32-fontconfig - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxi lib32-libxi - gettext lib32-gettext - freetype2 lib32-freetype2 - glu lib32-glu - libsm lib32-libsm - gcc-libs lib32-gcc-libs - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libpng lib32-libpng - gnutls lib32-gnutls - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libldap lib32-libldap - lcms2 lib32-lcms2 - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - libxcomposite lib32-libxcomposite - mesa lib32-mesa - mesa-libgl lib32-mesa-libgl - mesa-libcl lib32-mesa-libcl - samba - opencl-headers -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - lcms2 lib32-lcms2 - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - libjpeg-turbo lib32-libjpeg-turbo - libxcomposite lib32-libxcomposite - libxinerama lib32-libxinerama - ncurses lib32-ncurses - mesa-libcl lib32-mesa-libcl - cups - samba dosbox -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - _depends=(${_depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/} ${_depends[@]}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - makedepends=(${makedepends[@]} ${_depends[@]}) - provides+=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts+=('bin32-wine' 'wine-wow64') - replaces+=('bin32-wine') -fi - -depends=(${_depends[@]}) - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $_pkgname-$_pkgbasever $_pkgname - - # ncurses fix - sed -i 's|libncurses|libncursesw|g' "$srcdir/$_pkgname/configure" - sed -i 's|lncurses|lncursesw|g' "$srcdir/$_pkgname/configure" - - # Get rid of old build dirs - rm -rf $_pkgname-{32,64}-build - mkdir $_pkgname-32-build - - # These additional CPPFLAGS solve FS#27662 and FS#34195 - export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $_pkgname-64-build - cd "$srcdir/$_pkgname-64-build" - ../$_pkgname/configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --with-x \ - --without-gstreamer \ - --enable-win64 - # Gstreamer was disabled for FS#33655 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$_pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$_pkgname-32-build" - ../$_pkgname/configure \ - --prefix=/usr \ - --with-x \ - --without-gstreamer \ - "${_wine32opts[@]}" - - # These additional flags solve FS#23277 - make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2" -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$_pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$_pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi - - # Font aliasing settings for Win32 applications - install -d "$pkgdir"/etc/fonts/conf.{avail,d} - install -m644 "$srcdir/30-win32-aliases.conf" "$pkgdir/etc/fonts/conf.avail" - ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir/etc/fonts/conf.d/30-win32-aliases.conf" -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/libre-multilib/wine-libre/wine.install b/libre-multilib/wine-libre/wine.install deleted file mode 100644 index 21dda162b..000000000 --- a/libre-multilib/wine-libre/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - #echo "If you are on x86_64, the default WINEARCH will be win64." - #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - #echo "See the Parabola wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} diff --git a/libre/atril-libre/PKGBUILD b/libre/atril-libre/PKGBUILD new file mode 100644 index 000000000..d4b98a231 --- /dev/null +++ b/libre/atril-libre/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> + +_pkgname=atril +pkgname=atril-libre +pkgver=1.8.0 +pkgrel=1 +pkgdesc="Simply a document viewer, with libarchive recommendation" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libsm' 'libspectre' + 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib') +makedepends=('caja' 'djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' + 'perl-xml-parser' 'texlive-bin' 'yelp-tools') +optdepends=('caja: Document Properties extension' + 'djvulibre: DjVu support' + 'libgxps: XPS support' + 'p7zip: cbz and cb7 compressed comic books' + 'texlive-bin: DVI support' + 'libarchive: cbr compressed comic books' + 'yelp: for reading MATE help documents') +replaces=('mate-document-viewer' "$_pkgname") +provides=('mate-document-viewer' "$_pkgname=$pkgver") +conflicts=('mate-document-viewer' "$_pkgname") +options=('!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz") +sha1sums=('8327437ba12df61326b83342cea746d1764727d0') +install=${_pkgname}.install + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${_pkgname} \ + --with-gtk=2.0 \ + --enable-gtk-doc \ + --enable-djvu \ + --enable-dvi \ + --enable-t1lib \ + --enable-pixbuf \ + --enable-comics \ + --enable-xps \ + --enable-introspection \ + --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/mate-document-viewer-libre/mate-document-viewer.install b/libre/atril-libre/atril.install index bf6781f93..bf6781f93 100644 --- a/libre/mate-document-viewer-libre/mate-document-viewer.install +++ b/libre/atril-libre/atril.install diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index c06c8af0b..fd3f3b5ea 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106748 2014-03-07 08:31:10Z jelle $ +# $Id: PKGBUILD 107204 2014-03-14 14:47:48Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.27.0 +pkgver=1.28.0 pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('d30d39d8a63cb77c8fe04b99ef092dd9' +md5sums=('7f435bb4b4613c9a1642ce3a8414392d' 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 8fb7ec8e0..ebfa4796b 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 206208 2014-02-21 18:49:54Z andyrtr $ +# $Id: PKGBUILD 207606 2014-03-12 18:51:05Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.46 +pkgver=1.0.48 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar. provides=("${_pkgname}=${pkgver}" 'foomatic-filters') replaces=("${_pkgname}" 'foomatic-filters') conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('916b30ad3ee1424fa89883410abd7496') +md5sums=('9a879473de978b6fdbd4899f2a455be3') build() { cd $_pkgname-$pkgver diff --git a/libre/engrampa-libre/PKGBUILD b/libre/engrampa-libre/PKGBUILD new file mode 100644 index 000000000..a109e8839 --- /dev/null +++ b/libre/engrampa-libre/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 106530 2014-03-05 20:15:56Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> + +_pkgname=engrampa +pkgname=engrampa-libre +pkgver=1.8.0 +pkgrel=1 +pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed" +url="http://mate-desktop.org" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('bzip2' 'caja' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' 'tar') +makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools') +optdepends=('unar: for RAR uncompression' + 'zip: for ZIP archives' 'unzip: for ZIP archives' + 'p7zip: 7zip compression utility' 'arj: for ARJ archives' + 'yelp: for reading MATE help documents') +replaces=('mate-file-archiver' "$_pkgname") +provides=('mate-file-archiver' "$_pkgname=$pkgver") +conflicts=('mate-file-archiver' "$_pkgname") +options=( '!emptydirs') +groups=('mate-extra') +source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz" + fr-rpm-bsdtar.patch) +sha1sums=('511019cee95568a4951e9da12d8a7282c3f6af65' + '219b05a979bf6f249aaae27964f02345fd81168d') +install=${_pkgname}.install + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + # This patch 'depends' on libarchive + patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${_pkgname} \ + --with-gtk=2.0 \ + --disable-static \ + --disable-packagekit + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/mate-file-archiver-libre/mate-file-archiver.install b/libre/engrampa-libre/engrampa.install index bf6781f93..bf6781f93 100644 --- a/libre/mate-file-archiver-libre/mate-file-archiver.install +++ b/libre/engrampa-libre/engrampa.install diff --git a/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch b/libre/engrampa-libre/fr-rpm-bsdtar.patch index 93a783176..93a783176 100644 --- a/libre/mate-file-archiver-libre/fr-rpm-bsdtar.patch +++ b/libre/engrampa-libre/fr-rpm-bsdtar.patch diff --git a/libre/grub/09_parabola b/libre/grub/09_parabola index 49cbad4ba..90a9062a3 100644 --- a/libre/grub/09_parabola +++ b/libre/grub/09_parabola @@ -2,8 +2,9 @@ ## ## grub-mkconfig helper script specific to Parabola GNU/Linux-libre -## Contributed by "Keshav Padram Amburay" <the ddoott ridikulus ddoott rat aatt geemmayil ddoott ccoomm> +## Contributed by "Keshav Amburay" <the ddoott ridikulus ddoott rat aatt geemmayil ddoott ccoomm> ## Rebranded for Parabola by "André Silva" <emulatorman@parabola.nu> +## Updated on 08 February 2014 ## ## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script ## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream @@ -65,20 +66,29 @@ CLASS="--class parabola --class gnu-linux --class gnu --class os" [[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" -BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null)" +BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)" BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" -ROOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/" 2>/dev/null)" -ROOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/" 2>/dev/null)" -ROOT_PART_FS="$(${grub_probe} --target="fs" "/" 2>/dev/null)" - -if [[ "${ROOT_PART_FS_UUID}" == "${BOOT_PART_FS_UUID}" ]]; then - SUBDIR="/boot" -else - SUBDIR="" -fi +ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)" +ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")" if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then + + case "${ROOT_PART_FS}" in + btrfs) + rootsubvol="$(make_system_path_relative_to_its_root /)" + rootsubvol="${rootsubvol#/}" + if [[ "${rootsubvol}" != "" ]]; then + GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}" + fi + ;; + zfs) + rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)" + bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")" + GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + ;; + esac + if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ @@ -95,6 +105,10 @@ for _KERNEL_ in ${list} ; do echo "Found linux image: ${_KERNEL_}" >&2 + basename="$(basename "${_KERNEL_}")" + dirname="$(dirname "${_KERNEL_}")" + REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")" + _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" @@ -107,6 +121,7 @@ for _KERNEL_ in ${list} ; do cat << EOF menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { + $(save_default_entry) if [ x\$feature_all_video_module = xy ]; then insmod all_video fi @@ -118,9 +133,9 @@ menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} fi echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...' - initrd ${SUBDIR}/${_INITRAMFS_} + initrd ${REAL_DIR}/${_INITRAMFS_} } EOF @@ -135,6 +150,7 @@ EOF cat << EOF menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { + $(save_default_entry) if [ x\$feature_all_video_module = xy ]; then insmod all_video fi @@ -146,9 +162,9 @@ menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} fi echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...' - initrd ${SUBDIR}/${_INITRAMFS_FALLBACK_} + initrd ${REAL_DIR}/${_INITRAMFS_FALLBACK_} } EOF @@ -158,6 +174,7 @@ EOF cat << EOF menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { + $(save_default_entry) if [ x\$feature_all_video_module = xy ]; then insmod all_video fi @@ -169,7 +186,7 @@ menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLA search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} fi echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${SUBDIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} } EOF diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index df6956f96..ecf9bade2 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -15,7 +15,7 @@ _UNIFONT_VER="6.3.20131217" pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.02.beta2 -pkgrel=1.1 +pkgrel=2.1 epoch="1" url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') @@ -53,7 +53,7 @@ md5sums=('SKIP' '728b7439ac733a7c0d56049adec364c7' 'SKIP' 'e506ae4a9f9f7d1b765febfa84e10d48' - 'd272e5fa811859838cfb60cc656d66ed' + '9f67330f2979a153acb32af706e0c094' 'be55eabc102f2c60b38ed35c203686d6' '52d374e0194e3f2e39ff7c92ecd58a6c' 'b23a144b7001c88734b79ed3bec491c4') diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 8cf3ce164..82d82e8dd 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 205811 2014-02-10 13:07:22Z heftig $ +# $Id: PKGBUILD 207667 2014-03-12 23:35:44Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gst-plugins-bad pkgname=$_pkgname-libre pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 2958425b2..ead094736 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 202895 2013-12-28 22:46:10Z bpiotrowski $ +# $Id: PKGBUILD 207669 2014-03-12 23:48:57Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') pkgver=0.10.23 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus' 'git' 'spandsp' 'celt') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 77d324667..b39575e9c 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -7,8 +7,8 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.14.1 -pkgrel=2 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)" +pkgrel=2.1 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') @@ -37,6 +37,28 @@ md5sums=('11eb45f3d3edf1f03887fd13afc61b51' prepare() { cd $_pkgname-$pkgver + + echo "Removing printers not supported with free drivers from the database" + + # based on http://devel.trisquel.info/gitweb/?p=package-helpers.git;a=blob_plain;f=helpers/make-hplip;hb=refs/heads/toutatis revision 4 + # keep header license + sed '/\[/,99999d' data/models/models.dat > mktemp + + for model in $(grep '\[' data/models/models.dat | /bin/sed 's/\[//; s/\]//'); do + sed -n "/\[$model\]/,/^$/p;" data/models/models.dat > mktemp1 + grep '^download=True' -q mktemp1 && continue + grep '^plugin=1' -q mktemp1 && continue + grep '^support-type=0' -q mktemp1 && continue + cat mktemp1 >> mktemp + done + + sed -i 's/plugin=2/plugin=0/g' mktemp + + cp mktemp data/models/models.dat + + rm -v mktemp{,1} + + echo "Preparing source" export PYTHON=python2 diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 084e9a5a3..732537aa8 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106436 2014-03-03 06:35:51Z spupykin $ +# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.16 +pkgver=2.6.8.17 pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('03c72e88e22a392174a395cb3563f0fa') +md5sums=('11a37854aeda9eae8de3a822633a369d') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index a5914ba56..4cc94a66e 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -4,7 +4,7 @@ # We're getting this from Debian Sid _debname=icedove _debver=24.3.0 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,7 +31,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" ${_pkgname}.desktop) options=(!emptydirs) md5sums=('cbf58e11a8eb1ded01167fa927ce9cc0' - 'a8ef513d211c60bd2e77810c10a3c25c' + '36df0b60bd80a0097783b432a895ca13' 'c46cf2a671c8fdefcabd4c87e38f3d40' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 329546c29..87a1964d3 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106436 2014-03-03 06:35:51Z spupykin $ +# $Id: PKGBUILD 106974 2014-03-11 09:44:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.16 +pkgver=2.6.8.17 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('03c72e88e22a392174a395cb3563f0fa') +md5sums=('11a37854aeda9eae8de3a822633a369d') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/mate-document-viewer-libre/PKGBUILD b/libre/mate-document-viewer-libre/PKGBUILD deleted file mode 100644 index 969c335b2..000000000 --- a/libre/mate-document-viewer-libre/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer : Martin Wimpress <code@flexion.org> - -_pkgname=mate-document-viewer -pkgname=mate-document-viewer-libre -pkgver=1.6.2 -pkgrel=2 -pkgdesc="Simply a document viewer, with libarchive recommendation" -url="http://mate-desktop.org" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -depends=('dconf' 'dbus' 'desktop-file-utils' 'gtk2' 'libmatekeyring' 'libsm' - 'libspectre' 'mate-desktop' 'mate-icon-theme' 'poppler-glib' 'zlib') -makedepends=('djvulibre' 'gobject-introspection' 'libgxps' 'mate-common' - 'mate-doc-utils' 'mate-file-manager' 'perl-xml-parser' 'texlive-bin') -optdepends=('djvulibre: DjVu support' - 'libgxps: XPS support' - 'mate-file-manager: Document Properties extension' - 'p7zip: cbz and cb7 compressed comic books' - 'texlive-bin: DVI support' - 'libarchive: cbr compressed comic books') -options=('!emptydirs') -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz") -sha1sums=('295a59e7b7babd86f42eebb2a9ac5405dd7b2997') -install=${_pkgname}.install - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${_pkgname} \ - --enable-gtk-doc \ - --enable-djvu \ - --enable-dvi \ - --enable-t1lib \ - --enable-pixbuf \ - --enable-comics \ - --enable-introspection \ - --disable-static \ - --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s atril "${pkgdir}/usr/bin/mate-document-viewer" -} diff --git a/libre/mate-file-archiver-libre/PKGBUILD b/libre/mate-file-archiver-libre/PKGBUILD deleted file mode 100644 index 80711e259..000000000 --- a/libre/mate-file-archiver-libre/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer : Martin Wimpress <code@flexion.org> - -_pkgname=mate-file-archiver -pkgname=mate-file-archiver-libre -pkgver=1.6.2 -pkgrel=1 -pkgdesc="Archive manipulator for MATE, with unar recommendation included and nonfree unace recommendation removed" -url="http://mate-desktop.org" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver -depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive' - 'mate-file-manager' 'tar') -makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser') -optdepends=('arj: for ARJ support' - 'p7zip: for 7zip support' - 'unar: for RAR extract support' - 'unzip: for ZIP extract support' - 'zip: for ZIP support') -options=('!emptydirs') -groups=('mate-extra') -source=("http://pub.mate-desktop.org/releases/1.6/${_pkgname}-${pkgver}.tar.xz" - fr-rpm-bsdtar.patch) -sha1sums=('58a0f7d78dabd627a3a2b3352fabcba20d72aa92' - '219b05a979bf6f249aaae27964f02345fd81168d') -install=${_pkgname}.install - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - # This patch 'depends' on libarchive - patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch" -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/${_pkgname} \ - --disable-static \ - --disable-scrollkeeper \ - --disable-packagekit - mate-doc-prepare --force - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index 78104354f..97c3bde0f 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97188 2013-09-15 08:42:21Z schuay $ +# $Id: PKGBUILD 106934 2014-03-10 18:30:38Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Ray Powell <ray_al@xphoniexx.net> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ _pkgname=mcomix pkgname=mcomix-libre pkgver=1.00 -pkgrel=5.1 +pkgrel=6 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar recommendation" arch=('any') url="http://sourceforge.net/projects/mcomix/" @@ -18,7 +18,8 @@ conflicts=('mcomix' 'comix') replaces=('mcomix' 'comix') provides=("mcomix=${pkgver}") install='mcomix.install' -source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2") +source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2" + 'zoom.patch') build() { cd ${srcdir}/${_pkgname}-${pkgver} @@ -31,6 +32,10 @@ build() { do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done + + # Fix zoom in, zoom out keyboard shortcuts: + # https://sourceforge.net/p/mcomix/bugs/62/ + patch -Np1 < ${srcdir}/zoom.patch } package() { @@ -47,4 +52,5 @@ package() { install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas } -md5sums=('3a916dd9da17043ab59ccd17e26eb932') +md5sums=('3a916dd9da17043ab59ccd17e26eb932' + 'c80705bf6f132bfba20dcb84b79c9cb7') diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install index c33c1d5a1..82047a202 100644 --- a/libre/mcomix-libre/mcomix.install +++ b/libre/mcomix-libre/mcomix.install @@ -14,6 +14,7 @@ pre_upgrade() { } post_upgrade() { + echo 'In case of any issues with zoom keybindings, delete ~/.config/mcomix/keybindings.conf.' post_install $1 } diff --git a/libre/mcomix-libre/zoom.patch b/libre/mcomix-libre/zoom.patch new file mode 100644 index 000000000..26dc3ba6f --- /dev/null +++ b/libre/mcomix-libre/zoom.patch @@ -0,0 +1,17 @@ +diff --git a/mcomix-1.00/mcomix/event.py b/mcomix-1.00-mod/mcomix/event.py +index bc8cf79..bf80ec2 100644 +--- a/mcomix/event.py ++++ b/mcomix/event.py +@@ -117,8 +117,11 @@ class EventHandler: + + # Zooming commands for manual zoom mode + manager.register('zoom in', +- ['equal'], ++ ['plus', 'KP_Add', 'equal'], + self._window.actiongroup.get_action('zoom_in').activate) ++ manager.register('zoom out', ++ ['minus', 'KP_Subtract'], ++ self._window.actiongroup.get_action('zoom_out').activate) + # Zoom out is already defined as GTK menu hotkey + manager.register('zoom original', + ['KP_0'], diff --git a/libre/python2-ply/PKGBUILD b/libre/python2-ply/PKGBUILD deleted file mode 100644 index fec80926a..000000000 --- a/libre/python2-ply/PKGBUILD +++ /dev/null @@ -1,16 +0,0 @@ -# Contributor: Marcin "avalan" Falkiewicz <avalatron@gmail.com> -# Maintainer: C Anthony Risinger <anthony@xtfx.me> - -pkgname='python2-ply' -pkgver=3.4 -pkgrel=1 -pkgdesc='Implementation of lex and yacc parsing tools for Python.' -arch=('any') -url='http://www.dabeaz.com/ply/' -license=('BSD') -depends=('python2') -makedepends=('python2-distribute') -source=("${url}ply-${pkgver}.tar.gz") -md5sums=('ffdc95858819347bf92d7c2acc074894') - -build() { cd "ply-${pkgver}"; python2 setup.py install --root="${pkgdir}"; } diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 404843c67..6df239440 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200613 2013-11-29 21:10:52Z andyrtr $ +# $Id: PKGBUILD 207625 2014-03-12 22:46:29Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ pkgname=texlive-bin-libre pkgver=2013.30973 -pkgrel=7.1 +pkgrel=8 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index d3dc06cb1..e56677d76 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -4,16 +4,16 @@ pkgname=texlive-core-libre _pkgname=texlive-core -pkgver=2013.31589 +pkgver=2013.33063 _revnr=${pkgver#2013.} -pkgrel=1.2 +pkgrel=1 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)" license=('GPL') arch=(any) depends=('texlive-bin' 'perl') optdepends=( 'ruby: for old ConTeXT MkII and epspdf' - 'tk: for texdoctk' + 'perl-tk: for texdoctk' 'python2: for dviasm' 'ghostscript: for epstopdf, epspdf and other ConTeXt tools' 'psutils: to manipulate the output of dvips' @@ -30,6 +30,7 @@ noextract=("$_pkgname-$pkgver-src.zip") source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.tar.xz" "$_pkgname.maps" "texmf.cnf" + "texmfcnf.lua" "09-texlive-fonts.conf") options=(!strip) install=texlive.install @@ -45,10 +46,11 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/web2c/mktex.cnf \ etc/texmf/xdvi/XDvi) -mkmd5sums=('80c7fa3db1b468f9043c6acdd941a526') -md5sums=('ce7c019db21ce546d6d7f1df4bc247fe' - '306ab28bb9b070fc3e40d86d28ea7e8e' +mkmd5sums=('7e11e1bf401d0a152ac50ef48d676bb3') +md5sums=('7f276d14c0d715704b1acbc195e72fe6' + '8b998b0944a766abeb1ff8ca53029084' 'd5a3f442ec3b7aa1518170f64f9d006b' + '16ad4dc53deb00029baef1b01ba1d984' '393a4bf67adc7ca5df2b386759d1a637') mksource() { @@ -168,8 +170,8 @@ package() { # 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-dist/web2c/texmf.cnf - # fix location of TEXMFCACHE for luatools - sed -i 's#texlive2013#texlive#' "$pkgdir"/usr/share/texmf-dist/web2c/texmfcnf.lua + # replace upstream texmfcnf.lua with ours + install -m644 "$srcdir"/texmfcnf.lua "$pkgdir"/usr/share/texmf-dist/web2c/texmfcnf.lua ## remove aleph from fmtutil.cnf sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil.cnf diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core-libre/texlive-core.maps index 8d86bfad1..46f598907 100644 --- a/libre/texlive-core-libre/texlive-core.maps +++ b/libre/texlive-core-libre/texlive-core.maps @@ -21,7 +21,17 @@ Map qzc.map Map tabvar.map Map troff-updmap.map Map txfonts.map +Map uag.map +Map ubk.map +Map ucr.map +Map uhv.map +Map unc.map +Map upl.map +Map usy.map +Map utm.map Map utopia.map +Map uzc.map +Map uzd.map MixedMap ccpl.map MixedMap cm-super-t1.map MixedMap cm-super-t2a.map diff --git a/libre/texlive-core-libre/texmfcnf.lua b/libre/texlive-core-libre/texmfcnf.lua new file mode 100644 index 000000000..4409692be --- /dev/null +++ b/libre/texlive-core-libre/texmfcnf.lua @@ -0,0 +1,190 @@ +-- public domain + +-- ConTeXt needs a properly expanded TEXMFLOCAL, so here is a +-- bit of lua code to make that happen + +local texmflocal = resolvers.prefixes.selfautoparent(); +texmflocal = string.gsub(texmflocal, "20%d%d$", "texmf-local"); + +return { + + type = "configuration", + version = "1.1.0", + date = "2012-05-24", + time = "12:12:12", + comment = "ConTeXt MkIV configuration file", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + + content = { + + -- Originally there was support for engines and progname but I don't expect + -- other engines to use this file, so first engines were removed. After that + -- if made sense also to get rid of progname. At some point specific formats + -- will be supported but then as a subtable with fallbacks, which sounds more + -- natural. Also, at some point the paths will become tables. For the moment + -- I don't care too much about it as extending is easy. + + variables = { + + -- The following variable is predefined (but can be overloaded) and in + -- most cases you can leve this one untouched. The built-in definition + -- permits relocation of the tree. + -- + -- TEXMFCNF = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}" + -- + -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is: + -- + -- TEXMFCNF = { + -- "selfautoparent:/texmf-local", + -- "selfautoparent:/texmf-local/web2c", + -- "selfautoparent:/texmf-dist", + -- "selfautoparent:/texmf/web2c", + -- "selfautoparent:", + -- } + + -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live + + TEXMFSYSVAR = "/var/lib/texmf", + TEXMFVAR = "home:.texlive/texmf-var", + + -- We have only one cache path but there can be more. The first writable one + -- will be chosen but there can be more readable paths. + + TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR", + TEXMFCONFIG = "home:.texlive/texmf-config", + + -- I don't like this texmf under home and texmf-home would make more + -- sense. One never knows what installers put under texmf anywhere and + -- sorting out problems will be a pain. But on the other hand ... home + -- mess is normally under the users own responsibility. + -- + -- By using prefixes we don't get expanded paths in the cache __path__ + -- entry. This makes the tex root relocatable. + + TEXMFOS = "selfautodir:share", + TEXMFDIST = "selfautodir:share/texmf-dist", + + TEXMFLOCAL = texmflocal, + TEXMFSYSCONFIG = "/etc/texmf", + TEXMFFONTS = "selfautoparent:texmf-fonts", + TEXMFPROJECT = "selfautoparent:texmf-project", + + TEXMFHOME = "home:texmf", + -- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf", + + -- We need texmfos for a few rare files but as I have a few more bin trees + -- a hack is needed. Maybe other users also have texmf-platform-new trees. + + TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}", + + TEXFONTMAPS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//", + ENCFONTS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//", + VFFONTS = ".;$TEXMF/fonts/{data,vf}//", + TFMFONTS = ".;$TEXMF/fonts/{data,tfm}//", + T1FONTS = ".;$TEXMF/fonts/{data,type1}//;$OSFONTDIR", + AFMFONTS = ".;$TEXMF/fonts/{data,afm}//;$OSFONTDIR", + TTFONTS = ".;$TEXMF/fonts/{data,truetype}//;$OSFONTDIR", + OPENTYPEFONTS = ".;$TEXMF/fonts/{data,opentype}//;$OSFONTDIR", + CMAPFONTS = ".;$TEXMF/fonts/cmap//", + FONTFEATURES = ".;$TEXMF/fonts/{data,fea}//;$OPENTYPEFONTS;$TTFONTS;$T1FONTS;$AFMFONTS", + FONTCIDMAPS = ".;$TEXMF/fonts/{data,cid}//", + OFMFONTS = ".;$TEXMF/fonts/{data,ofm,tfm}//", + OVFFONTS = ".;$TEXMF/fonts/{data,ovf,vf}//", + + TEXINPUTS = ".;$TEXMF/tex/{context,plain/base,generic}//", + MPINPUTS = ".;$TEXMF/metapost/{context,base,}//", + + -- In the next variable the inputs path will go away. + + TEXMFSCRIPTS = ".;$TEXMF/scripts/context/{lua,ruby,python,perl}//;$TEXINPUTS", + PERLINPUTS = ".;$TEXMF/scripts/context/perl", + PYTHONINPUTS = ".;$TEXMF/scripts/context/python", + RUBYINPUTS = ".;$TEXMF/scripts/context/ruby", + LUAINPUTS = ".;$TEXINPUTS;$TEXMF/scripts/context/lua//", + CLUAINPUTS = ".;$SELFAUTOLOC/lib/{context,luatex,}/lua//", + + -- Not really used by MkIV so they might go away. + + BIBINPUTS = ".;$TEXMF/bibtex/bib//", + BSTINPUTS = ".;$TEXMF/bibtex/bst//", + + -- Experimental + + ICCPROFILES = ".;$TEXMF/tex/context/colors/{icc,profiles}//;$OSCOLORDIR", + + -- A few special ones that will change some day. + + FONTCONFIG_FILE = "fonts.conf", + FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf", + + }, + + -- We have a few reserved subtables. These control runtime behaviour. The + -- keys have names like 'foo.bar' which means that you have to use keys + -- like ['foo.bar'] so for convenience we also support 'foo_bar'. + + directives = { + + -- There are a few variables that determine the engines + -- limits. Most will fade away when we close in on version 1. + + ["luatex.expanddepth"] = "10000", -- 10000 + ["luatex.hashextra"] = "100000", -- 0 + ["luatex.nestsize"] = "1000", -- 50 + ["luatex.maxinopen"] = "500", -- 15 + ["luatex.maxprintline"] = " 10000", -- 79 + ["luatex.maxstrings"] = "500000", -- 15000 -- obsolete + ["luatex.paramsize"] = "25000", -- 60 + ["luatex.savesize"] = "50000", -- 4000 + ["luatex.stacksize"] = "10000", -- 300 + + -- A few process related variables come next. + + -- ["system.checkglobals"] = "10", + -- ["system.nostatistics"] = "yes", + ["system.errorcontext"] = "10", + ["system.compile.cleanup"] = "no", -- remove tma files + ["system.compile.strip"] = "yes", -- strip tmc files + + -- The io modes are similar to the traditional ones. Possible values + -- are all, paranoid and restricted. + + ["system.outputmode"] = "restricted", + ["system.inputmode"] = "any", + + -- The following variable is under consideration. We do have protection + -- mechanims but it's not enabled by default. + + ["system.commandmode"] = "any", -- any none list + ["system.commandlist"] = "mtxrun, convert, inkscape, gs, imagemagick, curl, bibtex, pstoedit", + + -- The mplib library support mechanisms have their own + -- configuration. Normally these variables can be left as + -- they are. + + ["mplib.texerrors"] = "yes", + + -- Normally you can leave the font related directives untouched + -- as they only make sense when testing. + + -- ["fonts.autoreload"] = "no", + -- ["fonts.otf.loader.method"] = "table", -- table mixed sparse + -- ["fonts.otf.loader.cleanup"] = "0", -- 0 1 2 3 + + -- In an edit cycle it can be handy to launch an editor. The + -- preferred one can be set here. + + -- ["pdfview.method"] = "okular", -- default (often acrobat) xpdf okular + + }, + + experiments = { + ["fonts.autorscale"] = "yes", + }, + + trackers = { + }, + + }, + +} diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 70f079049..40ef79a37 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -4,7 +4,7 @@ pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra -pkgver=2013.31570 +pkgver=2013.33010 _revnr=${pkgver#2013.} pkgrel=1 pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages" @@ -22,9 +22,9 @@ source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.t options=('!emptydirs') options=(!strip) install=texlive.install -mkmd5sums=('3f519371dd2e22e5b32daa461b89aea2') -md5sums=('e6b12e482913169f44c54172316416bc' - 'f489cc5f762dcdbe6acb11624de7e138') +mkmd5sums=('4953978642ddcfc90854230b57145b5b') +md5sums=('0e0d06caf88304ed7988f23962f44b2d' + '2ee682ecd2a7defb5f089be09be2ffed') mksource() { mkdir $_pkgname-$pkgver diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps index 852afce52..0b67bca11 100644 --- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps @@ -1,5 +1,7 @@ Map Acorn.map +Map Alegreya.map Map AnnSton.map +Map AnonymousPro.map Map ArrowsADF.map Map ArtNouv.map Map ArtNouvc.map @@ -19,6 +21,7 @@ Map Konanur.map Map Kramer.map Map LibreBaskerville.map Map LibreCaslon.map +Map LobsterTwo.map Map MnSymbol.map Map MorrisIn.map Map Nouveaud.map @@ -32,7 +35,9 @@ Map SourceCodePro.map Map SourceSansPro.map Map Starburst.map Map Typocaps.map +Map XCharter.map Map Zallman.map +Map accanthis.map Map antt.map Map ap.map Map archaicprw.map @@ -64,6 +69,7 @@ Map epigrafica.map Map esvect.map Map fbb.map Map fdsymbol.map +Map fetamont.map Map fge.map Map foekfont.map Map fonetika.map @@ -77,6 +83,7 @@ Map gfscomplutum.map Map gfsdidot.map Map gfsneohellenic.map Map gfssolomos.map +Map gillius.map Map gptimes.map Map hacm.map Map icelandic.map @@ -90,8 +97,14 @@ Map linearA.map Map mathabx.map Map mdbch.map Map mdgreek.map +Map mdici.map +Map mdpgd.map +Map mdpus.map Map mdput.map Map mdsymbol.map +Map mdugm.map +Map merriweather.map +Map mintspirit.map Map newpx.map Map newtx.map Map ocrb.map @@ -108,6 +121,7 @@ Map sansmathaccent.map Map sansmathfonts.map Map sqrcaps.map Map starfont.map +Map stix.map Map superiors.map Map tfrupee.map Map uaq.map diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index cbdc46a12..48756201a 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193983 2013-09-09 12:57:56Z remy $ +# $Id: PKGBUILD 207649 2014-03-12 22:58:16Z remy $ # Maintainer: Firmicus <firmicus āt gmx dōt net> # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ pkgname=texlive-latexextra-libre _pkgname=texlive-latexextra -pkgver=2013.31588 +pkgver=2013.33063 _revnr=${pkgver#2013.} pkgrel=1 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages" @@ -31,8 +31,8 @@ source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.t options=('!emptydirs') options=(!strip) install=texlive.install -mkmd5sums=('7c9755ca4e104089fab816d805990f6f') -md5sums=('7e6ff7b61faf268fe2b814c4949ab364' +mkmd5sums=('ef7a22d455bcf59aee21fc65274df5b8') +md5sums=('f555e017e8157716ead75f3bdc025d58' '9e4825f47dac663dd62c4bfa67899e84') mksource() { diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 2e40800bd..310331198 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin pkgver=1.670 -pkgrel=1 +pkgrel=1.1 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) license=('custom:webmin') diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 5a2df28db..84abd42f2 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 106505 2014-03-05 09:28:28Z spupykin $ +# $Id: PKGBUILD 107003 2014-03-11 11:04:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -12,8 +12,8 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=12.3 _codename=Frodo -pkgrel=11 -pkgdesc="A software media player and entertainment hub for digital media, without unrar support" +pkgrel=12 +pkgdesc="A software media player and entertainment hub for digital media, without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') @@ -41,7 +41,7 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver} "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb') md5sums=('7c71af50af55b097e4365a58b70754e8' - 'b643ab67e4675c6aa88af1857f35baf2' + '03e9a33e15714d1fd1f2a516abea5393' '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784') @@ -60,6 +60,9 @@ prepare() { # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp + + # use addons.xml from Parabola server (without nonfree addons support) + sed -i -e 's|mirrors[.]xbmc[.]org/addons/frodo/addons.xml|repo.parabolagnulinux.org/other/xbmc-libre/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml } build() { diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service index d161a21a8..050460f39 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -1,6 +1,6 @@ [Unit] Description = Starts instance of XBMC using xinit -After = remote-fs.target +After = systemd-user-sessions.service Conflicts=getty@tty7.service [Service] diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD index 5097c1d2c..04356604c 100644 --- a/nonprism/icedove-libre-nonprism/PKGBUILD +++ b/nonprism/icedove-libre-nonprism/PKGBUILD @@ -4,7 +4,7 @@ # We're getting this from Debian Sid _debname=icedove _debver=24.3.0 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -31,7 +31,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" ${_pkgname}.desktop) options=(!emptydirs) md5sums=('cbf58e11a8eb1ded01167fa927ce9cc0' - 'a8ef513d211c60bd2e77810c10a3c25c' + '36df0b60bd80a0097783b432a895ca13' 'c46cf2a671c8fdefcabd4c87e38f3d40' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD index 08b0b3c13..75f98249b 100644 --- a/nonprism/sylpheed-nonprism/PKGBUILD +++ b/nonprism/sylpheed-nonprism/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79630 2012-11-09 11:59:02Z speps $ +# $Id: PKGBUILD 107092 2014-03-12 11:31:06Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,33 +7,32 @@ _pkgname=sylpheed pkgname=sylpheed-nonprism -pkgver=3.3.0 -pkgrel=1.1 +pkgver=3.3.1 +pkgrel=1 pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support" arch=('i686' 'x86_64') url="http://sylpheed.sraoss.jp/en/" license=('GPL') -depends=('gpgme' 'gtkspell' 'desktop-file-utils' 'compface') -makedepends=('openssl') -options=('!libtool') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver +depends=('compface' 'gpgme' 'gtkspell' 'desktop-file-utils') +makedepends=('openssl') install="$_pkgname.install" source=("http://sylpheed.sraoss.jp/$_pkgname/v3.3/$_pkgname-$pkgver.tar.bz2" 'nonprism.patch') -md5sums=('20442f81dbb4e7c59462360ad0bb1afb' +md5sums=('34551fa05722bac80bbe0688bb4a3341' 'e1bddc14962e607cdb899ec082660639') prepare() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver # Remove Gmail support patch -Np1 -i "$srcdir/nonprism.patch" } build() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver ./configure --prefix=/usr \ --enable-ldap make @@ -43,7 +42,7 @@ build() { } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver make DESTDIR="$pkgdir/" install # Install Attachment-Tool Plug-in diff --git a/pcr/expac-relative/PKGBUILD b/pcr/expac-relative/PKGBUILD new file mode 100644 index 000000000..4f25e926b --- /dev/null +++ b/pcr/expac-relative/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 87501 2013-04-02 00:06:04Z dreisner $ +# Maintainer: Dave Reisner <d@falconindy.com> +# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> + +_pkgname=expac +pkgname=expac-relative +pkgver=3 +pkgrel=1 +pkgdesc="pacman database extraction utility, with dbpath and config options support" +arch=('i686' 'x86_64' 'mips64el') +url="http://github.com/falconindy/expac" +license=('GPL') +conflicts=$_pkgname +provides=$_pkgname +depends=('pacman') +makedepends=('perl') +source=("http://code.falconindy.com/archive/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig} + 'add-options-dbpath-and-config.patch') +md5sums=('2f53f9663b69948a4a8bb03c1aa435a5' + 'SKIP' + '30539a5f7d1acbebb393535ae8ecf570') + +prepare() { + cd "$_pkgname-$pkgver" + + patch -Np1 -i "$srcdir/add-options-dbpath-and-config.patch" + + sed '/\*\//q' expac.c >LICENSE +} + +build() { + cd "$_pkgname-$pkgver" + + make +} + +package() { + cd "$_pkgname-$pkgver" + + make PREFIX=/usr DESTDIR="$pkgdir" install + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" +} + +# vim: ft=sh syn=sh diff --git a/pcr/expac-relative/add-options-dbpath-and-config.patch b/pcr/expac-relative/add-options-dbpath-and-config.patch new file mode 100644 index 000000000..100fbb31d --- /dev/null +++ b/pcr/expac-relative/add-options-dbpath-and-config.patch @@ -0,0 +1,196 @@ +From cc0135f30893b719d34845c088e215900962d8dd Mon Sep 17 00:00:00 2001 +From: Esteban Carnevale <alfplayer@mailoo.org> +Date: Sat, 8 Feb 2014 17:49:10 -0300 +Subject: [PATCH] add options dbpath and config + +--- + README.pod | 12 +++++++++++ + expac.c | 72 +++++++++++++++++++++++++++++++++++++++++--------------------- + 2 files changed, 60 insertions(+), 24 deletions(-) + +diff --git a/README.pod b/README.pod +index 8e51329..ba27281 100644 +--- a/README.pod ++++ b/README.pod +@@ -24,6 +24,18 @@ a query string (in the case of a search), or in repo/package syntax when the + + =over 4 + ++=item B<-b, --dbpath> <path> ++ ++Specify an alternative database location (a typical default is ++/var/lib/pacman). This should not be used unless you know what you are doing. ++NOTE: if specified, this is an absolute path and the root path is not ++automatically prepended. ++ ++=item B<-c, --config> <file> ++ ++Specify an alternate configuration file (a typical default is ++/etc/pacman.conf). ++ + =item B<-Q, --query> + + Search the local database for provided targets. This is the default behavior. +diff --git a/expac.c b/expac.c +index ae3ef6d..3f9b0ba 100644 +--- a/expac.c ++++ b/expac.c +@@ -36,6 +36,8 @@ + #include <time.h> + + #define DEFAULT_DELIM "\n" ++#define DEFAULT_DBPATH "/var/lib/pacman" ++#define DEFAULT_CONFIGFILE "/etc/pacman.conf" + #define DEFAULT_LISTDELIM " " + #define DEFAULT_TIMEFMT "%c" + #define FORMAT_TOKENS "BCDEGLMNOPRSVabdhmnprsuvw%" +@@ -58,10 +60,13 @@ bool local = false; + bool groups = false; + bool localpkg = false; + char humansize = 'B'; ++char dbtype = NULL; + const char *format = NULL; + const char *timefmt = NULL; + const char *listdelim = NULL; + const char *delim = NULL; ++const char *dbpath = NULL; ++const char *configfile = NULL; + int pkgcounter = 0; + + typedef const char *(*extractfn)(void*); +@@ -154,7 +159,7 @@ static alpm_handle_t *alpm_init(void) { + char line[PATH_MAX]; + char *ptr, *section = NULL; + +- handle = alpm_initialize("/", "/var/lib/pacman", &alpm_errno); ++ handle = alpm_initialize("/", dbpath, &alpm_errno); + if (!handle) { + alpm_strerror(alpm_errno); + return NULL; +@@ -162,9 +167,9 @@ static alpm_handle_t *alpm_init(void) { + + db_local = alpm_get_localdb(handle); + +- fp = fopen("/etc/pacman.conf", "r"); ++ fp = fopen(configfile, "r"); + if (!fp) { +- perror("fopen: /etc/pacman.conf"); ++ fprintf(stderr, "fopen:%s\n", configfile); + return handle; + } + +@@ -209,6 +214,8 @@ static void usage(void) { + " Options:\n" + " -Q, --local search local DB (default)\n" + " -S, --sync search sync DBs\n" ++ " -b, --dbpath <path> alternative database location (default: /var/lib/pacman)\n" ++ " -c, --config <path> alternative configuration file (default: /etc/pacman.conf)\n" + " -s, --search search for matching regex\n" + " -g, --group return packages matching targets as groups\n" + " -H, --humansize <size> format package sizes in SI units (default: bytes)\n" +@@ -222,41 +229,43 @@ static void usage(void) { + "For more details see expac(1).\n"); + } + +-static int parse_options(int argc, char *argv[], alpm_handle_t *handle) { ++static int parse_options(int argc, char *argv[]) { + int opt, option_index = 0; + const char *i; + + static struct option opts[] = { +- {"readone", no_argument, 0, '1'}, +- {"delim", required_argument, 0, 'd'}, +- {"listdelim", required_argument, 0, 'l'}, +- {"group", required_argument, 0, 'g'}, +- {"help", no_argument, 0, 'h'}, +- {"file", no_argument, 0, 'p'}, +- {"humansize", required_argument, 0, 'H'}, +- {"query", no_argument, 0, 'Q'}, +- {"sync", no_argument, 0, 'S'}, +- {"search", no_argument, 0, 's'}, +- {"timefmt", required_argument, 0, 't'}, +- {"verbose", no_argument, 0, 'v'}, ++ {"readone", no_argument, 0, '1'}, ++ {"delim", required_argument, 0, 'd'}, ++ {"dbpath", required_argument, 0, 'b'}, ++ {"configfile", required_argument, 0, 'c'}, ++ {"listdelim", required_argument, 0, 'l'}, ++ {"group", required_argument, 0, 'g'}, ++ {"help", no_argument, 0, 'h'}, ++ {"file", no_argument, 0, 'p'}, ++ {"humansize", required_argument, 0, 'H'}, ++ {"query", no_argument, 0, 'Q'}, ++ {"sync", no_argument, 0, 'S'}, ++ {"search", no_argument, 0, 's'}, ++ {"timefmt", required_argument, 0, 't'}, ++ {"verbose", no_argument, 0, 'v'}, + {0, 0, 0, 0} + }; + +- while (-1 != (opt = getopt_long(argc, argv, "1l:d:gH:hf:pQSst:v", opts, &option_index))) { ++ while (-1 != (opt = getopt_long(argc, argv, "1l:d:b:c:gH:hf:pQSst:v", opts, &option_index))) { + switch (opt) { + case 'S': +- if (dblist) { ++ if (dbtype) { + fprintf(stderr, "error: can only select one repo option (use -h for help)\n"); + return 1; + } +- dblist = alpm_list_copy(alpm_get_syncdbs(handle)); ++ dbtype = 's'; + break; + case 'Q': +- if (dblist) { ++ if (dbtype) { + fprintf(stderr, "error: can only select one repo option (use -h for help)\n"); + return 1; + } +- dblist = alpm_list_add(dblist, db_local); ++ dbtype = 'q'; + local = true; + break; + case '1': +@@ -265,6 +274,12 @@ static int parse_options(int argc, char *argv[], alpm_handle_t *handle) { + case 'd': + delim = optarg; + break; ++ case 'b': ++ dbpath = optarg; ++ break; ++ case 'c': ++ configfile = optarg; ++ break; + case 'g': + groups = true; + break; +@@ -719,14 +734,23 @@ int main(int argc, char *argv[]) { + alpm_handle_t *handle; + alpm_list_t *results = NULL, *i; + ++ ret = parse_options(argc, argv); ++ if (ret != 0) { ++ goto finish; ++ } ++ ++ dbpath = dbpath ? dbpath : DEFAULT_DBPATH; ++ configfile = configfile ? configfile : DEFAULT_CONFIGFILE; ++ + handle = alpm_init(); + if (!handle) { + return ret; + } + +- ret = parse_options(argc, argv, handle); +- if (ret != 0) { +- goto finish; ++ if (dbtype == 's') { ++ dblist = alpm_list_copy(alpm_get_syncdbs(handle)); ++ } else if (dbtype == 'q') { ++ dblist = alpm_list_add(dblist, db_local); + } + + /* ensure sane defaults */ +-- +1.9.0 + + diff --git a/pcr/tryton/PKGBUILD b/pcr/tryton/PKGBUILD new file mode 100644 index 000000000..bca68fbf0 --- /dev/null +++ b/pcr/tryton/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +# Contributor: Florian Walch <florian.walch@gmx.at> +pkgname=tryton +pkgver=3.0.1 +_pkgdir=3.0 +pkgrel=2 +pkgdesc="A three-tiers high-level general purpose application platform (client application)" +arch=('any') +url="http://www.tryton.org/" +license=('GPL3') +depends=('python2>=2.4' 'gtk2' 'pygtk>=2.0' 'librsvg' 'python2-dateutil') +optdepends=('python2-pytz: timezone support') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz" + 'tryton.desktop') +md5sums=('96f1c2619e011f8660b177fb8651f064' + '7ca15ad6c790c78817fe1a1b6a2c3fcf') + +build() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir + install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/pcr/tryton/tryton.desktop b/pcr/tryton/tryton.desktop new file mode 100644 index 000000000..19ad39b4d --- /dev/null +++ b/pcr/tryton/tryton.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Tryton +GenericName=Client of the Tryton application platform +Icon=/usr/share/pixmaps/tryton/tryton-icon.png +Exec=/usr/bin/tryton +Type=Application +Categories=Office;Finance; + diff --git a/pcr/trytond-carrier/PKGBUILD b/pcr/trytond-carrier/PKGBUILD new file mode 100644 index 000000000..c4827cac0 --- /dev/null +++ b/pcr/trytond-carrier/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-carrier +_pkgname=trytond_carrier +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The carrier module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("f1c0c88d3e3ab4f2955a252125090eb7") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-product-price-list/PKGBUILD b/pcr/trytond-product-price-list/PKGBUILD new file mode 100644 index 000000000..bc55f3e7b --- /dev/null +++ b/pcr/trytond-product-price-list/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-product-price-list +_pkgname=trytond_product_price_list +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The product_price_list module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-product>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("d220b8f8693368fe17688ddeda92aaa8") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-purchase/PKGBUILD b/pcr/trytond-purchase/PKGBUILD new file mode 100644 index 000000000..5b0042cb0 --- /dev/null +++ b/pcr/trytond-purchase/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-purchase +_pkgname=trytond_purchase +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The purchase module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-invoice>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-stock>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("83da5c8fce0588ca6077e1adb21d15d9") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-sale-invoice-grouping/PKGBUILD b/pcr/trytond-sale-invoice-grouping/PKGBUILD new file mode 100644 index 000000000..8606d43e2 --- /dev/null +++ b/pcr/trytond-sale-invoice-grouping/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-sale-invoice-grouping +_pkgname=trytond_sale_invoice_grouping +pkgver=3.0.1 +_pkgdir=3.0 +pkgrel=2 +pkgdesc="The sale_invoice_grouping module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-party>=3.0' 'trytond-account-invoice>=3.0' 'trytond-sale>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("aef313cc4465536e7c4c925514bbdc3f") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-sale-opportunity/PKGBUILD b/pcr/trytond-sale-opportunity/PKGBUILD new file mode 100644 index 000000000..c2702eb4b --- /dev/null +++ b/pcr/trytond-sale-opportunity/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-sale-opportunity +_pkgname=trytond_sale_opportunity +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The sale_opportunity module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-sale>=3.0' 'trytond-stock>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("08a104e969fa638f265e427260756dfd") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-sale-price-list/PKGBUILD b/pcr/trytond-sale-price-list/PKGBUILD new file mode 100644 index 000000000..f0d501e9a --- /dev/null +++ b/pcr/trytond-sale-price-list/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-sale-price-list +_pkgname=trytond_sale_price_list +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The sale_price_list module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-party>=3.0' 'trytond-product-price-list>=3.0' 'trytond-sale>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("aad1178622b585285bd24964926a1326") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-sale-shipment-cost/PKGBUILD b/pcr/trytond-sale-shipment-cost/PKGBUILD new file mode 100644 index 000000000..723ebfc11 --- /dev/null +++ b/pcr/trytond-sale-shipment-cost/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-sale-shipment-cost +_pkgname=trytond_sale_shipment_cost +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The sale_shipment_cost module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-account-invoice>=3.0' 'trytond-carrier>=3.0' 'trytond-currency>=3.0' 'trytond-sale>=3.0' 'trytond-stock>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("031f6c3decc0f8918527b324c3674238") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-sale-supply-drop-shipment/PKGBUILD b/pcr/trytond-sale-supply-drop-shipment/PKGBUILD new file mode 100644 index 000000000..2c8acf5e5 --- /dev/null +++ b/pcr/trytond-sale-supply-drop-shipment/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-sale-supply-drop-shipment +_pkgname=trytond_sale_supply_drop_shipment +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The sale_supply_drop_shipment module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-purchase>=3.0' 'trytond-sale>=3.0' 'trytond-sale-supply>=3.0' 'trytond-stock>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("3c7ace69223264f6a06ee2a5393bdb3e") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-sale-supply/PKGBUILD b/pcr/trytond-sale-supply/PKGBUILD new file mode 100644 index 000000000..031c2ca85 --- /dev/null +++ b/pcr/trytond-sale-supply/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-sale-supply +_pkgname=trytond_sale_supply +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The sale_supply module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-purchase>=3.0' 'trytond-sale>=3.0' 'trytond-stock>=3.0' 'trytond-stock-supply>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("806c0c542375cd2f9883352c544b2411") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-sale/PKGBUILD b/pcr/trytond-sale/PKGBUILD new file mode 100644 index 000000000..f6ac99044 --- /dev/null +++ b/pcr/trytond-sale/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-sale +_pkgname=trytond_sale +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The sale module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-invoice>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-stock>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("87b25a8af9d592a903a071031bd5f2e9") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file diff --git a/pcr/trytond-stock-supply/PKGBUILD b/pcr/trytond-stock-supply/PKGBUILD new file mode 100644 index 000000000..6f65cfc8d --- /dev/null +++ b/pcr/trytond-stock-supply/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Robin Baumgartner <robin@baumgartners.ch> +pkgname=trytond-stock-supply +_pkgname=trytond_stock_supply +pkgver=3.0.0 +_pkgdir=3.0 +pkgrel=3 +pkgdesc="The stock_supply module of the Tryton application platform" +arch=('any') +url='http://www.tryton.org/' +license=('GPL3') +groups=('trytond-modules') +depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0' 'trytond-purchase>=3.0' 'trytond-stock>=3.0') +makedepends=('python2-distribute') +source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz") +md5sums=("19b178ba0b6d42cc64e09577113edf88") + +build() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py build +} + +package() { + cd $srcdir/$_pkgname-$pkgver + python2 setup.py install --root=$pkgdir +}
\ No newline at end of file |