From 26606f981048ee9efcda690b619d3c53501a7a58 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 19 Aug 2013 01:35:50 -0700 Subject: Mon Aug 19 01:34:37 PDT 2013 --- coherence/empathy-coherence/PKGBUILD | 39 ++++++ coherence/empathy-coherence/empathy.install | 16 +++ coherence/evolution-data-server-coherence/PKGBUILD | 40 ++++++ .../evolution-data-server.install | 11 ++ community/freeorion/PKGBUILD | 109 ++++++++++++++++ community/freeorion/cmake_python.patch | 23 ++++ community/freeorion/freeorion.install | 13 ++ community/freeorion/freeorion.sh | 143 +++++++++++++++++++++ community/gigi/PKGBUILD | 7 +- community/goaccess/PKGBUILD | 9 +- community/mksh/PKGBUILD | 9 +- community/mupdf/PKGBUILD | 9 +- community/nodejs/PKGBUILD | 6 +- community/php-mongo/PKGBUILD | 6 +- community/pidgin-lwqq/PKGBUILD | 10 +- community/v4l2ucp/PKGBUILD | 35 +++++ community/v4l2ucp/v4l2ucp.install | 11 ++ core/glib2/PKGBUILD | 12 +- core/glib2/bug701560.patch | 37 ------ extra/antlr2/PKGBUILD | 24 ++-- extra/boost/PKGBUILD | 12 +- extra/boost/fix-new-glibc.patch | 14 ++ extra/gstreamer-vaapi/PKGBUILD | 12 +- extra/java7-openjdk/PKGBUILD | 15 ++- 24 files changed, 529 insertions(+), 93 deletions(-) create mode 100644 coherence/empathy-coherence/PKGBUILD create mode 100644 coherence/empathy-coherence/empathy.install create mode 100644 coherence/evolution-data-server-coherence/PKGBUILD create mode 100644 coherence/evolution-data-server-coherence/evolution-data-server.install create mode 100644 community/freeorion/PKGBUILD create mode 100644 community/freeorion/cmake_python.patch create mode 100644 community/freeorion/freeorion.install create mode 100644 community/freeorion/freeorion.sh create mode 100644 community/v4l2ucp/PKGBUILD create mode 100644 community/v4l2ucp/v4l2ucp.install delete mode 100644 core/glib2/bug701560.patch create mode 100644 extra/boost/fix-new-glibc.patch diff --git a/coherence/empathy-coherence/PKGBUILD b/coherence/empathy-coherence/PKGBUILD new file mode 100644 index 000000000..de0eca1e9 --- /dev/null +++ b/coherence/empathy-coherence/PKGBUILD @@ -0,0 +1,39 @@ + +_pkgname=empathy +pkgname=empathy-coherence +pkgver=3.8.3 +pkgrel=1 +pkgdesc="A GNOME instant messaging client using the Telepathy framework without support for nonfree, unsafe and dangerous for privacy protocols" +arch=(i686 x86_64) +url="http://live.gnome.org/Empathy" +license=(GPL2) +depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control) +makedepends=(intltool itstool docbook-xsl python2) +optdepends=('telepathy-gabble: XMPP/Jabber support' + 'telepathy-idle: IRC support' + 'telepathy-salut: Link-local XMPP support' + 'telepathy-rakia: SIP support') +options=('!libtool' '!makeflags') +groups=(gnome) +install=empathy.install +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz) +sha256sums=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0') + +build() { + cd $_pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/empathy \ + --disable-static + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + diff --git a/coherence/empathy-coherence/empathy.install b/coherence/empathy-coherence/empathy.install new file mode 100644 index 000000000..4c5b64313 --- /dev/null +++ b/coherence/empathy-coherence/empathy.install @@ -0,0 +1,16 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + echo "To use Empathy you need to install at least one Telepathy connection manager." +} + +post_upgrade() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_remove() { + post_upgrade +} \ No newline at end of file diff --git a/coherence/evolution-data-server-coherence/PKGBUILD b/coherence/evolution-data-server-coherence/PKGBUILD new file mode 100644 index 000000000..2ba93b16c --- /dev/null +++ b/coherence/evolution-data-server-coherence/PKGBUILD @@ -0,0 +1,40 @@ + +_pkgname=evolution-data-server +pkgname=evolution-data-server-coherence +pkgver=3.8.5 +pkgrel=1 +pkgdesc="Centralized access to appointments and contacts without libgdata support" +arch=(i686 x86_64) +depends=(nss krb5 libical db libxml2 libsoup gtk3 libsecret gcr) +makedepends=(intltool gperf gobject-introspection vala python2 gnome-common) +options=('!libtool') +install=$_pkgname.install +url="http://www.gnome.org" +license=(GPL) +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) +sha256sums=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a') + + +build() { + cd "$_pkgname-$pkgver" + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-openldap=yes \ + --libexecdir=/usr/lib/evolution-data-server \ + --with-krb5=/usr --with-libdb=/usr \ + --without-libgdata \ + --disable-goa \ + --disable-google \ + --disable-weather \ + --enable-vala-bindings --disable-uoa PYTHON=python2 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd "$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/coherence/evolution-data-server-coherence/evolution-data-server.install b/coherence/evolution-data-server-coherence/evolution-data-server.install new file mode 100644 index 000000000..e75920e11 --- /dev/null +++ b/coherence/evolution-data-server-coherence/evolution-data-server.install @@ -0,0 +1,11 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade () { + post_install +} + +post_remove () { + post_install +} \ No newline at end of file diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD new file mode 100644 index 000000000..a130e59b3 --- /dev/null +++ b/community/freeorion/PKGBUILD @@ -0,0 +1,109 @@ +# $Id: PKGBUILD 95910 2013-08-18 16:26:52Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Elmo Todurov +# Contributor: guini +# Contributor: Forrest Loomis +# Contributor: Sven-Hendrik Haase +# Contributor: fana-m + +pkgname=freeorion +pkgver=0.4.3 +pkgrel=2 +_svnrev=6344 +_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/#revision=6344") +sha256sums=('25b574af5397226373e24510ce59de94c5df5b31d94562fc0de387fd70731707' + 'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f' + '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a' + 'SKIP') + +prepare() { + cd "$pkgname" + + # CMake/Python fix... + patch -N -p1 -i "$srcdir/cmake_python.patch" + + # Generate desktop shortcut + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" + + addinclude -n GG/GG/adobe/once.hpp '#include ' + addinclude -n GG/GG/adobe/closed_hash.hpp '#include ' +} + +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 new file mode 100644 index 000000000..b875fa844 --- /dev/null +++ b/community/freeorion/cmake_python.patch @@ -0,0 +1,23 @@ +--- 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 new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/community/freeorion/freeorion.install @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..9f35e7032 --- /dev/null +++ b/community/freeorion/freeorion.sh @@ -0,0 +1,143 @@ +#!/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 index 63772c53e..101ade4d5 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95773 2013-08-16 17:52:10Z arodseth $ +# $Id: PKGBUILD 95912 2013-08-18 17:24:22Z svenstaro $ # Maintainer: Alexander Rødseth # Contributor: Sven-Hendrik Haase # Contributor: fana-m @@ -7,14 +7,14 @@ pkgname=gigi pkgver=6142 -pkgrel=2 +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' 'addinclude' 'mesa-libgl') +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') @@ -31,7 +31,6 @@ prepare() { setconf cmake/GiGiOgre.pc.in prefix /usr setconf cmake/GiGi.pc.in prefix /usr setconf cmake/GiGiSDL.pc.in prefix /usr - addinclude -n GG/adobe/once.hpp '#include ' } build() { diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD index f2c1d647b..7550aed59 100644 --- a/community/goaccess/PKGBUILD +++ b/community/goaccess/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 84906 2013-02-26 01:29:13Z fyan $ +# $Id: PKGBUILD 95903 2013-08-18 15:28:38Z fyan $ # Maintainer: Felix Yan # Contributor: Josh VanderLinden # Contributor: Nicolas Storme pkgname=goaccess -pkgver=0.5 -pkgrel=2 +pkgver=0.6 +pkgrel=1 pkgdesc="An open source real-time web log analyzer and interactive viewer" arch=('i686' 'x86_64') url="http://goaccess.prosoftcorp.com" license=('GPL') depends=('ncurses' 'geoip' 'glib2') source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f6359a9553a460265f5859cea4d40ec0') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,3 +23,5 @@ package() { cd "$srcdir/$pkgname-$pkgver" make prefix="$pkgdir/usr" install } + +sha512sums=('cd3fb241a9d84f2f9023c179a96d441f7f7d52e9c7227b31a3a18761c60ae6abdbfc70799c0a2c5ceb8788afd36eeaaf55ed7944310fb5809dd403d7fe09dfbd') diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index c15073565..d04d5a8e0 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 95786 2013-08-16 19:38:52Z ttoepper $ +# $Id: PKGBUILD 95881 2013-08-18 08:58:15Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Daniel Hommel pkgname=mksh -pkgver=R48 +_pkgver=R48b +pkgver=48.1 pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' @@ -11,9 +12,9 @@ license=('custom') arch=('i686' 'x86_64') depends=('gcc-libs') install=mksh.install -source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" +source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$_pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('f714fbe2caf2bbcc592a97515ac2fda5' +md5sums=('ab9baa6b5a4de9d0e6a3ce9957c18da0' '0601617f19e1c0423cbdb8599e16eec3') check() { diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index c20a92469..8406480bb 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95688 2013-08-15 16:50:34Z bpiotrowski $ +# $Id: PKGBUILD 95919 2013-08-18 17:34:31Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Brad Fanella # Contributor: Stefan Husmann @@ -7,7 +7,7 @@ pkgname=mupdf pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64') url='http://mupdf.com' @@ -22,13 +22,16 @@ build() { CXXFLAGS+=' -fPIC' cd $pkgname-$pkgver-source - make build=release + make build=release CURL_LIBS='-lcurl -lpthread' } package() { cd $pkgname-$pkgver-source make build=release prefix="$pkgdir"/usr install + mv "$pkgdir"/usr/bin/mupdf-x11-curl "$pkgdir"/usr/bin/mupdf + rm "$pkgdir"/usr/bin/mupdf-x11 + cd platform/debian sed -i 's/mupdf.xpm/mupdf/' mupdf.desktop sed -i 's/application\/x-pdf/application\/x-pdf/' mupdf.desktop diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index d0f99a15e..4429c63af 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94551 2013-07-26 20:25:44Z bpiotrowski $ +# $Id: PKGBUILD 95908 2013-08-18 16:16:15Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.15 +pkgver=0.10.16 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('87345ab3b96aa02c5250d7b5ae1d80e620e8ae2a7f509f7fa18c4aaa340953e8') +sha256sums=('62db6ec83f34733bffdae2f8ee50d7273d568bba8814be29e78a042c1d64f31a') prepare() { cd node-v$pkgver diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD index c501d117b..de13f8385 100644 --- a/community/php-mongo/PKGBUILD +++ b/community/php-mongo/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jarek Sedlacek pkgname=php-mongo -pkgver=1.4.2 -pkgrel=2 +pkgver=1.4.3 +pkgrel=3 pkgdesc="Officially supported PHP driver for MongoDB" arch=("i686" "x86_64") url="http://www.mongodb.org/display/DOCS/PHP+Language+Center" @@ -26,5 +26,5 @@ package() { make INSTALL_ROOT="$pkgdir" install install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" } -sha256sums=('ecbf8621c418c35abb0d5e9719432a2f315db2559023861105635bae5bfbd120' +sha256sums=('43686e8c9fabfec6852fa42eb664aa662a6d423b4bd3eba41f42514892d8d4a4' 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 75cc0d86d..a260a4cf8 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 95726 2013-08-16 07:23:39Z fyan $ +# $Id: PKGBUILD 95879 2013-08-18 05:35:59Z fyan $ # Maintainer: Felix Yan pkgname=pidgin-lwqq -pkgver=0.2a.20130816 -_commit=dbd57d99769303f86f5c9aa66a7383a719a22dc7 -pkgrel=1 +pkgver=0.2a.20130818 +_commit=de2af3f13e664af0e05a197cc2bd073edffaf235 +pkgrel=2 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64') url="https://github.com/xiehuc/pidgin-lwqq" license=('GPL3') -depends=('libpurple' 'curl' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libev') +depends=('libpurple' 'curl' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libev' 'js185') optdepends=('pidgin: Multi-protocol instant messaging client' 'telepathy-haze: Empathy plugin support') makedepends=('git' 'cmake') diff --git a/community/v4l2ucp/PKGBUILD b/community/v4l2ucp/PKGBUILD new file mode 100644 index 000000000..1cf3293bb --- /dev/null +++ b/community/v4l2ucp/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 95917 2013-08-18 17:31:41Z speps $ +# Maintainer : speps +# Contributor: Xavion +# Contributor: Giovanni Scafora + +pkgname=v4l2ucp +pkgver=2.0.2 +pkgrel=1 +pkgdesc="A universal control panel for Video for Linux Two (V4L2) devices" +arch=('i686' 'x86_64') +url="http://v4l2ucp.sourceforge.net/" +license=('GPL') +depends=('qt4' 'v4l-utils') +optdepends=('mplayer: video preview') +makedepends=('cmake') +install=$pkgname.install +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('e5bc6e71e2cd3ab123c277b2f7154b4f') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + # use videodev2.h header + sed -i 's/videodev/&2/' src/v4l2ctrl.c +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/v4l2ucp/v4l2ucp.install b/community/v4l2ucp/v4l2ucp.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/community/v4l2ucp/v4l2ucp.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index ae81b895e..70ebe648f 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 191338 2013-07-23 17:13:19Z jgc $ +# $Id: PKGBUILD 193184 2013-08-18 08:13:38Z heftig $ # Maintainer: Jan de Groot pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.36.3 -pkgrel=3 +pkgver=2.36.4 +pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz - bug701560.patch revert-warn-glib-compile-schemas.patch) -sha256sums=('5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e' - '5e71f9a59f434f8850fb2474d3f8022ea36c7e254283db3437ae72f52b0690bd' +sha256sums=('f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') prepare() { cd glib-$pkgver patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch - patch -Np1 -i ../bug701560.patch - touch -r NEWS gtk-doc.make } diff --git a/core/glib2/bug701560.patch b/core/glib2/bug701560.patch deleted file mode 100644 index 041419791..000000000 --- a/core/glib2/bug701560.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05d430065da918051a97e3384c4b2252af47503d Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 20 Jun 2013 17:13:29 +0000 -Subject: Revert "g_file_set_contents(): don't fsync on ext3/4" - -We didn't actually do any real-world testing of this, and -unsurprisingly it turns out to break in at least one widely-used -configuration (Fedora 19 x86_64, ext4 on LVM). - -This reverts commit 9d0c17b50102267a5029b58b1f44efbad82d8f03. - -https://bugzilla.gnome.org/show_bug.cgi?id=701560 ---- -diff --git a/glib/gfileutils.c b/glib/gfileutils.c -index b6ca3bb..2980098 100644 ---- a/glib/gfileutils.c -+++ b/glib/gfileutils.c -@@ -1088,16 +1088,9 @@ write_to_temp_file (const gchar *contents, - /* On Linux, on btrfs, skip the fsync since rename-over-existing is - * guaranteed to be atomic and this is the only case in which we - * would fsync() anyway. -- * -- * ext3 and ext4 are also safe in this respect under the default -- * mount options (and if someone picks non-default options to -- * improve their performance at the cost of reliability, who are we -- * to argue?) -- * -- * Note: EXT[234]_SUPER_MAGIC are equal. - */ - -- if (fstatfs (fd, &buf) == 0 && (buf.f_type == BTRFS_SUPER_MAGIC || buf.f_type == EXT3_SUPER_MAGIC)) -+ if (fstatfs (fd, &buf) == 0 && buf.f_type == BTRFS_SUPER_MAGIC) - goto no_fsync; - } - #endif --- -cgit v0.9.2 diff --git a/extra/antlr2/PKGBUILD b/extra/antlr2/PKGBUILD index 31269e235..77f37b20a 100644 --- a/extra/antlr2/PKGBUILD +++ b/extra/antlr2/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $ -# Maintainer: Andrea Scarpino +# $Id: PKGBUILD 193188 2013-08-18 11:26:04Z guillaume $ +# Maintainer: Guillaume ALAUX +# Contributor: Andrea Scarpino # Contributor: George Giorgidze # Contributor: Stefan Husmann pkgbase=antlr2 pkgname=('antlr2' 'python2-antlr2') pkgver=2.7.7 -pkgrel=3 -# Arch dependant files in /usr/lib/libantlr.a +pkgrel=4 +# architecture dependant files in /usr/lib/libantlr.a arch=('i686' 'x86_64') url="http://www.antlr2.org/" license=('custom') makedepends=('java-environment' 'python2' 'sh') source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz" - 'runantlr2.sh' - 'gcc4.4.patch') + 'runantlr2.sh' + 'gcc4.4.patch') md5sums=('01cc9a2a454dd33dcd8c856ec89af090' - 'e4aa827cf78f97c4e5fae086831192d6' - '8574c93f40e6477e83c29f9b07de49da') + 'e4aa827cf78f97c4e5fae086831192d6' + '8574c93f40e6477e83c29f9b07de49da') build() { cd "${srcdir}/antlr-${pkgver}" @@ -31,7 +32,7 @@ build() { } package_antlr2() { - pkgdesc="ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, compilers, and translators from grammatical descriptions containing C++ or Java actions" + pkgdesc='Tool for language recognition with C++ or Java actions' depends=('java-runtime' 'sh') replaces=('antlr') conflicts=('antlr') @@ -48,7 +49,7 @@ package_antlr2() { } package_python2-antlr2() { - pkgdesc="ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, compilers, and translators from grammatical descriptions containing C++ or Java actions (Python version)" + pkgdesc='Tool for language recognition with C++ or Java actions - Python runtime support' depends=('antlr2' 'python2') replaces=('python-antlr') conflicts=('python-antlr') @@ -56,4 +57,7 @@ package_python2-antlr2() { cd ${srcdir}/antlr-${pkgver}/lib/python python2 setup.py install --root="${pkgdir}" --optimize=1 + + install -d ${pkgdir}/usr/share/licenses + ln -s /usr/share/licenses/antlr2 ${pkgdir}/usr/share/licenses/${pkgname} } diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index fabcb0037..7be6887c8 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190035 2013-07-13 12:40:22Z svenstaro $ +# $Id: PKGBUILD 193196 2013-08-18 16:43:01Z svenstaro $ # Maintainer: Stéphane Gaudreault # Maintainer: Ionut Biru # Contributor: kevin @@ -10,18 +10,19 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.54.0 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=3 url="http://www.boost.org/" arch=('i686' 'x86_64') license=('custom') makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz boost-1.53.0-python3.patch - boost-1.54.0-Fix-macro-for-int128-detection.patch) + boost-1.54.0-Fix-macro-for-int128-detection.patch + fix-new-glibc.patch) sha1sums=('069501636097d3f40ddfd996d29748bb23591c53' '34026072a7cb2534164f20e77bb71a5c75093307' - 'bf5177694ab8a0df6bc13aa47b05727c40febebb') - + 'bf5177694ab8a0df6bc13aa47b05727c40febebb' + 'e3a5fac340c12b39add50070efb439b857108a0b') build() { export _stagedir="${srcdir}/stagedir" @@ -30,6 +31,7 @@ build() { cd "${srcdir}/${pkgbase}_${_boostver}" patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch + patch -Np2 -i ../fix-new-glibc.patch # Fix build errors with python 3 sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh diff --git a/extra/boost/fix-new-glibc.patch b/extra/boost/fix-new-glibc.patch new file mode 100644 index 000000000..5daa11cf5 --- /dev/null +++ b/extra/boost/fix-new-glibc.patch @@ -0,0 +1,14 @@ +Index: /trunk/boost/cstdint.hpp +=================================================================== +--- /trunk/boost/cstdint.hpp (revision 84805) ++++ /trunk/boost/cstdint.hpp (revision 84950) +@@ -42,5 +42,8 @@ + // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 + // +-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) ++#if defined(BOOST_HAS_STDINT_H) \ ++ && (!defined(__GLIBC__) \ ++ || defined(__GLIBC_HAVE_LONG_LONG) \ ++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) + + // The following #include is an implementation artifact; not part of interface. diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index b7facf76f..45a3bc4bd 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 191181 2013-07-19 01:56:55Z heftig $ +# $Id: PKGBUILD 193179 2013-08-18 02:49:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) pkgver=0.5.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva - libxrandr) + libxrandr git) options=(!libtool !emptydirs) -source=($url/$pkgbase-${pkgver}.tar.bz2) -sha1sums=('f4f28d04a2f6dc2b68151af700231ff8e47a7596') +#source=($url/$pkgbase-${pkgver}.tar.bz2) +source=("$pkgbase-$pkgver::git://gitorious.org/vaapi/gstreamer-vaapi.git#commit=73323ba") +sha1sums=('SKIP') prepare() { cd $pkgbase-$pkgver + NO_CONFIGURE=1 ./autogen.sh mkdir build-1.0 build-0.10 } diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 2e8864f5e..1743f2af7 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191921 2013-08-01 06:59:51Z bpiotrowski $ +# $Id: PKGBUILD 193198 2013-08-18 17:27:18Z andyrtr $ # Maintainer: Andreas Radke # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspo _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -207,6 +207,9 @@ package_jre7-openjdk-headless() { install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ ${pkgdir}/usr/share/licenses/${pkgbase} + + # link license + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" # Put some more files under backup control install -m755 -d ${pkgdir}/etc/java-7-openjdk/ @@ -273,6 +276,10 @@ package_jre7-openjdk() { # Install desktop files. install -m755 -d ${pkgdir}/usr/share/applications install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications + + # link license + install -m755 -d ${pkgdir}/usr/share/licenses + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } package_jdk7-openjdk() { @@ -327,6 +334,10 @@ package_jdk7-openjdk() { # Temporarily fixing FS#35141 chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar + + # link license + install -m755 -d ${pkgdir}/usr/share/licenses + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } package_openjdk7-src() { -- cgit v1.2.3-54-g00ecf