diff options
127 files changed, 3765 insertions, 1455 deletions
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index e1c4b66ca..639ac47ca 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94704 2013-07-29 09:56:29Z seblu $ +# $Id: PKGBUILD 98871 2013-10-20 22:53:38Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') pkgver=1.3.11 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://bird.network.cz/' license=('GPL2') @@ -13,8 +13,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') md5sums=('8ad2eb997fb8251bc5b24cf32619571b' - '01360e3b71ff2ed2223e87a3176e0659' - 'b895b473cbc98cfd54751f737536eb1e') + '69221e063a3f07dcad519d5eeacaae75' + '5b172bd052b523efd95ee018e891e181') build() { cd $pkgbase-$pkgver diff --git a/community/bird/bird.service b/community/bird/bird.service index faee0d845..c2e2572bf 100644 --- a/community/bird/bird.service +++ b/community/bird/bird.service @@ -3,7 +3,8 @@ Description=BIRD routing daemon After=network.target [Service] -ExecStart=/usr/bin/bird -d +Type=forking +ExecStart=/usr/bin/bird ExecReload=/usr/bin/birdc configure ExecStop=/usr/bin/birdc down diff --git a/community/bird/bird6.service b/community/bird/bird6.service index d852fb52c..b7fed8637 100644 --- a/community/bird/bird6.service +++ b/community/bird/bird6.service @@ -3,7 +3,8 @@ Description=BIRD IPv6 routing daemon After=network.target [Service] -ExecStart=/usr/bin/bird6 -d +Type=forking +ExecStart=/usr/bin/bird6 ExecReload=/usr/bin/birdc6 configure ExecStop=/usr/bin/birdc6 down diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 658301efe..4d0c78a55 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97976 2013-10-02 13:30:38Z spupykin $ +# $Id: PKGBUILD 98903 2013-10-21 10:04:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.1.7 -pkgrel=2 +pkgrel=3 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime' 'libzdb' 'mhash' 'libevent') diff --git a/community/echoping/PKGBUILD b/community/echoping/PKGBUILD index 8aa171a71..6a7177ad2 100644 --- a/community/echoping/PKGBUILD +++ b/community/echoping/PKGBUILD @@ -2,7 +2,7 @@ pkgname=echoping pkgver=6.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="tests performance of a remote host by sending HTTP, TCP and UDP requests" arch=('i686' 'x86_64') url="http://echoping.sourceforge.net/" diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 8e23f7412..94899af37 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 85342 2013-03-01 10:29:55Z andrea $ +# $Id: PKGBUILD 98932 2013-10-21 13:19:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader pkgver=0.99.4 -pkgrel=2 +pkgrel=3 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64') url="http://www.fbreader.org/" license=('GPL') -depends=('fribidi' 'bzip2' 'curl' 'qt4' 'liblinebreak' 'sqlite') +depends=('fribidi' 'bzip2' 'curl' 'qt4' 'libunibreak' 'sqlite') makedepends=('ccache') source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz) md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d') @@ -19,7 +19,6 @@ build() { export UI_TYPE=qt4 export TARGET_STATUS=release cd $srcdir/fbreader-$pkgver - sed -i 's|-lunibreak|-llinebreak|g' makefiles/config.mk zlibrary/text/Makefile make ZLSHARED=no MOC=/usr/bin/moc-qt4 } diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD deleted file mode 100644 index 2639d3686..000000000 --- a/community/freeorion/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 98802 2013-10-18 22:43:31Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Elmo Todurov <todurov@gmail.com> -# Contributor: guini <sidtrun@googlemail.com> -# Contributor: Forrest Loomis <cybercyst@gmail.com> -# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: fana-m <geminin@gmx.net> - -pkgname=freeorion -pkgver=0.4.3 -pkgrel=3 -_svnrev=6281 #6454 -_pyversion=2.7 -pkgdesc='Turn-based galactic conquest game inspired by Master of Orion' -arch=('x86_64' 'i686') -url='http://www.freeorion.org/' -license=('GPL2') -if [ "$CARCH" == "x86_64" ] -then - depends=('lib32-nvidia-cg-toolkit') -else - depends=('nvidia-cg-toolkit') -fi -depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl') -makedepends=('boost' 'ogre=1.8.1' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl' - 'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' - 'libogg' 'addinclude') -options=('!strip' '!emptydirs') -install=$pkgname.install -source=("$pkgname.sh" - "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png" - 'cmake_python.patch' - "$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/") -sha256sums=('25b574af5397226373e24510ce59de94c5df5b31d94562fc0de387fd70731707' - 'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f' - '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a' - 'SKIP') - -prepare() { - cd "$pkgname" - - svn up -r "$_svnrev" - - # CMake/Python fix... - patch -N -p1 -i "$srcdir/cmake_python.patch" - - # Generate desktop shortcut - gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" - - # Add missing includes - addinclude -n GG/GG/adobe/once.hpp '#include <stdint.h>' - addinclude -n GG/GG/adobe/closed_hash.hpp '#include <stdint.h>' -} - -build() { - cd "$pkgname" - - # Generating makefiles - cmake \ - -DPYTHON_INCLUDE_DIR:PATH="/usr/include/python$_pyversion" \ - -DPYTHON_LIBRARY:FILEPATH="/usr/lib/libpython$_pyversion.so" \ - -G "Unix Makefiles" - - # GLU fix - if [ "$CARCH" == "x86_64" ] - then - setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \ - "'-march=native -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU -rpath=/usr/lib '" - fi - - # Compiling - make -j1 - - # OGRE fix - sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \ - "$srcdir/$pkgname/ogre_plugins.cfg" -} - -package() { - cd "$pkgname" - - # Binaries - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion" - install -Dm755 freeorion "$pkgdir/usr/bin/freeorion.elf" - install -Dm755 freeorionca "$pkgdir/usr/bin/freeorionca" - install -Dm755 freeoriond "$pkgdir/usr/bin/freeoriond" - - # Data - install -d "$pkgdir/usr/share/$pkgname" - install -d "$pkgdir/usr/lib/$pkgname" - cp -r default "$pkgdir/usr/share/$pkgname" - install -Dm644 OISInput.cfg "$pkgdir/usr/share/$pkgname/OISInput.cfg" - - # Desktop shortcut and icon - install -Dm644 "$pkgname.desktop" \ - "$pkgdir/usr/share/applications/freeorion.desktop" - install -Dm644 "$srcdir/$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/freeorion.png" - - # OGRE plugin configuration - install -Dm644 "$srcdir/$pkgname/ogre_plugins.cfg" \ - "$pkgdir/usr/share/freeorion/ogre_plugins.cfg" - - # Documentation - install -Dm644 loki_setup/README.txt \ - "$pkgdir/usr/share/doc/$pkgname/README.txt" - - # Cleanup - find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf -} - -# vim:set ts=2 sw=2 et: diff --git a/community/freeorion/cmake_python.patch b/community/freeorion/cmake_python.patch deleted file mode 100644 index b875fa844..000000000 --- a/community/freeorion/cmake_python.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/client/AI/CMakeLists.txt 2012-09-10 00:11:18.659341865 +0200 -+++ b/client/AI/CMakeLists.txt 2012-09-10 00:12:37.659345189 +0200 -@@ -33,6 +33,20 @@ - find_package(PythonLibs) - if (PYTHONLIBS_FOUND) - include_directories(${PYTHON_INCLUDE_PATH}) -+ SET(_VERSION_REGEX -+ "^#define[ \t]+PY([A-Z_]*_VERSION)[ \t]+[\"]*([0-9A-Za-z\\.]+)[\"]*[ \t]*$") -+ FILE(STRINGS "${PYTHON_INCLUDE_DIR}/patchlevel.h" _VERSION_STRINGS -+ LIMIT_COUNT 10 REGEX ${_VERSION_REGEX}) -+ FOREACH(_VERSION_STRING ${_VERSION_STRINGS}) -+ STRING(REGEX REPLACE ${_VERSION_REGEX} "PYTHON\\1" -+ _VERSION_VARIABLE "${_VERSION_STRING}") -+ STRING(REGEX REPLACE ${_VERSION_REGEX} "\\2" -+ _VERSION_NUMBER "${_VERSION_STRING}") -+ SET(${_VERSION_VARIABLE} ${_VERSION_NUMBER}) -+ ENDFOREACH(_VERSION_STRING ${_VERSION_STRINGS}) -+ IF(PYTHON_MAJOR_VERSION EQUAL 3) -+ MESSAGE(FATAL_ERROR "Python 3 is not supported!") -+ ENDIF() - else () - message(FATAL_ERROR " library not found.") - endif () diff --git a/community/freeorion/freeorion.install b/community/freeorion/freeorion.install deleted file mode 100644 index ad97d7bab..000000000 --- a/community/freeorion/freeorion.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/freeorion/freeorion.sh b/community/freeorion/freeorion.sh deleted file mode 100644 index 9f35e7032..000000000 --- a/community/freeorion/freeorion.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh -# -# written by Markus Sinner, http://psitronic.de -# -# Nightly builds on. -# http://freeorion.psitronic.de/download/nightly/ -# -# This is a wrapper-script for starting FreeOrion on -# ix86 (and maybe x64) Linux Systems. -# This script will CD into application and set some -# enviroment variables. - -# ---- commandline PARAMETERS and ENVIROMENT variables ----- -# This script supports parameters, that will be evaluated -# BEFORE freeorion binary is called and will be removed, -# because the binary won't support them. -# Currently only one parameter at a time is supported! -# Parameters other than these will be appended as command -# line parameters to the call of the freeorion binary. -# -# --strace -# This starts freeorion using the "strace" utility. -# Generates a strace logifle /tmp/freeorion.trace. -# Make sure it is installed on your system! -# --gdb -# Runs freeorion in a gdb instance, passes the original -# parameters through the --args parameter of gdb -# -# -# ENVIROMENT variables -# This script supports some enviroment variables. To set them -# either use the followin command BEFORE you execute this script. -# export XXXX="value" -# This permanently set the variable in you current shell script. -# Or you prepend the options when running this script, like this: -# PARAM1="hello" PARAM2="yo man" /usr/bin/freeorion.elf -# -# Supportet are: -# FO_TRACE= -# Use this to prepend something to calling freorion. -# This variables also is used internally, when --gdb or --trace -# appear on the command line. -# FO_GDB_ARGS= -# If you use --gbd, you should uses this env to add GDB parameters. -# Make sure you end this list of parameters with --args, otherwise -# gdb won't start. Example: FO_GDB_ARGS="-q -s fo.symbols --args" -# LD_LIBRARY_PATH= -# This is a well known env and will be honored by this script. -# - - -# ---------- STARTS HERE --------------- -# Change into application directory -# If this is a symlink, then we -# need to change into the dir of symlink-target. -if [ -h $0 ]; then - #echo "I am Symlink. Following into my targets basedir" - ME=`readlink $0` -else - #echo "Following into my basedir" - ME=$0 -fi - -# This is important! Script won't work outside its installation dir -ROOT=/usr/share/freeorion -cd ${ROOT} -#echo -n "CWD: " -pwd - - - -# Check for python. If freeorionca binary is missing it, use -# the shipped version. -if ldd /usr/bin/freeorionca | grep "libpython.*not found"; then - #echo "python2.5 missing. Using shipped version." - PYTHON_USE_SHIPPED=1 -else - #echo "python2.5 found. Using it." - PYTHON_USE_SHIPPED=0 -fi - -# Set Python library home for loading modules -# If no python 2.5 is detected, use shipped python 2.5 -if [ "$PYTHON_USE_SHIPPED" = "1" ]; then - export PYTHONHOME=/usr/lib/freeorion/python2.5 - export PYTHONPATH=${PYTHONHOME} - export PYTHONDEBUG=1 - export PYTHONVERBOSE=1 - #echo "PYTHONHOME=${PYTHONHOME}" - - export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH} - export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so -fi - - -# Command line Parameter --gdb forces running in gdb -# Setting FO_TRACE to gdb results in other settings, see -# below -if [ "$1" = "--gdb" ]; then - FO_TRACE="gdb" - - # Don't forget to remove the param - shift -fi - -if [ "$1" = "--strace" ]; then - TRACEFILE=/tmp/freeorion.trace - echo - echo "Tracing to ${TRACEFILE}" - echo - FO_TRACE="strace -f -o ${TRACEFILE}" - - # Don't forget to remove the param - shift -fi - - - -# Add a parameter FO_GDB_ARGS to support gdb -# Or warn the user, if he changed FO_GDB_ARGS and has -# forgotten to end it with --args -if [ "$FO_TRACE" = "gdb" ]; then - if [ "$FO_GDB_ARGS" = "" ]; then - FO_GDB_ARGS="--args" - else - echo "****************************************************" - echo "** NOTE NOTE NOTE NOTE **" - echo "Running FO in gdb" - echo "If you use FO_GDB_ARGS on your command line, make" - echo "sure that you END this variabble with --args." - echo "Otherwise gdb will not start." - echo - echo "Type 'start' when the gdb instance has loaded!" - echo - fi -fi - - -# Support loading libs from application/lib -export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH} - -# Call with settings-dir to avoid conflicting installations -${FO_TRACE} ${FO_GDB_ARGS} /usr/bin/freeorion.elf --resource-dir ./default $@ diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD deleted file mode 100644 index 101ade4d5..000000000 --- a/community/gigi/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 95912 2013-08-18 17:24:22Z svenstaro $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: fana-m <geminin@gmx.net> -# Contributor: Andrzej Giniewicz <gginiu@gmail.com> -# Contributor: Manuel Gaul <inkaine@hotmail.com> - -pkgname=gigi -pkgver=6142 -pkgrel=3 -pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)' -#url='http://gigi.sourceforge.net/' -url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/' -arch=('x86_64' 'i686') -license=('LGPL') -depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl') -#https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ -source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/") -sha256sums=('SKIP') - -pkgver() { - cd "$pkgname" - - svnversion | tr -d [A-z] -} - -prepare() { - cd "$pkgname" - - setconf cmake/GiGiOgre.pc.in prefix /usr - setconf cmake/GiGi.pc.in prefix /usr - setconf cmake/GiGiSDL.pc.in prefix /usr -} - -build() { - cd "$pkgname" - - cmake \ - -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \ - -D BUILD_TUTORIALS=OFF \ - -D CPACK_GENERATOR=GiGiDevel \ - -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \ - . - make -j1 -} - -package() { - cd "$pkgname" - - make install - mv -v "$srcdir/pkg/usr" "$pkgdir/" - - # python3 fix - for f in `find "$pkgdir/usr" -name "*.py"`; do - sed -i "s:/env python:/python3:g" "$f" - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD index 8727835f9..7d3e2c7a6 100644 --- a/community/gtkpod/PKGBUILD +++ b/community/gtkpod/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 90342 2013-05-11 16:17:24Z tomegun $ +# $Id: PKGBUILD 98959 2013-10-21 17:47:32Z jelle $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod -pkgver=2.1.3 -pkgrel=4 +pkgver=2.1.4 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" license=('GPL') -depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'libwebkit3') +depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'webkitgtk') makedepends=('flex' 'intltool' 'faad2' 'libvorbis') optdepends=('libmp4v2: MP4/h264 support' 'vorbis-tools: OGG support' @@ -21,13 +21,13 @@ install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz" gtkpod-2.1.3-gdl-3.6.patch) -md5sums=('57f04578de6e3262a436ec574422b144' - '94a4cc0b47ba8895c0a51e53e94da517') +md5sums=('66c12ccb529c0f7de9a48a7f0d277c80' + '94a4cc0b47ba8895c0a51e53e94da517') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/gtkpod-2.1.3-gdl-3.6.patch" +# patch -p1 -i "$srcdir/gtkpod-2.1.3-gdl-3.6.patch" sed -i 's#python#python2#' scripts/sync-palm-jppy.py ./configure --prefix=/usr diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD deleted file mode 100644 index b49cbedef..000000000 --- a/community/icewm-utils/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 87991 2013-04-09 21:31:23Z eric $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Dominika Solarz <dominikasolarz@gmail.com> - -pkgname=icewm-utils -pkgver=1.0 - -_mcver=2.1 -_tsver=1.4 -_bgsetver=1.3 -_kedver=1.5 -_woedver=1.8 -_sndcfgver=1.3 -_ccver=2.9 -_cursorscfgver=0.6 -_iconcvtver=1.0 -_rrunver=0.5 -_mergeprefsver=0.5 - -pkgrel=6 -pkgdesc="Suite of tools for IceWM" -arch=(i686 x86_64) -license=("GPL") -url="http://icecc.sourceforge.net/" -depends=('qt3' 'python2') -optdepends=('pyqt3' 'gvim') -source=("http://downloads.sourceforge.net/icecc/icemc-$_mcver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icets-$_tsver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icebgset-$_bgsetver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/iceked-$_kedver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icewoed-$_woedver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icesndcfg-$_sndcfgver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icecc-$_ccver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icecursorscfg-$_cursorscfgver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/iceiconcvt-$_iconcvtver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icerrun-$_rrunver.tar.bz2" - "http://downloads.sourceforge.net/sourceforge/icecc/icemergeprefs-$_mergeprefsver.tar.bz2" - icets-fix-icewmtray-crash.diff) -md5sums=('cb2afc6efaa0f9d77b0119b29d528667' - '1d87c93f5cb27da16c90f47531b7fb21' - '7086b771fc7877369924affc5b5f5e41' - '47761a8dc59880ddda2a00de9cd187f5' - '518f05c02cb24a7e36715ce0d0672c8e' - '2113c524ebbbf38ce7eb174b9997c202' - 'e3ddbb3536941745435f727053816865' - '000ec299a83dbae269f2f335910bd50e' - '64463287b6c535b31cb2823d97bfe299' - 'cea2fd7726b9f01b080e3861d325ec24' - 'b34931566da118e7a14ddcb529e739c6' - '5116da930c0063dd8c478dd8e473b08f') - -build() { - cd $srcdir - # fix default global path to IceWM - for file in icewoed-$_woedver/qcentralwidget.cpp \ - icemc-$_mcver/qcentralwidget.cpp \ - icets-$_tsver/icets.cpp - do - sed -i 's|/usr/local/|/usr/|' $file - done - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python$_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file - done - - (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff) - - cd $srcdir/icemc-$_mcver - qmake-qt3 - make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' - - cd $srcdir/icets-$_tsver - qmake-qt3 - make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' - - cd $srcdir/icebgset-$_bgsetver - qmake-qt3 - make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' - - cd $srcdir/iceked-$_kedver - qmake-qt3 - make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' - - cd $srcdir/icecc-$_ccver - qmake-qt3 - make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' - - cd $srcdir/icesndcfg-$_sndcfgver - qmake-qt3 - make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' - - cd $srcdir/icewoed-$_woedver - qmake-qt3 - make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3' -} - -package() { - mkdir -p $pkgdir/usr/bin - cp $srcdir/icemc-$_mcver/icemc $pkgdir/usr/bin/ - cp $srcdir/icets-$_tsver/icets $pkgdir/usr/bin/ - cp $srcdir/icebgset-$_bgsetver/icebgset $pkgdir/usr/bin/ - cp $srcdir/iceked-$_kedver/iceked $pkgdir/usr/bin/ - cp $srcdir/icecc-$_ccver/icecc $pkgdir/usr/bin/ - cp $srcdir/icesndcfg-$_sndcfgver/icesndcfg $pkgdir/usr/bin/ - cp $srcdir/icewoed-$_woedver/icewoed $pkgdir/usr/bin/ - cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg - cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt - cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs - cp $srcdir/icerrun-$_rrunver/icerrun.py $pkgdir/usr/bin/icerrun - cp $srcdir/icerrun-$_rrunver/icerrrun.py $pkgdir/usr/bin/icerrrun -} diff --git a/community/icewm-utils/icets-fix-icewmtray-crash.diff b/community/icewm-utils/icets-fix-icewmtray-crash.diff deleted file mode 100644 index 3a3b62bcc..000000000 --- a/community/icewm-utils/icets-fix-icewmtray-crash.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ./icets.cpp.orig 2010-03-22 00:42:19.231913625 +1000 -+++ ./icets.cpp 2010-03-22 00:43:34.611221044 +1000 -@@ -311,7 +311,9 @@ - }/* if(bakFile.exists()) */ - - //restart IceWM -- system("pkill -1 icewm"); -+ // Use killall instead of pkill, because pkill kills all icewm processes -+ // like icewmtray - in this case we lost view of running tray apps -+ system("killall -1 icewm"); - }/* setTheme() */ - - /** diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 8bc0b969f..5ec207883 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 98863 2013-10-20 19:57:37Z seblu $ +# $Id: PKGBUILD 98882 2013-10-21 00:55:51Z seblu $ # Maintainer: Sébastien Luttringer pkgname=ipset pkgver=6.20 -pkgrel=1 +pkgrel=2 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' license=('GPL2') depends=('libmnl') backup=("etc/$pkgname.conf") -options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" '01-Fix-configure-failure-when-with-kmod.patch' "$pkgname.service") diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 25791b35d..929d2fc03 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 93008 2013-06-22 07:02:22Z foutrelis $ +# $Id: PKGBUILD 98953 2013-10-21 15:55:33Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached pkgver=1.0.17 -pkgrel=1 +pkgrel=2 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') url="http://libmemcached.org/" license=('GPL') depends=('glibc' 'libsasl' 'libevent') makedepends=('perl' 'memcached' 'python-sphinx') -options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz gcc-4.8.patch) sha256sums=('7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5' diff --git a/community/librsync/PKGBUILD b/community/librsync/PKGBUILD index 5674db504..1e6ab33e8 100644 --- a/community/librsync/PKGBUILD +++ b/community/librsync/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 64645 2012-02-17 13:31:34Z foutrelis $ +# $Id: PKGBUILD 98947 2013-10-21 15:00:15Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: Christoph 'delmonico' Neuroth <delmonico@gmx.net> pkgname=librsync pkgver=0.9.7 -pkgrel=6 +pkgrel=7 pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)" arch=('i686' 'x86_64') url="http://librsync.sourceforge.net/" license=('GPL') depends=('popt' 'zlib' 'bzip2') -options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/librsync/$pkgname-$pkgver.tar.gz lfs-overflow.patch) sha256sums=('6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6' diff --git a/community/libunibreak/PKGBUILD b/community/libunibreak/PKGBUILD new file mode 100644 index 000000000..8c8623f9a --- /dev/null +++ b/community/libunibreak/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 83714 2013-02-04 16:20:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Orivej Desh <smpuj@bk.ru> + +pkgname=libunibreak +pkgver=1.1 +pkgrel=1 +pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24" +arch=("i686" "x86_64") +url="http://vimgadgets.sourceforge.net/libunibreak/" +license=("custom:zlib/libpng") +depends=("glibc") +makedepends=() +replaces=('liblinebreak') +options=("!libtool") +source=("$pkgname-$pkgver.tar.gz::https://github.com/adah1972/libunibreak/archive/libunibreak_${pkgver//./_}.tar.gz") +md5sums=('80c933a03493bd920553c9380aa7f13d') + +build() { + cd "$srcdir/libunibreak-libunibreak_${pkgver//./_}" + ./bootstrap + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/libunibreak-libunibreak_${pkgver//./_}" + make DESTDIR="$pkgdir" install + install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/libunwind/PKGBUILD b/community/libunwind/PKGBUILD index 57cc71112..84ee163ec 100644 --- a/community/libunwind/PKGBUILD +++ b/community/libunwind/PKGBUILD @@ -1,18 +1,17 @@ # $id$ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Maintainer: Sébastien Luttringer # Contributor: Lawrence Lee <valheru@facticius.net> # Contributor: Phillip Marvin <phillip.marvin@gmail.com> # Contributor: keystone <phillip.marvin@gmail.com> pkgname=libunwind pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program' arch=('i686' 'x86_64') url='http://www.nongnu.org/libunwind/' license=('GPL') depends=('glibc' 'xz') -options=(!libtool) source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('fb4ea2f6fbbe45bf032cd36e586883ce') diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index a3846f9fb..c9169eea7 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96810 2013-09-05 18:48:50Z seblu $ +# $Id: PKGBUILD 98972 2013-10-21 20:21:28Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools @@ -9,7 +9,7 @@ pkgname=('linux-tools-meta' 'x86_energy_perf_policy' 'usbip') pkgver=3.11 -pkgrel=1 +pkgrel=2 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -151,7 +151,6 @@ package_x86_energy_perf_policy() { package_usbip() { pkgdesc='An USB device sharing system over IP network' depends=('glib2' 'sysfsutils') - options=('!libtool') pushd linux-$pkgver/drivers/staging/usbip/userspace make install DESTDIR="$pkgdir" diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD index 13d3d93e9..17d9f37db 100644 --- a/community/lksctp-tools/PKGBUILD +++ b/community/lksctp-tools/PKGBUILD @@ -4,13 +4,12 @@ pkgname=lksctp-tools pkgver=1.0.15 -pkgrel=1 +pkgrel=2 pkgdesc='An implementation of the SCTP protocol' arch=('i686' 'x86_64') url='http://lksctp.sourceforge.net/' license=('GPL2' 'LGPL2.1') depends=('bash') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz") md5sums=('d829677541fb41061e7f4d61f8413b07') diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD index 3ac6c659b..1f52e844a 100644 --- a/community/log4cpp/PKGBUILD +++ b/community/log4cpp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89526 2013-04-29 18:41:08Z stativ $ +# $Id: PKGBUILD 98912 2013-10-21 10:46:13Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor : Geraud Le Falher <daureg@gmail.com> pkgname=log4cpp pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." arch=('i686' 'x86_64') url="http://log4cpp.sourceforge.net/" diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD index ac93b46cb..583ac6aac 100644 --- a/community/luasec/PKGBUILD +++ b/community/luasec/PKGBUILD @@ -1,49 +1,59 @@ -# $Id: PKGBUILD 81569 2012-12-24 14:48:29Z spupykin $ +# $Id: PKGBUILD 98944 2013-10-21 14:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.1@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgbase=luasec -pkgname=(lua51-sec) -pkgver=0.4.1 -pkgrel=4 +pkgname=(lua-sec lua51-sec) +pkgver=20131021git +pkgrel=1 pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' arch=('i686' 'x86_64') -url='http://luasec.luaforge.net/' +url='https://github.com/brunoos/luasec/wiki' license=('MIT') -#makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket') -makedepends=('openssl' 'lua51' 'lua51-socket') -source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-$pkgver.tar.gz") -md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12') +makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket' 'git') +source=("luasec::git://github.com/brunoos/luasec.git") +md5sums=('SKIP') build() { - cp -a luasec-$pkgver luasec-$pkgver-51 - msg2 'Building with lua 5.2' - cd luasec-$pkgver - make linux - msg2 'Building with lua 5.1' - cd ../luasec-$pkgver-51 - make INCDIR=-I/usr/include/lua5.1 linux + cp -a luasec luasec-51 + + unset CFLAGS + unset LDFLAGS + + msg2 'Building with lua 5.2' + cd luasec + make linux + + msg2 'Building with lua 5.1' + cd ../luasec-51 + find . -type f -name \*.[ch] -exec sed -i \ + -e 's|include .lua.h.|include "lua5.1/lua.h"|g' \ + -e 's|include .lualib.h.|include "lua5.1/lualib.h"|g' \ + -e 's|include .luaconf.h.|include "lua5.1/luaconf.h"|g' \ + -e 's|include .lauxlib.h.|include "lua5.1/lauxlib.h"|g' \ + {} \; + make linux } -#package_lua-sec() { -# depends=('openssl' 'lua' 'lua-socket') -# -# install -dm755 "$pkgdir/usr/lib/lua/5.2" -# cd luasec-$pkgver -# make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install -# install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -#} +package_lua-sec() { + depends=('openssl' 'lua' 'lua-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.2" + cd luasec + make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} package_lua51-sec() { - depends=('openssl' 'lua51' 'lua51-socket') - conflicts=('luasec') - replaces=('luasec') - - install -dm755 "$pkgdir/usr/lib/lua/5.1" - cd luasec-$pkgver-51 - make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + depends=('openssl' 'lua51' 'lua51-socket') + conflicts=('luasec') + replaces=('luasec') + + install -dm755 "$pkgdir/usr/lib/lua/5.1" + cd luasec-51 + make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=4 sw=4 et: diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD index d659a6086..684566c28 100644 --- a/community/luasocket/PKGBUILD +++ b/community/luasocket/PKGBUILD @@ -1,50 +1,49 @@ -# $Id: PKGBUILD 81274 2012-12-15 15:00:36Z seblu $ +# $Id: PKGBUILD 98942 2013-10-21 14:19:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Anders Bergh <anders1@gmail.com> pkgbase=luasocket -pkgname=(lua51-socket) -pkgver=2.0.2 -pkgrel=5 +pkgname=(lua-socket lua51-socket) +pkgver=3.0rc1 +pkgrel=2 pkgdesc='Networking support library for the Lua language' arch=('i686' 'x86_64') -url='http://www.cs.princeton.edu/~diego/professional/luasocket/' +url='https://github.com/diegonehab/luasocket' license=('MIT') -replaces=('luasocket') -conflicts=('luasocket') makedepends=('lua' 'lua51') -source=("http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz" - 'luasocket-unixsocket.patch') -md5sums=('41445b138deb7bcfe97bff957503da8e' - '8d116bb70bd7a2fa15cbe949d4cfc35e') +source=("$pkgname-$pkgver.tar.gz::https://github.com/diegonehab/luasocket/archive/v${pkgver/rc/-rc}.tar.gz") +md5sums=('08bd2f265b244eb4bf5c2c36bf89b759') build() { -# cp -a luasocket-$pkgver luasocket-$pkgver-52 -# msg2 'Building with lua 5.2' -# pushd luasocket-$pkgver-52 -# patch -Np1 -i "$srcdir/luasocket-unixsocket.patch" -# make -# popd + cp -a luasocket-${pkgver/rc/-rc} luasocket-${pkgver/rc/-rc}-52 + msg2 'Building with lua 5.2' + pushd luasocket-${pkgver/rc/-rc}-52 + make LUAV=5.2 + popd msg2 'Building with lua 5.1' - cd luasocket-$pkgver - patch -Np1 -i "$srcdir/luasocket-unixsocket.patch" - make LUAINC=-I/usr/include/lua5.1 + cd luasocket-${pkgver/rc/-rc} + find . -type f -name \*.[ch] -exec sed -i \ + -e 's|include "lua.h|include "lua5.1/lua.h|g' \ + -e 's|include "lualib.h|include "lua5.1/lualib.h|g' \ + -e 's|include "luaconf.h|include "lua5.1/luaconf.h|g' \ + -e 's|include "lauxlib.h|include "lua5.1/lauxlib.h|g' \ + {} \; + make LUAV=5.1 } -#package_lua-socket() { -# depends=('lua') -# cd luasocket-$pkgver-52 -# make DESTDIR="$pkgdir/" \ -# INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \ -# INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install -# install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -#} +package_lua-socket() { + depends=('lua') + cd luasocket-${pkgver/rc/-rc}-52 + make DESTDIR="$pkgdir/" LUAV=5.2 prefix=/usr install + install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} package_lua51-socket() { depends=('lua51') - cd luasocket-$pkgver - make DESTDIR="$pkgdir/" \ - INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.1' \ - INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.1' install + replaces=('luasocket') + conflicts=('luasocket') + + cd luasocket-${pkgver/rc/-rc} + make DESTDIR="$pkgdir/" LUAV=5.1 prefix=/usr install install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/luasocket/luasocket-unixsocket.patch b/community/luasocket/luasocket-unixsocket.patch deleted file mode 100644 index 07c9401fa..000000000 --- a/community/luasocket/luasocket-unixsocket.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -wbBur luasocket-2.0.2/makefile luasocket-2.0.2.my/makefile ---- luasocket-2.0.2/makefile 2007-10-15 04:21:05.000000000 +0000 -+++ luasocket-2.0.2.my/makefile 2011-03-09 12:00:54.000000000 +0000 -@@ -10,6 +10,8 @@ - INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket - INSTALL_MIME_SHARE=$(INSTALL_TOP_SHARE)/mime - INSTALL_MIME_LIB=$(INSTALL_TOP_LIB)/mime -+# -+INSTALL_UNIX_LIB=$(INSTALL_SOCKET_LIB) - - all clean: - cd src; $(MAKE) $@ -@@ -45,6 +47,8 @@ - #cd src; $(INSTALL_DATA) $(TO_MIME_SHARE) $(INSTALL_MIME_SHARE) - cd src; mkdir -p $(INSTALL_MIME_LIB) - cd src; $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(EXT) -+ cd src; mkdir -p $(INSTALL_UNIX_LIB) -+ cd src; $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_UNIX_LIB)/$(UNIX_SO) - - #------ - # End of makefile -diff -wbBur luasocket-2.0.2/src/makefile luasocket-2.0.2.my/src/makefile ---- luasocket-2.0.2/src/makefile 2007-10-15 04:21:05.000000000 +0000 -+++ luasocket-2.0.2.my/src/makefile 2011-03-09 12:02:25.000000000 +0000 -@@ -47,7 +47,7 @@ - usocket.o \ - unix.o - --all: $(SOCKET_SO) $(MIME_SO) -+all: $(SOCKET_SO) $(MIME_SO) $(UNIX_SO) - - $(SOCKET_SO): $(SOCKET_OBJS) - $(LD) $(LDFLAGS) -o $@ $(SOCKET_OBJS) diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index 9b6bee941..e3e86c036 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 94352 2013-07-22 08:32:55Z seblu $ +# $Id: PKGBUILD 98970 2013-10-21 20:20:39Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64') url='http://www.nongnu.org/oath-toolkit/' license=('GPL3') depends=('glibc' 'pam' 'xmlsec') -options=('!libtool') -source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('456774fbc37d5267e4e8920694b7ad48') +source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('456774fbc37d5267e4e8920694b7ad48' + 'SKIP') build() { cd $pkgname-$pkgver diff --git a/community/opensc/0001-pkcs15-regression-in-e35febe-compute-cert-length.patch b/community/opensc/0001-pkcs15-regression-in-e35febe-compute-cert-length.patch new file mode 100644 index 000000000..057452e1b --- /dev/null +++ b/community/opensc/0001-pkcs15-regression-in-e35febe-compute-cert-length.patch @@ -0,0 +1,114 @@ +From cc5a171ddcc8e49b2252135daac9ad3aa6d66ae7 Mon Sep 17 00:00:00 2001 +From: Viktor Tarasov <viktor.tarasov@gmail.com> +Date: Tue, 25 Dec 2012 20:05:45 +0100 +Subject: [PATCH] pkcs15: regression in e35febe: compute cert length + +parse_x509_cert() reviewed. +Now certificate's DER data are allocated and the DER data length is determined in one place. + +https://github.com/OpenSC/OpenSC/pull/114 +https://github.com/OpenSC/OpenSC/commit/e35febe +--- + src/libopensc/pkcs15-cert.c | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +diff --git a/src/libopensc/pkcs15-cert.c b/src/libopensc/pkcs15-cert.c +index 86bea25..9b08aac 100644 +--- a/src/libopensc/pkcs15-cert.c ++++ b/src/libopensc/pkcs15-cert.c +@@ -34,13 +34,13 @@ + #include "pkcs15.h" + + static int +-parse_x509_cert(sc_context_t *ctx, const u8 *buf, size_t buflen, struct sc_pkcs15_cert *cert) ++parse_x509_cert(sc_context_t *ctx, struct sc_pkcs15_der *der, struct sc_pkcs15_cert *cert) + { + int r; + struct sc_algorithm_id sig_alg; +- struct sc_pkcs15_pubkey * pubkey = NULL; +- u8 *serial = NULL; +- size_t serial_len = 0; ++ struct sc_pkcs15_pubkey *pubkey = NULL; ++ unsigned char *serial = NULL, *buf = der->value; ++ size_t serial_len = 0, data_len = 0, buflen = der->len; + struct sc_asn1_entry asn1_version[] = { + { "version", SC_ASN1_INTEGER, SC_ASN1_TAG_INTEGER, 0, &cert->version, NULL }, + { NULL, 0, 0, 0, NULL, NULL } +@@ -87,30 +87,32 @@ parse_x509_cert(sc_context_t *ctx, const u8 *buf, size_t buflen, struct sc_pkcs1 + if (obj == NULL) + LOG_TEST_RET(ctx, SC_ERROR_INVALID_ASN1_OBJECT, "X.509 certificate not found"); + +- cert->data.len = objlen + (obj - buf); ++ data_len = objlen + (obj - buf); ++ cert->data.value = malloc(data_len); ++ if (!cert->data.value) ++ LOG_FUNC_RETURN(ctx, SC_ERROR_OUT_OF_MEMORY); ++ memcpy(cert->data.value, buf, data_len); ++ cert->data.len = data_len; ++ + r = sc_asn1_decode(ctx, asn1_cert, obj, objlen, NULL, NULL); + LOG_TEST_RET(ctx, r, "ASN.1 parsing of certificate failed"); + + cert->version++; + +- if (pubkey) { +- cert->key = pubkey; +- pubkey = NULL; +- } +- else { ++ if (!pubkey) + LOG_TEST_RET(ctx, SC_ERROR_INVALID_ASN1_OBJECT, "Unable to decode subjectPublicKeyInfo from cert"); +- } ++ cert->key = pubkey; ++ + sc_asn1_clear_algorithm_id(&sig_alg); +- if (r < 0) +- return r; + + if (serial && serial_len) { + sc_format_asn1_entry(asn1_serial_number + 0, serial, &serial_len, 1); + r = sc_asn1_encode(ctx, asn1_serial_number, &cert->serial, &cert->serial_len); + free(serial); ++ LOG_TEST_RET(ctx, r, "ASN.1 encoding of serial failed"); + } + +- return r; ++ return SC_SUCCESS; + } + + +@@ -125,7 +127,7 @@ sc_pkcs15_pubkey_from_cert(struct sc_context *ctx, + if (cert == NULL) + return SC_ERROR_OUT_OF_MEMORY; + +- rv = parse_x509_cert(ctx, cert_blob->value, cert_blob->len, cert); ++ rv = parse_x509_cert(ctx, cert_blob, cert); + + *out = cert->key; + cert->key = NULL; +@@ -158,20 +160,19 @@ sc_pkcs15_read_certificate(struct sc_pkcs15_card *p15card, const struct sc_pkcs1 + return SC_ERROR_OBJECT_NOT_FOUND; + } + +- + cert = malloc(sizeof(struct sc_pkcs15_cert)); + if (cert == NULL) { + free(der.value); + return SC_ERROR_OUT_OF_MEMORY; + } + memset(cert, 0, sizeof(struct sc_pkcs15_cert)); +- if (parse_x509_cert(p15card->card->ctx, der.value, der.len, cert)) { ++ if (parse_x509_cert(p15card->card->ctx, &der, cert)) { + free(der.value); + sc_pkcs15_free_certificate(cert); + return SC_ERROR_INVALID_ASN1_OBJECT; + } ++ free(der.value); + +- cert->data = der; + *cert_out = cert; + return SC_SUCCESS; + } +-- +1.8.4 + diff --git a/community/opensc/PKGBUILD b/community/opensc/PKGBUILD index cabba2e79..269579f1d 100644 --- a/community/opensc/PKGBUILD +++ b/community/opensc/PKGBUILD @@ -1,20 +1,26 @@ -# $Id: PKGBUILD 84027 2013-02-08 13:50:52Z seblu $ +# $Id: PKGBUILD 98897 2013-10-21 07:29:21Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: kevku <kevku@msn.com> pkgname=opensc pkgver=0.13.0 -pkgrel=2 -pkgdesc='Access smart cards that support cryptographic operations' +pkgrel=3 +pkgdesc='Tools and libraries for smart cards' arch=('x86_64' 'i686') -url='http://www.opensc-project.org/opensc/' +url='https://github.com/OpenSC/OpenSC/wiki' license=('LGPL') backup=('etc/opensc.conf') makedepends=('docbook-xsl') depends=('openssl' 'pcsclite' 'libltdl') options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('74a10de6c646bdaae307d6dc9e9accc0') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + '0001-pkcs15-regression-in-e35febe-compute-cert-length.patch') +md5sums=('74a10de6c646bdaae307d6dc9e9accc0' + '49a0989c169decf6876a3a9631289dbc') + +prepare() { + patch -p1 -d $pkgname-$pkgver < 0001-pkcs15-regression-in-e35febe-compute-cert-length.patch +} build() { cd $pkgname-$pkgver diff --git a/community/picocom/PKGBUILD b/community/picocom/PKGBUILD index 6347d05b1..17684fe0b 100644 --- a/community/picocom/PKGBUILD +++ b/community/picocom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75039 2012-08-12 14:06:03Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 98869 2013-10-20 22:35:11Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Jens Adam (byte/jra) <j_adam@web.de> pkgname=picocom pkgver=1.7 -pkgrel=2 +pkgrel=3 pkgdesc='Minimal dumb-terminal emulation program, very much like minicom' url='http://code.google.com/p/picocom/' license=('GPL2') @@ -16,7 +16,7 @@ sha1sums=('bde6e36af71db845913f9d61f28dee1b485218fa') build() { cd $pkgname-$pkgver - make --environment-overrides UUCP_LOCK_DIR=/run/lock/picocom + make UUCP_LOCK_DIR=/run/lock/picocom } package() { @@ -30,4 +30,4 @@ package() { > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/picocom/picocom.install b/community/picocom/picocom.install index 4d2f2ed48..aab48bdc7 100644 --- a/community/picocom/picocom.install +++ b/community/picocom/picocom.install @@ -1,8 +1,8 @@ -#!/bin/sh +# vim:set ts=2 sw=2 ft=sh et: ## arg 1: the new package version post_install() { - type systemd-tmpfiles >/dev/null && systemd-tmpfiles --create picocom.conf + type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create picocom.conf } # arg 1: the new package version @@ -13,7 +13,5 @@ post_upgrade() { ## arg 1: the old package version post_remove() { - type systemd-tmpfiles >/dev/null && systemd-tmpfiles --clean --remove picocom.conf + type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --clean --remove picocom.conf } - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD deleted file mode 100644 index d0bf8fd58..000000000 --- a/community/pyqt3/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 90081 2013-05-06 19:39:12Z foutrelis $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> - -pkgname=pyqt3 -pkgver=3.18.1 -pkgrel=13 -pkgdesc="A set of Python bindings for the Qt3 toolkit" -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.com/software/pyqt/intro" -depends=('python2-sip' 'qscintilla-qt3') -makedepends=('glu') -license=('GPL') -source=("http://downloads.sourceforge.net/project/pyqt/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('f1d120495d1aaf393819e988c0a7bb7e') - -build() { - cd ${srcdir}/PyQt-x11-gpl-${pkgver} - export QTDIR=/usr - export QMAKESPEC=/usr/share/qt3/mkspecs/linux-g++ - echo yes | python2 configure.py -b /usr/bin \ - -d /usr/lib/python2.7/site-packages \ - -v /usr/share/sip \ - INCDIR_QT=/usr/include/qt3 - make CXX="g++ -DANY=void" -} - -package() { - cd ${srcdir}/PyQt-x11-gpl-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index b6919a163..6cffeb967 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97523 2013-09-23 16:15:04Z spupykin $ +# $Id: PKGBUILD 98945 2013-10-21 14:45:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=qcad -pkgver=3.3.1.0 +pkgver=3.3.4.0 pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') @@ -16,17 +16,13 @@ makedepends=('glu') options=(libtool) source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('e6e469482b40515980c416e61482abc2' +md5sums=('ceec731e034aa2e2e9a1f1669ec55e57' '35100eaedbdf6625f6e6a09b177854cd') prepare() { cd ${srcdir}/qcad-$pkgver - sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp - sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp - (cd src/3rdparty && - cp -a qt-labs-qtscriptgenerator-4.8.4 qt-labs-qtscriptgenerator-4.8.5) - (cd src/3rdparty/qt-labs-qtscriptgenerator-4.8.5 && - mv qt-labs-qtscriptgenerator-4.8.4.pro qt-labs-qtscriptgenerator-4.8.5.pro) +# sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp +# sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp } build() { diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD deleted file mode 100644 index 257ea4fb9..000000000 --- a/community/qscintilla-qt3/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 88009 2013-04-09 21:48:46Z eric $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net> - -pkgname=qscintilla-qt3 -pkgver=1.7.1 -pkgrel=4 -pkgdesc="A port to Qt3 of Neil Hodgson's Scintilla C++ editor class" -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/" -license=('GPL2') -depends=('qt3') -source=("http://downloads.sourceforge.net/pyqt/QScintilla-1.71-gpl-$pkgver.tar.gz") -md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a') - -build() { - cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver - cd qt - sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/usr/lib%g" qscintilla.pro - qmake-qt3 qscintilla.pro - sed -i 's|$(QTDIR)/include|/usr/include/qt3|' Makefile - make MOC=/usr/bin/moc-qt3 -} - -package() { - cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt - # installind includes - for i in qextscintilla*.h; do - install -m 644 -D $i "${pkgdir}"/usr/include/qt3/$i - done -} diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD index 815c9d945..d85ed86d5 100644 --- a/community/qtcurve/PKGBUILD +++ b/community/qtcurve/PKGBUILD @@ -1,29 +1,27 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# $Id: PKGBUILD 98877 2013-10-21 00:42:02Z speps $ +# Maintainer : speps <speps at aur dot archlinux dot org> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qtcurve -pkgname=('qtcurve-qt4' 'qtcurve-kde4') -pkgver=1.8.15 -pkgrel=2 +pkgname=('qtcurve-utils' 'qtcurve-gtk2' 'qtcurve-qt4' 'qtcurve-qt5' 'qtcurve-kde4') +pkgver=1.8.17 +pkgrel=1 +pkgdesc='A configurable set of widget styles for KDE and Gtk' arch=('i686' 'x86_64') -groups=('qtcurve') +url='https://github.com/QtCurve/qtcurve' license=('GPL') -pkgdesc='A configurable set of widget styles for KDE and Gtk' -url='https://github.com/QtCurve/qtcurve-qt4' -makedepends=('cmake' 'automoc4' 'kdebase-workspace') +groups=('qtcurve') +makedepends=('cmake' 'automoc4' 'gtk2' 'qt4' 'qt5-svg' 'qt5-x11extras' 'kdebase-workspace') source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -md5sums=('ee0b35fe428807b0dc2b0c57e5eb4f38') +md5sums=('c4f2e9bc296398b42bfc132b88a3b989') build() { - cd "qtcurve-qt4-$pkgver" - - sed -i "s/QApplication/QCoreApplication/g" tools/gen_image_header_qt4.cpp + cd $pkgbase-$pkgver - mkdir build-{qt,kde}4 - - cd build-qt4 + mkdir build{,-kde4} + cd build cmake .. -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DQTC_QT4_ENABLE_KDE=false @@ -31,18 +29,40 @@ build() { cd ../build-kde4 cmake .. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_GTK2=false \ + -DENABLE_QT5=false make } +package_qtcurve-utils() { + depends=('libx11') + cd $pkgbase-$pkgver/build/qtcurve-utils + make DESTDIR="$pkgdir" install +} + +package_qtcurve-gtk2() { + depends=('qtcurve-utils' 'gtk2') + cd $pkgbase-$pkgver/build/gtk2 + make DESTDIR="$pkgdir" install +} + package_qtcurve-qt4() { - depends=('qt4') - cd "qtcurve-qt4-$pkgver/build-qt4/qt4/style" + depends=('qtcurve-utils' 'qt4') + cd $pkgbase-$pkgver/build/qt4 + make DESTDIR="$pkgdir" install +} + +package_qtcurve-qt5() { + depends=('qtcurve-utils' 'qt5-svg' 'qt5-x11extras') + cd $pkgbase-$pkgver/build/qt5 make DESTDIR="$pkgdir" install } package_qtcurve-kde4() { - depends=('kdebase-workspace') - cd "qtcurve-qt4-$pkgver/build-kde4" + depends=('qtcurve-utils' 'kdebase-workspace') + cd $pkgbase-$pkgver/build-kde4/qt4 + make DESTDIR="$pkgdir" install + cd ../po make DESTDIR="$pkgdir" install } diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 2672e91cd..486fbec49 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 96712 2013-09-03 08:11:01Z seblu $ +# $Id: PKGBUILD 98892 2013-10-21 07:13:03Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga pkgver=0.99.22.4 -pkgrel=1 +pkgrel=2 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' license=('GPL2') depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses') -options=('!libtool' '!buildflags') +options=('!buildflags') install=quagga.install source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" 'babeld.service' diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index 36a28fbe6..da1eb29dc 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,39 +1,44 @@ -# $Id: PKGBUILD 96925 2013-09-08 17:54:00Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# $Id: PKGBUILD 98928 2013-10-21 12:34:16Z andrea $ +#Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') pkgver=8.54 -pkgrel=1 -pkgdesc="Framework to provide credential storage and authentication service" +pkgrel=2 arch=('i686' 'x86_64') url="http://code.google.com/p/accounts-sso/" license=('LGPL') -depends=('qt4' 'libproxy') -makedepends=('doxygen' 'graphviz' 'ttf-dejavu') -backup=(etc/signond.conf) -install=$pkgname.install -source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 - use_keyring.patch) +makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'ttf-font') +options=('!emptydirs') +source=("http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2" + 'use_keyring.patch') sha1sums=('a29a12d6fe3747930e94932f6e1b1339b471d108' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') -build() { - cd "$srcdir/$pkgbase-$pkgver" - +prepare() { + cd $pkgbase-$pkgver + # Use gnome-keyring secrets storage if signon-keyring-extension is available patch -Np1 -i "$srcdir/use_keyring.patch" - + # qt4 fix sed -i 's/qdbusxml2cpp/qdbusxml2cpp-qt4/' src/signond/signond.pro +} +build() { + cd $pkgbase-$pkgver qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } package_signon() { - cd "$srcdir/$pkgbase-$pkgver" + pkgdesc="Framework to provide credential storage and authentication service" + depends=('qt4' 'libproxy') + backup=('etc/signond.conf') + install=$pkgname.install + cd $pkgbase-$pkgver make INSTALL_ROOT="$pkgdir" install # Split out documentation @@ -42,10 +47,6 @@ package_signon() { package_signon-doc() { pkgdesc="Developer documention of signon" - depends=() - options=('!emptydirs') - backup=() - install= mkdir -p "$pkgdir/usr/share" mv "$srcdir/doc" "$pkgdir/usr/share" diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD index 5c28092e5..2fad295bf 100644 --- a/community/tellico/PKGBUILD +++ b/community/tellico/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94089 2013-07-14 11:11:38Z jlichtblau $ +# $Id: PKGBUILD 98964 2013-10-21 20:10:32Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ pkgname=tellico pkgver=2.3.8 -pkgrel=1 +pkgrel=2 pkgdesc="A collection manager for KDE" arch=('i686' 'x86_64') url="http://tellico-project.org/" diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 206ad7748..e6d50c882 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 98657 2013-10-16 15:07:26Z andyrtr $ +# $Id: PKGBUILD 98899 2013-10-21 07:30:43Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.18 -pkgrel=9 +pkgver=4.3.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 1c4785678..aead28508 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 98595 2013-10-14 16:58:33Z tpowa $ +# $Id: PKGBUILD 98896 2013-10-21 07:29:04Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.18 -pkgrel=7 +pkgver=4.3.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/xcb-util-cursor/PKGBUILD b/community/xcb-util-cursor/PKGBUILD index 0db7bf4eb..cc94347a8 100644 --- a/community/xcb-util-cursor/PKGBUILD +++ b/community/xcb-util-cursor/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 98637 2013-10-16 01:00:11Z seblu $ +# $Id: PKGBUILD 98879 2013-10-21 00:54:20Z seblu $ # Maintainer: Sébastien Luttringer <seblu at seblu dot net> # Contributor: Bastien Dejean <nihilhill@gmail.com> pkgname=xcb-util-cursor pkgver=0.1.0 -pkgrel=3 +pkgrel=4 pkgdesc='XCB cursor library' arch=('i686' 'x86_64') url='http://cgit.freedesktop.org/xcb/util-cursor' license=('custom:MIT') -options=('!libtool') depends=('libxcb' 'xcb-util-renderutil' 'xcb-util-image') source=("http://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.bz2") md5sums=('40e913aae6fb30a72d423e6bae9a93e9') diff --git a/community/xplc/PKGBUILD b/community/xplc/PKGBUILD index bcd055e00..d7f452021 100644 --- a/community/xplc/PKGBUILD +++ b/community/xplc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64687 2012-02-17 18:35:47Z bluewind $ +# $Id: PKGBUILD 98918 2013-10-21 12:15:57Z bluewind $ # Maintainer: # Contributor: dorphell <dorphell@archlinux.org> pkgname=xplc pkgver=0.3.13 -pkgrel=4 +pkgrel=5 pkgdesc="Cross-Platform Lightweight Components" arch=('i686' 'x86_64') url="http://xplc.sourceforge.net" diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD index 06e0f8cfc..35319964f 100644 --- a/extra/alsa-oss/PKGBUILD +++ b/extra/alsa-oss/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147698 2012-01-27 07:26:45Z tpowa $ +# $Id: PKGBUILD 196918 2013-10-21 07:20:36Z tpowa $ # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-oss pkgver=1.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="OSS compatibility library" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 13be5ebf5..69ea74bbb 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183103 2013-04-17 15:00:29Z jgc $ +# $Id: PKGBUILD 197052 2013-10-21 15:08:54Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util pkgver=1.5.2 -pkgrel=1 +pkgrel=3 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" @@ -18,7 +18,7 @@ build() { cd "${srcdir}/apr-util-${pkgver}" ./configure --prefix=/usr --with-apr=/usr \ --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ - --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap + --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap --disable-static make } diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index e49205cc7..2dcadbdec 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190841 2013-07-18 18:46:16Z jgc $ +# $Id: PKGBUILD 197050 2013-10-21 15:02:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" @@ -20,7 +20,7 @@ build() { ./configure --prefix=/usr --includedir=/usr/include/apr-1 \ --with-installbuilddir=/usr/share/apr-1/build \ --enable-nonportable-atomics \ - --with-devrandom=/dev/urandom + --with-devrandom=/dev/urandom --disable-static make } diff --git a/extra/celt/PKGBUILD b/extra/celt/PKGBUILD index d017bc519..412435658 100644 --- a/extra/celt/PKGBUILD +++ b/extra/celt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176867 2013-02-02 03:18:42Z heftig $ +# $Id: PKGBUILD 196952 2013-10-21 10:52:00Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Lauri Niskanen <ape@ape3000.com> @@ -6,7 +6,7 @@ pkgname=celt pkgver=0.11.3 -pkgrel=1 +pkgrel=2 pkgdesc="Low-latency audio communication codec" arch=(i686 x86_64) url="http://www.celt-codec.org/" @@ -18,7 +18,7 @@ md5sums=('5511732a426cc42bf986ca79b5cdd02f') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-custom-modes + ./configure --prefix=/usr --enable-custom-modes --disable-static make } diff --git a/extra/celt0.5.1/PKGBUILD b/extra/celt0.5.1/PKGBUILD index fa7e927b3..45ac1a735 100644 --- a/extra/celt0.5.1/PKGBUILD +++ b/extra/celt0.5.1/PKGBUILD @@ -5,7 +5,7 @@ pkgname=celt0.5.1 _basename=celt pkgver=0.5.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Low-latency audio communication codec - SPICE version" arch=(i686 x86_64) url="http://www.celt-codec.org" diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD index 98f83cb2c..dc2285f2c 100644 --- a/extra/compface/PKGBUILD +++ b/extra/compface/PKGBUILD @@ -1,28 +1,38 @@ -# $Id: PKGBUILD 137677 2011-09-10 11:50:26Z pierre $ -# Maintainer: simo <simo@archlinux.org> +# $Id: PKGBUILD 197085 2013-10-21 18:34:54Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: simo <simo@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=compface pkgver=1.5.2 -pkgrel=3 +pkgrel=4 pkgdesc="Utils & libs to convert from/to X-Face format." arch=('i686' 'x86_64') url="http://ftp.xemacs.org/pub/xemacs/aux/" license=('custom') depends=('glibc') -source=("$url/$pkgname-$pkgver.tar.gz" 'LICENSE') +source=($url/$pkgname-$pkgver.tar.gz + compface-1.5.2-build.patch + LICENSE) md5sums=('62f4f79c0861ad292ba3cf77b4c48319' + '25874b31f97a53f66ceed54f6b422515' '27a0d5a4d695e68b4d3eebe17db77189') +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ${srcdir}/compface-1.5.2-build.patch +} + build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver + CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make BINDIR=$pkgdir/usr/bin LIBDIR=$pkgdir/usr/lib MANDIR=$pkgdir/usr/share/man \ - INCLUDEDIR=$pkgdir/usr/include install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" STRIP=/bin/true install + install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/extra/compface/compface-1.5.2-build.patch b/extra/compface/compface-1.5.2-build.patch new file mode 100644 index 000000000..b86cdb881 --- /dev/null +++ b/extra/compface/compface-1.5.2-build.patch @@ -0,0 +1,82 @@ +o Build shared library, link tools against it +o Make it possible to prevent stripping +o Add DESTDIR support + +--- Makefile.in~ 2005-10-04 15:59:49.000000000 +0300 ++++ Makefile.in 2006-08-02 22:23:07.000000000 +0300 +@@ -15,6 +15,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + SHELL = /bin/sh ++STRIP = strip + + NAME = compface + UNNAME = uncompface +@@ -25,6 +26,7 @@ + UNEXECUTABLE = $(BINDIR)/$(UNNAMEEXE) + LIBNAME = lib$(NAME).a + LIBRARY = $(LIBDIR)/$(LIBNAME) ++SHLIBNAME = lib$(NAME).so + MAN1DIR = $(MANDIR)/man1 + MAN3DIR = $(MANDIR)/man3 + OBJECTS = arith.o file.o compress.o gen.o uncompface.o +@@ -45,11 +47,11 @@ + + all: $(NAMEEXE) $(UNNAMEEXE) + +-$(NAMEEXE) : cmain.o compface.o $(LIBNAME) +- $(CC) $(LDFLAGS) -o $@ cmain.o compface.o $(LIBNAME) ++$(NAMEEXE) : cmain.o compface.o $(SHLIBNAME) ++ $(CC) $(LDFLAGS) -o $@ cmain.o compface.o -L. -l$(NAME) + +-$(UNNAMEEXE) : uncmain.o $(LIBNAME) +- $(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME) ++$(UNNAMEEXE) : uncmain.o $(SHLIBNAME) ++ $(CC) $(LDFLAGS) -o $@ uncmain.o -L. -l$(NAME) + + $(LIBNAME) : $(OBJECTS) + ar rc $(LIBNAME) $(OBJECTS) +@@ -73,25 +75,28 @@ + tar chzf `cat .fname`.tar.gz `cat .fname` + $(RM) -rf `cat .fname` .fname + +-install: $(NAMEEXE) $(UNNAMEEXE) $(LIBNAME) +- $(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR) +- $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) +- -chmod 0755 $(EXECUTABLE) +- -strip $(EXECUTABLE) +- $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE) +- -chmod 0755 $(UNEXECUTABLE) +- -strip $(UNEXECUTABLE) +- $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1 +- cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1 +- $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3 +- cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3 +- for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done +- $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY) ++install: $(NAMEEXE) $(UNNAMEEXE) $(SHLIBNAME) ++ $(INSTALL_PROGRAM) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN3DIR) $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(DESTDIR)$(EXECUTABLE) ++ -$(STRIP) $(DESTDIR)$(EXECUTABLE) ++ $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(DESTDIR)$(UNEXECUTABLE) ++ -$(STRIP) $(DESTDIR)$(UNEXECUTABLE) ++ $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1 ++ cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1 ++ $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3 ++ cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3 ++ for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done ++ $(INSTALL_PROGRAM) $(srcdir)/$(SHLIBNAME) $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1.0.0 ++ $(LN_S) $(SHLIBNAME).1.0.0 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1 ++ $(LN_S) $(SHLIBNAME).1 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME) + + shar : + shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh + compress $(NAME).sh + ++$(SHLIBNAME): $(OBJECTS) ++ $(CC) -shared -Wl,-soname,$(SHLIBNAME).1 $(LDFLAGS) -o $(SHLIBNAME) $(OBJECTS) ++ + .c.o: + $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< + + diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD index 3e47d8053..8f526087e 100644 --- a/extra/dmapi/PKGBUILD +++ b/extra/dmapi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175121 2013-01-14 07:38:26Z tpowa $ +# $Id: PKGBUILD 196924 2013-10-21 07:25:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=dmapi pkgver=2.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="Data migration API" arch=('i686' 'x86_64') url="http://oss.sgi.com/projects/xfs/" diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 1f145e72b..d6280cc87 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196027 2013-10-07 11:50:40Z jgc $ +# $Id: PKGBUILD 197013 2013-10-21 12:58:51Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=4.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) @@ -12,7 +12,7 @@ arch=(i686 x86_64) depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') optdepends=('evolution-data-server: Evolution integration') -options=(!emptydirs) +options=(!emptydirs !libtool) install=ekiga.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b') diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD index 8f3a78e4c..31220cf8d 100644 --- a/extra/exempi/PKGBUILD +++ b/extra/exempi/PKGBUILD @@ -3,7 +3,7 @@ pkgname=exempi pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library to parse XMP metadata" arch=(i686 x86_64) url="http://libopenraw.freedesktop.org/wiki/Exempi" @@ -17,7 +17,7 @@ md5sums=('0f8e5832299224684a65847eedf8d1e4' build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD index d033c1e3b..f77be22ec 100644 --- a/extra/f2fs-tools/PKGBUILD +++ b/extra/f2fs-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186280 2013-05-23 15:59:36Z tpowa $ +# $Id: PKGBUILD 197003 2013-10-21 12:37:50Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> pkgname=f2fs-tools pkgver=1.1.0_130404 -pkgrel=1 +pkgrel=2 pkgdesc="Tools for Flash-Friendly File System (F2FS)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/f2fs-tools/" diff --git a/extra/freealut/PKGBUILD b/extra/freealut/PKGBUILD index ae34c1a82..2fe418034 100644 --- a/extra/freealut/PKGBUILD +++ b/extra/freealut/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 137589 2011-09-09 23:35:10Z allan $ +# $Id: PKGBUILD 196960 2013-10-21 11:45:38Z heftig $ # Maintainer: # Contributor: Arkamririon <Arkamririon@gmx.net> pkgname=freealut pkgver=1.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="OpenAL Utility Toolkit (ALUT)" arch=('i686' 'x86_64') url="http://www.openal.org" license=("LGPL") depends=('openal') options=('!libtool') -source=(http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$pkgver.tar.gz) +source=(http://pkgs.fedoraproject.org/repo/pkgs/freealut/freealut-1.1.0.tar.gz/e089b28a0267faabdb6c079ee173664a/freealut-1.1.0.tar.gz) md5sums=('e089b28a0267faabdb6c079ee173664a') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD index 66c6d8dda..c8ebac944 100644 --- a/extra/gc/PKGBUILD +++ b/extra/gc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165647 2012-08-28 07:31:01Z jgc $ +# $Id: PKGBUILD 197084 2013-10-21 17:25:02Z jgc $ # Maintainer: Daniel Isenmann <daniel [at] archlinux.org> # Contributor: dorphell <dorphell@gmx.net> pkgname=gc pkgver=7.2.d -pkgrel=1 +pkgrel=2 pkgdesc="A garbage collector for C and C++" arch=('i686' 'x86_64') url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" @@ -16,7 +16,7 @@ md5sums=('91340b28c61753a789eb6077675d87d2') build() { cd "${srcdir}/${pkgname}-7.2" - ./configure --prefix=/usr --enable-cplusplus + ./configure --prefix=/usr --enable-cplusplus --disable-static make } diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD index 3f5ba7f7c..b36efb967 100644 --- a/extra/ghc/PKGBUILD +++ b/extra/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183848 2013-04-28 16:50:01Z td123 $ +# $Id: PKGBUILD 196900 2013-10-21 03:40:08Z td123 $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Special note for devs looking to upgrade this package: @@ -6,6 +6,9 @@ # Libraries depend on versions specified by those hashes. # This implies that all libraries need to be rebuilt when ghc is rebuilt. +# use the following command to print out packages that need to get rebuilt +# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u + pkgname=ghc pkgver=7.6.3 pkgrel=1 @@ -21,6 +24,7 @@ install='ghc.install' # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... #options=('!makeflags') # missing rtl? +options=('staticlibs') provides=('haskell-array=0.4.0.1' 'haskell-base=4.6.0.1' 'haskell-binary=0.5.1.1' diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD index 3a6309dc5..fcfab95d4 100644 --- a/extra/gnome-desktop-sharp/PKGBUILD +++ b/extra/gnome-desktop-sharp/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 144403 2011-12-05 14:57:02Z jgc $ +# $Id: PKGBUILD 197056 2013-10-21 15:20:28Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-desktop-sharp pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp') pkgver=2.26.0 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') license=(LGPL) url="http://gtk-sharp.sourceforge.net" makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.bz2 gnome-desktop-sharp-lib-target.patch) md5sums=('4bc990900bb318b2ba0b0e7998bb47d1' '980cd3adf5e745f4caee0a172a51dcc3') @@ -19,9 +19,9 @@ build() { export MONO_SHARED_DIR="$srcdir/wapi" mkdir -p "$MONO_SHARED_DIR" - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } @@ -34,7 +34,7 @@ package_libgnome-desktop-sharp() { pkgdesc="Mono bindings for libgnome-desktop" depends=('gtk-sharp-2' 'gnome-desktop2') - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make -C gnomedesktop install DESTDIR="$pkgdir" } @@ -42,7 +42,7 @@ package_gtkhtml-sharp() { pkgdesc="Mono bindings for gtkhtml" depends=('gtk-sharp-2' 'gtkhtml') - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make -C gtkhtml install DESTDIR="$pkgdir" } @@ -50,7 +50,7 @@ package_gtksourceview2-sharp() { pkgdesc="Mono bindings for gtksourceview2" depends=('gtk-sharp-2' 'gtksourceview2') - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make -C gtksourceview install DESTDIR="$pkgdir" } @@ -58,7 +58,7 @@ package_rsvg2-sharp() { pkgdesc="Mono bindings for librsvg" depends=('gtk-sharp-2' 'librsvg') - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make -C rsvg install DESTDIR="$pkgdir" } @@ -66,7 +66,7 @@ package_vte-sharp() { pkgdesc="Mono bindings for libvte" depends=('gtk-sharp-2' 'vte') - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make -C vte install DESTDIR="$pkgdir" } @@ -74,6 +74,6 @@ package_wnck-sharp() { pkgdesc="Mono bindings for libwnck" depends=('gtk-sharp-2' 'libwnck') - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make -C wnck install DESTDIR="$pkgdir" } diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD index 7c7d3f940..64e52346a 100644 --- a/extra/gnu-efi-libs/PKGBUILD +++ b/extra/gnu-efi-libs/PKGBUILD @@ -5,7 +5,7 @@ _pkgver="3.0" pkgname="gnu-efi-libs" pkgver="${_pkgver}u" -pkgrel="2" +pkgrel="3" pkgdesc="Library for building UEFI Applications using GNU toolchain" url="http://sourceforge.net/projects/gnu-efi/" license=('GPL') diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD index 621e10490..21c7e46ae 100644 --- a/extra/haskell-http/PKGBUILD +++ b/extra/haskell-http/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh' 'haskell-network=2.4.1.2-1' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options=('staticlibs') md5sums=('94be05278da4e9324aaef6e012e751e2') build() { diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD index c755c10a8..9ff28ad5e 100644 --- a/extra/haskell-mtl/PKGBUILD +++ b/extra/haskell-mtl/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh' 'haskell-transformers=0.3.0.0-4') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options=('staticlibs') md5sums=('943c110524d96126bfa0e61f7df1ebcd') build() { diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD index 70bbb8aa9..0ef09b9b5 100644 --- a/extra/haskell-network/PKGBUILD +++ b/extra/haskell-network/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh' 'haskell-parsec=3.1.3-3') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options=('staticlibs') md5sums=('032075c35dea5d23923af3928f9a5511') build() { diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD index 02ae2aa0e..2b8284f13 100644 --- a/extra/haskell-parsec/PKGBUILD +++ b/extra/haskell-parsec/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options('staticlibs') md5sums=('d72fc94b81153132c61125a1ec52a4a5') build() { diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD index 649d2bd84..ba0c472c3 100644 --- a/extra/haskell-random/PKGBUILD +++ b/extra/haskell-random/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options=('staticlibs') md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') build() { diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD index b50b41af4..da4b5abf7 100644 --- a/extra/haskell-text/PKGBUILD +++ b/extra/haskell-text/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options=('staticlibs') md5sums=('7a469d49a7576fb3a18785cb64d4ee6c') build() { diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD index 94006ab2d..144848401 100644 --- a/extra/haskell-transformers/PKGBUILD +++ b/extra/haskell-transformers/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options=('staticlibs') md5sums=('852dc0b79cc2bcb39136287d3dd385e5') build() { diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD index 2c541b5f3..5175a544f 100644 --- a/extra/haskell-zlib/PKGBUILD +++ b/extra/haskell-zlib/PKGBUILD @@ -11,6 +11,7 @@ arch=('i686' 'x86_64') depends=('ghc=7.6.3-1' 'sh' 'zlib') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install +options=('staticlibs') md5sums=('d0d10786d2bbd1d401a8b28a83e88475') build() { diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD index d558f4974..0511a9769 100644 --- a/extra/htdig/PKGBUILD +++ b/extra/htdig/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 149485 2012-02-08 10:07:38Z pierre $ +# $Id: PKGBUILD 197001 2013-10-21 12:35:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=htdig pkgver=3.2.0b6 -pkgrel=8 +pkgrel=9 pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine" url="http://www.htdig.org/" arch=('i686' 'x86_64') license=('GPL') depends=('openssl') -options=('!libtool' 'emptydirs') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'gcc4.3.patch' 'CVE-2007-6110.patch') @@ -18,11 +17,15 @@ md5sums=('8b9b9587a411ac7dd278fa5413428960' '2aeda683f95b58efc0978d7fe951de59' '0d9099d3b5a32d322a8e0240f85a3578') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/gcc4.3.patch" patch -p1 -i "${srcdir}/CVE-2007-6110.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --mandir=/usr/share/man \ @@ -30,15 +33,15 @@ build() { --with-default-config-file=/etc/htdig/htdig.conf \ --with-database-dir=/var/lib/htdig/db \ --with-cgi-bin-dir=/usr/bin \ - --with-common-dir=/usr/share/doc/htdig \ - --with-search-dir=/usr/share/doc/htdig \ - --with-image-dir=/usr/share/doc/htdig \ + --with-common-dir=/usr/share/doc/htdig \ + --with-search-dir=/usr/share/doc/htdig \ + --with-image-dir=/usr/share/doc/htdig \ --localstatedir=/var/lib/htdig \ --with-ssl make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/hunspell/PKGBUILD b/extra/hunspell/PKGBUILD index a4b178a7e..7967c69f4 100644 --- a/extra/hunspell/PKGBUILD +++ b/extra/hunspell/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 166664 2012-09-15 07:49:23Z andyrtr $ +# $Id: PKGBUILD 197086 2013-10-21 18:34:57Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=hunspell pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Spell checker and morphological analyzer library and program" arch=('i686' 'x86_64') url="http://hunspell.sourceforge.net/" license=('GPL' 'LGPL' 'MPL') depends=('gcc-libs' 'readline') optdepends=('perl: for ispellaff2myspell') -options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz) md5sums=('3121aaf3e13e5d88dfff13fb4a5f1ab8') diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index 2352df7dc..021d15aa7 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ilmbase pkgver=2.0.1 -pkgrel=1 +pkgrel=2 depends=('gcc-libs') pkgdesc="Base libraries from ILM for OpenEXR" arch=(i686 x86_64) diff --git a/extra/iniparser/PKGBUILD b/extra/iniparser/PKGBUILD index 8345a8f79..546ba77a7 100644 --- a/extra/iniparser/PKGBUILD +++ b/extra/iniparser/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 189665 2013-07-04 11:16:11Z tpowa $ +# $Id: PKGBUILD 196933 2013-10-21 07:46:00Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=iniparser pkgver=3.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C" arch=('i686' 'x86_64') url="http://ndevilla.free.fr/iniparser/" license=('MIT') -depends=() +depends=('glibc') makedepends=('chrpath') source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz) md5sums=('0aa4f995468ed390caf323f50a285bc3') diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 5bd2ea109..d241703a7 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194862 2013-09-23 20:40:54Z guillaume $ +# $Id: PKGBUILD 197107 2013-10-21 20:21:18Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,22 +6,22 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 -_updatever=u40 -_icedtea_ver=2.4.2 +_icedtea_ver=2.4.3 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am -_CORBA_CHANGESET=5ea58899ae9f -_JAXP_CHANGESET=135f46e0e653 -_JAXWS_CHANGESET=a2ff16e5361f -_JDK_CHANGESET=4bf5ac86e0e4 -_LANGTOOLS_CHANGESET=06ea051f7ffe -_OPENJDK_CHANGESET=6125b83238df +_JDK_UPDATE_VERSION=45 +_CORBA_CHANGESET=8ed5df839fbc +_JAXP_CHANGESET=8f220f7b51c7 +_JAXWS_CHANGESET=652eb396f959 +_JDK_CHANGESET=7958751eb9ef +_LANGTOOLS_CHANGESET=3c8eb52a32ea +_OPENJDK_CHANGESET=e2f5917da3c1 -_HOTSPOT_CHANGESET=b732355257e3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map +_HOTSPOT_CHANGESET=b59e02d9e72b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap -pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} +pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver} pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" @@ -47,16 +47,16 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('3dab1edc5c0391bd67cfac60cbfb5c91aee6ea9726043252d9f216dfafd236b6' - 'bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b' - '41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8' - '3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde' - 'ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda' - '8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a' - 'd2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735' - '4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36' +sha256sums=('15b1acc1fb43b83ca08d531491261c5eeaea4cad3598300074692acea93bdd3d' + '75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9' + '7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c' + 'cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca' + 'fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518' + '4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe' + '462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91' + 'b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' + '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' 'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8' @@ -123,7 +123,8 @@ package_jre7-openjdk-headless() { pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs" depends=('libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java') optdepends=('libcups: needed for Java Mauve support - libmawt.so' - 'fontconfig: needed for Java Mauve support - libmawt.so') + 'fontconfig: needed for Java Mauve support - libmawt.so' + 'java-rhino: for some JavaScript support') provides=('java-runtime-headless=7') conflicts=('openjdk6') backup=(etc/profile.d/jre.sh diff --git a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff index 22d54fc42..fb4710c13 100644 --- a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff +++ b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -1,16 +1,16 @@ ---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 -+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 -@@ -103,7 +103,8 @@ - COMPIZ_WM = 12, +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2013-10-16 16:17:14.000000000 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2013-10-21 20:57:34.768580842 +0200 +@@ -105,7 +105,8 @@ LG3D_WM = 13, CWM_WM = 14, -- MUTTER_WM = 15; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; + MUTTER_WM = 15, +- MARCO_WM = 16; ++ MARCO_WM = 16, ++ OTHER_NONREPARENTING_WM = 17; public String toString() { switch (WMID) { case NO_WM: -@@ -583,7 +584,7 @@ +@@ -591,7 +592,7 @@ // TODO: according to wikipedia, compiz is now reparenting. This should // probably be updated. static boolean isNonReparentingWM() { @@ -19,7 +19,7 @@ } /* -@@ -771,9 +772,17 @@ +@@ -781,9 +782,17 @@ * supports WIN or _NET wm spec. */ else if (l_net_protocol.active()) { @@ -28,18 +28,18 @@ + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; -+ } ++ } } else if (win.active()) { - awt_wmgr = XWM.OTHER_WM; + if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { + awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; -+ } ++ } } /* * Check for legacy WMs. -@@ -784,6 +793,8 @@ +@@ -794,6 +803,8 @@ awt_wmgr = XWM.MOTIF_WM; } else if (isOpenLook()) { awt_wmgr = XWM.OPENLOOK_WM; @@ -48,7 +48,7 @@ } else { awt_wmgr = XWM.OTHER_WM; } -@@ -1298,6 +1309,7 @@ +@@ -1309,6 +1320,7 @@ res = new Insets(28, 6, 6, 6); break; case NO_WM: diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index 38f0a2dc6..cc23a4cf6 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 195987 2013-10-07 07:06:22Z tpowa $ +# $Id: PKGBUILD 197007 2013-10-21 12:38:24Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 pkgver=2.16.0 -pkgrel=3 +pkgrel=4 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/libaio/PKGBUILD b/extra/libaio/PKGBUILD index 485392608..500097b37 100644 --- a/extra/libaio/PKGBUILD +++ b/extra/libaio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186545 2013-05-28 18:17:04Z tpowa $ +# $Id: PKGBUILD 196999 2013-10-21 12:33:19Z tpowa $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas S Hatch <thatch45 at gmail dot com> pkgname=libaio pkgver=0.3.109 -pkgrel=6 +pkgrel=7 pkgdesc="The Linux-native asynchronous I/O facility (aio) library" arch=('i686' 'x86_64') url="http://lse.sourceforge.net/io/aio.html" diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD index cc60149fd..96a06f643 100644 --- a/extra/libdmtx/PKGBUILD +++ b/extra/libdmtx/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 188766 2013-06-19 20:23:44Z andrea $ +# $Id: PKGBUILD 196974 2013-10-21 12:07:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=libdmtx pkgver=0.7.4 -pkgrel=4 +pkgrel=5 pkgdesc="A software for reading and writing Data Matrix 2D barcodes" url="http://www.libdmtx.org/" arch=('i686' 'x86_64') license=('GPL2') depends=('glibc') -options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('d3a4c0becd92895eb606dbdb78b023e2') diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD index 70b45ca81..104082d0b 100644 --- a/extra/libfs/PKGBUILD +++ b/extra/libfs/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 186578 2013-05-29 15:21:31Z andyrtr $ +# $Id: PKGBUILD 197087 2013-10-21 18:34:58Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libfs pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Font Services Library" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') -options=('!libtool') source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2") sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107') diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD index ec0d68a5b..6808b42b0 100644 --- a/extra/libical/PKGBUILD +++ b/extra/libical/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185545 2013-05-14 21:40:24Z andrea $ +# $Id: PKGBUILD 196976 2013-10-21 12:11:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=libical pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open source reference implementation of the icalendar data type and serialization format" arch=('i686' 'x86_64') url='http://sourceforge.net/projects/freeassociation/' @@ -14,8 +14,11 @@ makedepends=('cmake') source=("http://downloads.sourceforge.net/freeassociation/${pkgname}-${pkgver}.tar.gz") md5sums=('4438c31d00ec434f02867a267a92f8a1') +prepare() { + mkdir build +} + build() { - mkdir -p build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/libice/PKGBUILD b/extra/libice/PKGBUILD index 0144fe780..63fd40816 100644 --- a/extra/libice/PKGBUILD +++ b/extra/libice/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 151848 2012-03-03 13:42:06Z andyrtr $ +# $Id: PKGBUILD 197088 2013-10-21 18:34:59Z andyrtr $ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libice pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Inter-Client Exchange library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" depends=('glibc' 'xproto>=7.0.18') -makedepends=('pkgconfig' 'xtrans>=1.2.5') -options=('!libtool') +makedepends=('xtrans>=1.2.5') source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2) license=('custom') sha1sums=('ddb14df8bbc43df7322978f5f9f802936e2a7324') build() { - cd "${srcdir}/libICE-${pkgver}" + cd libICE-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/libICE-${pkgver}" + cd libICE-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" diff --git a/extra/libifp/PKGBUILD b/extra/libifp/PKGBUILD index 80bdad06a..a7f7bf510 100644 --- a/extra/libifp/PKGBUILD +++ b/extra/libifp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149577 2012-02-08 14:57:04Z tpowa $ +# $Id: PKGBUILD 196997 2013-10-21 12:32:22Z tpowa $ # Maintainer: damir <damir@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=libifp pkgver=1.0.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="General-purpose library-driver for iRiver's iFP portable audio players" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index 2b722ee5c..e8866c165 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 190040 2013-07-13 12:41:09Z svenstaro $ +# $Id: PKGBUILD 196980 2013-10-21 12:13:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libindi pkgver=0.9.6 -pkgrel=3 +pkgrel=4 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" license=('GPL2') arch=('i686' 'x86_64') depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat') makedepends=('cmake' 'boost') -options=('!libtool') source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz") md5sums=('c1456544a36f543e2884f88913cf3eb0') diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index cb7d2a0e4..97b2b507a 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 192280 2013-08-09 14:22:03Z andyrtr $ +# $Id: PKGBUILD 197089 2013-10-21 18:35:00Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia-project.org" arch=('i686' 'x86_64') license=('GPL2') depends=('libburn>=1.3.2' 'libisofs>=1.3.2' 'readline') -options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('7ebee7c1d4e09565daddca15467035af' diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index 97aa07524..071959754 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191705 2013-07-29 10:07:56Z tpowa $ +# $Id: PKGBUILD 196993 2013-10-21 12:26:23Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64') url="http://mp3splt.sourceforge.net" diff --git a/extra/liboil/PKGBUILD b/extra/liboil/PKGBUILD index e99d3ce6b..36d7acd3f 100644 --- a/extra/liboil/PKGBUILD +++ b/extra/liboil/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 150459 2012-02-17 23:55:27Z allan $ +# $Id: PKGBUILD 197082 2013-10-21 16:45:46Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=liboil pkgver=0.3.17 -pkgrel=2 +pkgrel=3 pkgdesc="Library of simple functions that are optimized for various CPUs." arch=('i686' 'x86_64') license=('custom') url="http://liboil.freedesktop.org/" +depends=('glibc') makedepends=('glib2' 'pkgconfig' 'docbook-xsl') options=('!libtool' '!makeflags') source=(${url}/download/${pkgname}-${pkgver}.tar.gz) @@ -15,7 +16,7 @@ md5sums=('47dc734f82faeb2964d97771cfd2e701') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD index c79705c13..45838f2f1 100644 --- a/extra/libpciaccess/PKGBUILD +++ b/extra/libpciaccess/PKGBUILD @@ -4,24 +4,23 @@ pkgname=libpciaccess pkgver=0.13.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 PCI access library" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('pkgconfig' 'xorg-util-macros') -options=('!libtool') +makedepends=('xorg-util-macros') source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) sha256sums=('abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 1c7576b30..5f68cd1c1 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 194432 2013-09-16 10:42:02Z jgc $ +# $Id: PKGBUILD 197058 2013-10-21 15:24:24Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.6.5 -_apngver=1.6.3 +pkgver=1.6.6 +_apngver=1.6.6 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64') @@ -16,14 +16,14 @@ depends=('zlib' 'sh') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc} http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz) -md5sums=('dec292dd99b094cea03bdd7232f5a80c' +md5sums=('3a41dcd58bcac7cc191c2ec80c7fb2ac' 'SKIP' - '57007fc121baa2cdc48abcfb26300e78') + '8af242769611daf62a8a17349b6059f7') prepare() { cd $pkgname-$pkgver - # Add animated PNG (apng) support + # Add animated PNG (apng) support. Required by Firefox # see http://sourceforge.net/projects/libpng-apng/ patch -Np1 -i ../libpng-$_apngver-apng.patch } @@ -31,7 +31,7 @@ prepare() { build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/libraw1394/PKGBUILD b/extra/libraw1394/PKGBUILD index 227415d70..7267d7f85 100644 --- a/extra/libraw1394/PKGBUILD +++ b/extra/libraw1394/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180142 2013-03-18 09:02:21Z jgc $ +# $Id: PKGBUILD 196995 2013-10-21 12:28:31Z tpowa $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libraw1394 pkgver=2.1.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL2.1') pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver" diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD index d006d757f..cb1b92e57 100644 --- a/extra/libsm/PKGBUILD +++ b/extra/libsm/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 194298 2013-09-13 07:26:46Z andyrtr $ +# $Id: PKGBUILD 197091 2013-10-21 18:35:02Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsm pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Session Management library" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libice' 'util-linux') makedepends=('xorg-util-macros' 'xtrans') -options=('!libtool') source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2) sha256sums=('0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd') build() { - cd "${srcdir}/libSM-${pkgver}" + cd libSM-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/libSM-${pkgver}" + cd libSM-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index 721f23a58..d7f0cb2b2 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 183190 2013-04-18 16:15:55Z andyrtr $ +# $Id: PKGBUILD 197093 2013-10-21 18:40:47Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 pkgver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/libtasn1/" depends=('glibc' 'texinfo') -options=('!libtool') install=libtasn1.install source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('2bdd687f487c50a0382b99553866a6e0' 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --with-packager=Archlinux \ --with-packager-bug-reports="http://bugs.archlinux.org/" \ @@ -26,11 +25,11 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD index 27a759d6f..104978a93 100644 --- a/extra/libvncserver/PKGBUILD +++ b/extra/libvncserver/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 158727 2012-05-08 13:54:05Z andrea $ +# $Id: PKGBUILD 196982 2013-10-21 12:18:29Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libvncserver pkgver=0.9.9 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" arch=('i686' 'x86_64') url="http://libvncserver.sourceforge.net/" license=('GPL') depends=('libjpeg' 'gnutls' 'libgcrypt' 'openssl') -options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") md5sums=('70422169b122765693d2a294d13e3714') build() { - cd "${srcdir}/LibVNCServer-${pkgver}" + cd LibVNCServer-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/LibVNCServer-${pkgver}" + cd LibVNCServer-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD index 0015633f4..5916e389b 100644 --- a/extra/libwpg/PKGBUILD +++ b/extra/libwpg/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 185181 2013-05-11 20:24:49Z andyrtr $ +# $Id: PKGBUILD 197095 2013-10-21 18:43:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libwpg pkgver=0.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library for importing and converting Corel WordPerfect(tm) Graphics images." arch=('i686' 'x86_64') url="http://libwpg.sourceforge.net/" license=('LGPL') depends=('libwpd' 'perl') -options=('!libtool') source=("http://downloads.sourceforge.net/libwpg/${pkgname}-${pkgver}.tar.bz2") md5sums=('b85436266b2ac91d351ab5684b181151') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD index b9de81117..42feec139 100644 --- a/extra/libxau/PKGBUILD +++ b/extra/libxau/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 186350 2013-05-25 08:48:08Z andyrtr $ +# $Id: PKGBUILD 197097 2013-10-21 18:45:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxau pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="X11 authorisation library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" depends=('glibc' 'xproto>=7.0.18') makedepends=('pkgconfig') license=('custom') -options=('!libtool') source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) sha256sums=('fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2') build() { - cd "${srcdir}/libXau-${pkgver}" + cd libXau-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/libXau-${pkgver}" + cd libXau-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD index 60df0d2ab..cf6b3cd5a 100644 --- a/extra/libxinerama/PKGBUILD +++ b/extra/libxinerama/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 186881 2013-05-31 14:01:07Z andyrtr $ +# $Id: PKGBUILD 197099 2013-10-21 18:47:43Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxinerama pkgver=1.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Xinerama extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') -options=('!libtool') source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") sha256sums=('7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2') build() { - cd "${srcdir}/libXinerama-${pkgver}" + cd libXinerama-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/libXinerama-${pkgver}" + cd libXinerama-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/libxkbui/PKGBUILD b/extra/libxkbui/PKGBUILD index 83b03186d..752f16bba 100644 --- a/extra/libxkbui/PKGBUILD +++ b/extra/libxkbui/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 151385 2012-02-25 23:56:14Z pierre $ +# $Id: PKGBUILD 197101 2013-10-21 18:50:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxkbui pkgver=1.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="X11 keyboard UI presentation library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxt' 'libxkbfile') makedepends=('pkgconfig') -options=('!libtool') source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2" 'LICENSE') md5sums=('1143e456f7429e18e88f2eadb2f2b6b1' 'd1efaa1271fc028cd5bec33f836ee9ef') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD index 7edcbe836..2556e81ca 100644 --- a/extra/libxrandr/PKGBUILD +++ b/extra/libxrandr/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 194294 2013-09-13 07:22:51Z andyrtr $ +# $Id: PKGBUILD 197103 2013-10-21 18:56:46Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxrandr pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxext' 'libxrender' 'randrproto>=1.4.0') makedepends=('xorg-util-macros') -options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) sha256sums=('caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad') build() { - cd "${srcdir}/libXrandr-${pkgver}" + cd libXrandr-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/libXrandr-${pkgver}" + cd libXrandr-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/libxss/PKGBUILD b/extra/libxss/PKGBUILD index 5fafc2d8d..0e8959f49 100644 --- a/extra/libxss/PKGBUILD +++ b/extra/libxss/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 152791 2012-03-09 16:28:04Z andyrtr $ +# $Id: PKGBUILD 197105 2013-10-21 19:00:07Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxss pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Screen Saver extension library" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxext' 'scrnsaverproto') makedepends=('xorg-util-macros') -options=('!libtool') source=("${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2") sha1sums=('7b8298eec371c33a71232e3653370a98f03c6c88') build() { - cd "${srcdir}/libXScrnSaver-${pkgver}" + cd libXScrnSaver-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd "${srcdir}/libXScrnSaver-${pkgver}" + cd libXScrnSaver-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index cb49d9877..899d29785 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188592 2013-06-16 17:21:04Z foutrelis $ +# $Id: PKGBUILD 197048 2013-10-21 14:52:40Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -16,6 +16,7 @@ arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx') +options=('staticlibs') source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD index ed7751ba4..8218e5d8d 100644 --- a/extra/misdnuser/PKGBUILD +++ b/extra/misdnuser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186032 2013-05-20 17:17:10Z tpowa $ +# $Id: PKGBUILD 196940 2013-10-21 10:26:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=misdnuser pkgver=2.0.17_20120917 -pkgrel=2 +pkgrel=3 pkgdesc="Tools and library for mISDN" arch=('i686' 'x86_64') url="http://www.misdn.org" diff --git a/extra/musicbrainz/PKGBUILD b/extra/musicbrainz/PKGBUILD index 2cccee247..8f780b82d 100644 --- a/extra/musicbrainz/PKGBUILD +++ b/extra/musicbrainz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149574 2012-02-08 14:54:36Z tpowa $ +# $Id: PKGBUILD 196950 2013-10-21 10:37:47Z tpowa $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=musicbrainz pkgver=2.1.5 -pkgrel=5 +pkgrel=6 pkgdesc="The second generation incarnation of the CD Index" arch=('i686' 'x86_64') url="http://www.musicbrainz.org" diff --git a/extra/nacl-toolchain-newlib/PKGBUILD b/extra/nacl-toolchain-newlib/PKGBUILD deleted file mode 100644 index 362f962aa..000000000 --- a/extra/nacl-toolchain-newlib/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 193478 2013-08-21 02:11:50Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> - -pkgname=nacl-toolchain-newlib -pkgver=12029 -pkgrel=1 -_binutilsver=2.20.1 -_newlibver=1.20.0 -_gccver=4.4.3 -pkgdesc="Native Client newlib-based toolchain (only for compiling IRT)" -arch=('i686' 'x86_64') -url="http://code.google.com/chrome/nativeclient/" -license=('BSD' 'GPL3' 'LGPL3' 'GPL2' 'FDL' 'custom') -depends=('zlib' 'mpfr') -options=('!strip') -source=(http://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2 - ftp://sources.redhat.com/pub/newlib/newlib-$_newlibver.tar.gz - http://ftp.gnu.org/gnu/gcc/gcc-$_gccver/gcc-$_gccver.tar.bz2 - http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/nacltoolchain-buildscripts-r$pkgver.tar.gz - http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclbinutils-$_binutilsver-r$pkgver.patch.bz2 - http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclnewlib-$_newlibver-r$pkgver.patch.bz2 - http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2 - binutils-texinfo-r0.patch - gcc-texinfo-r0.patch) -sha256sums=('71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64' - 'c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692' - '97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040' - 'a77912c4aac01142bd1c2f684f9933d6fcd39f0e67a1058858be50f0db18da7e' - '3b0e41b7923a90d611e598b31ed30062cfa3cf2fc2cbe7304e340a0acc780186' - '2de88079c500a694b73dab5a6a3690b2126ea0df498f1e27c5819b7d4256cb1a' - 'c98bda783fbc9726a9d0374118b1315f4ade4fe3bb5cbc96511b7a80b385dd70' - '64ba7c3f5edbe33b17312ab6da6c4b9e244e47289bde796a3078bf73072a0139' - '7eab20b6db6a7224984fd4b5bff1742571b0429428ea2af02f83f82f3de63070') - -prepare() { - cd "$srcdir" - - mkdir SRC - mv binutils-$_binutilsver SRC/binutils - mv newlib-$_newlibver SRC/newlib - mv gcc-$_gccver SRC/gcc - - for _patch in *-r$pkgver.patch; do - patch -d SRC -Np0 -i "$srcdir/$_patch" - done - - cd SRC - - # Fix build with texinfo 5.1 - patch -d binutils -Np1 -i "$srcdir/binutils-texinfo-r0.patch" - patch -d gcc -Np1 -i "$srcdir/gcc-texinfo-r0.patch" -} - -build() { - cd "$srcdir" - - CFLAGS+=" $CPPFLAGS" - CXXFLAGS+=" $CPPFLAGS" - unset CPPFLAGS - - make PREFIX="$srcdir/$pkgname" CANNED_REVISION="yes" build-with-newlib -} - -package() { - cd "$srcdir" - - install -d "$pkgdir/usr/lib" - mv $pkgname "$pkgdir/usr/lib/$pkgname" - - # NaCL license - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # Newlib license - install -m644 -t "$pkgdir/usr/share/licenses/$pkgname/" \ - SRC/newlib/COPYING.{NEWLIB,LIBGLOSS} -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch b/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch deleted file mode 100644 index ab81d8a49..000000000 --- a/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=464168 - -commit 935f85422863b42b6fbca30885885e3fa28eea36 -Author: Nick Clifton <nickc@redhat.com> -Date: Mon Jan 7 12:11:11 2013 +0000 - - * ld.texinfo: Replace @ with @@ when it is part of the text. - Correct ordering of M68HC11 entry. - - * doc/binutils.texi: Fix ordering of top level nodes. - Replace erroneous uses of @itemx with @item. - - * bfd.texinfo: Replace @ with @@ when it is part of the text. - -diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo -index 45ffa73..3aa3300 100644 ---- a/bfd/doc/bfd.texinfo -+++ b/bfd/doc/bfd.texinfo -@@ -322,7 +324,7 @@ All of BFD lives in one directory. - @printindex cp - - @tex --% I think something like @colophon should be in texinfo. In the -+% I think something like @@colophon should be in texinfo. In the - % meantime: - \long\def\colophon{\hbox to0pt{}\vfill - \centerline{The body of this manual is set in} -@@ -333,7 +335,7 @@ All of BFD lives in one directory. - \centerline{{\sl\fontname\tensl\/}} - \centerline{are used for emphasis.}\vfill} - \page\colophon --% Blame: doc@cygnus.com, 28mar91. -+% Blame: doc@@cygnus.com, 28mar91. - @end tex - - @bye -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index c7ae2a5..4777ad5 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same - @printindex cp - - @tex --% I think something like @colophon should be in texinfo. In the -+% I think something like @@colophon should be in texinfo. In the - % meantime: - \long\def\colophon{\hbox to0pt{}\vfill - \centerline{The body of this manual is set in} -@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same - \centerline{{\sl\fontname\tensl\/}} - \centerline{are used for emphasis.}\vfill} - \page\colophon --% Blame: doc@cygnus.com, 28mar91. -+% Blame: doc@@cygnus.com, 28mar91. - @end tex - - @bye diff --git a/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch b/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch deleted file mode 100644 index 852337351..000000000 --- a/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch +++ /dev/null @@ -1,132 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=464168 - -commit 85ad240e47dcdc1bf20ef6a95e921ac1f766d995 -Author: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Sun Oct 28 09:19:54 2012 +0000 - - * doc/cppopts.texi: Fix use of @item vs. @itemx inside @table. - * doc/extend.texi: Likewise. - * doc/generic.texi: Likewise. - * doc/invoke.texi: Likewise. - * doc/md.texi: Likewise. - * doc/sourcebuild.texi: Likewise. - - - git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192887 138bc75d-0d04-0410-961f-82ee72b054a4 - -diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi -index 27b1095..a2eb79d 100644 ---- a/gcc/doc/cppopts.texi -+++ b/gcc/doc/cppopts.texi -@@ -805,7 +805,7 @@ Replacement: [ ] @{ @} # \ ^ | ~ - Enable special code to work around file systems which only permit very - short file names, such as MS-DOS@. - --@itemx --help -+@item --help - @itemx --target-help - @opindex help - @opindex target-help -diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi -index dfbdc4c..bca0d8f 100644 ---- a/gcc/doc/md.texi -+++ b/gcc/doc/md.texi -@@ -4483,8 +4483,8 @@ means of constraints requiring operands 1 and 0 to be the same location. - @cindex @code{ior@var{m}3} instruction pattern - @cindex @code{xor@var{m}3} instruction pattern - @item @samp{ssadd@var{m}3}, @samp{usadd@var{m}3} --@item @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3} --@item @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3} -+@itemx @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3} -+@itemx @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3} - @itemx @samp{div@var{m}3}, @samp{ssdiv@var{m}3} - @itemx @samp{udiv@var{m}3}, @samp{usdiv@var{m}3} - @itemx @samp{mod@var{m}3}, @samp{umod@var{m}3} -diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi -index 89e7712..ec8263f 100644 ---- a/gcc/doc/sourcebuild.texi -+++ b/gcc/doc/sourcebuild.texi -@@ -691,7 +691,7 @@ standard rule in @file{gcc/Makefile.in} to the variable - @code{lang_checks}. - - @table @code --@itemx all.cross -+@item all.cross - @itemx start.encap - @itemx rest.encap - FIXME: exactly what goes in each of these targets? ---- a/gcc/doc/c-tree.texi -+++ b/gcc/doc/c-tree.texi -@@ -2338,13 +2338,13 @@ - not matter. The type of the operands and that of the result are - always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}. - --@itemx POINTER_PLUS_EXPR -+@item POINTER_PLUS_EXPR - This node represents pointer arithmetic. The first operand is always - a pointer/reference type. The second operand is always an unsigned - integer type compatible with sizetype. This is the only binary - arithmetic operand that can operate on pointer types. - --@itemx PLUS_EXPR -+@item PLUS_EXPR - @itemx MINUS_EXPR - @itemx MULT_EXPR - These nodes represent various binary arithmetic operations. ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -4645,11 +4652,11 @@ - @option{-fdump-rtl-ce3} enable dumping after the three - if conversion passes. - --@itemx -fdump-rtl-cprop_hardreg -+@item -fdump-rtl-cprop_hardreg - @opindex fdump-rtl-cprop_hardreg - Dump after hard register copy propagation. - --@itemx -fdump-rtl-csa -+@item -fdump-rtl-csa - @opindex fdump-rtl-csa - Dump after combining stack adjustments. - -@@ -4660,11 +4667,11 @@ - @option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after - the two common sub-expression elimination passes. - --@itemx -fdump-rtl-dce -+@item -fdump-rtl-dce - @opindex fdump-rtl-dce - Dump after the standalone dead code elimination passes. - --@itemx -fdump-rtl-dbr -+@item -fdump-rtl-dbr - @opindex fdump-rtl-dbr - Dump after delayed branch scheduling. - -@@ -4709,7 +4716,7 @@ - @opindex fdump-rtl-initvals - Dump after the computation of the initial value sets. - --@itemx -fdump-rtl-into_cfglayout -+@item -fdump-rtl-into_cfglayout - @opindex fdump-rtl-into_cfglayout - Dump after converting to cfglayout mode. - -@@ -4739,7 +4746,7 @@ - @opindex fdump-rtl-rnreg - Dump after register renumbering. - --@itemx -fdump-rtl-outof_cfglayout -+@item -fdump-rtl-outof_cfglayout - @opindex fdump-rtl-outof_cfglayout - Dump after converting from cfglayout mode. - -@@ -4751,7 +4758,7 @@ - @opindex fdump-rtl-postreload - Dump after post-reload optimizations. - --@itemx -fdump-rtl-pro_and_epilogue -+@item -fdump-rtl-pro_and_epilogue - @opindex fdump-rtl-pro_and_epilogue - Dump after generating the function pro and epilogues. - diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 49f852159..fb61adc46 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 195984 2013-10-07 07:06:19Z tpowa $ +# $Id: PKGBUILD 196938 2013-10-21 10:23:27Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') pkgver=4.01.0 -pkgrel=1 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2.1' 'custom: QPL-1.0') diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index d92f34628..47a4e7efe 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 194345 2013-09-14 08:18:24Z bpiotrowski $ +# $Id: PKGBUILD 197009 2013-10-21 12:41:49Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal -pkgver=3.10.10 -pkgrel=3 +pkgver=3.10.11 +pkgrel=1 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) url="http://www.opalvoip.org" license=(GPL) depends=(ptlib libtheora x264 speex gsm celt) makedepends=(ffmpeg) +optdepends=('ffmpeg: h263 and mpeg4 plugins') options=(!makeflags) -source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz +source=(http://downloads.sourceforge.net/opalvoip/$pkgname-$pkgver.tar.bz2 opal-ffmpeg.patch) -sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864' +sha256sums=('f38e7969e88a28dd9a10a6051315aceecde79d0bbd1a35676868dc5787aed706' '83f60ecf692e004293ce9dbaae7d7eb64d9713d3bfb71a0e7b1a0d1f936794cd') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../opal-ffmpeg.patch +} + build() { - cd "${srcdir}/opal-${pkgver}" - patch -Np1 -i "${srcdir}/opal-ffmpeg.patch" + cd $pkgname-$pkgver CXXFLAGS="$CXXFLAGS -fpermissive" \ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "${srcdir}/opal-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}/usr/lib/libopal_s.a" } diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD index 40760be9b..f67e2c7cd 100644 --- a/extra/opus/PKGBUILD +++ b/extra/opus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190019 2013-07-12 21:33:32Z heftig $ +# $Id: PKGBUILD 196962 2013-10-21 11:46:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> @@ -6,7 +6,7 @@ pkgname=opus pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet" arch=(i686 x86_64) url="http://www.opus-codec.org/" @@ -18,7 +18,7 @@ md5sums=('86eedbd3c5a0171d2437850435e6edff') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-custom-modes + ./configure --prefix=/usr --enable-custom-modes --disable-static make } diff --git a/extra/progsreiserfs/PKGBUILD b/extra/progsreiserfs/PKGBUILD index 7d4cb1baa..5542b78d9 100644 --- a/extra/progsreiserfs/PKGBUILD +++ b/extra/progsreiserfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136335 2011-08-26 15:07:16Z tpowa $ +# $Id: PKGBUILD 196946 2013-10-21 10:34:53Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=progsreiserfs pkgver=0.3.0.5 -pkgrel=7 +pkgrel=8 pkgdesc="library for accessing and manipulating reiserfs partitions" arch=(i686 x86_64) url="http://www.namesys.com" diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD index eba6e483e..88b024278 100644 --- a/extra/ptlib/PKGBUILD +++ b/extra/ptlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185571 2013-05-15 08:05:30Z bpiotrowski $ +# $Id: PKGBUILD 196964 2013-10-21 11:48:01Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=ptlib -pkgver=2.10.10 -pkgrel=2 +pkgver=2.10.11 +pkgrel=1 pkgdesc="Portable Windows Library" arch=('i686' 'x86_64') url="http://www.opalvoip.org" @@ -11,11 +11,18 @@ license=('GPL') depends=('sdl' 'libpulse' 'v4l-utils' 'libldap') replaces=('pwlib') conflicts=('pwlib') -source=(http://ftp.gnome.org/pub/GNOME/sources/ptlib/${pkgver%.*}/ptlib-$pkgver.tar.xz) -sha256sums=('7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4') +source=(http://downloads.sourceforge.net/opalvoip/ptlib-$pkgver.tar.bz2 + ptlib-2.10.10-bison_fixes-1.patch) +sha256sums=('27a8ba1fd147195c0b310897f81d26f73996b77b18147e587638444cfacd681a' + '11027b21f568b2ab84f9c25775e5a697a15304b39aaab6380922ed609aac63b9') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../ptlib-2.10.10-bison_fixes-1.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc --localstatedir=/var \ --enable-opal --enable-plugins \ @@ -28,6 +35,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/ptlib/ptlib-2.10.10-bison_fixes-1.patch b/extra/ptlib/ptlib-2.10.10-bison_fixes-1.patch new file mode 100644 index 000000000..996d2365a --- /dev/null +++ b/extra/ptlib/ptlib-2.10.10-bison_fixes-1.patch @@ -0,0 +1,2895 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2013-08-20 +Initial Package Version: 2.10.10 +Upstream Status: Reported +Origin: Self +Description: Adds pregenerated C file which isn't generated correctly + with Bison 3.0. + +--- a/src/ptlib/common/getdate.tab.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/src/ptlib/common/getdate.tab.c 2013-08-20 17:26:14.143891774 +0200 +@@ -0,0 +1,2884 @@ ++/* A Bison parser, made by GNU Bison 2.7.12-4996. */ ++ ++/* Bison implementation for Yacc-like parsers in C ++ ++ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see <http://www.gnu.org/licenses/>. */ ++ ++/* As a special exception, you may create a larger work that contains ++ part or all of the Bison parser skeleton and distribute that work ++ under terms of your choice, so long as that work isn't itself a ++ parser generator using the skeleton or a modified version thereof ++ as a parser skeleton. Alternatively, if you modify or redistribute ++ the parser skeleton itself, you may (at your option) remove this ++ special exception, which will cause the skeleton and the resulting ++ Bison output files to be licensed under the GNU General Public ++ License without this special exception. ++ ++ This special exception was added by the Free Software Foundation in ++ version 2.2 of Bison. */ ++ ++/* C LALR(1) parser skeleton written by Richard Stallman, by ++ simplifying the original so-called "semantic" parser. */ ++ ++/* All symbols defined below should begin with yy or YY, to avoid ++ infringing on user name space. This should be done even for local ++ variables, as they might otherwise be expanded by user macros. ++ There are some unavoidable exceptions within include files to ++ define necessary library symbols; they are noted "INFRINGES ON ++ USER NAME SPACE" below. */ ++ ++/* Identify Bison output. */ ++#define YYBISON 1 ++ ++/* Bison version. */ ++#define YYBISON_VERSION "2.7.12-4996" ++ ++/* Skeleton name. */ ++#define YYSKELETON_NAME "yacc.c" ++ ++/* Pure parsers. */ ++#define YYPURE 1 ++ ++/* Push parsers. */ ++#define YYPUSH 0 ++ ++/* Pull parsers. */ ++#define YYPULL 1 ++ ++ ++ ++ ++/* Copy the first part of user declarations. */ ++/* Line 371 of yacc.c */ ++#line 1 "ptlib/common/getdate.y" ++ ++/* ++** Originally written by Steven M. Bellovin <smb@research.att.com> while ++** at the University of North Carolina at Chapel Hill. Later tweaked by ++** a couple of people on Usenet. Completely overhauled by Rich $alz ++** <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990; ++** ++** Major hack to coerce it into use with the Equivalence Portable ++** Windows Library. ++** ++** This grammar has 10 shift/reduce conflicts. ++** ++** This code is in the public domain and has no copyright. ++*/ ++/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */ ++/* SUPPRESS 288 on yyerrlab *//* Label unused */ ++ ++ ++#include <time.h> ++#include <string.h> ++#include <ctype.h> ++#include <stdlib.h> ++ ++#ifndef EOF ++#include <stdio.h> ++#endif ++ ++ ++#ifdef _WIN32 ++#ifdef _MSC_VER ++#pragma warning(disable:4131 4701 4996) ++#endif ++#define STDAPICALLTYPE __stdcall ++#define MSDOS ++#else ++#define STDAPICALLTYPE ++#endif ++ ++ ++extern int STDAPICALLTYPE PTimeGetChar(void * stream); ++extern void STDAPICALLTYPE PTimeUngetChar(void * stream, int c); ++int STDAPICALLTYPE PTimeGetDateOrder(); ++int STDAPICALLTYPE PTimeIsMonthName(const char *, int, int); ++int STDAPICALLTYPE PTimeIsDayName(const char *, int, int); ++ ++ ++#define EPOCH 1970 ++#define HOUR(x) ((time_t)(x) * 60) ++#define SECSPERDAY (24L * 60L * 60L) ++ ++ ++/* ++** An entry in the lexical lookup table. ++*/ ++typedef struct _TABLE { ++ char *name; ++ int type; ++ time_t value; ++} TABLE; ++ ++ ++/* ++** Daylight-savings mode: on, off, or not yet known. ++*/ ++typedef enum _DSTMODE { ++ DSTon, DSToff, DSTmaybe ++} DSTMODE; ++ ++/* ++** Meridian: am, pm, or 24-hour style. ++*/ ++typedef enum _MERIDIAN { ++ MERam, MERpm, MER24 ++} MERIDIAN; ++ ++ ++/* ++** Global variables. We could get rid of most of these by using a good ++** union as the yacc stack. (This routine was originally written before ++** yacc had the %union construct.) Maybe someday; right now we only use ++** the %union very rarely. ++*/ ++struct Variables { ++ void *yyInput; ++ DSTMODE yyDSTmode; ++ time_t yyDayOrdinal; ++ time_t yyDayNumber; ++ int yyHaveDate; ++ int yyHaveDay; ++ int yyHaveRel; ++ int yyHaveTime; ++ int yyHaveZone; ++ time_t yyTimezone; ++ time_t yyDay; ++ time_t yyHour; ++ time_t yyMinutes; ++ time_t yyMonth; ++ time_t yySeconds; ++ time_t yyYear; ++ MERIDIAN yyMeridian; ++ time_t yyRelMonth; ++ time_t yyRelSeconds; ++}; ++ ++#define VARIABLE ((struct Variables*)parseParam) ++ ++ ++#define YYPURE 1 ++#define YYLEX_PARAM VARIABLE ++#define YYPARSE_PARAM parseParam ++ ++#define yyparse PTime_yyparse ++#define yylex PTime_yylex ++#define yyerror PTime_yyerror ++ ++#define GCC_VERSION (__GNUC__ * 10000 \ ++ + __GNUC_MINOR__ * 100 \ ++ + __GNUC_PATCHLEVEL__) ++ ++static int yyparse(void *); ++static int yylex(); ++ ++#ifdef __GNUC__ ++static int yyerror(char const *msg); ++#else ++static void yyerror(char const *msg); ++#endif ++ ++ ++static void SetPossibleDate(struct Variables*, time_t, time_t, time_t); ++ ++ ++ ++/* Line 371 of yacc.c */ ++#line 202 "ptlib/common/getdate.tab.c" ++ ++# ifndef YY_NULL ++# if defined __cplusplus && 201103L <= __cplusplus ++# define YY_NULL nullptr ++# else ++# define YY_NULL 0 ++# endif ++# endif ++ ++/* Enabling verbose error messages. */ ++#ifdef YYERROR_VERBOSE ++# undef YYERROR_VERBOSE ++# define YYERROR_VERBOSE 1 ++#else ++# define YYERROR_VERBOSE 0 ++#endif ++ ++ ++/* Enabling traces. */ ++#ifndef YYDEBUG ++# define YYDEBUG 0 ++#endif ++#if YYDEBUG ++extern int yydebug; ++#endif ++ ++/* Tokens. */ ++#ifndef YYTOKENTYPE ++# define YYTOKENTYPE ++ /* Put the tokens into the symbol table, so that GDB and other debuggers ++ know about them. */ ++ enum yytokentype { ++ tAGO = 258, ++ tDAY = 259, ++ tDAYZONE = 260, ++ tID = 261, ++ tMERIDIAN = 262, ++ tMINUTE_UNIT = 263, ++ tMONTH = 264, ++ tMONTH_UNIT = 265, ++ tSNUMBER = 266, ++ tS4DIGITNUMBER = 267, ++ tUNUMBER = 268, ++ t4DIGITNUMBER = 269, ++ t6DIGITNUMBER = 270, ++ t8DIGITNUMBER = 271, ++ tSEC_UNIT = 272, ++ tZONE = 273, ++ tMILZONE = 274, ++ tRFC3339 = 275, ++ tDST = 276 ++ }; ++#endif ++ ++ ++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED ++typedef union YYSTYPE ++{ ++/* Line 387 of yacc.c */ ++#line 137 "ptlib/common/getdate.y" ++ ++ time_t Number; ++ enum _MERIDIAN Meridian; ++ ++ ++/* Line 387 of yacc.c */ ++#line 269 "ptlib/common/getdate.tab.c" ++} YYSTYPE; ++# define YYSTYPE_IS_TRIVIAL 1 ++# define yystype YYSTYPE /* obsolescent; will be withdrawn */ ++# define YYSTYPE_IS_DECLARED 1 ++#endif ++ ++ ++#ifdef YYPARSE_PARAM ++#if defined __STDC__ || defined __cplusplus ++int yyparse (void *YYPARSE_PARAM); ++#else ++int yyparse (); ++#endif ++#else /* ! YYPARSE_PARAM */ ++#if defined __STDC__ || defined __cplusplus ++int yyparse (void); ++#else ++int yyparse (); ++#endif ++#endif /* ! YYPARSE_PARAM */ ++ ++ ++ ++/* Copy the second part of user declarations. */ ++ ++/* Line 390 of yacc.c */ ++#line 296 "ptlib/common/getdate.tab.c" ++ ++#ifdef short ++# undef short ++#endif ++ ++#ifdef YYTYPE_UINT8 ++typedef YYTYPE_UINT8 yytype_uint8; ++#else ++typedef unsigned char yytype_uint8; ++#endif ++ ++#ifdef YYTYPE_INT8 ++typedef YYTYPE_INT8 yytype_int8; ++#elif (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++typedef signed char yytype_int8; ++#else ++typedef short int yytype_int8; ++#endif ++ ++#ifdef YYTYPE_UINT16 ++typedef YYTYPE_UINT16 yytype_uint16; ++#else ++typedef unsigned short int yytype_uint16; ++#endif ++ ++#ifdef YYTYPE_INT16 ++typedef YYTYPE_INT16 yytype_int16; ++#else ++typedef short int yytype_int16; ++#endif ++ ++#ifndef YYSIZE_T ++# ifdef __SIZE_TYPE__ ++# define YYSIZE_T __SIZE_TYPE__ ++# elif defined size_t ++# define YYSIZE_T size_t ++# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ ++# define YYSIZE_T size_t ++# else ++# define YYSIZE_T unsigned int ++# endif ++#endif ++ ++#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) ++ ++#ifndef YY_ ++# if defined YYENABLE_NLS && YYENABLE_NLS ++# if ENABLE_NLS ++# include <libintl.h> /* INFRINGES ON USER NAME SPACE */ ++# define YY_(Msgid) dgettext ("bison-runtime", Msgid) ++# endif ++# endif ++# ifndef YY_ ++# define YY_(Msgid) Msgid ++# endif ++#endif ++ ++#ifndef __attribute__ ++/* This feature is available in gcc versions 2.5 and later. */ ++# if (! defined __GNUC__ || __GNUC__ < 2 \ ++ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) ++# define __attribute__(Spec) /* empty */ ++# endif ++#endif ++ ++/* Suppress unused-variable warnings by "using" E. */ ++#if ! defined lint || defined __GNUC__ ++# define YYUSE(E) ((void) (E)) ++#else ++# define YYUSE(E) /* empty */ ++#endif ++ ++ ++/* Identity function, used to suppress warnings about constant conditions. */ ++#ifndef lint ++# define YYID(N) (N) ++#else ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static int ++YYID (int yyi) ++#else ++static int ++YYID (yyi) ++ int yyi; ++#endif ++{ ++ return yyi; ++} ++#endif ++ ++#if ! defined yyoverflow || YYERROR_VERBOSE ++ ++/* The parser invokes alloca or malloc; define the necessary symbols. */ ++ ++# ifdef YYSTACK_USE_ALLOCA ++# if YYSTACK_USE_ALLOCA ++# ifdef __GNUC__ ++# define YYSTACK_ALLOC __builtin_alloca ++# elif defined __BUILTIN_VA_ARG_INCR ++# include <alloca.h> /* INFRINGES ON USER NAME SPACE */ ++# elif defined _AIX ++# define YYSTACK_ALLOC __alloca ++# elif defined _MSC_VER ++# include <malloc.h> /* INFRINGES ON USER NAME SPACE */ ++# define alloca _alloca ++# else ++# define YYSTACK_ALLOC alloca ++# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ ++ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ ++# ifndef EXIT_SUCCESS ++# define EXIT_SUCCESS 0 ++# endif ++# endif ++# endif ++# endif ++# endif ++ ++# ifdef YYSTACK_ALLOC ++ /* Pacify GCC's `empty if-body' warning. */ ++# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) ++# ifndef YYSTACK_ALLOC_MAXIMUM ++ /* The OS might guarantee only one guard page at the bottom of the stack, ++ and a page size can be as small as 4096 bytes. So we cannot safely ++ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number ++ to allow for a few compiler-allocated temporary stack slots. */ ++# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ ++# endif ++# else ++# define YYSTACK_ALLOC YYMALLOC ++# define YYSTACK_FREE YYFREE ++# ifndef YYSTACK_ALLOC_MAXIMUM ++# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM ++# endif ++# if (defined __cplusplus && ! defined EXIT_SUCCESS \ ++ && ! ((defined YYMALLOC || defined malloc) \ ++ && (defined YYFREE || defined free))) ++# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ ++# ifndef EXIT_SUCCESS ++# define EXIT_SUCCESS 0 ++# endif ++# endif ++# ifndef YYMALLOC ++# define YYMALLOC malloc ++# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++# endif ++# endif ++# ifndef YYFREE ++# define YYFREE free ++# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++void free (void *); /* INFRINGES ON USER NAME SPACE */ ++# endif ++# endif ++# endif ++#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ ++ ++ ++#if (! defined yyoverflow \ ++ && (! defined __cplusplus \ ++ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) ++ ++/* A type that is properly aligned for any stack member. */ ++union yyalloc ++{ ++ yytype_int16 yyss_alloc; ++ YYSTYPE yyvs_alloc; ++}; ++ ++/* The size of the maximum gap between one aligned stack and the next. */ ++# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) ++ ++/* The size of an array large to enough to hold all stacks, each with ++ N elements. */ ++# define YYSTACK_BYTES(N) \ ++ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ ++ + YYSTACK_GAP_MAXIMUM) ++ ++# define YYCOPY_NEEDED 1 ++ ++/* Relocate STACK from its old location to the new one. The ++ local variables YYSIZE and YYSTACKSIZE give the old and new number of ++ elements in the stack, and YYPTR gives the new location of the ++ stack. Advance YYPTR to a properly aligned location for the next ++ stack. */ ++# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ ++ do \ ++ { \ ++ YYSIZE_T yynewbytes; \ ++ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ ++ Stack = &yyptr->Stack_alloc; \ ++ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ ++ yyptr += yynewbytes / sizeof (*yyptr); \ ++ } \ ++ while (YYID (0)) ++ ++#endif ++ ++#if defined YYCOPY_NEEDED && YYCOPY_NEEDED ++/* Copy COUNT objects from SRC to DST. The source and destination do ++ not overlap. */ ++# ifndef YYCOPY ++# if defined __GNUC__ && 1 < __GNUC__ ++# define YYCOPY(Dst, Src, Count) \ ++ __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) ++# else ++# define YYCOPY(Dst, Src, Count) \ ++ do \ ++ { \ ++ YYSIZE_T yyi; \ ++ for (yyi = 0; yyi < (Count); yyi++) \ ++ (Dst)[yyi] = (Src)[yyi]; \ ++ } \ ++ while (YYID (0)) ++# endif ++# endif ++#endif /* !YYCOPY_NEEDED */ ++ ++/* YYFINAL -- State number of the termination state. */ ++#define YYFINAL 2 ++/* YYLAST -- Last index in YYTABLE. */ ++#define YYLAST 105 ++ ++/* YYNTOKENS -- Number of terminals. */ ++#define YYNTOKENS 25 ++/* YYNNTS -- Number of nonterminals. */ ++#define YYNNTS 12 ++/* YYNRULES -- Number of rules. */ ++#define YYNRULES 51 ++/* YYNRULES -- Number of states. */ ++#define YYNSTATES 63 ++ ++/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ ++#define YYUNDEFTOK 2 ++#define YYMAXUTOK 276 ++ ++#define YYTRANSLATE(YYX) \ ++ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) ++ ++/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ ++static const yytype_uint8 yytranslate[] = ++{ ++ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 23, 2, 2, 24, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 22, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, ++ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21 ++}; ++ ++#if YYDEBUG ++/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in ++ YYRHS. */ ++static const yytype_uint8 yyprhs[] = ++{ ++ 0, 0, 3, 4, 7, 9, 11, 13, 15, 17, ++ 19, 22, 25, 28, 33, 38, 45, 52, 54, 56, ++ 59, 61, 63, 66, 69, 73, 79, 84, 86, 90, ++ 93, 98, 101, 105, 108, 110, 113, 116, 118, 121, ++ 124, 126, 129, 132, 134, 136, 138, 140, 142, 144, ++ 146, 147 ++}; ++ ++/* YYRHS -- A `-1'-separated list of the rules' RHS. */ ++static const yytype_int8 yyrhs[] = ++{ ++ 26, 0, -1, -1, 26, 27, -1, 28, -1, 29, ++ -1, 31, -1, 30, -1, 32, -1, 35, -1, 13, ++ 7, -1, 14, 12, -1, 15, 12, -1, 34, 22, ++ 34, 36, -1, 34, 22, 34, 12, -1, 34, 22, ++ 34, 22, 34, 36, -1, 34, 22, 34, 22, 34, ++ 12, -1, 18, -1, 5, -1, 18, 21, -1, 19, ++ -1, 4, -1, 4, 23, -1, 34, 4, -1, 34, ++ 24, 34, -1, 34, 24, 34, 24, 34, -1, 34, ++ 11, 11, 20, -1, 16, -1, 34, 9, 11, -1, ++ 9, 34, -1, 9, 34, 23, 34, -1, 34, 9, ++ -1, 34, 9, 34, -1, 33, 3, -1, 33, -1, ++ 34, 8, -1, 11, 8, -1, 8, -1, 11, 17, ++ -1, 34, 17, -1, 17, -1, 11, 10, -1, 34, ++ 10, -1, 10, -1, 13, -1, 14, -1, 15, -1, ++ 13, -1, 14, -1, 15, -1, -1, 7, -1 ++}; ++ ++/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ ++static const yytype_uint16 yyrline[] = ++{ ++ 0, 153, 153, 154, 157, 160, 163, 166, 169, 172, ++ 175, 181, 189, 197, 203, 210, 216, 226, 230, 235, ++ 239, 249, 253, 257, 263, 266, 269, 273, 278, 282, ++ 289, 294, 301, 306, 310, 313, 316, 319, 322, 325, ++ 328, 331, 334, 337, 342, 345, 348, 353, 379, 390, ++ 407, 410 ++}; ++#endif ++ ++#if YYDEBUG || YYERROR_VERBOSE || 0 ++/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. ++ First, the terminals, then, starting at YYNTOKENS, nonterminals. */ ++static const char *const yytname[] = ++{ ++ "$end", "error", "$undefined", "tAGO", "tDAY", "tDAYZONE", "tID", ++ "tMERIDIAN", "tMINUTE_UNIT", "tMONTH", "tMONTH_UNIT", "tSNUMBER", ++ "tS4DIGITNUMBER", "tUNUMBER", "t4DIGITNUMBER", "t6DIGITNUMBER", ++ "t8DIGITNUMBER", "tSEC_UNIT", "tZONE", "tMILZONE", "tRFC3339", "tDST", ++ "':'", "','", "'/'", "$accept", "spec", "item", "time", "zone", "day", ++ "date", "rel", "relunit", "unumber", "number", "o_merid", YY_NULL ++}; ++#endif ++ ++# ifdef YYPRINT ++/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to ++ token YYLEX-NUM. */ ++static const yytype_uint16 yytoknum[] = ++{ ++ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, ++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 58, 44, 47 ++}; ++# endif ++ ++/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ ++static const yytype_uint8 yyr1[] = ++{ ++ 0, 25, 26, 26, 27, 27, 27, 27, 27, 27, ++ 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, ++ 29, 30, 30, 30, 31, 31, 31, 31, 31, 31, ++ 31, 31, 31, 32, 32, 33, 33, 33, 33, 33, ++ 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, ++ 36, 36 ++}; ++ ++/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ ++static const yytype_uint8 yyr2[] = ++{ ++ 0, 2, 0, 2, 1, 1, 1, 1, 1, 1, ++ 2, 2, 2, 4, 4, 6, 6, 1, 1, 2, ++ 1, 1, 2, 2, 3, 5, 4, 1, 3, 2, ++ 4, 2, 3, 2, 1, 2, 2, 1, 2, 2, ++ 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, ++ 0, 1 ++}; ++ ++/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. ++ Performed when YYTABLE doesn't specify something else to do. Zero ++ means the default is an error. */ ++static const yytype_uint8 yydefact[] = ++{ ++ 2, 0, 1, 21, 18, 37, 0, 43, 0, 44, ++ 45, 46, 27, 40, 17, 20, 3, 4, 5, 7, ++ 6, 8, 34, 0, 9, 22, 44, 45, 46, 29, ++ 36, 41, 38, 10, 11, 12, 19, 33, 23, 35, ++ 31, 42, 0, 39, 0, 0, 0, 28, 32, 0, ++ 50, 24, 30, 26, 51, 14, 0, 13, 0, 50, ++ 25, 16, 15 ++}; ++ ++/* YYDEFGOTO[NTERM-NUM]. */ ++static const yytype_int8 yydefgoto[] = ++{ ++ -1, 1, 16, 17, 18, 19, 20, 21, 22, 23, ++ 24, 57 ++}; ++ ++/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing ++ STATE-NUM. */ ++#define YYPACT_NINF -27 ++static const yytype_int8 yypact[] = ++{ ++ -27, 49, -27, -10, -27, -27, -11, -27, 1, 10, ++ 69, 86, -27, -27, -9, -27, -27, -27, -27, -27, ++ -27, -27, 13, -3, -27, -27, -27, -27, -27, 8, ++ -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, ++ 30, -27, 9, -27, -11, -11, -11, -27, -27, 12, ++ 15, 18, -27, -27, -27, -27, -11, -27, -11, 23, ++ -27, -27, -27 ++}; ++ ++/* YYPGOTO[NTERM-NUM]. */ ++static const yytype_int8 yypgoto[] = ++{ ++ -27, -27, -27, -27, -27, -27, -27, -27, -27, -6, ++ -27, -26 ++}; ++ ++/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If ++ positive, shift that token. If negative, reduce the rule which ++ number is the opposite. If YYTABLE_NINF, syntax error. */ ++#define YYTABLE_NINF -50 ++static const yytype_int8 yytable[] = ++{ ++ 29, 38, 26, 27, 28, 39, 40, 41, 42, 30, ++ -47, 31, 36, 25, 43, -47, 37, 33, 32, 44, ++ 49, 45, 54, -47, -47, -47, -47, 55, -47, -47, ++ 54, 46, 53, 62, 48, 61, 0, 56, 50, 51, ++ 52, 47, 58, 26, 27, 28, 0, 0, 0, 2, ++ 59, 0, 60, 3, 4, 0, 0, 5, 6, 7, ++ 8, 0, 9, 10, 11, 12, 13, 14, 15, -48, ++ 0, 0, 0, 0, -48, 0, 0, 0, 0, 0, ++ 0, 34, -48, -48, -48, -48, -49, -48, -48, 0, ++ 0, -49, 0, 0, 0, 0, 0, 0, 35, -49, ++ -49, -49, -49, 0, -49, -49 ++}; ++ ++#define yypact_value_is_default(Yystate) \ ++ (!!((Yystate) == (-27))) ++ ++#define yytable_value_is_error(Yytable_value) \ ++ YYID (0) ++ ++static const yytype_int8 yycheck[] = ++{ ++ 6, 4, 13, 14, 15, 8, 9, 10, 11, 8, ++ 0, 10, 21, 23, 17, 5, 3, 7, 17, 22, ++ 11, 24, 7, 13, 14, 15, 16, 12, 18, 19, ++ 7, 23, 20, 59, 40, 12, -1, 22, 44, 45, ++ 46, 11, 24, 13, 14, 15, -1, -1, -1, 0, ++ 56, -1, 58, 4, 5, -1, -1, 8, 9, 10, ++ 11, -1, 13, 14, 15, 16, 17, 18, 19, 0, ++ -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, ++ -1, 12, 13, 14, 15, 16, 0, 18, 19, -1, ++ -1, 5, -1, -1, -1, -1, -1, -1, 12, 13, ++ 14, 15, 16, -1, 18, 19 ++}; ++ ++/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing ++ symbol of state STATE-NUM. */ ++static const yytype_uint8 yystos[] = ++{ ++ 0, 26, 0, 4, 5, 8, 9, 10, 11, 13, ++ 14, 15, 16, 17, 18, 19, 27, 28, 29, 30, ++ 31, 32, 33, 34, 35, 23, 13, 14, 15, 34, ++ 8, 10, 17, 7, 12, 12, 21, 3, 4, 8, ++ 9, 10, 11, 17, 22, 24, 23, 11, 34, 11, ++ 34, 34, 34, 20, 7, 12, 22, 36, 24, 34, ++ 34, 12, 36 ++}; ++ ++#define yyerrok (yyerrstatus = 0) ++#define yyclearin (yychar = YYEMPTY) ++#define YYEMPTY (-2) ++#define YYEOF 0 ++ ++#define YYACCEPT goto yyacceptlab ++#define YYABORT goto yyabortlab ++#define YYERROR goto yyerrorlab ++ ++ ++/* Like YYERROR except do call yyerror. This remains here temporarily ++ to ease the transition to the new meaning of YYERROR, for GCC. ++ Once GCC version 2 has supplanted version 1, this can go. However, ++ YYFAIL appears to be in use. Nevertheless, it is formally deprecated ++ in Bison 2.4.2's NEWS entry, where a plan to phase it out is ++ discussed. */ ++ ++#define YYFAIL goto yyerrlab ++#if defined YYFAIL ++ /* This is here to suppress warnings from the GCC cpp's ++ -Wunused-macros. Normally we don't worry about that warning, but ++ some users do, and we want to make it easy for users to remove ++ YYFAIL uses, which will produce warnings from Bison 2.5. */ ++#endif ++ ++#define YYRECOVERING() (!!yyerrstatus) ++ ++#define YYBACKUP(Token, Value) \ ++do \ ++ if (yychar == YYEMPTY) \ ++ { \ ++ yychar = (Token); \ ++ yylval = (Value); \ ++ YYPOPSTACK (yylen); \ ++ yystate = *yyssp; \ ++ goto yybackup; \ ++ } \ ++ else \ ++ { \ ++ yyerror (YY_("syntax error: cannot back up")); \ ++ YYERROR; \ ++ } \ ++while (YYID (0)) ++ ++/* Error token number */ ++#define YYTERROR 1 ++#define YYERRCODE 256 ++ ++ ++/* This macro is provided for backward compatibility. */ ++#ifndef YY_LOCATION_PRINT ++# define YY_LOCATION_PRINT(File, Loc) ((void) 0) ++#endif ++ ++ ++/* YYLEX -- calling `yylex' with the right arguments. */ ++#ifdef YYLEX_PARAM ++# define YYLEX yylex (&yylval, YYLEX_PARAM) ++#else ++# define YYLEX yylex (&yylval) ++#endif ++ ++/* Enable debugging if requested. */ ++#if YYDEBUG ++ ++# ifndef YYFPRINTF ++# include <stdio.h> /* INFRINGES ON USER NAME SPACE */ ++# define YYFPRINTF fprintf ++# endif ++ ++# define YYDPRINTF(Args) \ ++do { \ ++ if (yydebug) \ ++ YYFPRINTF Args; \ ++} while (YYID (0)) ++ ++# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ ++do { \ ++ if (yydebug) \ ++ { \ ++ YYFPRINTF (stderr, "%s ", Title); \ ++ yy_symbol_print (stderr, \ ++ Type, Value); \ ++ YYFPRINTF (stderr, "\n"); \ ++ } \ ++} while (YYID (0)) ++ ++ ++/*--------------------------------. ++| Print this symbol on YYOUTPUT. | ++`--------------------------------*/ ++ ++/*ARGSUSED*/ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) ++#else ++static void ++yy_symbol_value_print (yyoutput, yytype, yyvaluep) ++ FILE *yyoutput; ++ int yytype; ++ YYSTYPE const * const yyvaluep; ++#endif ++{ ++ FILE *yyo = yyoutput; ++ YYUSE (yyo); ++ if (!yyvaluep) ++ return; ++# ifdef YYPRINT ++ if (yytype < YYNTOKENS) ++ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); ++# else ++ YYUSE (yyoutput); ++# endif ++ YYUSE (yytype); ++} ++ ++ ++/*--------------------------------. ++| Print this symbol on YYOUTPUT. | ++`--------------------------------*/ ++ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) ++#else ++static void ++yy_symbol_print (yyoutput, yytype, yyvaluep) ++ FILE *yyoutput; ++ int yytype; ++ YYSTYPE const * const yyvaluep; ++#endif ++{ ++ if (yytype < YYNTOKENS) ++ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); ++ else ++ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); ++ ++ yy_symbol_value_print (yyoutput, yytype, yyvaluep); ++ YYFPRINTF (yyoutput, ")"); ++} ++ ++/*------------------------------------------------------------------. ++| yy_stack_print -- Print the state stack from its BOTTOM up to its | ++| TOP (included). | ++`------------------------------------------------------------------*/ ++ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) ++#else ++static void ++yy_stack_print (yybottom, yytop) ++ yytype_int16 *yybottom; ++ yytype_int16 *yytop; ++#endif ++{ ++ YYFPRINTF (stderr, "Stack now"); ++ for (; yybottom <= yytop; yybottom++) ++ { ++ int yybot = *yybottom; ++ YYFPRINTF (stderr, " %d", yybot); ++ } ++ YYFPRINTF (stderr, "\n"); ++} ++ ++# define YY_STACK_PRINT(Bottom, Top) \ ++do { \ ++ if (yydebug) \ ++ yy_stack_print ((Bottom), (Top)); \ ++} while (YYID (0)) ++ ++ ++/*------------------------------------------------. ++| Report that the YYRULE is going to be reduced. | ++`------------------------------------------------*/ ++ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_reduce_print (YYSTYPE *yyvsp, int yyrule) ++#else ++static void ++yy_reduce_print (yyvsp, yyrule) ++ YYSTYPE *yyvsp; ++ int yyrule; ++#endif ++{ ++ int yynrhs = yyr2[yyrule]; ++ int yyi; ++ unsigned long int yylno = yyrline[yyrule]; ++ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", ++ yyrule - 1, yylno); ++ /* The symbols being reduced. */ ++ for (yyi = 0; yyi < yynrhs; yyi++) ++ { ++ YYFPRINTF (stderr, " $%d = ", yyi + 1); ++ yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], ++ &(yyvsp[(yyi + 1) - (yynrhs)]) ++ ); ++ YYFPRINTF (stderr, "\n"); ++ } ++} ++ ++# define YY_REDUCE_PRINT(Rule) \ ++do { \ ++ if (yydebug) \ ++ yy_reduce_print (yyvsp, Rule); \ ++} while (YYID (0)) ++ ++/* Nonzero means print parse trace. It is left uninitialized so that ++ multiple parsers can coexist. */ ++int yydebug; ++#else /* !YYDEBUG */ ++# define YYDPRINTF(Args) ++# define YY_SYMBOL_PRINT(Title, Type, Value, Location) ++# define YY_STACK_PRINT(Bottom, Top) ++# define YY_REDUCE_PRINT(Rule) ++#endif /* !YYDEBUG */ ++ ++ ++/* YYINITDEPTH -- initial size of the parser's stacks. */ ++#ifndef YYINITDEPTH ++# define YYINITDEPTH 200 ++#endif ++ ++/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only ++ if the built-in stack extension method is used). ++ ++ Do not make this value too large; the results are undefined if ++ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) ++ evaluated with infinite-precision integer arithmetic. */ ++ ++#ifndef YYMAXDEPTH ++# define YYMAXDEPTH 10000 ++#endif ++ ++ ++#if YYERROR_VERBOSE ++ ++# ifndef yystrlen ++# if defined __GLIBC__ && defined _STRING_H ++# define yystrlen strlen ++# else ++/* Return the length of YYSTR. */ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static YYSIZE_T ++yystrlen (const char *yystr) ++#else ++static YYSIZE_T ++yystrlen (yystr) ++ const char *yystr; ++#endif ++{ ++ YYSIZE_T yylen; ++ for (yylen = 0; yystr[yylen]; yylen++) ++ continue; ++ return yylen; ++} ++# endif ++# endif ++ ++# ifndef yystpcpy ++# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE ++# define yystpcpy stpcpy ++# else ++/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in ++ YYDEST. */ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static char * ++yystpcpy (char *yydest, const char *yysrc) ++#else ++static char * ++yystpcpy (yydest, yysrc) ++ char *yydest; ++ const char *yysrc; ++#endif ++{ ++ char *yyd = yydest; ++ const char *yys = yysrc; ++ ++ while ((*yyd++ = *yys++) != '\0') ++ continue; ++ ++ return yyd - 1; ++} ++# endif ++# endif ++ ++# ifndef yytnamerr ++/* Copy to YYRES the contents of YYSTR after stripping away unnecessary ++ quotes and backslashes, so that it's suitable for yyerror. The ++ heuristic is that double-quoting is unnecessary unless the string ++ contains an apostrophe, a comma, or backslash (other than ++ backslash-backslash). YYSTR is taken from yytname. If YYRES is ++ null, do not copy; instead, return the length of what the result ++ would have been. */ ++static YYSIZE_T ++yytnamerr (char *yyres, const char *yystr) ++{ ++ if (*yystr == '"') ++ { ++ YYSIZE_T yyn = 0; ++ char const *yyp = yystr; ++ ++ for (;;) ++ switch (*++yyp) ++ { ++ case '\'': ++ case ',': ++ goto do_not_strip_quotes; ++ ++ case '\\': ++ if (*++yyp != '\\') ++ goto do_not_strip_quotes; ++ /* Fall through. */ ++ default: ++ if (yyres) ++ yyres[yyn] = *yyp; ++ yyn++; ++ break; ++ ++ case '"': ++ if (yyres) ++ yyres[yyn] = '\0'; ++ return yyn; ++ } ++ do_not_strip_quotes: ; ++ } ++ ++ if (! yyres) ++ return yystrlen (yystr); ++ ++ return yystpcpy (yyres, yystr) - yyres; ++} ++# endif ++ ++/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message ++ about the unexpected token YYTOKEN for the state stack whose top is ++ YYSSP. ++ ++ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is ++ not large enough to hold the message. In that case, also set ++ *YYMSG_ALLOC to the required number of bytes. Return 2 if the ++ required number of bytes is too large to store. */ ++static int ++yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, ++ yytype_int16 *yyssp, int yytoken) ++{ ++ YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); ++ YYSIZE_T yysize = yysize0; ++ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; ++ /* Internationalized format string. */ ++ const char *yyformat = YY_NULL; ++ /* Arguments of yyformat. */ ++ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; ++ /* Number of reported tokens (one for the "unexpected", one per ++ "expected"). */ ++ int yycount = 0; ++ ++ /* There are many possibilities here to consider: ++ - Assume YYFAIL is not used. It's too flawed to consider. See ++ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html> ++ for details. YYERROR is fine as it does not invoke this ++ function. ++ - If this state is a consistent state with a default action, then ++ the only way this function was invoked is if the default action ++ is an error action. In that case, don't check for expected ++ tokens because there are none. ++ - The only way there can be no lookahead present (in yychar) is if ++ this state is a consistent state with a default action. Thus, ++ detecting the absence of a lookahead is sufficient to determine ++ that there is no unexpected or expected token to report. In that ++ case, just report a simple "syntax error". ++ - Don't assume there isn't a lookahead just because this state is a ++ consistent state with a default action. There might have been a ++ previous inconsistent state, consistent state with a non-default ++ action, or user semantic action that manipulated yychar. ++ - Of course, the expected token list depends on states to have ++ correct lookahead information, and it depends on the parser not ++ to perform extra reductions after fetching a lookahead from the ++ scanner and before detecting a syntax error. Thus, state merging ++ (from LALR or IELR) and default reductions corrupt the expected ++ token list. However, the list is correct for canonical LR with ++ one exception: it will still contain any token that will not be ++ accepted due to an error action in a later state. ++ */ ++ if (yytoken != YYEMPTY) ++ { ++ int yyn = yypact[*yyssp]; ++ yyarg[yycount++] = yytname[yytoken]; ++ if (!yypact_value_is_default (yyn)) ++ { ++ /* Start YYX at -YYN if negative to avoid negative indexes in ++ YYCHECK. In other words, skip the first -YYN actions for ++ this state because they are default actions. */ ++ int yyxbegin = yyn < 0 ? -yyn : 0; ++ /* Stay within bounds of both yycheck and yytname. */ ++ int yychecklim = YYLAST - yyn + 1; ++ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; ++ int yyx; ++ ++ for (yyx = yyxbegin; yyx < yyxend; ++yyx) ++ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR ++ && !yytable_value_is_error (yytable[yyx + yyn])) ++ { ++ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) ++ { ++ yycount = 1; ++ yysize = yysize0; ++ break; ++ } ++ yyarg[yycount++] = yytname[yyx]; ++ { ++ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); ++ if (! (yysize <= yysize1 ++ && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) ++ return 2; ++ yysize = yysize1; ++ } ++ } ++ } ++ } ++ ++ switch (yycount) ++ { ++# define YYCASE_(N, S) \ ++ case N: \ ++ yyformat = S; \ ++ break ++ YYCASE_(0, YY_("syntax error")); ++ YYCASE_(1, YY_("syntax error, unexpected %s")); ++ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); ++ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); ++ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); ++ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); ++# undef YYCASE_ ++ } ++ ++ { ++ YYSIZE_T yysize1 = yysize + yystrlen (yyformat); ++ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) ++ return 2; ++ yysize = yysize1; ++ } ++ ++ if (*yymsg_alloc < yysize) ++ { ++ *yymsg_alloc = 2 * yysize; ++ if (! (yysize <= *yymsg_alloc ++ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) ++ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; ++ return 1; ++ } ++ ++ /* Avoid sprintf, as that infringes on the user's name space. ++ Don't have undefined behavior even if the translation ++ produced a string with the wrong number of "%s"s. */ ++ { ++ char *yyp = *yymsg; ++ int yyi = 0; ++ while ((*yyp = *yyformat) != '\0') ++ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) ++ { ++ yyp += yytnamerr (yyp, yyarg[yyi++]); ++ yyformat += 2; ++ } ++ else ++ { ++ yyp++; ++ yyformat++; ++ } ++ } ++ return 0; ++} ++#endif /* YYERROR_VERBOSE */ ++ ++/*-----------------------------------------------. ++| Release the memory associated to this symbol. | ++`-----------------------------------------------*/ ++ ++/*ARGSUSED*/ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) ++#else ++static void ++yydestruct (yymsg, yytype, yyvaluep) ++ const char *yymsg; ++ int yytype; ++ YYSTYPE *yyvaluep; ++#endif ++{ ++ YYUSE (yyvaluep); ++ ++ if (!yymsg) ++ yymsg = "Deleting"; ++ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); ++ ++ YYUSE (yytype); ++} ++ ++ ++ ++ ++/*----------. ++| yyparse. | ++`----------*/ ++ ++#ifdef YYPARSE_PARAM ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++int ++yyparse (void *YYPARSE_PARAM) ++#else ++int ++yyparse (YYPARSE_PARAM) ++ void *YYPARSE_PARAM; ++#endif ++#else /* ! YYPARSE_PARAM */ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++int ++yyparse (void) ++#else ++int ++yyparse () ++ ++#endif ++#endif ++{ ++/* The lookahead symbol. */ ++int yychar; ++ ++ ++#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ ++/* Suppress an incorrect diagnostic about yylval being uninitialized. */ ++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ ++ _Pragma ("GCC diagnostic push") \ ++ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ ++ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") ++# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ ++ _Pragma ("GCC diagnostic pop") ++#else ++/* Default value used for initialization, for pacifying older GCCs ++ or non-GCC compilers. */ ++static YYSTYPE yyval_default; ++# define YY_INITIAL_VALUE(Value) = Value ++#endif ++#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++# define YY_IGNORE_MAYBE_UNINITIALIZED_END ++#endif ++#ifndef YY_INITIAL_VALUE ++# define YY_INITIAL_VALUE(Value) /* Nothing. */ ++#endif ++ ++/* The semantic value of the lookahead symbol. */ ++YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); ++ ++ /* Number of syntax errors so far. */ ++ int yynerrs; ++ ++ int yystate; ++ /* Number of tokens to shift before error messages enabled. */ ++ int yyerrstatus; ++ ++ /* The stacks and their tools: ++ `yyss': related to states. ++ `yyvs': related to semantic values. ++ ++ Refer to the stacks through separate pointers, to allow yyoverflow ++ to reallocate them elsewhere. */ ++ ++ /* The state stack. */ ++ yytype_int16 yyssa[YYINITDEPTH]; ++ yytype_int16 *yyss; ++ yytype_int16 *yyssp; ++ ++ /* The semantic value stack. */ ++ YYSTYPE yyvsa[YYINITDEPTH]; ++ YYSTYPE *yyvs; ++ YYSTYPE *yyvsp; ++ ++ YYSIZE_T yystacksize; ++ ++ int yyn; ++ int yyresult; ++ /* Lookahead token as an internal (translated) token number. */ ++ int yytoken = 0; ++ /* The variables used to return semantic value and location from the ++ action routines. */ ++ YYSTYPE yyval; ++ ++#if YYERROR_VERBOSE ++ /* Buffer for error messages, and its allocated size. */ ++ char yymsgbuf[128]; ++ char *yymsg = yymsgbuf; ++ YYSIZE_T yymsg_alloc = sizeof yymsgbuf; ++#endif ++ ++#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) ++ ++ /* The number of symbols on the RHS of the reduced rule. ++ Keep to zero when no symbol should be popped. */ ++ int yylen = 0; ++ ++ yyssp = yyss = yyssa; ++ yyvsp = yyvs = yyvsa; ++ yystacksize = YYINITDEPTH; ++ ++ YYDPRINTF ((stderr, "Starting parse\n")); ++ ++ yystate = 0; ++ yyerrstatus = 0; ++ yynerrs = 0; ++ yychar = YYEMPTY; /* Cause a token to be read. */ ++ goto yysetstate; ++ ++/*------------------------------------------------------------. ++| yynewstate -- Push a new state, which is found in yystate. | ++`------------------------------------------------------------*/ ++ yynewstate: ++ /* In all cases, when you get here, the value and location stacks ++ have just been pushed. So pushing a state here evens the stacks. */ ++ yyssp++; ++ ++ yysetstate: ++ *yyssp = yystate; ++ ++ if (yyss + yystacksize - 1 <= yyssp) ++ { ++ /* Get the current used size of the three stacks, in elements. */ ++ YYSIZE_T yysize = yyssp - yyss + 1; ++ ++#ifdef yyoverflow ++ { ++ /* Give user a chance to reallocate the stack. Use copies of ++ these so that the &'s don't force the real ones into ++ memory. */ ++ YYSTYPE *yyvs1 = yyvs; ++ yytype_int16 *yyss1 = yyss; ++ ++ /* Each stack pointer address is followed by the size of the ++ data in use in that stack, in bytes. This used to be a ++ conditional around just the two extra args, but that might ++ be undefined if yyoverflow is a macro. */ ++ yyoverflow (YY_("memory exhausted"), ++ &yyss1, yysize * sizeof (*yyssp), ++ &yyvs1, yysize * sizeof (*yyvsp), ++ &yystacksize); ++ ++ yyss = yyss1; ++ yyvs = yyvs1; ++ } ++#else /* no yyoverflow */ ++# ifndef YYSTACK_RELOCATE ++ goto yyexhaustedlab; ++# else ++ /* Extend the stack our own way. */ ++ if (YYMAXDEPTH <= yystacksize) ++ goto yyexhaustedlab; ++ yystacksize *= 2; ++ if (YYMAXDEPTH < yystacksize) ++ yystacksize = YYMAXDEPTH; ++ ++ { ++ yytype_int16 *yyss1 = yyss; ++ union yyalloc *yyptr = ++ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); ++ if (! yyptr) ++ goto yyexhaustedlab; ++ YYSTACK_RELOCATE (yyss_alloc, yyss); ++ YYSTACK_RELOCATE (yyvs_alloc, yyvs); ++# undef YYSTACK_RELOCATE ++ if (yyss1 != yyssa) ++ YYSTACK_FREE (yyss1); ++ } ++# endif ++#endif /* no yyoverflow */ ++ ++ yyssp = yyss + yysize - 1; ++ yyvsp = yyvs + yysize - 1; ++ ++ YYDPRINTF ((stderr, "Stack size increased to %lu\n", ++ (unsigned long int) yystacksize)); ++ ++ if (yyss + yystacksize - 1 <= yyssp) ++ YYABORT; ++ } ++ ++ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); ++ ++ if (yystate == YYFINAL) ++ YYACCEPT; ++ ++ goto yybackup; ++ ++/*-----------. ++| yybackup. | ++`-----------*/ ++yybackup: ++ ++ /* Do appropriate processing given the current state. Read a ++ lookahead token if we need one and don't already have one. */ ++ ++ /* First try to decide what to do without reference to lookahead token. */ ++ yyn = yypact[yystate]; ++ if (yypact_value_is_default (yyn)) ++ goto yydefault; ++ ++ /* Not known => get a lookahead token if don't already have one. */ ++ ++ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ ++ if (yychar == YYEMPTY) ++ { ++ YYDPRINTF ((stderr, "Reading a token: ")); ++ yychar = YYLEX; ++ } ++ ++ if (yychar <= YYEOF) ++ { ++ yychar = yytoken = YYEOF; ++ YYDPRINTF ((stderr, "Now at end of input.\n")); ++ } ++ else ++ { ++ yytoken = YYTRANSLATE (yychar); ++ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); ++ } ++ ++ /* If the proper action on seeing token YYTOKEN is to reduce or to ++ detect an error, take that action. */ ++ yyn += yytoken; ++ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) ++ goto yydefault; ++ yyn = yytable[yyn]; ++ if (yyn <= 0) ++ { ++ if (yytable_value_is_error (yyn)) ++ goto yyerrlab; ++ yyn = -yyn; ++ goto yyreduce; ++ } ++ ++ /* Count tokens shifted since error; after three, turn off error ++ status. */ ++ if (yyerrstatus) ++ yyerrstatus--; ++ ++ /* Shift the lookahead token. */ ++ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); ++ ++ /* Discard the shifted token. */ ++ yychar = YYEMPTY; ++ ++ yystate = yyn; ++ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++ *++yyvsp = yylval; ++ YY_IGNORE_MAYBE_UNINITIALIZED_END ++ ++ goto yynewstate; ++ ++ ++/*-----------------------------------------------------------. ++| yydefault -- do the default action for the current state. | ++`-----------------------------------------------------------*/ ++yydefault: ++ yyn = yydefact[yystate]; ++ if (yyn == 0) ++ goto yyerrlab; ++ goto yyreduce; ++ ++ ++/*-----------------------------. ++| yyreduce -- Do a reduction. | ++`-----------------------------*/ ++yyreduce: ++ /* yyn is the number of a rule to reduce with. */ ++ yylen = yyr2[yyn]; ++ ++ /* If YYLEN is nonzero, implement the default value of the action: ++ `$$ = $1'. ++ ++ Otherwise, the following line sets YYVAL to garbage. ++ This behavior is undocumented and Bison ++ users should not rely upon it. Assigning to YYVAL ++ unconditionally makes the parser a bit smaller, and it avoids a ++ GCC warning that YYVAL may be used uninitialized. */ ++ yyval = yyvsp[1-yylen]; ++ ++ ++ YY_REDUCE_PRINT (yyn); ++ switch (yyn) ++ { ++ case 4: ++/* Line 1787 of yacc.c */ ++#line 157 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveTime++; ++ } ++ break; ++ ++ case 5: ++/* Line 1787 of yacc.c */ ++#line 160 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveZone++; ++ } ++ break; ++ ++ case 6: ++/* Line 1787 of yacc.c */ ++#line 163 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveDate++; ++ } ++ break; ++ ++ case 7: ++/* Line 1787 of yacc.c */ ++#line 166 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveDay++; ++ } ++ break; ++ ++ case 8: ++/* Line 1787 of yacc.c */ ++#line 169 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveRel++; ++ } ++ break; ++ ++ case 10: ++/* Line 1787 of yacc.c */ ++#line 175 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyMinutes = 0; ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = (yyvsp[(2) - (2)].Meridian); ++ } ++ break; ++ ++ case 11: ++/* Line 1787 of yacc.c */ ++#line 181 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/100; ++ VARIABLE->yyMinutes = (yyvsp[(1) - (2)].Number)%100; ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 12: ++/* Line 1787 of yacc.c */ ++#line 189 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/10000; ++ VARIABLE->yyMinutes = ((yyvsp[(1) - (2)].Number)/100)%100; ++ VARIABLE->yySeconds = (yyvsp[(1) - (2)].Number) % 100; ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 13: ++/* Line 1787 of yacc.c */ ++#line 197 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number); ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = (yyvsp[(4) - (4)].Meridian); ++ } ++ break; ++ ++ case 14: ++/* Line 1787 of yacc.c */ ++#line 203 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number); ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(4) - (4)].Number) % 100 + ((yyvsp[(4) - (4)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 15: ++/* Line 1787 of yacc.c */ ++#line 210 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number); ++ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number); ++ VARIABLE->yyMeridian = (yyvsp[(6) - (6)].Meridian); ++ } ++ break; ++ ++ case 16: ++/* Line 1787 of yacc.c */ ++#line 216 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number); ++ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number); ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(6) - (6)].Number) % 100 + ((yyvsp[(6) - (6)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 17: ++/* Line 1787 of yacc.c */ ++#line 226 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); ++ VARIABLE->yyDSTmode = DSToff; ++ } ++ break; ++ ++ case 18: ++/* Line 1787 of yacc.c */ ++#line 230 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); ++ VARIABLE->yyDSTmode = DSTon; ++ } ++ break; ++ ++ case 19: ++/* Line 1787 of yacc.c */ ++#line 235 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyDSTmode = DSTon; ++ } ++ break; ++ ++ case 20: ++/* Line 1787 of yacc.c */ ++#line 239 "ptlib/common/getdate.y" ++ { ++ if (VARIABLE->yyHaveTime > 0) { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); ++ VARIABLE->yyDSTmode = DSToff; ++ } ++ else ++ VARIABLE->yyHaveZone--; ++ } ++ break; ++ ++ case 21: ++/* Line 1787 of yacc.c */ ++#line 249 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDayOrdinal = 1; ++ VARIABLE->yyDayNumber = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 22: ++/* Line 1787 of yacc.c */ ++#line 253 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDayOrdinal = 1; ++ VARIABLE->yyDayNumber = (yyvsp[(1) - (2)].Number); ++ } ++ break; ++ ++ case 23: ++/* Line 1787 of yacc.c */ ++#line 257 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDayOrdinal = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyDayNumber = (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 24: ++/* Line 1787 of yacc.c */ ++#line 263 "ptlib/common/getdate.y" ++ { ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(3) - (3)].Number), VARIABLE->yyYear); ++ } ++ break; ++ ++ case 25: ++/* Line 1787 of yacc.c */ ++#line 266 "ptlib/common/getdate.y" ++ { ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (5)].Number), (yyvsp[(3) - (5)].Number), (yyvsp[(5) - (5)].Number)); ++ } ++ break; ++ ++ case 26: ++/* Line 1787 of yacc.c */ ++#line 269 "ptlib/common/getdate.y" ++ { ++ /* ISO 8601 format. yyyy-mm-dd. */ ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (4)].Number), -(yyvsp[(2) - (4)].Number), -(yyvsp[(3) - (4)].Number)); ++ } ++ break; ++ ++ case 27: ++/* Line 1787 of yacc.c */ ++#line 273 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; ++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; ++ } ++ break; ++ ++ case 28: ++/* Line 1787 of yacc.c */ ++#line 278 "ptlib/common/getdate.y" ++ { ++ /* e.g. 17-JUN-1992. */ ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), -(yyvsp[(3) - (3)].Number)); ++ } ++ break; ++ ++ case 29: ++/* Line 1787 of yacc.c */ ++#line 282 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyMonth = (yyvsp[(1) - (2)].Number); ++ if ((yyvsp[(2) - (2)].Number) > 31) ++ VARIABLE->yyYear = (yyvsp[(2) - (2)].Number); ++ else ++ VARIABLE->yyDay = (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 30: ++/* Line 1787 of yacc.c */ ++#line 289 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyMonth = (yyvsp[(1) - (4)].Number); ++ VARIABLE->yyDay = (yyvsp[(2) - (4)].Number); ++ VARIABLE->yyYear = (yyvsp[(4) - (4)].Number); ++ } ++ break; ++ ++ case 31: ++/* Line 1787 of yacc.c */ ++#line 294 "ptlib/common/getdate.y" ++ { ++ if ((yyvsp[(1) - (2)].Number) > 31) ++ VARIABLE->yyYear = (yyvsp[(1) - (2)].Number); ++ else ++ VARIABLE->yyDay = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyMonth = (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 32: ++/* Line 1787 of yacc.c */ ++#line 301 "ptlib/common/getdate.y" ++ { ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), (yyvsp[(3) - (3)].Number)); ++ } ++ break; ++ ++ case 33: ++/* Line 1787 of yacc.c */ ++#line 306 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds = -VARIABLE->yyRelSeconds; ++ VARIABLE->yyRelMonth = -VARIABLE->yyRelMonth; ++ } ++ break; ++ ++ case 35: ++/* Line 1787 of yacc.c */ ++#line 313 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L; ++ } ++ break; ++ ++ case 36: ++/* Line 1787 of yacc.c */ ++#line 316 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L; ++ } ++ break; ++ ++ case 37: ++/* Line 1787 of yacc.c */ ++#line 319 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (1)].Number) * 60L; ++ } ++ break; ++ ++ case 38: ++/* Line 1787 of yacc.c */ ++#line 322 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number); ++ } ++ break; ++ ++ case 39: ++/* Line 1787 of yacc.c */ ++#line 325 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number); ++ } ++ break; ++ ++ case 40: ++/* Line 1787 of yacc.c */ ++#line 328 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds++; ++ } ++ break; ++ ++ case 41: ++/* Line 1787 of yacc.c */ ++#line 331 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 42: ++/* Line 1787 of yacc.c */ ++#line 334 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 43: ++/* Line 1787 of yacc.c */ ++#line 337 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelMonth += (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 44: ++/* Line 1787 of yacc.c */ ++#line 342 "ptlib/common/getdate.y" ++ { ++ (yyval.Number) = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 45: ++/* Line 1787 of yacc.c */ ++#line 345 "ptlib/common/getdate.y" ++ { ++ (yyval.Number) = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 46: ++/* Line 1787 of yacc.c */ ++#line 348 "ptlib/common/getdate.y" ++ { ++ (yyval.Number) = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 47: ++/* Line 1787 of yacc.c */ ++#line 353 "ptlib/common/getdate.y" ++ { ++ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel) ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number); ++ else { ++ if((yyvsp[(1) - (1)].Number)>240000) { ++ VARIABLE->yyHaveDate++; ++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; ++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; ++ } ++ else { ++ VARIABLE->yyHaveTime++; ++ if ((yyvsp[(1) - (1)].Number) < 10000) { ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number) / 100; ++ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number) % 100; ++ VARIABLE->yySeconds = 0; ++ } ++ else { ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000; ++ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100; ++ } ++ VARIABLE->yyMeridian = MER24; ++ } ++ } ++ } ++ break; ++ ++ case 48: ++/* Line 1787 of yacc.c */ ++#line 379 "ptlib/common/getdate.y" ++ { ++ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel) ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number); ++ else { ++ VARIABLE->yyHaveTime++; ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/100; ++ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number)%100; ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = MER24; ++ } ++ } ++ break; ++ ++ case 49: ++/* Line 1787 of yacc.c */ ++#line 390 "ptlib/common/getdate.y" ++ { ++ if (!VARIABLE->yyHaveDate && (yyvsp[(1) - (1)].Number)>240000) { ++ VARIABLE->yyHaveDate++; ++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; ++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; ++ } ++ else if (!VARIABLE->yyHaveTime) { ++ VARIABLE->yyHaveTime++; ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000; ++ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100; ++ VARIABLE->yyMeridian = MER24; ++ } ++ } ++ break; ++ ++ case 50: ++/* Line 1787 of yacc.c */ ++#line 407 "ptlib/common/getdate.y" ++ { ++ (yyval.Meridian) = MER24; ++ } ++ break; ++ ++ case 51: ++/* Line 1787 of yacc.c */ ++#line 410 "ptlib/common/getdate.y" ++ { ++ (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian); ++ } ++ break; ++ ++ ++/* Line 1787 of yacc.c */ ++#line 2031 "ptlib/common/getdate.tab.c" ++ default: break; ++ } ++ /* User semantic actions sometimes alter yychar, and that requires ++ that yytoken be updated with the new translation. We take the ++ approach of translating immediately before every use of yytoken. ++ One alternative is translating here after every semantic action, ++ but that translation would be missed if the semantic action invokes ++ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or ++ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an ++ incorrect destructor might then be invoked immediately. In the ++ case of YYERROR or YYBACKUP, subsequent parser actions might lead ++ to an incorrect destructor call or verbose syntax error message ++ before the lookahead is translated. */ ++ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); ++ ++ YYPOPSTACK (yylen); ++ yylen = 0; ++ YY_STACK_PRINT (yyss, yyssp); ++ ++ *++yyvsp = yyval; ++ ++ /* Now `shift' the result of the reduction. Determine what state ++ that goes to, based on the state we popped back to and the rule ++ number reduced by. */ ++ ++ yyn = yyr1[yyn]; ++ ++ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; ++ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) ++ yystate = yytable[yystate]; ++ else ++ yystate = yydefgoto[yyn - YYNTOKENS]; ++ ++ goto yynewstate; ++ ++ ++/*------------------------------------. ++| yyerrlab -- here on detecting error | ++`------------------------------------*/ ++yyerrlab: ++ /* Make sure we have latest lookahead translation. See comments at ++ user semantic actions for why this is necessary. */ ++ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); ++ ++ /* If not already recovering from an error, report this error. */ ++ if (!yyerrstatus) ++ { ++ ++yynerrs; ++#if ! YYERROR_VERBOSE ++ yyerror (YY_("syntax error")); ++#else ++# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ ++ yyssp, yytoken) ++ { ++ char const *yymsgp = YY_("syntax error"); ++ int yysyntax_error_status; ++ yysyntax_error_status = YYSYNTAX_ERROR; ++ if (yysyntax_error_status == 0) ++ yymsgp = yymsg; ++ else if (yysyntax_error_status == 1) ++ { ++ if (yymsg != yymsgbuf) ++ YYSTACK_FREE (yymsg); ++ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); ++ if (!yymsg) ++ { ++ yymsg = yymsgbuf; ++ yymsg_alloc = sizeof yymsgbuf; ++ yysyntax_error_status = 2; ++ } ++ else ++ { ++ yysyntax_error_status = YYSYNTAX_ERROR; ++ yymsgp = yymsg; ++ } ++ } ++ yyerror (yymsgp); ++ if (yysyntax_error_status == 2) ++ goto yyexhaustedlab; ++ } ++# undef YYSYNTAX_ERROR ++#endif ++ } ++ ++ ++ ++ if (yyerrstatus == 3) ++ { ++ /* If just tried and failed to reuse lookahead token after an ++ error, discard it. */ ++ ++ if (yychar <= YYEOF) ++ { ++ /* Return failure if at end of input. */ ++ if (yychar == YYEOF) ++ YYABORT; ++ } ++ else ++ { ++ yydestruct ("Error: discarding", ++ yytoken, &yylval); ++ yychar = YYEMPTY; ++ } ++ } ++ ++ /* Else will try to reuse lookahead token after shifting the error ++ token. */ ++ goto yyerrlab1; ++ ++ ++/*---------------------------------------------------. ++| yyerrorlab -- error raised explicitly by YYERROR. | ++`---------------------------------------------------*/ ++yyerrorlab: ++ ++ /* Pacify compilers like GCC when the user code never invokes ++ YYERROR and the label yyerrorlab therefore never appears in user ++ code. */ ++ if (/*CONSTCOND*/ 0) ++ goto yyerrorlab; ++ ++ /* Do not reclaim the symbols of the rule which action triggered ++ this YYERROR. */ ++ YYPOPSTACK (yylen); ++ yylen = 0; ++ YY_STACK_PRINT (yyss, yyssp); ++ yystate = *yyssp; ++ goto yyerrlab1; ++ ++ ++/*-------------------------------------------------------------. ++| yyerrlab1 -- common code for both syntax error and YYERROR. | ++`-------------------------------------------------------------*/ ++yyerrlab1: ++ yyerrstatus = 3; /* Each real token shifted decrements this. */ ++ ++ for (;;) ++ { ++ yyn = yypact[yystate]; ++ if (!yypact_value_is_default (yyn)) ++ { ++ yyn += YYTERROR; ++ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) ++ { ++ yyn = yytable[yyn]; ++ if (0 < yyn) ++ break; ++ } ++ } ++ ++ /* Pop the current state because it cannot handle the error token. */ ++ if (yyssp == yyss) ++ YYABORT; ++ ++ ++ yydestruct ("Error: popping", ++ yystos[yystate], yyvsp); ++ YYPOPSTACK (1); ++ yystate = *yyssp; ++ YY_STACK_PRINT (yyss, yyssp); ++ } ++ ++ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++ *++yyvsp = yylval; ++ YY_IGNORE_MAYBE_UNINITIALIZED_END ++ ++ ++ /* Shift the error token. */ ++ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); ++ ++ yystate = yyn; ++ goto yynewstate; ++ ++ ++/*-------------------------------------. ++| yyacceptlab -- YYACCEPT comes here. | ++`-------------------------------------*/ ++yyacceptlab: ++ yyresult = 0; ++ goto yyreturn; ++ ++/*-----------------------------------. ++| yyabortlab -- YYABORT comes here. | ++`-----------------------------------*/ ++yyabortlab: ++ yyresult = 1; ++ goto yyreturn; ++ ++#if !defined yyoverflow || YYERROR_VERBOSE ++/*-------------------------------------------------. ++| yyexhaustedlab -- memory exhaustion comes here. | ++`-------------------------------------------------*/ ++yyexhaustedlab: ++ yyerror (YY_("memory exhausted")); ++ yyresult = 2; ++ /* Fall through. */ ++#endif ++ ++yyreturn: ++ if (yychar != YYEMPTY) ++ { ++ /* Make sure we have latest lookahead translation. See comments at ++ user semantic actions for why this is necessary. */ ++ yytoken = YYTRANSLATE (yychar); ++ yydestruct ("Cleanup: discarding lookahead", ++ yytoken, &yylval); ++ } ++ /* Do not reclaim the symbols of the rule which action triggered ++ this YYABORT or YYACCEPT. */ ++ YYPOPSTACK (yylen); ++ YY_STACK_PRINT (yyss, yyssp); ++ while (yyssp != yyss) ++ { ++ yydestruct ("Cleanup: popping", ++ yystos[*yyssp], yyvsp); ++ YYPOPSTACK (1); ++ } ++#ifndef yyoverflow ++ if (yyss != yyssa) ++ YYSTACK_FREE (yyss); ++#endif ++#if YYERROR_VERBOSE ++ if (yymsg != yymsgbuf) ++ YYSTACK_FREE (yymsg); ++#endif ++ /* Make sure YYID is used. */ ++ return YYID (yyresult); ++} ++ ++ ++/* Line 2050 of yacc.c */ ++#line 415 "ptlib/common/getdate.y" ++ ++ ++/* Month and day table. */ ++static TABLE const MonthDayTable[] = { ++ { "january", tMONTH, 1 }, ++ { "february", tMONTH, 2 }, ++ { "march", tMONTH, 3 }, ++ { "april", tMONTH, 4 }, ++ { "may", tMONTH, 5 }, ++ { "june", tMONTH, 6 }, ++ { "july", tMONTH, 7 }, ++ { "august", tMONTH, 8 }, ++ { "september", tMONTH, 9 }, ++ { "sept", tMONTH, 9 }, ++ { "october", tMONTH, 10 }, ++ { "november", tMONTH, 11 }, ++ { "december", tMONTH, 12 }, ++ { "sunday", tDAY, 0 }, ++ { "monday", tDAY, 1 }, ++ { "tuesday", tDAY, 2 }, ++ { "tues", tDAY, 2 }, ++ { "wednesday", tDAY, 3 }, ++ { "wednes", tDAY, 3 }, ++ { "thursday", tDAY, 4 }, ++ { "thur", tDAY, 4 }, ++ { "thurs", tDAY, 4 }, ++ { "friday", tDAY, 5 }, ++ { "saturday", tDAY, 6 }, ++ { NULL } ++}; ++ ++/* Time units table. */ ++static TABLE const UnitsTable[] = { ++ { "year", tMONTH_UNIT, 12 }, ++ { "month", tMONTH_UNIT, 1 }, ++ { "fortnight", tMINUTE_UNIT, 14 * 24 * 60 }, ++ { "week", tMINUTE_UNIT, 7 * 24 * 60 }, ++ { "day", tMINUTE_UNIT, 1 * 24 * 60 }, ++ { "hour", tMINUTE_UNIT, 60 }, ++ { "minute", tMINUTE_UNIT, 1 }, ++ { "min", tMINUTE_UNIT, 1 }, ++ { "second", tSEC_UNIT, 1 }, ++ { "sec", tSEC_UNIT, 1 }, ++ { NULL } ++}; ++ ++/* Assorted relative-time words. */ ++static TABLE const OtherTable[] = { ++ { "tomorrow", tMINUTE_UNIT, 1 * 24 * 60 }, ++ { "yesterday", tMINUTE_UNIT, -1 * 24 * 60 }, ++ { "today", tMINUTE_UNIT, 0 }, ++ { "now", tMINUTE_UNIT, 0 }, ++ { "last", tUNUMBER, -1 }, ++ { "this", tMINUTE_UNIT, 0 }, ++ { "next", tUNUMBER, 2 }, ++ { "first", tUNUMBER, 1 }, ++/* { "second", tUNUMBER, 2 }, */ ++ { "third", tUNUMBER, 3 }, ++ { "fourth", tUNUMBER, 4 }, ++ { "fifth", tUNUMBER, 5 }, ++ { "sixth", tUNUMBER, 6 }, ++ { "seventh", tUNUMBER, 7 }, ++ { "eighth", tUNUMBER, 8 }, ++ { "ninth", tUNUMBER, 9 }, ++ { "tenth", tUNUMBER, 10 }, ++ { "eleventh", tUNUMBER, 11 }, ++ { "twelfth", tUNUMBER, 12 }, ++ { "ago", tAGO, 1 }, ++ { NULL } ++}; ++ ++/* The timezone table. */ ++/* Some of these are commented out because a time_t can't store a float. */ ++static TABLE const TimezoneTable[] = { ++ { "gmt", tZONE, HOUR( 0) }, /* Greenwich Mean */ ++ { "ut", tZONE, HOUR( 0) }, /* Universal (Coordinated) */ ++ { "utc", tZONE, HOUR( 0) }, ++ { "wet", tZONE, HOUR( 0) }, /* Western European */ ++ { "bst", tDAYZONE, HOUR( 0) }, /* British Summer */ ++ { "wat", tZONE, HOUR( 1) }, /* West Africa */ ++ { "at", tZONE, HOUR( 2) }, /* Azores */ ++#if 0 ++ /* For completeness. BST is also British Summer, and GST is ++ * also Guam Standard. */ ++ { "bst", tZONE, HOUR( 3) }, /* Brazil Standard */ ++ { "gst", tZONE, HOUR( 3) }, /* Greenland Standard */ ++#endif ++#if 0 ++ { "nft", tZONE, HOUR(3.5) }, /* Newfoundland */ ++ { "nst", tZONE, HOUR(3.5) }, /* Newfoundland Standard */ ++ { "ndt", tDAYZONE, HOUR(3.5) }, /* Newfoundland Daylight */ ++#endif ++ { "ast", tZONE, HOUR( 4) }, /* Atlantic Standard */ ++ { "adt", tDAYZONE, HOUR( 4) }, /* Atlantic Daylight */ ++ { "est", tZONE, HOUR( 5) }, /* Eastern Standard */ ++ { "edt", tDAYZONE, HOUR( 5) }, /* Eastern Daylight */ ++ { "cst", tZONE, HOUR( 6) }, /* Central Standard */ ++ { "cdt", tDAYZONE, HOUR( 6) }, /* Central Daylight */ ++ { "mst", tZONE, HOUR( 7) }, /* Mountain Standard */ ++ { "mdt", tDAYZONE, HOUR( 7) }, /* Mountain Daylight */ ++ { "pst", tZONE, HOUR( 8) }, /* Pacific Standard */ ++ { "pdt", tDAYZONE, HOUR( 8) }, /* Pacific Daylight */ ++ { "yst", tZONE, HOUR( 9) }, /* Yukon Standard */ ++ { "ydt", tDAYZONE, HOUR( 9) }, /* Yukon Daylight */ ++ { "hst", tZONE, HOUR(10) }, /* Hawaii Standard */ ++ { "hdt", tDAYZONE, HOUR(10) }, /* Hawaii Daylight */ ++ { "cat", tZONE, HOUR(10) }, /* Central Alaska */ ++ { "ahst", tZONE, HOUR(10) }, /* Alaska-Hawaii Standard */ ++ { "nt", tZONE, HOUR(11) }, /* Nome */ ++ { "idlw", tZONE, HOUR(12) }, /* International Date Line West */ ++ { "cet", tZONE, -HOUR(1) }, /* Central European */ ++ { "met", tZONE, -HOUR(1) }, /* Middle European */ ++ { "mewt", tZONE, -HOUR(1) }, /* Middle European Winter */ ++ { "mest", tDAYZONE, -HOUR(1) }, /* Middle European Summer */ ++ { "swt", tZONE, -HOUR(1) }, /* Swedish Winter */ ++ { "sst", tDAYZONE, -HOUR(1) }, /* Swedish Summer */ ++ { "fwt", tZONE, -HOUR(1) }, /* French Winter */ ++ { "fst", tDAYZONE, -HOUR(1) }, /* French Summer */ ++ { "eet", tZONE, -HOUR(2) }, /* Eastern Europe, USSR Zone 1 */ ++ { "bt", tZONE, -HOUR(3) }, /* Baghdad, USSR Zone 2 */ ++#if 0 ++ { "it", tZONE, -HOUR(3.5) },/* Iran */ ++#endif ++ { "zp4", tZONE, -HOUR(4) }, /* USSR Zone 3 */ ++ { "zp5", tZONE, -HOUR(5) }, /* USSR Zone 4 */ ++#if 0 ++ { "ist", tZONE, -HOUR(5.5) },/* Indian Standard */ ++#endif ++ { "zp6", tZONE, -HOUR(6) }, /* USSR Zone 5 */ ++#if 0 ++ /* For completeness. NST is also Newfoundland Stanard, and SST is ++ * also Swedish Summer. */ ++ { "nst", tZONE, -HOUR(6.5) },/* North Sumatra */ ++ { "sst", tZONE, -HOUR(7) }, /* South Sumatra, USSR Zone 6 */ ++#endif /* 0 */ ++ { "wast", tZONE, -HOUR(7) }, /* West Australian Standard */ ++ { "wadt", tDAYZONE, -HOUR(7) }, /* West Australian Daylight */ ++#if 0 ++ { "jt", tZONE, -HOUR(7.5) },/* Java (3pm in Cronusland!) */ ++#endif ++ { "cct", tZONE, -HOUR(8) }, /* China Coast, USSR Zone 7 */ ++ { "jst", tZONE, -HOUR(9) }, /* Japan Standard, USSR Zone 8 */ ++#if 0 ++ { "cast", tZONE, -HOUR(9.5) },/* Central Australian Standard */ ++ { "cadt", tDAYZONE, -HOUR(9.5) },/* Central Australian Daylight */ ++#endif ++ { "east", tZONE, -HOUR(10) }, /* Eastern Australian Standard */ ++ { "eadt", tDAYZONE, -HOUR(10) }, /* Eastern Australian Daylight */ ++ { "gst", tZONE, -HOUR(10) }, /* Guam Standard, USSR Zone 9 */ ++ { "nzt", tZONE, -HOUR(12) }, /* New Zealand */ ++ { "nzst", tZONE, -HOUR(12) }, /* New Zealand Standard */ ++ { "nzdt", tDAYZONE, -HOUR(12) }, /* New Zealand Daylight */ ++ { "idle", tZONE, -HOUR(12) }, /* International Date Line East */ ++ { NULL } ++}; ++ ++/* Military timezone table. */ ++static TABLE const MilitaryTable[] = { ++ { "a", tMILZONE, HOUR( 1) }, ++ { "b", tMILZONE, HOUR( 2) }, ++ { "c", tMILZONE, HOUR( 3) }, ++ { "d", tMILZONE, HOUR( 4) }, ++ { "e", tMILZONE, HOUR( 5) }, ++ { "f", tMILZONE, HOUR( 6) }, ++ { "g", tMILZONE, HOUR( 7) }, ++ { "h", tMILZONE, HOUR( 8) }, ++ { "i", tMILZONE, HOUR( 9) }, ++ { "k", tMILZONE, HOUR( 10) }, ++ { "l", tMILZONE, HOUR( 11) }, ++ { "m", tMILZONE, HOUR( 12) }, ++ { "n", tMILZONE, HOUR(- 1) }, ++ { "o", tMILZONE, HOUR(- 2) }, ++ { "p", tMILZONE, HOUR(- 3) }, ++ { "q", tMILZONE, HOUR(- 4) }, ++ { "r", tMILZONE, HOUR(- 5) }, ++ { "s", tMILZONE, HOUR(- 6) }, ++ { "t", tMILZONE, HOUR(- 7) }, ++ { "u", tMILZONE, HOUR(- 8) }, ++ { "v", tMILZONE, HOUR(- 9) }, ++ { "w", tMILZONE, HOUR(-10) }, ++ { "x", tMILZONE, HOUR(-11) }, ++ { "y", tMILZONE, HOUR(-12) }, ++ { "z", tZONE, HOUR( 0) }, /* Deliberately tZONE */ ++ { NULL } ++}; ++ ++static int LookupWord(char * buff, YYSTYPE * yylval, struct Variables * vars) ++{ ++ register char *p; ++ register char *q; ++ register const TABLE *tp; ++ int i; ++ int abbrev; ++ ++ /* Make it lowercase. */ ++ for (p = buff; *p != '\0'; p++) ++ *p = (char)tolower(*p); ++ ++ if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) { ++ yylval->Meridian = MERam; ++ return tMERIDIAN; ++ } ++ if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) { ++ yylval->Meridian = MERpm; ++ return tMERIDIAN; ++ } ++ ++ /* See if we have an abbreviation for a month. */ ++ if (strlen(buff) == 3) ++ abbrev = 1; ++ else if (strlen(buff) == 4 && buff[3] == '.') { ++ abbrev = 1; ++ buff[3] = '\0'; ++ } ++ else ++ abbrev = 0; ++ ++ for (tp = MonthDayTable; tp->name; tp++) { ++ if (abbrev) { ++ if (strncmp(buff, tp->name, 3) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ } ++ else if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ } ++ ++ for (tp = TimezoneTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ if (strcmp(buff, "dst") == 0) ++ return tDST; ++ ++ for (tp = UnitsTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ /* Strip off any plural and try the units table again. */ ++ i = strlen(buff) - 1; ++ if (buff[i] == 's') { ++ buff[i] = '\0'; ++ for (tp = UnitsTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ buff[i] = 's'; /* Put back for "this" in OtherTable. */ ++ } ++ ++ for (tp = OtherTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ /* Avoid confusion with 'T' in RFC3339 and 't' in Military timezones */ ++ if (!vars->yyHaveTime && strcmp(buff, "t") == 0) ++ return tRFC3339; ++ ++ /* Military timezones. */ ++ if (buff[1] == '\0' && isalpha(*buff)) { ++ for (tp = MilitaryTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ } ++ ++ /* Drop out any periods and try the timezone table again. */ ++ for (i = 0, p = q = buff; *q; q++) ++ if (*q != '.') ++ *p++ = *q; ++ else ++ i++; ++ *p = '\0'; ++ if (i) ++ for (tp = TimezoneTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ for (i = 1; i <= 12; i++) ++ for (abbrev = 0; abbrev < 2; abbrev++) ++ if (PTimeIsMonthName(buff, i, abbrev)) { ++ yylval->Number = i; ++ return tMONTH; ++ } ++ ++ for (i = 1; i <= 7; i++) ++ for (abbrev = 0; abbrev < 2; abbrev++) ++ if (PTimeIsDayName(buff, i, abbrev)) { ++ yylval->Number = i; ++ return tDAY; ++ } ++ ++ return tID; ++} ++ ++ ++#ifdef _MSC_VER ++#pragma warning(disable:4211) ++#endif ++ ++#ifndef __GNUC__ ++static ++#endif ++int yylex(YYSTYPE * yylval, struct Variables * vars) ++{ ++ register char *p; ++ char buff[20]; ++ int Count; ++ int sign; ++ register int c = PTimeGetChar(vars->yyInput); ++ ++ while (c != EOF && c != '\0' && c != '\n') { ++ while (isspace(c)) ++ c = PTimeGetChar(vars->yyInput); ++ ++ if (isdigit(c) || c == '-' || c == '+') { ++ if (c == '-' || c == '+') { ++ sign = c == '-' ? -1 : 1; ++ if (!isdigit(c = PTimeGetChar(vars->yyInput))) ++ /* skip the '-' sign */ ++ continue; ++ } ++ else ++ sign = 0; ++ yylval->Number = 0; ++ Count = 0; /* Count number of digits */ ++ while (isdigit(c)) { ++ yylval->Number = 10 * yylval->Number + c - '0'; ++ c = PTimeGetChar(vars->yyInput); ++ Count++; ++ } ++ PTimeUngetChar(vars->yyInput, c); ++ if (sign < 0) ++ yylval->Number = -yylval->Number; ++ if (Count == 4) ++ return sign ? tS4DIGITNUMBER : t4DIGITNUMBER; ++ if (sign) ++ return tSNUMBER; ++ if (Count == 6) ++ return t6DIGITNUMBER; ++ if (Count == 8) ++ return t8DIGITNUMBER; ++ return tUNUMBER; ++ } ++ ++ if (isalpha(c)) { ++ for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(vars->yyInput)) { ++ if (p < &buff[sizeof(buff)-1]) ++ *p++ = (char)c; ++ } ++ *p = '\0'; ++ PTimeUngetChar(vars->yyInput, c); ++ return LookupWord(buff, yylval, vars); ++ } ++ ++ if (c != '(') ++ return c; ++ ++ Count = 0; ++ do { ++ c = PTimeGetChar(vars->yyInput); ++ if (c == '\0' || c == EOF) ++ return c; ++ if (c == '(') ++ Count++; ++ else if (c == ')') ++ Count--; ++ } while (Count > 0); ++ } ++ ++ if (c == '\n') ++ PTimeUngetChar(vars->yyInput, c); ++ ++ return EOF; ++} ++ ++#ifdef _MSC_VER ++#pragma warning(default:4211) ++#endif ++ ++ ++static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds, ++ MERIDIAN Meridian) ++{ ++ if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59) ++ return -1; ++ switch (Meridian) { ++ case MER24: ++ if (Hours < 0 || Hours > 23) ++ return -1; ++ return (Hours * 60L + Minutes) * 60L + Seconds; ++ case MERam: ++ if (Hours < 1 || Hours > 12) ++ return -1; ++ if (Hours == 12) ++ Hours = 0; ++ return (Hours * 60L + Minutes) * 60L + Seconds; ++ case MERpm: ++ if (Hours < 1 || Hours > 12) ++ return -1; ++ if (Hours == 12) ++ Hours = 0; ++ return ((Hours + 12) * 60L + Minutes) * 60L + Seconds; ++ } ++ ++ return -1; ++} ++ ++ ++static time_t Convert(time_t Month, time_t Day, time_t Year, ++ time_t Hours, time_t Minutes, time_t Seconds, ++ MERIDIAN Meridian, DSTMODE DSTmode, time_t yyTimezone) ++{ ++ static int DaysInMonth[12] = { ++ 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ++ }; ++ time_t tod; ++ time_t Julian; ++ int i; ++ ++ if (Year < 0) ++ Year = -Year; ++ if (Year < 70) ++ Year += 2000; ++ else if (Year < 100) ++ Year += 1900; ++ DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ++ ? 29 : 28; ++ /* Checking for 2038 bogusly assumes that time_t is 32 bits. But ++ I'm too lazy to try to check for time_t overflow in another way. */ ++ if (Year < EPOCH || Year > 2038 ++ || Month < 1 || Month > 12 ++ /* Lint fluff: "conversion from long may lose accuracy" */ ++ || Day < 1 || Day > DaysInMonth[(int)--Month]) ++ return -1; ++ ++ for (Julian = Day - 1, i = 0; i < Month; i++) ++ Julian += DaysInMonth[i]; ++ for (i = EPOCH; i < Year; i++) ++ Julian += 365 + (i % 4 == 0); ++ Julian *= SECSPERDAY; ++ Julian += yyTimezone * 60L; ++ if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0) ++ return -1; ++ Julian += tod; ++ if (DSTmode == DSTon ++ || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst)) ++ Julian -= 60 * 60; ++ return Julian; ++} ++ ++ ++static time_t DSTcorrect(time_t Start, time_t Future) ++{ ++ time_t StartDay; ++ time_t FutureDay; ++ ++ StartDay = (localtime(&Start)->tm_hour + 1) % 24; ++ FutureDay = (localtime(&Future)->tm_hour + 1) % 24; ++ return (Future - Start) + (StartDay - FutureDay) * 60L * 60L; ++} ++ ++ ++static time_t RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber) ++{ ++ struct tm *tm; ++ time_t now; ++ ++ now = Start; ++ tm = localtime(&now); ++ now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7); ++ now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1); ++ return DSTcorrect(Start, now); ++} ++ ++ ++static time_t RelativeMonth(time_t Start, time_t RelMonth, time_t yyTimezone) ++{ ++ struct tm *tm; ++ time_t Month; ++ time_t Year; ++ ++ if (RelMonth == 0) ++ return 0; ++ tm = localtime(&Start); ++ Month = 12 * tm->tm_year + tm->tm_mon + RelMonth; ++ Year = Month / 12 + 1900; ++ Month = Month % 12 + 1; ++ return DSTcorrect(Start, ++ Convert(Month, (time_t)tm->tm_mday, Year, ++ (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec, ++ MER24, DSTmaybe, yyTimezone)); ++} ++ ++ ++static void SetPossibleDate(struct Variables * var, ++ time_t possible_day, ++ time_t possible_month, ++ time_t possible_year) ++{ ++ int date_order; ++ ++ if (possible_day > 31) /* test for ymd */ ++ date_order = 2; ++ else if (possible_day > 12) /* test for dmy */ ++ date_order = 1; ++ else if (possible_month > 12) /* test for mdy */ ++ date_order = 0; ++ else ++ date_order = PTimeGetDateOrder(); ++ ++ switch (date_order) { ++ case 0 : ++ var->yyDay = possible_month; ++ var->yyMonth = possible_day; ++ var->yyYear = possible_year; ++ break; ++ case 1 : ++ var->yyDay = possible_day; ++ var->yyMonth = possible_month; ++ var->yyYear = possible_year; ++ break; ++ default : ++ var->yyDay = possible_year; ++ var->yyMonth = possible_month; ++ var->yyYear = possible_day; ++ } ++} ++ ++ ++time_t STDAPICALLTYPE PTimeParse(void * inputStream, struct tm * now, int timezone) ++{ ++ time_t Start; ++ struct Variables var; ++ ++ ++ var.yyInput = inputStream; ++ var.yyYear = now->tm_year + 1900; ++ var.yyMonth = now->tm_mon + 1; ++ var.yyDay = now->tm_mday; ++ var.yyTimezone = -timezone; ++ var.yyDSTmode = DSTmaybe; ++ var.yyHour = 0; ++ var.yyMinutes = 0; ++ var.yySeconds = 0; ++ var.yyMeridian = MER24; ++ var.yyRelSeconds = 0; ++ var.yyRelMonth = 0; ++ var.yyHaveDate = 0; ++ var.yyHaveDay = 0; ++ var.yyHaveRel = 0; ++ var.yyHaveTime = 0; ++ var.yyHaveZone = 0; ++ ++ yyparse(&var); ++ ++ if (var.yyHaveTime > 1 || var.yyHaveZone > 1 || ++ var.yyHaveDate > 1 || var.yyHaveDay > 1) ++ return -1; ++ ++ if (var.yyHaveTime == 0 && var.yyHaveZone == 0 && ++ var.yyHaveDate == 0 && var.yyHaveDay == 0 && var.yyHaveRel == 0) ++ return -1; ++ ++ if (var.yyHaveDate || var.yyHaveTime || var.yyHaveDay) { ++ Start = Convert(var.yyMonth, var.yyDay, var.yyYear, ++ var.yyHour, var.yyMinutes, var.yySeconds, ++ var.yyMeridian, var.yyDSTmode, var.yyTimezone); ++ if (Start < 0) ++ return -1; ++ } ++ else { ++ time(&Start); ++ if (!var.yyHaveRel) ++ Start -= ((now->tm_hour * 60L + now->tm_min) * 60L) + now->tm_sec; ++ } ++ ++ Start += var.yyRelSeconds; ++ Start += RelativeMonth(Start, var.yyRelMonth, var.yyTimezone); ++ ++ if (var.yyHaveDay && !var.yyHaveDate) ++ Start += RelativeDate(Start, var.yyDayOrdinal, var.yyDayNumber); ++ ++ /* Have to do *something* with a legitimate -1 so it's distinguishable ++ * from the error return value. (Alternately could set errno on error.) */ ++ return Start == -1 ? 0 : Start; ++} ++ ++ ++#ifdef _MSC_VER ++#pragma warning(disable:4028 4100 4211) ++#endif ++ ++#ifdef __GNUC__ ++int yyerror(const char * s) ++{ ++ return 0; ++} ++#else ++static void yyerror(const char * s) ++{ ++} ++#endif ++ ++#ifdef _MSC_VER ++#pragma warning(default:4028 4100 4211) ++#endif ++ ++ ++/* End of file ***************************************************************/ diff --git a/extra/ruby/0001-remove-db-support.patch b/extra/ruby/0001-remove-db-support.patch deleted file mode 100644 index bdd7e5871..000000000 --- a/extra/ruby/0001-remove-db-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Sat, 10 Aug 2013 10:50:16 -0700 -Subject: [PATCH] remove db support - ---- - ext/dbm/extconf.rb | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb -index 32a9446..2412404 100644 ---- a/ext/dbm/extconf.rb -+++ b/ext/dbm/extconf.rb -@@ -5,17 +5,11 @@ dir_config("dbm") - if dblib = with_config("dbm-type", nil) - dblib = dblib.split(/[ ,]+/) - else -- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm) -+ dblib = %w(libc gdbm_compat gdbm qdbm) - end - - headers = { - "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc. -- "db" => ["db.h"], -- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], -- "db2" => ["db2/db.h", "db2.h", "db.h"], -- "db3" => ["db3/db.h", "db3.h", "db.h"], -- "db4" => ["db4/db.h", "db4.h", "db.h"], -- "db5" => ["db5/db.h", "db5.h", "db.h"], - "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1 - "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0 - "qdbm" => ["qdbm/relic.h", "relic.h"], --- -1.8.3.4 - diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 5737c5a6a..e5e55363f 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -10,26 +10,21 @@ arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') -options=('!emptydirs' '!makeflags') -source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" - 'gemrc' - '0001-remove-db-support.patch') +options=('!emptydirs' '!makeflags' 'staticlibs') +source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" + 'gemrc') md5sums=('60913f3eec0c4071f44df42600be2604' - '6fb8e7a09955e0f64be3158fb4a27e7a' - 'b93ff50214a3da26525244cf37b71a8f') + '6fb8e7a09955e0f64be3158fb4a27e7a') build() { cd ruby-${pkgver//_/-} - # use gdbm because db v6 changed the license to AGPL - patch -Np1 -i ${srcdir}/0001-remove-db-support.patch - PKG_CONFIG=/usr/bin/pkg-config ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --enable-shared \ - --enable-pthread \ - --disable-rpath + --disable-rpath \ + --with-dbm-type=gdbm_compat make } diff --git a/extra/speex/PKGBUILD b/extra/speex/PKGBUILD index d87cae398..4caff0078 100644 --- a/extra/speex/PKGBUILD +++ b/extra/speex/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176866 2013-02-02 03:18:03Z heftig $ +# $Id: PKGBUILD 196966 2013-10-21 11:52:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributer: Jason Chu <jason@archlinux.org> pkgname=speex pkgver=1.2rc1 -pkgrel=3 +pkgrel=4 pkgdesc="A free codec for free speech" arch=(i686 x86_64) url="http://www.speex.org/" @@ -16,7 +16,7 @@ md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static make } diff --git a/extra/tidyhtml/PKGBUILD b/extra/tidyhtml/PKGBUILD index aaca30008..958210b0a 100644 --- a/extra/tidyhtml/PKGBUILD +++ b/extra/tidyhtml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146404 2012-01-10 21:14:26Z andrea $ +# $Id: PKGBUILD 197005 2013-10-21 12:38:07Z andrea $ # Maintainer: # Contributor: eric <eric@archlinux.org> # Contributor: Markus Meissner <markus@meissna.de> @@ -6,13 +6,12 @@ pkgname=tidyhtml # obtain pkgver from http://tidy.cvs.sourceforge.net/tidy/tidy/src/version.h?view=markup pkgver=1.46 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to tidy down your HTML code to a clean style" arch=('i686' 'x86_64') url="http://tidy.sourceforge.net/" license=('custom') depends=('glibc') -options=('!libtool') source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('3d970d54be83c5ec985687e9976a2832') @@ -26,17 +25,17 @@ mksource() { } build(){ - cd $srcdir/${pkgname}-${pkgver}/tidy + cd ${pkgname}-${pkgver}/tidy source build/gnuauto/setup.sh - + ./configure --prefix=/usr make } package() { - cd $srcdir/${pkgname}-${pkgver}/tidy + cd ${pkgname}-${pkgver}/tidy make DESTDIR=$pkgdir install - + install -Dm644 htmldoc/license.html \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD index a6d50bc14..6d84309a9 100644 --- a/extra/vc/PKGBUILD +++ b/extra/vc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196799 2013-10-19 12:28:25Z andrea $ +# $Id: PKGBUILD 197078 2013-10-21 16:10:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: PedsXing <pedsxing at gmx dot net> pkgname=vc pkgver=0.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library to ease explicit vectorization of C++ code" url='http://code.compeng.uni-frankfurt.de/projects/vc/' arch=('x86_64' 'i686') @@ -16,7 +16,7 @@ md5sums=('a55e2871a33dbcbbe444c22ccef47dbd') prepare() { mkdir build } - + build() { cd build cmake ../Vc-${pkgver} \ diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 2b17d70c5..ec03926d7 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $ +# $Id: PKGBUILD 196978 2013-10-21 12:12:28Z tpowa $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=vde2 pkgver=2.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" license=("GPL" "LGPL" "CUSTOM") arch=('i686' 'x86_64') depends=('bash' 'libpcap' 'openssl') makedepends=('python') -backup=(etc/conf.d/vde) source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 dhcpd.conf.sample iptables.rules.sample @@ -39,10 +38,5 @@ package() { md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' '7d9bc56d2e561d849e915000d1c0f269' 'a920123fc620bcedbccb703a8d1bdc55' - 'cb8ace28e8efd4dad128be4be71b3b07' - '63033c33565e2030541c5e05e9d9b063') -md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' - '7d9bc56d2e561d849e915000d1c0f269' - 'a920123fc620bcedbccb703a8d1bdc55' 'f47d3372382dc9d67c1174d2796729fe' '63033c33565e2030541c5e05e9d9b063') diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD index 80d66a5cf..c70dd0211 100644 --- a/extra/wcslib/PKGBUILD +++ b/extra/wcslib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183302 2013-04-21 06:02:20Z andrea $ -# Maintainer: Your Name <youremail@domain.com> +# $Id: PKGBUILD 197080 2013-10-21 16:11:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=wcslib -pkgver=4.17 +pkgver=4.19 pkgrel=1 pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL3') depends=('cfitsio') makedepends=('gcc-fortran') source=("ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}.tar.bz2") -md5sums=('81f739c84789b84626db9fe4cd866081') +md5sums=('79d47ab10dfde08d91c0e6184cf73bda') build() { cd $pkgname-$pkgver @@ -21,6 +21,7 @@ build() { make } +# Fails on i686 #check() { # cd $pkgname-$pkgver # make -k check diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD index 23c6bb99d..09ee547fe 100644 --- a/extra/xerces-c/PKGBUILD +++ b/extra/xerces-c/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184762 2013-05-08 07:12:02Z andrea $ +# $Id: PKGBUILD 197079 2013-10-21 16:11:01Z andrea $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> @@ -6,13 +6,12 @@ pkgname=xerces-c pkgver=3.1.1 -pkgrel=4 +pkgrel=5 pkgdesc="A validating XML parser written in a portable subset of C++" arch=('i686' 'x86_64') url="http://xerces.apache.org/xerces-c/" license=('APACHE') depends=('gcc-libs' 'curl') -options=('!libtool') source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz") md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae') diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD index 36fb4823e..5fc04de6a 100644 --- a/extra/xfce4-dev-tools/PKGBUILD +++ b/extra/xfce4-dev-tools/PKGBUILD @@ -1,19 +1,26 @@ -# $Id: PKGBUILD 157849 2012-04-30 04:20:15Z foutrelis $ +# $Id: PKGBUILD 197077 2013-10-21 15:48:24Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-dev-tools pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Xfce developer tools" arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2') depends=('gtk-doc' 'automake' 'make' 'intltool' 'pkg-config') -options=('!libtool') -source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8') +source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch) +sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8' + '4ecfdf8cdb0940ce1044349bdb6646192dffd2b7f4e890f0ef5f00bfdfad7676') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch" +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-dev-tools/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch b/extra/xfce4-dev-tools/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch new file mode 100644 index 000000000..1c9fb4e2f --- /dev/null +++ b/extra/xfce4-dev-tools/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch @@ -0,0 +1,22 @@ +From 236a0c578369bfc726f7d9a830975cbeaefbfee5 Mon Sep 17 00:00:00 2001 +From: Nick Schermer <nick@xfce.org> +Date: Mon, 23 Jul 2012 15:31:48 +0000 +Subject: Remove FORTIFY_SOURCE=2. + +This gives warnings with full debug builds on recent gcc versions. +--- +diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4 +index c5f5583..f258822 100644 +--- a/m4macros/xdt-features.m4 ++++ b/m4macros/xdt-features.m4 +@@ -79,7 +79,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]), + -Wcast-align -Wformat-security \ + -Winit-self -Wmissing-include-dirs -Wundef \ + -Wmissing-format-attribute -Wnested-externs" +- CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" ++ CPPFLAGS="$CPPFLAGS" + + if test x`uname` = x"Linux"; then + xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" +-- +cgit v0.9.2 diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index e3e5f7f1d..a72bf74c6 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -167,7 +167,7 @@ package_icecat-l10n-$(echo $lang | tr A-Z a-z) () { done sha512sums=( - 1ec2a61191cdcd98678cdc823cf7b03bfad1444c5e33b5f2e264863ee302639202680207fc36c9a0337d699dcc7d7cc99a3f02b9caa07dc64d907c0c42a51138 + b6ddcf75c0ff8c542851be45147dfe22c1a73c5e4dd59ce6543d5a3e7bba70be3576bd280cbe53f479bfdf5c3839561484b0f9e93ca061bae9ff25990a7e899b f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439 d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441 6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 551605dd7..fe7f265ce 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -10,12 +10,6 @@ browser.search.order.1=DuckDuckGo HTML browser.search.order.2=DuckDuckGo Lite browser.search.order.3=Seeks Search -# URL for site-specific search engines -# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site -# to be searched and the user's search query. Place them in the appropriate location -# for your locale's URL but do not translate them. -browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} - # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the # profile database. Note that "new" is defined as "has a different URL"; this diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 31a7bde09..6727d45a5 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -10,46 +10,52 @@ # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -_pgo=false +_pgo=true pkgname=icecat -pkgver=17.0.1 -pkgrel=10 +pkgver=24.0 +pkgrel=1 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base wireless_tools hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 unzip zip) -options=(!emptydirs) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 unzip zip) +options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi -optdepends=('networkmanager: Location detection via available WiFi networks') +optdepends=('networkmanager: Location detection via available WiFi networks' + 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' + 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-good-plugins: webm and mp4 demuxing' + 'gstreamer0.10-ugly-plugins: h.264 decoding' + 'libpulse: PulseAudio audio driver') url=http://www.gnu.org/software/gnuzilla/ install=$pkgname.install source=( - ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz + ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::2}/$pkgname-$pkgver.tar.gz mozconfig mozconfig.pgo - xulrunner-copy-stub.patch libre.patch $pkgname.desktop $pkgname-safe.desktop $pkgname-install-dir.patch vendor.js + icecat-20.0.1-fixed-loading-icon.png #cairo.patch ) + md5sums=( - c88a29aa92fc41a07e777a0e63ac5f7e - 5154141da7cf38102927e3addb49ccac - 383e8e2a97a8b13fe56d153adb6878b6 - 3009b176cc5f9b1e416b1bf7c45b064b - 0c358e8357e3629de6982246ace629ea + 0d3fdcec3f5fde494dedb595387e8f21 + 71dce16848bc51503a154841ce99427b + df08eaa1ac3bc6c2356be4fbf8ec8932 + b5198ac730fc09e3d0297523b28289c4 b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 2c48d9feffb909df35b552f9c5c555d5 + 6e335a517c68488941340ee1c23f97b0 #c8552d030494443218d88792f4dbbd0f ) @@ -64,7 +70,6 @@ prepare() { fi patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname - patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff #patch -Np1 -i $srcdir/cairo.patch # fix cairo @@ -100,9 +105,17 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" + # Use gold, as Mozilla can use some of its features, such as safe ICF + #ln -s /usr/bin/ld.gold "$srcdir/path/ld" + # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix tab loading icon (flickers with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/icecat-20.0.1-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png } build() { @@ -111,19 +124,27 @@ build() { export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" export PYTHON="/usr/bin/python2" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS - - if $_pgo; then - # Enable PGO - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - make -f client.mk build MOZ_PGO=1 || _fail=1 + if [[ $CARCH == i686 ]]; then + # Work around memory address space exhaustion during linking on i686 + LDFLAGS+=' -Wl,--no-keep-memory' + fi - kill $! || true - return $_fail + if $_pgo; then + if [[ $CARCH != i686 ]]; then + # Set up PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + + if ! make -f client.mk build MOZ_PGO=1; then + kill $! + return 1 + fi + + kill $! || true + else + make -f client.mk build + fi else make -f client.mk build fi @@ -133,7 +154,7 @@ package() { cd $srcdir/gnuzilla-build make -j1 -f client.mk DESTDIR=$pkgdir install - install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js" + install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" brandingdir=browser/branding/unofficial icondir=$pkgdir/usr/share/icons/hicolor @@ -145,11 +166,13 @@ package() { install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop done - rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins} + rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation} ln -sf /usr/share/hunspell $pkgdir/usr/lib/$pkgname/dictionaries ln -sf /usr/share/hyphen $pkgdir/usr/lib/$pkgname/hyphenation - ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/plugins - ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins + + rm -rf $pkgdir/usr/lib/$pkgname/{searchplugins,plugins} + ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/browser/plugins + ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/browser/searchplugins # We don't want the development stuff rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl} diff --git a/libre/icecat/icecat-20.0.1-fixed-loading-icon.png b/libre/icecat/icecat-20.0.1-fixed-loading-icon.png Binary files differnew file mode 100644 index 000000000..55f25e591 --- /dev/null +++ b/libre/icecat/icecat-20.0.1-fixed-loading-icon.png diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index c5c9a6ade..244592db8 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,23 +1,8 @@ -diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -1150,11 +1150,9 @@ - // (This is intentionally on the high side; see bug 746055.) - pref("image.mem.max_decoded_image_kb", 256000); - --// Example social provider --pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); - // Comma-separated list of nsIURI::prePaths that are allowed to activate - // built-in social functionality. --pref("social.activation.whitelist", "https://www.facebook.com"); -+pref("social.activation.whitelist", ""); - pref("social.sidebar.open", true); - pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.active", false); -diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index f4adbdc..fe7f265 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,30 +3,18 @@ +@@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -31,84 +16,61 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow - -# This is the default set of web based feed handlers shown in the reader -# selection UI --browser.contentHandlers.types.0.title=Bloglines --browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s --browser.contentHandlers.types.1.title=My Yahoo --browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s --browser.contentHandlers.types.2.title=Google --browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s -- --# Keyword URL (for location bar searches) --keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= +-browser.contentHandlers.types.0.title=My Yahoo! +-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search - # URL for site-specific search engines - # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site - # to be searched and the user's search query. Place them in the appropriate location - # for your locale's URL but do not translate them. --browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} - # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -34,3 +22,11 @@ - # means that it's not possible to update the name of existing handler, so +@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 -+ -+# The default set of protocol handlers for irc: + +-# The default set of protocol handlers for webcal: +-gecko.handlerService.schemes.webcal.0.name=30 Boxes +-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s +- +-# The default set of protocol handlers for mailto: +-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail +-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s +-gecko.handlerService.schemes.mailto.1.name=Gmail +-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +- + # The default set of protocol handlers for irc: +-gecko.handlerService.schemes.irc.0.name=Mibbit +-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net -+ -+# The default set of protocol handlers for ircs: + + # The default set of protocol handlers for ircs: +-gecko.handlerService.schemes.ircs.0.name=Mibbit +-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul ---- a/dom/ipc/test.xul -+++ b/dom/ipc/test.xul -@@ -294,6 +294,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> - <label id="messageLog" value="" crop="center"/> - </window> -diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul ---- a/layout/ipc/test-ipcbrowser.xul -+++ b/layout/ipc/test-ipcbrowser.xul -@@ -69,6 +69,6 @@ - label="setViewportScale"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" - remote="true"/> - </window> -diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in +diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in +index e925c1e..5101035 100644 --- a/browser/locales/generic/profile/bookmarks.html.in +++ b/browser/locales/generic/profile/bookmarks.html.in -@@ -11,13 +11,21 @@ +@@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> + <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> </DL><p> - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> + <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> + <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> + <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> + <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/klEQVQ4jWP4TyFgGAYGLN25iDID+pd0UGbAxMUTUQT+fP36/9+/f2A2jMZrwKyNEC/8+P71/6/ijP9/fv/+/23Hzv+fly/9/7m7+//XkuL/7yvL/j+PCf3/qrn+/+ed2/7/evocZPr/b3fu/Ge4cuf6/2/fPv5PnaD9f720wP9lyir/F0kI/V8myv9/jbjA/w3i/P+XC/H8n8Uv8H+6kOj/JZIS/2eqaP2/umPP/88/fv5nADnz+cuX/x0S9f8n6Kv/jxGQ+R8vJPu/x9D+/2wrz//9hnb/mzVM/5fKav4vMbL835OZ+//ty9dw7zFcuPuYKL/iDAOydY4aAAcA33O6tzziloYAAAAASUVORK5CYII=">Parabola GNU/Linux-libre Labs</A> -+ <DT><A HREF="https://identi.ca/group/parabola" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAHElEQVQ4jWNgGFTgVwLLf2LwqAGjBgxyA4YmAABB5QQG+m9VWQAAAABJRU5ErkJggg==" LAST_CHARSET="UTF-8">Parabola GNU/Linux-libre (parabola) group - Identi.ca</A> + </DL><p> + <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> + <DL><p> @@ -118,3 +80,27 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ + <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> +diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul +index 25efdb6..8162c73 100644 +--- a/dom/ipc/test.xul ++++ b/dom/ipc/test.xul +@@ -299,6 +299,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> + <label id="messageLog" value="" crop="center"/> + </window> +diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul +index 237ba61..7603d7d 100644 +--- a/layout/ipc/test-ipcbrowser.xul ++++ b/layout/ipc/test-ipcbrowser.xul +@@ -73,6 +73,6 @@ + label="setViewportScale"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="content" ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" + remote="true"/> + </window> diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index d1fd0e3f8..2f6d0757b 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -23,15 +23,13 @@ ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi #ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification -ac_add_options --enable-gstreamer +ac_add_options --enable-pulseaudio ac_add_options --disable-crashreporter ac_add_options --disable-updater -ac_add_options --disable-tests ac_add_options --disable-installer # Parabola features diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index 2f4ebe32b..71ba205a4 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,3 +1,3 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 767afa781..ac05421c1 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96809 2013-09-05 18:48:20Z seblu $ +# $Id: PKGBUILD 98971 2013-10-21 20:21:06Z seblu $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -13,7 +13,7 @@ _basekernel=3.11 #_sublevel=6 #_pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=1 +pkgrel=2 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -172,7 +172,6 @@ package_x86_energy_perf_policy-libre() { package_usbip-libre() { pkgdesc='An USB device sharing system over IP network' depends=('glib2' 'sysfsutils') - options=('!libtool') replaces=('usbip') conflicts=('usbip') provides=("usbip=$pkgver") diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD index 358e11709..b3a94547f 100644 --- a/libre/mkpxelinux/PKGBUILD +++ b/libre/mkpxelinux/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185735 2013-05-18 06:50:57Z tpowa $ +# $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=mkpxelinux -pkgver=2013.03 -pkgrel=2 +pkgver=2013.10 +pkgrel=1 pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)" arch=(any) license=('GPL') @@ -12,10 +12,6 @@ depends=('mkinitcpio' 'tftp-hpa' 'syslinux') backup=(etc/mkpxelinux.conf) optdepends=('dhcp: for dhcp server usage') source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg') -md5sums=('7225e73bfe717f97bd7ab52f5ab157f6' - '58dfd6b96e7faeb75b7e5753e1751f31' - 'aad6a91bae077461c33c2db3844814f0' - 'ae0007d6679b5a575b2a9e5ac3664baf') package() { @@ -25,3 +21,7 @@ package() install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg" install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg" } +md5sums=('7225e73bfe717f97bd7ab52f5ab157f6' + '44c6b9fa8ae668a432f26adb9e70bd3f' + '158dece3af889740b0f0ee397f9058ed' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux index 6dd8213f2..35e946f82 100755 --- a/libre/mkpxelinux/mkpxelinux +++ b/libre/mkpxelinux/mkpxelinux @@ -88,4 +88,4 @@ echo ":: Installing message files to ${INSTALLDIR} ..." [ ! -s ${INSTALLDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 [ ! -s ${INSTALLDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 echo ":: Installing PXELINUX to ${INSTALLDIR} ..." - install -m644 /usr/lib/syslinux/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed." + install -m644 /usr/lib/syslinux/bios/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed." diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD index 29c926e1d..36eeb00ef 100644 --- a/libre/openexr-libre/PKGBUILD +++ b/libre/openexr-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191713 2013-07-29 10:21:41Z tpowa $ +# $Id: PKGBUILD 196943 2013-10-21 10:31:44Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=openexr pkgname=openexr-libre pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" url="http://www.openexr.com/" arch=('i686' 'x86_64' 'mips64el') |
