diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-23 03:27:46 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-23 03:27:46 +0000 |
| commit | 0459e6459ee534bf22ab8a5381cd485e6035e9e2 (patch) | |
| tree | 605a15ed18dc37695caaeb02271fdd06320a00f3 | |
| parent | d4b7ceefdfb9c828799749419e8f8f7a36c2d7b8 (diff) | |
Wed Apr 23 03:24:08 UTC 2014
39 files changed, 941 insertions, 464 deletions
diff --git a/community/ccmalloc/PKGBUILD b/community/ccmalloc/PKGBUILD deleted file mode 100644 index bbb271bf8..000000000 --- a/community/ccmalloc/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 2304 2008-05-31 05:00:40Z paul $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: aurelien <aurelien@archlinux.org> - -pkgname=ccmalloc -pkgver=0.4.0 -pkgrel=2 -pkgdesc="Track down memory related problems with C and C++ programs" -arch=('i686' 'x86_64') -url="http://packages.debian.org/sid/ccmalloc" -license=('GPL2') -depends=('sh') -source=(http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver.orig.tar.gz - http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver-9.diff.gz) -md5sums=('b90d955149569bbc6e801739f099db3d' - '25c2654e6f3880bb58b82f46a7296dc6') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i $srcdir/ccmalloc_$pkgver-9.diff - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir/usr install -} diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD deleted file mode 100644 index 31f879e1c..000000000 --- a/community/checkinstall/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 91846 2013-05-28 17:24:53Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=checkinstall -pkgver=1.6.2 -pkgrel=3 -pkgdesc="spy for 'make install' and build rpm or deb" -arch=('i686' 'x86_64') -url="http://asic-linux.com.mx/~izto/checkinstall/" -license=('GPL') -backup=(etc/checkinstall/checkinstallrc) -source=(http://asic-linux.com.mx/~izto/checkinstall/files/source/$pkgname-$pkgver.tar.gz - build-fix.patch) -md5sums=('d7b43c92001e68243a93bcce8b1e5480' - 'eac0c843781c300e7bc15c55be262e51') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 <../build-fix.patch - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community/checkinstall/build-fix.patch b/community/checkinstall/build-fix.patch deleted file mode 100644 index 9ab00cde5..000000000 --- a/community/checkinstall/build-fix.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -wbBur checkinstall-1.6.2/checkinstall checkinstall-1.6.2.my/checkinstall ---- checkinstall-1.6.2/checkinstall 2009-12-26 22:17:24.000000000 +0300 -+++ checkinstall-1.6.2.my/checkinstall 2010-01-15 18:31:55.212907700 +0300 -@@ -869,7 +869,7 @@ - - ################################################################ - # User-configurable variables were moved to the checkinstallrc # --# file which is probably found at /usr/local/lib/checkinstall # -+# file which is probably found at /usr/lib/checkinstall # - # # - # DO NOT modify them here!! # - ################################################################ -@@ -1851,11 +1851,11 @@ - COMPRESS="gzip -9" - COMPRESS_EXT=.gz - -- for d in ./usr/local/man/man* ./usr/local/man/*/man* ./usr/local/info \ -- ./usr/local/share/man/man* ./usr/local/share/man/*/man* \ -- ./usr/local/share/info \ -- ./usr/local/kerberos/man \ -- ./usr/local/share/doc/*/man/man* ./usr/local/lib/*/man/man* \ -+ for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \ -+ ./usr/share/man/man* ./usr/share/man/*/man* \ -+ ./usr/share/info \ -+ ./usr/kerberos/man \ -+ ./usr/share/doc/*/man/man* ./usr/lib/*/man/man* \ - ././usr/man/man* ./usr/man/*/man* ./usr/info \ - ./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \ - ./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \ -diff -wbBur checkinstall-1.6.2/checkinstallrc-dist checkinstall-1.6.2.my/checkinstallrc-dist ---- checkinstall-1.6.2/checkinstallrc-dist 2008-11-11 22:10:34.000000000 +0300 -+++ checkinstall-1.6.2.my/checkinstallrc-dist 2010-01-15 18:31:55.212907700 +0300 -@@ -16,7 +16,7 @@ - DEBUG=0 - - # Location of the "installwatch" program --INSTALLWATCH_PREFIX="/usr/local" -+INSTALLWATCH_PREFIX="/usr" - INSTALLWATCH=${INSTALLWATCH_PREFIX}/bin/installwatch - - # Location of the makepkg program. "makepak" is the default, and is -diff -wbBur checkinstall-1.6.2/installwatch/installwatch.c checkinstall-1.6.2.my/installwatch/installwatch.c ---- checkinstall-1.6.2/installwatch/installwatch.c 2008-11-16 19:20:53.000000000 +0300 -+++ checkinstall-1.6.2.my/installwatch/installwatch.c 2010-01-15 18:55:50.112716628 +0300 -@@ -2938,13 +2938,8 @@ - return result; - } - --#if (GLIBC_MINOR <= 4) --int readlink(const char *path,char *buf,size_t bufsiz) { -- int result; --#else - ssize_t readlink(const char *path,char *buf,size_t bufsiz) { - ssize_t result; --#endif - instw_t instw; - int status; - -@@ -3077,9 +3072,12 @@ - return result; - } - --int scandir( const char *dir,struct dirent ***namelist, -- int (*select)(const struct dirent *), -- int (*compar)(const void *,const void *) ) { -+extern int scandir (__const char *__restrict dir, -+ struct dirent ***__restrict namelist, -+ int (*select) (__const struct dirent *), -+ int (*compar) (__const struct dirent **, -+ __const struct dirent **)) -+{ - int result; - - if (!libc_handle) -@@ -3689,9 +3687,13 @@ - return result; - } - --int scandir64( const char *dir,struct dirent64 ***namelist, -- int (*select)(const struct dirent64 *), -- int (*compar)(const void *,const void *) ) { -+extern int scandir64 (__const char *__restrict dir, -+ struct dirent64 ***__restrict namelist, -+ int (*select) (__const struct dirent64 *), -+ int (*compar) (__const struct dirent64 **, -+ __const struct dirent64 **)) -+// __nonnull ((1, 2)) -+{ - int result; - - if (!libc_handle) -Only in checkinstall-1.6.2.my/installwatch: installwatch.o -Only in checkinstall-1.6.2.my/installwatch: installwatch.so -Only in checkinstall-1.6.2.my/installwatch: localdecls.h -diff -wbBur checkinstall-1.6.2/installwatch/Makefile checkinstall-1.6.2.my/installwatch/Makefile ---- checkinstall-1.6.2/installwatch/Makefile 2008-11-16 19:20:53.000000000 +0300 -+++ checkinstall-1.6.2.my/installwatch/Makefile 2010-01-15 18:31:55.219536411 +0300 -@@ -4,14 +4,14 @@ - # Well, the only configurable part is the following variable. - # Make sure the directory you specify exists. - --PREFIX=/usr/local -+PREFIX=/usr - - # End of configurable part - - VERSION=0.7.0beta7 - --BINDIR=$(PREFIX)/bin --LIBDIR=$(PREFIX)/lib -+BINDIR=$(DESTDIR)$(PREFIX)/bin -+LIBDIR=$(DESTDIR)$(PREFIX)/lib - - all: installwatch.so - -Only in checkinstall-1.6.2.my/locale: checkinstall-de.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-es.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-id.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-it.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-ja.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-no.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-pt_BR.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-ru.mo -Only in checkinstall-1.6.2.my/locale: checkinstall-zh_CN.mo -diff -wbBur checkinstall-1.6.2/Makefile checkinstall-1.6.2.my/Makefile ---- checkinstall-1.6.2/Makefile 2008-11-12 05:43:53.000000000 +0300 -+++ checkinstall-1.6.2.my/Makefile 2010-01-15 18:31:55.219536411 +0300 -@@ -1,10 +1,10 @@ - # $Id: Makefile,v 1.6.2.1 2008/11/09 07:48:18 izto Exp $ - - # Where to install. --PREFIX=/usr/local --BINDIR=$(PREFIX)/sbin --LCDIR=$(PREFIX)/lib/checkinstall/locale --CONFDIR=$(PREFIX)/lib/checkinstall -+PREFIX=/usr -+BINDIR=$(DESTDIR)/$(PREFIX)/bin -+LCDIR=$(DESTDIR)/$(PREFIX)/share/locale -+CONFDIR=$(DESTDIR)/etc/checkinstall - - all: - for file in locale/checkinstall-*.po ; do \ -@@ -25,7 +25,11 @@ - export - $(MAKE) -C installwatch install - -+ mkdir -p $(DESTDIR)/usr/bin - mkdir -p $(BINDIR) -+ mkdir -p $(CONFDIR) -+ mkdir -p $(DESTDIR)/etc/checkinstall -+ - install checkinstall makepak $(BINDIR) - for file in locale/*.mo ; do \ - LANG=`echo $$file | sed -e 's|locale/checkinstall-||' \ diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index 57a9906d8..989517824 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99729 2013-10-30 23:21:31Z allan $ +# $Id: PKGBUILD 109977 2014-04-22 16:20:55Z spupykin $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=dia pkgver=0.97.2 -pkgrel=5 +pkgrel=6 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64') license=('GPL') @@ -19,18 +19,22 @@ options=('docs' '!emptydirs') source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" "dia-crash.patch::https://git.gnome.org/browse/dia/patch/?id=213bdfe956bf8fe57c86316f68a09408fef1647e") md5sums=('1e1180a513fb567709b09bc19f12105e' - '2ad4fcfbfb561930a1d0335cc942a07b') + '9ae7a0f48498962240208b9f7c86b1ff') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - export PYTHON=/usr/bin/python2 for file in `find -type f -name '*.py'`; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" done sed -i 's#python2\.1#python2 python2.1#' configure patch -p1 <$srcdir/dia-crash.patch + sed -i 's|#include <freetype/|#include <freetype2/|g' plug-ins/postscript/diapsft2renderer.c +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --with-cairo \ --with-python \ diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD index 82f907907..5102bde82 100644 --- a/community/frei0r-plugins/PKGBUILD +++ b/community/frei0r-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86724 2013-03-21 13:55:20Z spupykin $ +# $Id: PKGBUILD 109989 2014-04-22 16:30:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=frei0r-plugins pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="A minimalistic plugin API for video sources and filters" arch=(i686 x86_64) url="http://www.piksel.org/frei0r" @@ -11,7 +11,7 @@ license=('GPL') depends=('gcc-libs' 'gavl>=1.0.0' 'opencv>=2.4.3') makedepends=('doxygen') options=('!emptydirs') -source=(http://ftp.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz) +source=(https://files.dyne.org/.xsend.php?file=frei0r/releases/frei0r-plugins-$pkgver.tar.gz) md5sums=('202375d1bcb545c1b6eb8f34e0260ec5') build() { diff --git a/community/gnubiff-gtk/PKGBUILD b/community/gnubiff-gtk/PKGBUILD index 5bf35b283..ef647b7cc 100644 --- a/community/gnubiff-gtk/PKGBUILD +++ b/community/gnubiff-gtk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66678 2012-02-27 10:01:18Z spupykin $ +# $Id: PKGBUILD 109975 2014-04-22 16:00:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> # Contributor: Todd Musall <tmusall@gmail.com> pkgname=gnubiff-gtk pkgver=2.2.15 -pkgrel=1 +pkgrel=2 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived. GTK version." arch=('i686' 'x86_64') url="http://gnubiff.sourceforge.net/" @@ -18,9 +18,13 @@ md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443') build() { cd $srcdir/gnubiff-$pkgver - export LDFLAGS=-lX11 + export LDFLAGS="-lgthread-2.0 -lX11" ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" make +} + +package() { + cd $srcdir/gnubiff-$pkgver make DESTDIR=$pkgdir install rm -rf $pkgdir/usr/lib rm -rf $pkgdir/usr/share/gnome-2.0 diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD index 814259c8a..d7cd94cc0 100644 --- a/community/gnubiff/PKGBUILD +++ b/community/gnubiff/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66676 2012-02-27 10:00:34Z spupykin $ +# $Id: PKGBUILD 109973 2014-04-22 16:00:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> # Contributor: Todd Musall <tmusall@gmail.com> pkgname=gnubiff pkgver=2.2.15 -pkgrel=1 +pkgrel=2 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived" arch=('i686' 'x86_64') url="http://gnubiff.sourceforge.net/" @@ -19,11 +19,14 @@ md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443') build() { [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr cd $srcdir/gnubiff-$pkgver - + export LDFLAGS="-lgthread-2.0" ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \ --disable-fam --disable-gnome make - make DESTDIR=$pkgdir install +} +package() { + cd $srcdir/gnubiff-$pkgver + make DESTDIR=$pkgdir install rm -rf ${pkgdir}/usr/share/info/dir } diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD index 4a8602e0b..0ff6ced9e 100644 --- a/community/gnuradio/PKGBUILD +++ b/community/gnuradio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106243 2014-02-25 20:49:30Z kkeen $ +# $Id: PKGBUILD 110002 2014-04-22 21:44:23Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dominik Heidler <dheidler@gmail.com> # Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com> pkgname=gnuradio -pkgver=3.7.2.1 -pkgrel=2 +pkgver=3.7.3 +pkgrel=1 pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd." arch=('i686' 'x86_64') url="http://gnuradio.org" @@ -42,7 +42,7 @@ install=gnuradio.install source=("http://gnuradio.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" "21-fcd.rules") -md5sums=('f2ea23a30cb02802870fe8cb9bf272c9' +md5sums=('a51e1c2860d6b289233e453d4085514f' '465e12c454c6a22ebec9849181af7bdc') build() { diff --git a/community/gnuradio/gnuradio.install b/community/gnuradio/gnuradio.install index 1166dd05e..1ba012bf9 100644 --- a/community/gnuradio/gnuradio.install +++ b/community/gnuradio/gnuradio.install @@ -4,7 +4,7 @@ # it would be great if pkgname and not just pkgver was passed in the arg list _pkg='gnuradio' -_cpython='cpython-33' +_cpython='cpython-34' post_upgrade() { while read _f; do diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index f484fbe1e..f7adacbff 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108291 2014-03-26 09:53:48Z arodseth $ +# $Id: PKGBUILD 109996 2014-04-22 20:02:26Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -12,7 +12,7 @@ pkgname=go epoch=2 pkgver=1.2.1 -pkgrel=4 +pkgrel=5 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') url='http://golang.org/' @@ -23,7 +23,7 @@ options=('!strip' 'staticlibs') optdepends=('mercurial: for fetching sources from mercurial repositories' 'git: for fetching sources from git repositories' 'bzr: for fetching sources from bazaar repositories' - 'svn: for fetching sources from subversion repositories') + 'subversion: for fetching sources from subversion repositories') install="$pkgname.install" source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#branch=release-branch.$pkgname${pkgver/.1}") md5sums=('SKIP') @@ -36,10 +36,10 @@ build() { export GOROOT_FINAL=/usr/lib/go # - # Arch Linux doesn't support SSE2 for i686 (to support older CPUs) + # Arch Linux doesn't support SSE2 for i686 (because of older i686 CPUs) # The SSE2 version is _a lot_ faster for i686. - # This line disables it. # + # This line selects the slow and compatible version. export GO386=387 # Enable ARM crosscompilation for linux diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD index 090847555..b53ab4611 100644 --- a/community/ibus-qt/PKGBUILD +++ b/community/ibus-qt/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 109786 2014-04-18 17:31:30Z andyrtr $ +# $Id: PKGBUILD 109949 2014-04-22 09:31:16Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: garion < garion @ mailoo.org > # Contributor: leemars pkgname=ibus-qt -pkgver=1.3.2 -pkgrel=3 +pkgver=1.3.3 +pkgrel=1 pkgdesc='IBus qt library and IBus qt input method plugin' arch=('i686' 'x86_64') license=('LGPL') url='http://ibus.googlecode.com' depends=('qt4' 'ibus' 'icu') -makedepends=('cmake' 'automoc4' 'doxygen') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") +makedepends=('cmake' 'automoc4' 'doxygen' 'git') +source=("git+https://github.com/ibus/ibus-qt.git#tag=$pkgver") +md5sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}-Source" - mkdir build - cd build + cd $pkgname - cmake .. -DCMAKE_INSTALL_PREFIX=/usr + cmake . -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}-Source/build" + cd $pkgname + make DESTDIR="${pkgdir}" install } -md5sums=('e53cb59f993d0c93ba968330dbc62c22') diff --git a/community/libvirt-glib/PKGBUILD b/community/libvirt-glib/PKGBUILD index dbdea88ad..f99ede8b9 100644 --- a/community/libvirt-glib/PKGBUILD +++ b/community/libvirt-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 108799 2014-04-04 07:49:23Z spupykin $ +# $Id: PKGBUILD 109981 2014-04-22 16:21:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Stefano Facchini <stefano.facchini@gmail.com> pkgname=libvirt-glib pkgver=0.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="GLib bindings for libvirt" arch=('i686' 'x86_64') url="http://libvirt.org" @@ -19,7 +19,7 @@ build() { ./configure --prefix=/usr \ --disable-static \ --with-python=/usr/bin/python2 - make + make -j1 } package() { diff --git a/community/lrzsz/PKGBUILD b/community/lrzsz/PKGBUILD index cb1874f18..e1cf72c25 100644 --- a/community/lrzsz/PKGBUILD +++ b/community/lrzsz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66212 2012-02-23 03:25:05Z spupykin $ +# $Id: PKGBUILD 109953 2014-04-22 14:53:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeremie Dimino <jeremie@dimino.org> # Contributor: bender02 at gmx dot com pkgname=lrzsz pkgver=0.12.20 -pkgrel=4 +pkgrel=5 pkgdesc="xmodem, ymodem and zmodem file transfer protocols" url="http://www.ohse.de/uwe/software/lrzsz.html" license=('GPL2') @@ -15,12 +15,21 @@ source=(http://www.ohse.de/uwe/releases/$pkgname-$pkgver.tar.gz md5sums=('b5ce6a74abc9b9eb2af94dffdfd372a4' '332f6e4af9fe0266efecf9d334c4d3db') -build() { +prepare() { cd $srcdir/$pkgname-$pkgver patch -Np1 -i ../lrzsz.patch + sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure +} + +build() { + cd $srcdir/$pkgname-$pkgver # Rename file so they can be used with minicom ./configure --prefix=/usr --mandir=/usr/share/man \ --program-transform-name=s/l// make -j1 +} + +package() { + cd $srcdir/$pkgname-$pkgver make -j1 DESTDIR=$pkgdir install } diff --git a/community/netwatch/PKGBUILD b/community/netwatch/PKGBUILD index 4bbe25890..6f28dae6d 100644 --- a/community/netwatch/PKGBUILD +++ b/community/netwatch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66253 2012-02-23 05:25:17Z spupykin $ +# $Id: PKGBUILD 109971 2014-04-22 15:47:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=netwatch pkgver=1.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="monitor network connections" arch=(i686 x86_64) url="http://www.slctech.org/~mackay/NETWATCH/netwatch.html" @@ -13,13 +13,19 @@ depends=(ncurses) source=(http://www.slctech.org/~mackay/NETWATCH/netwatch-$pkgver-1.tgz) md5sums=('9168c20c1984e9d126d1a0ec1eb0c1d3') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's|${CC-cc} |${CC-cc} -O2 |g' configure +} - unset CFLAGS +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make +} +package() { + cd "$srcdir/$pkgname-$pkgver" install -D -m0755 netwatch $pkgdir/usr/bin/netwatch install -D -m0755 netresolv $pkgdir/usr/bin/netresolv install -D -m0644 netwatch.1 $pkgdir/usr/share/man/man1/netwatch.1 diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD index 02dc4a26e..7557e4f97 100644 --- a/community/noise/PKGBUILD +++ b/community/noise/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 103644 2014-01-08 17:47:17Z alucryd $ +# $Id: PKGBUILD 109947 2014-04-22 08:25:27Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> pkgname=noise pkgver=0.2.4 -pkgrel=3 -pkgdesc="Simple, fast, and good looking music player" +pkgrel=4 +pkgdesc='The Pantheon Music Player' arch=('i686' 'x86_64') -url="https://launchpad.net/noise" +url='https://launchpad.net/noise' license=('GPL3') depends=('desktop-file-utils' 'granite' 'gstreamer0.10-base' 'json-glib' 'libgpod' 'libnotify' 'libpeas' 'libsoup' 'sqlheavy' 'taglib') makedepends=('cmake' 'vala') diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 18803f55d..8cb9c97c0 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,40 +1,32 @@ -# $Id: PKGBUILD 102001 2013-12-03 16:51:56Z eric $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# $Id: PKGBUILD 109969 2014-04-22 15:34:00Z spupykin $ +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> # Contributor: Samuel Tardieu <sam@rfc1149.net> pkgname=openocd -pkgver=0.7.0 -pkgrel=3 +pkgver=0.8.0_rc1 +pkgrel=4 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') url='http://openocd.berlios.de' license=('GPL') -depends=('libftdi' 'libusb-compat') +depends=('libftdi' 'libftdi-compat' 'libusb' 'libusb-compat') options=(!strip) install=openocd.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63') - -_features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ft2232_libftdi ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink) - -# FIXME: needs /dev/bus/usb and cannot be compiled in chroot -prepare() { - cd $pkgname-$pkgver - sed -i 's|$CC -E|$CC -O2 -E|g' configure - sed -i 's|\${CC} -E|$CC -O2 -E|g' configure - sed -i 's|-lftdi -lusb|-lftdi1 -lusb-1.0|g' configure src/Makefile* -} +_features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2) +md5sums=('7cbf6b556f020298eab80df94b73d52c') build() { - cd $pkgname-$pkgver - export CFLAGS="-I/usr/include/libftdi1" + cd $pkgname-${pkgver/_/-} + export LIBFTDI_CFLAGS="-I/usr/include/libftdi1" + export LIBFTDI_LIBS="-lftdi1" ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror - make + make LIBS="-ldl -lftdi1" } package() { - cd $pkgname-$pkgver + cd $pkgname-${pkgver/_/-} make DESTDIR="$pkgdir" install } diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD index 75e6fd54e..d2ae38bdb 100644 --- a/community/qtemu/PKGBUILD +++ b/community/qtemu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85402 2013-03-01 10:39:15Z andrea $ +# $Id: PKGBUILD 109966 2014-04-22 15:33:22Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=qtemu pkgver=1.0.5 -pkgrel=8 +pkgrel=9 pkgdesc="Graphical user interface for QEMU written in Qt4" url="http://qtemu.org" license=("GPL") @@ -14,7 +14,7 @@ depends=('qemu' 'qt4') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 http://qtemu.svn.sourceforge.net/viewvc/qtemu/trunk/qtemu/misc/qtemu.desktop) md5sums=('3b93e209dc62e52a1d94c8eb24d0b149' - 'b323b75384fdb327728d2603979f7202') + '3906b73a731799061f6e10110fea5235') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 99cb22424..4a204a048 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 108268 2014-03-25 18:03:08Z spupykin $ +# $Id: PKGBUILD 109955 2014-04-22 14:53:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.8.8 +pkgver=2.8.9 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('f3af82ca88b9d84c81d0b77614d07426' +md5sums=('3c106b0f1128dc930684e2da88b2a03d' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index ea8d7003c..ebe888532 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108537 2014-03-28 06:23:41Z svenstaro $ +# $Id: PKGBUILD 109943 2014-04-21 23:21:49Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.186 +pkgver=0.189 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer') makedepends=('boost' 'asio' 'cmake') install=springlobby.install source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) -md5sums=('95d7a77f180dc35873d6bb31435591e1') +md5sums=('1322ff6a03ed59db093699a842f2dcda') build() { cd $srcdir/${pkgname}-$pkgver diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD index 5f968fda9..e20356ed1 100755 --- a/community/sqlheavy/PKGBUILD +++ b/community/sqlheavy/PKGBUILD @@ -1,34 +1,38 @@ -# $Id: PKGBUILD 99102 2013-10-24 12:51:25Z alucryd $ +# $Id: PKGBUILD 109945 2014-04-22 08:15:41Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor : sebikul <sebikul@gmail.com> pkgname=sqlheavy -pkgver=0.2.0.7ae6112 +pkgver=0.1.1 pkgrel=1 +epoch=1 pkgdesc="GObject SQLite wrapper" arch=('i686' 'x86_64') -url="https://code.google.com/p/sqlheavy/" -license=('LGPL') +url='https://code.google.com/p/sqlheavy/' +license=('LGPL2.1') depends=('gtk2' 'sqlite3') -makedepends=('git' 'gobject-introspection' 'vala') -source=('git://gitorious.org/sqlheavy/sqlheavy.git') -sha256sums=('SKIP') +makedepends=('gobject-introspection' 'vala') +source=("http://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz" + "${pkgname}-no-utils.patch") +sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031' + '57956925990bf8fb3b75e8e7dff5038d803c0c171013d7401474a5490afd7960') -pkgver() { - cd ${pkgname} +prepare() { + cd ${pkgname}-${pkgver} - printf "0.2.0.%s" "$(git rev-parse --short HEAD)" + patch -Np1 -i ../${pkgname}-no-utils.patch } build() { - cd ${pkgname} + cd ${pkgname}-${pkgver} - ./autogen.sh --prefix='/usr' --disable-static + autoreconf -vif + ./configure --prefix='/usr' --disable-static make } package() { - cd ${pkgname} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/share/man diff --git a/community/sqlheavy/sqlheavy-no-utils.patch b/community/sqlheavy/sqlheavy-no-utils.patch new file mode 100644 index 000000000..7dfb2d5ad --- /dev/null +++ b/community/sqlheavy/sqlheavy-no-utils.patch @@ -0,0 +1,624 @@ +diff --git a/Makefile.am b/Makefile.am +index 6a4c487..bb8e475 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,7 +4,6 @@ SUBDIRS = \ + sqlheavy \ + gtk \ + examples \ +- utils \ + docs \ + data \ + $(NULL) +diff --git a/configure.ac b/configure.ac +index 73753c9..46de092 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,11 +69,6 @@ AC_SUBST(GMODULE_LIBS) + PKG_CHECK_MODULES(SQLITE3, sqlite3 >= $SQLITE3_REQUIRED) + AC_SUBST(SQLITE3_CFLAGS) + AC_SUBST(SQLITE3_LIBS) +-VALA_PACKAGE=libvala-0.16 +-PKG_CHECK_MODULES(VALA, $VALA_PACKAGE >= $VALA_REQUIRED) +-AC_SUBST(VALA_PACKAGE) +-AC_SUBST(VALA_CFLAGS) +-AC_SUBST(VALA_LIBS) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) + GTK_PACKAGE=gtk+-2.0 + AC_SUBST(GTK_PACKAGE) +@@ -114,6 +109,5 @@ AC_CONFIG_FILES([Makefile + gtk/sqlheavygtk-$SQLHEAVY_API_VERSION.deps + sqlheavy/Makefile + sqlheavy-$SQLHEAVY_API_VERSION.pc +- sqlheavygtk-$SQLHEAVY_API_VERSION.pc +- utils/Makefile]) ++ sqlheavygtk-$SQLHEAVY_API_VERSION.pc]) + AC_OUTPUT +diff --git a/utils/Makefile.am b/utils/Makefile.am +deleted file mode 100644 +index 2ac208c..0000000 +--- a/utils/Makefile.am ++++ /dev/null +@@ -1,31 +0,0 @@ +-NULL = +- +-LDADD = \ +- $(top_builddir)/sqlheavy/libsqlheavy$(SQLHEAVY_API_VERSION).la \ +- $(GIO_LIBS) \ +- $(GLIB_LIBS) \ +- $(GMODULE_LIBS) \ +- $(SQLITE3_LIBS) \ +- $(VALA_LIBS) \ +- $(NULL) +- +-bin_PROGRAMS = sqlheavy-gen-orm +- +-VALAFLAGS = \ +- --vapidir $(top_srcdir)/sqlheavy \ +- --pkg $(VALA_PACKAGE) \ +- --pkg sqlheavy-@SQLHEAVY_API_VERSION@ \ +- $(NULL) +- +-AM_CFLAGS = \ +- -I$(top_srcdir)/sqlheavy \ +- $(GIO_CFLAGS) \ +- $(GLIB_CFLAGS) \ +- $(GMODULE_CFLAGS) \ +- $(SQLITE3_CFLAGS) \ +- $(VALA_CFLAGS) \ +- $(NULL) +- +-sqlheavy_gen_orm_SOURCES = \ +- sqlheavy-gen-orm.vala \ +- $(NULL) +diff --git a/utils/sqlheavy-gen-orm.vala b/utils/sqlheavy-gen-orm.vala +deleted file mode 100644 +index ceaac3b..0000000 +--- a/utils/sqlheavy-gen-orm.vala ++++ /dev/null +@@ -1,542 +0,0 @@ +-namespace SQLHeavy { +- public errordomain GeneratorError { +- CONFIGURATION, +- METADATA, +- SYMBOL_RESOLVER, +- DATABASE, +- SELECTOR +- } +- +- public class Generator : GLib.Object { +- [CCode (array_length = false, array_null_terminated = true)] +- static string[] sources; +- [CCode (array_length = false, array_null_terminated = true)] +- static string[] vapi_directories; +- [CCode (array_length = false, array_null_terminated = true)] +- static string[] packages; +- static string metadata_location; +- static string output_location; +- static bool write_properties; +- +- private Vala.CodeContext context = new Vala.CodeContext (); +- private GLib.SList<string> databases = new GLib.SList<string> (); +- +- const GLib.OptionEntry[] options = { +- { "metadata", 'm', 0, OptionArg.FILENAME, ref metadata_location, "Load metadata from FILE", "FILE..." }, +- { "vapidir", 0, 0, OptionArg.FILENAME_ARRAY, ref vapi_directories, "Look for package bindings in DIRECTORY", "DIRECTORY..." }, +- { "pkg", 0, 0, OptionArg.STRING_ARRAY, ref packages, "Include binding for PACKAGE", "PACKAGE..." }, +- { "output", 'o', 0, OptionArg.FILENAME, ref output_location, "Output to FILE", "FILE..." }, +- { "properties", 'p', 0, GLib.OptionArg.NONE, ref write_properties, "Write properties instead of methods", null }, +- { "", 0, 0, OptionArg.FILENAME_ARRAY, ref sources, "SQLite databases", "DATABASE..." }, +- { null } +- }; +- +- private Vala.HashMap<string, Vala.HashMap <string, string>> cache = +- new Vala.HashMap<string, Vala.HashMap <string, string>> (GLib.str_hash, GLib.str_equal); +- private Vala.HashMap<string, Vala.HashMap <string, string>> wildcard_cache = +- new Vala.HashMap<string, Vala.HashMap <string, string>> (GLib.str_hash, GLib.str_equal); +- +- private Vala.HashMap <string, string> get_symbol_properties (string symbol) { +- var map = this.cache.get (symbol); +- if ( map != null ) +- return map; +- +- map = new Vala.HashMap<string,string> (GLib.str_hash, GLib.str_equal, GLib.str_equal); +- foreach ( string selector in this.wildcard_cache.get_keys () ) { +- if ( GLib.PatternSpec.match_simple (selector, symbol) ) { +- var wmap = this.wildcard_cache.get (selector); +- foreach ( string key in wmap.get_keys () ) +- map.set (key, wmap.get (key)); +- } +- } +- +- this.cache.set (symbol, map); +- return map; +- } +- +- private void set_symbol_property (string symbol, string key, string value) { +- this.get_symbol_properties (symbol).set (key, value); +- } +- +- private string? get_symbol_property (string symbol, string key) { +- return this.get_symbol_properties (symbol).get (key); +- } +- +- private string get_symbol_name (string symbol) { +- string? sym = this.get_symbol_property (symbol, "name"); +- if ( sym != null ) +- return sym; +- +- int sym_t = 3; +- bool tb = true, sb = true, tf = true; +- GLib.StringBuilder name = new GLib.StringBuilder.sized (symbol.length * 2); +- for ( sym = symbol ; ; sym = sym.offset (1) ) { +- var c = sym.get_char_validated (); +- if ( c <= 0 ) +- break; +- +- if ( sb ) { +- if ( c == '@' ) { +- sym_t = 1; +- continue; +- } else if ( c == '%' ) { +- sym_t = 2; +- continue; +- } +- } +- +- if ( c == '_' ) { +- tb = true; +- tf = true; +- continue; +- } else if ( c == '/' ) { +- sym_t = int.min (3, sym_t + 1); +- tf = tb = sb = true; +- name.truncate (0); +- continue; +- } +- +- if ( c.isupper () && !tb ) { +- if ( sym_t == 3 ) +- name.append_c ('_'); +- tb = true; +- tf = false; +- name.append_unichar (sym_t == 3 ? c.tolower () : c.toupper ()); +- continue; +- } else if ( c.islower () && tb ) { +- if ( tf && sym_t != 3 ) +- name.append_unichar (c.toupper ()); +- else if ( tf && !sb && sym_t == 3 ) { +- name.append_c ('_'); +- name.append_unichar (c); +- } +- else +- name.append_unichar (c); +- tb = tf = false; +- continue; +- } +- +- sb = false; +- name.append_unichar (tb ? (sym_t == 3 ? c.tolower () : c.toupper ()) : c.tolower ()); +- tf = false; +- } +- +- this.set_symbol_property (symbol, "name", name.str); +- return name.str; +- } +- +- public bool symbol_is_hidden (string symbol) { +- var p = this.get_symbol_property (symbol, "hidden"); +- return p != null && (p == "1" || p == "true" || p == "yes"); +- } +- +- private static Vala.DataType type_from_string (string datatype) { +- bool is_array = false; +- var internal_datatype = datatype; +- Vala.UnresolvedSymbol? symbol = null; +- +- if ( datatype.has_suffix ("[]") ) { +- internal_datatype = internal_datatype.substring (0, -2); +- is_array = true; +- } +- +- foreach ( unowned string m in internal_datatype.split (".") ) +- symbol = new Vala.UnresolvedSymbol (symbol, m); +- +- var data_type = new Vala.UnresolvedType.from_symbol (symbol); +- if ( is_array ) +- return new Vala.ArrayType (data_type, 1, null); +- else +- return data_type; +- } +- +- private Vala.DataType? get_data_type (string symbol) { +- string? name = this.get_symbol_property (symbol, "type"); +- +- return name == null ? null : type_from_string (name); +- } +- +- private void parse_field (SQLHeavy.Table table, int field, Vala.Class cl, Vala.SwitchStatement signals, Vala.SourceReference source_reference) throws GeneratorError, SQLHeavy.Error { +- var db = table.queryable.database; +- var db_symbol = GLib.Path.get_basename (db.filename).split (".", 2)[0]; +- var symbol = @"@$(GLib.Path.get_basename (db_symbol))/$(table.name)/$(table.field_name (field))"; +- var name = this.get_symbol_name (symbol); +- +- if ( this.symbol_is_hidden (symbol) ) +- return; +- +- var data_type = this.get_data_type (symbol); +- if ( data_type == null ) { +- var affinity = table.field_affinity (field).down ().split (" "); +- +- if ( affinity[0] == "integer" ) +- affinity[0] = "int"; +- else if ( affinity[0] == "text" || +- affinity[0].has_prefix ("varchar") || +- affinity[0].has_prefix ("char") ) +- affinity[0] = "string"; +- else if ( affinity[0] == "blob" ) +- affinity[0] = "uint8[]"; +- else if ( affinity[0] == "timestamp" || +- affinity[0] == "datetime" ) +- affinity[0] = "time_t"; +- +- data_type = type_from_string (affinity[0]); +- } +- +- var data_type_get = data_type.copy (); +- data_type_get.value_owned = true; +- +- var switch_section = new Vala.SwitchSection (source_reference); +- signals.add_section (switch_section); +- switch_section.add_label (new Vala.SwitchLabel (new Vala.StringLiteral (@"\"$(name)\"", source_reference), source_reference)); +- Vala.MethodCall emit_changed_notify; +- +- if ( !write_properties ) { +- var changed_signal = new Vala.Signal (@"$(name)_changed", new Vala.VoidType (source_reference), source_reference); +- changed_signal.access = Vala.SymbolAccessibility.PUBLIC; +- cl.add_signal (changed_signal); +- emit_changed_notify = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("this"), @"$(name)_changed", source_reference), source_reference); +- +- { +- var get_method = new Vala.Method (@"get_$(name)", data_type_get, source_reference); +- cl.add_method (get_method); +- get_method.access = Vala.SymbolAccessibility.PUBLIC; +- get_method.add_error_type (type_from_string ("SQLHeavy.Error")); +- +- var block = new Vala.Block (source_reference); +- var call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("this"), @"get_$(data_type_get.to_string ())", source_reference), source_reference); +- call.add_argument (new Vala.StringLiteral (@"\"$(table.field_name (field))\"", source_reference)); +- block.add_statement (new Vala.ReturnStatement (call, source_reference)); +- +- get_method.body = block; +- } +- +- { +- var set_method = new Vala.Method (@"set_$(name)", new Vala.VoidType (source_reference), source_reference); +- set_method.add_parameter (new Vala.Parameter ("value", data_type, source_reference)); +- cl.add_method (set_method); +- set_method.access = Vala.SymbolAccessibility.PUBLIC; +- set_method.add_error_type (type_from_string ("SQLHeavy.Error")); +- +- var block = new Vala.Block (source_reference); +- var call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("this"), @"set_$(data_type.to_string ())", source_reference), source_reference); +- call.add_argument (new Vala.StringLiteral (@"\"$(table.field_name (field))\"", source_reference)); +- block.add_statement (new Vala.ExpressionStatement (call, source_reference)); +- +- set_method.body = block; +- } +- } else { +- Vala.PropertyAccessor get_accessor, set_accessor; +- emit_changed_notify = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("this", source_reference), "notify_property", source_reference), source_reference); +- emit_changed_notify.add_argument (new Vala.StringLiteral ("\"" + name.replace ("_", "-") + "\"", source_reference)); +- { +- var block = new Vala.Block (source_reference); +- var try_block = new Vala.Block (source_reference); +- var catch_block = new Vala.Block (source_reference); +- var try_stmt = new Vala.TryStatement (try_block, null, source_reference); +- +- var call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("this"), @"get_$(data_type_get.to_string ())", source_reference), source_reference); +- call.add_argument (new Vala.StringLiteral (@"\"$(table.field_name (field))\"", source_reference)); +- try_block.add_statement (new Vala.ReturnStatement (call, source_reference)); +- +- var error_call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("GLib"), "error", source_reference), source_reference); +- error_call.add_argument (new Vala.StringLiteral (@"\"Unable to retrieve `$(name)': %s\"", source_reference)); +- error_call.add_argument (new Vala.MemberAccess (new Vala.MemberAccess (null, "e"), "message", source_reference)); +- catch_block.add_statement (new Vala.ExpressionStatement (error_call, source_reference)); +- +- var anr = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("GLib", source_reference), "assert_not_reached", source_reference)); +- catch_block.add_statement (new Vala.ExpressionStatement (anr, source_reference)); +- +- try_stmt.add_catch_clause (new Vala.CatchClause (type_from_string ("SQLHeavy.Error"), "e", catch_block, source_reference)); +- block.add_statement (try_stmt); +- +- get_accessor = new Vala.PropertyAccessor (true, false, false, data_type_get, block, source_reference); +- } +- +- { +- var block = new Vala.Block (source_reference); +- var try_block = new Vala.Block (source_reference); +- var catch_block = new Vala.Block (source_reference); +- var try_stmt = new Vala.TryStatement (try_block, null, source_reference); +- +- var call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("this", source_reference), @"set_$(data_type_get.to_string ())", source_reference), source_reference); +- call.add_argument (new Vala.StringLiteral (@"\"$(table.field_name (field))\"", source_reference)); +- call.add_argument (new Vala.MemberAccess (null, "value", source_reference)); +- try_block.add_statement (new Vala.ExpressionStatement (call, source_reference)); +- +- var error_call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("GLib"), "error", source_reference), source_reference); +- error_call.add_argument (new Vala.StringLiteral (@"\"Unable to set `$(name)': %s\"", source_reference)); +- error_call.add_argument (new Vala.MemberAccess (new Vala.MemberAccess (null, "e"), "message", source_reference)); +- catch_block.add_statement (new Vala.ExpressionStatement (error_call, source_reference)); +- +- try_stmt.add_catch_clause (new Vala.CatchClause (type_from_string ("SQLHeavy.Error"), "e", catch_block, source_reference)); +- block.add_statement (try_stmt); +- +- set_accessor = new Vala.PropertyAccessor (false, true, false, data_type, block, source_reference); +- } +- +- var prop = new Vala.Property (name, data_type, get_accessor, set_accessor, source_reference); +- prop.access = Vala.SymbolAccessibility.PUBLIC; +- cl.add_property (prop); +- } +- +- switch_section.add_statement (new Vala.ExpressionStatement (emit_changed_notify, source_reference)); +- switch_section.add_statement (new Vala.BreakStatement (source_reference)); +- } +- +- private void parse_table (SQLHeavy.Table table, Vala.Namespace ns, Vala.SourceReference source_reference) throws GeneratorError, SQLHeavy.Error { +- var db = table.queryable.database; +- var db_symbol = GLib.Path.get_basename (db.filename).split (".", 2)[0]; +- var symbol = @"@$(GLib.Path.get_basename (db_symbol))/$(table.name)"; +- var symbol_name = this.get_symbol_name (symbol); +- +- if ( this.symbol_is_hidden (symbol) ) +- return; +- +- var cl = ns.scope.lookup (symbol_name) as Vala.Class; +- +- if ( cl == null ) { +- cl = new Vala.Class (symbol_name, source_reference); +- cl.access = Vala.SymbolAccessibility.PUBLIC; +- ns.add_class (cl); +- } +- +- cl.add_base_type (type_from_string ("SQLHeavy.Row")); +- +- Vala.SwitchStatement signals_switch; +- { +- var register_notify = new Vala.Method ("emit_change_notification", new Vala.VoidType ()); +- register_notify.access = Vala.SymbolAccessibility.PRIVATE; +- register_notify.add_parameter (new Vala.Parameter ("field", type_from_string ("int"))); +- +- var block = new Vala.Block (source_reference); +- var try_block = new Vala.Block (source_reference); +- var catch_block = new Vala.Block (source_reference); +- var try_stmt = new Vala.TryStatement (try_block, null, source_reference); +- +- var field_name = new Vala.LocalVariable (type_from_string ("string"), "field_name", new Vala.StringLiteral ("null"), source_reference); +- block.add_statement (new Vala.DeclarationStatement (field_name, source_reference)); +- +- block.add_statement (try_stmt); +- var get_field_name = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("this"), "field_name")); +- get_field_name.add_argument (new Vala.MemberAccess (null, "field")); +- try_block.add_statement (new Vala.ExpressionStatement (new Vala.Assignment (new Vala.StringLiteral ("field_name"), get_field_name))); +- +- var warn_call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.StringLiteral ("GLib"), "warning"), source_reference); +- warn_call.add_argument (new Vala.StringLiteral ("\"" + "Unknown field: %d" + "\"", source_reference)); +- warn_call.add_argument (new Vala.MemberAccess (null, "field", source_reference)); +- catch_block.add_statement (new Vala.ExpressionStatement (warn_call, source_reference)); +- catch_block.add_statement (new Vala.ReturnStatement (null, source_reference)); +- try_stmt.add_catch_clause (new Vala.CatchClause (type_from_string ("SQLHeavy.Error"), "e", catch_block, source_reference)); +- +- signals_switch = new Vala.SwitchStatement (new Vala.StringLiteral ("field_name"), source_reference); +- block.add_statement (signals_switch); +- register_notify.body = block; +- +- cl.add_method (register_notify); +- } +- +- var con = new Vala.Constructor (source_reference); +- con.body = new Vala.Block (source_reference); +- +- var conn_call = new Vala.MethodCall (new Vala.MemberAccess (new Vala.MemberAccess (new Vala.StringLiteral ("this"), "field_changed", source_reference), "connect", source_reference), source_reference); +- conn_call.add_argument (new Vala.MemberAccess (new Vala.StringLiteral ("this"), "emit_change_notification", source_reference)); +- +- con.body.add_statement (new Vala.ExpressionStatement (conn_call, source_reference)); +- cl.constructor = con; +- +- for ( var field = 0 ; field < table.field_count ; field++ ) { +- this.parse_field (table, field, cl, signals_switch, source_reference); +- } +- } +- +- private void parse_database (SQLHeavy.Database db) throws GeneratorError { +- var symbol = "@".concat (GLib.Path.get_basename (db.filename).split (".", 2)[0]); +- var symbol_name = this.get_symbol_name (symbol); +- Vala.Namespace? ns = this.context.root.scope.lookup (symbol_name) as Vala.Namespace; +- +- Vala.SourceFile source_file = new Vala.SourceFile (this.context, Vala.SourceFileType.NONE, db.filename); +- Vala.SourceReference source_reference = new Vala.SourceReference (source_file); +- +- if ( ns == null ) { +- ns = new Vala.Namespace (symbol_name, source_reference); +- this.context.root.add_namespace (ns); +- } +- +- if ( this.symbol_is_hidden (symbol) ) +- return; +- +- try { +- var tables = db.get_tables (); +- foreach ( unowned SQLHeavy.Table table in tables.get_values () ) { +- this.parse_table (table, ns, source_reference); +- } +- } catch ( SQLHeavy.Error e ) { +- throw new GeneratorError.DATABASE ("Database error: %s", e.message); +- } +- } +- +- public void run () throws GeneratorError { +- if ( output_location == null ) { +- GLib.stderr.printf ("You must supply an output location\n"); +- return; +- } +- +- var parser = new Vala.Parser (); +- parser.parse (this.context); +- +- foreach ( unowned string dbfile in this.databases ) { +- SQLHeavy.Database db; +- try { +- db = new SQLHeavy.Database (dbfile, SQLHeavy.FileMode.READ); +- } catch ( SQLHeavy.Error e ) { +- throw new GeneratorError.CONFIGURATION ("Unable to open database: %s", e.message); +- } +- this.parse_database (db); +- } +- +- var resolver = new Vala.SymbolResolver (); +- resolver.resolve (context); +- +- if (context.report.get_errors () > 0) +- throw new GeneratorError.SYMBOL_RESOLVER ("Error resolving symbols."); +- +- context.analyzer.analyze (context); +- +- var code_writer = new Vala.CodeWriter (Vala.CodeWriterType.DUMP); +- code_writer.write_file (this.context, output_location); +- } +- +- private static string parse_selector (string selector, out bool wildcard) throws GeneratorError { +- wildcard = false; +- string[] real_selector = new string[3]; +- var segments = selector.split ("/", 3); +- +- int pos = 0; +- for ( int seg = 0 ; seg < segments.length ; seg++ ) { +- var first_char = segments[seg].get_char (); +- +- if ( first_char == '%' || first_char == '@' ) { +- int dest_pos; +- if ( first_char == '%' ) { +- segments[seg] = segments[seg].offset (1); +- dest_pos = 1; +- } +- else +- dest_pos = 0; +- +- while ( pos < dest_pos ) { +- wildcard = true; +- real_selector[pos] = "*"; +- pos++; +- } +- } else if ( pos == 0 && first_char != '*' ) { +- wildcard = true; +- real_selector[0] = "*"; +- real_selector[1] = "*"; +- pos = 2; +- } +- +- if ( segments[seg] == "*" ) +- wildcard = true; +- +- if ( pos > 2 || real_selector[pos] != null ) +- throw new GeneratorError.SELECTOR ("Invalid selector (%s).", selector); +- real_selector[pos] = segments[seg]; +- pos++; +- } +- +- return string.joinv ("/", real_selector); +- } +- +- private void parse_metadata () throws GeneratorError, GLib.KeyFileError { +- var metadata = new GLib.KeyFile (); +- metadata.load_from_file (metadata_location, GLib.KeyFileFlags.NONE); +- +- foreach ( unowned string group in metadata.get_groups () ) { +- bool is_wildcard; +- var selector = parse_selector (group, out is_wildcard); +- +- var cache = is_wildcard ? this.wildcard_cache : this.cache; +- var properties = cache.get (selector); +- if ( properties == null ) { +- properties = new Vala.HashMap<string, string> (GLib.str_hash, GLib.str_equal, GLib.str_equal); +- cache.set (selector, properties); +- } +- +- foreach ( unowned string key in metadata.get_keys (group) ) +- properties.set (key, metadata.get_string (group, key)); +- } +- } +- +- public void configure () throws GeneratorError { +- if ( metadata_location != null ) { +- try { +- this.parse_metadata (); +- } catch ( GLib.KeyFileError e ) { +- throw new GeneratorError.CONFIGURATION ("Unable to load metadata file: %s", e.message); +- } catch ( GLib.FileError e ) { +- throw new GeneratorError.CONFIGURATION ("Unable to load metadata file: %s", e.message); +- } +- } +- +- this.context.profile = Vala.Profile.GOBJECT; +- Vala.CodeContext.push (this.context); +- +- // Default packages +- this.context.add_external_package ("glib-2.0"); +- this.context.add_external_package ("gobject-2.0"); +- this.context.add_external_package ("sqlheavy-%s".printf (SQLHeavy.Version.api ())); +- +- foreach ( unowned string pkg in packages ) { +- this.context.add_external_package (pkg); +- } +- +- foreach ( unowned string source in sources ) { +- if ( source.has_suffix (".vala") ) { +- if ( GLib.FileUtils.test (source, GLib.FileTest.EXISTS) ) +- this.context.add_source_file (new Vala.SourceFile (this.context, Vala.SourceFileType.NONE, source)); +- else +- throw new GeneratorError.CONFIGURATION (@"Source file '$(source)' does not exist."); +- } else { +- this.databases.prepend (source); +- } +- } +- } +- +- private static int main (string[] args) { +- try { +- var opt_context = new GLib.OptionContext ("- SQLHeavy ORM Generator"); +- opt_context.set_help_enabled (true); +- opt_context.add_main_entries (options, null); +- opt_context.set_summary ("This tool will generate a Vala file which provides an object for each\ntable in the specified database(s), each of which extends the\nSQLHeavyRow class."); +- opt_context.set_description ("Copyright 2010 Evan Nemerson.\nReleased under versions 2.1 and 3 of the LGPL.\n\nFor more information, or to report a bug, see\n<http://code.google.com/p/sqlheavy>"); +- +- opt_context.parse (ref args); +- } catch ( GLib.OptionError e ) { +- GLib.stdout.puts (@"$(e.message)\n"); +- GLib.stdout.puts (@"Run '$(args[0]) --help' to see a full list of available command line options.\n"); +- return 1; +- } +- +- if ( sources == null ) { +- GLib.stderr.puts ("No databases specified.\n"); +- return 1; +- } +- +- var generator = new Generator (); +- try { +- generator.configure (); +- generator.run (); +- } catch ( GeneratorError e ) { +- GLib.stderr.puts (@"Error: $(e.message)\n"); +- GLib.stdout.puts (@"Run '$(args[0]) --help' to see a full list of available command line options.\n"); +- return 1; +- } +- +- return 0; +- } +- } +-} +- +-- +1.7.1 + diff --git a/community/tdl/PKGBUILD b/community/tdl/PKGBUILD deleted file mode 100644 index 12d9cec49..000000000 --- a/community/tdl/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 109251 2014-04-12 16:55:40Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Jeff Mickey <j@codemac.net> - -pkgname=tdl -pkgver=1.5.2 -pkgrel=6 -pkgdesc='TODO list manager' -arch=('x86_64' 'i686') -url='https://github.com/rc0/tdl' -license=('GPL') -depends=('readline') -makedepends=('git') -source=("$pkgname::git://github.com/T-J-Teru/tdl.git#commit=382c52a2d1f2d064110c189459fe09a6edb12761" 'readline63.patch') -md5sums=('SKIP' - 'dada1488632f9d672e75e15cfb011ecb') - -prepare() { - cd "$pkgname" - - patch -p1 -i "$srcdir/readline63.patch" -} - -build() { - cd "$pkgname" - - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - make -C "$pkgname" DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/tdl/readline63.patch b/community/tdl/readline63.patch deleted file mode 100644 index b42ddec02..000000000 --- a/community/tdl/readline63.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/inter.c 2014-04-12 18:48:39.020103780 +0200 -+++ b/inter.c 2014-04-12 18:48:33.323365100 +0200 -@@ -556,7 +556,7 @@ - static char *interactive_text_readline(char *prompt, char *initval, int *is_blank, int *error)/*{{{*/ - { - char *line; -- Function *old_rl_pre_input_hook = NULL; -+ rl_command_func_t *old_rl_pre_input_hook = NULL; - - *error = 0; - old_rl_pre_input_hook = rl_pre_input_hook; -@@ -633,9 +633,9 @@ - #ifdef USE_READLINE - if (isatty(0)) { - char *result; -- rl_attempted_completion_function = (CPPFunction *) null_tdl_completion; -+ rl_attempted_completion_function = null_tdl_completion; - result = interactive_text_readline(prompt, initval, is_blank, error); -- rl_attempted_completion_function = (CPPFunction *) tdl_completion; -+ rl_attempted_completion_function = tdl_completion; - return result; - } else { - /* In case someone wants to drive tdl from a script, by redirecting stdin to it. */ -@@ -653,7 +653,7 @@ - #ifdef USE_READLINE - if (isatty(0)) { - rl_completion_entry_function = NULL; -- rl_attempted_completion_function = (CPPFunction *) tdl_completion; -+ rl_attempted_completion_function = tdl_completion; - interactive_readline(); - } else { - /* In case someone wants to drive tdl from a script, by redirecting stdin to it. */ diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD index 8ac110856..c035ae09c 100644 --- a/community/vagrant/PKGBUILD +++ b/community/vagrant/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109450 2014-04-14 21:47:09Z jsteel $ +# $Id: PKGBUILD 109994 2014-04-22 19:49:32Z jsteel $ # Maintainer: Jonathan Steel <jsteel at aur.archlinux.org> # Contributor: Ido Rosen <ido@kernel.org> # Contributor: Brett Hoerner <brett@bretthoerner.com> @@ -10,7 +10,7 @@ # Contributor: Steven Nance <steven@devtrw.com> pkgname=vagrant -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=1 pkgdesc="Build and distribute virtualized development environments" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!emptydirs') depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump') source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip) -md5sums=('2abdab78c7c27e6bf7d9f89862b4d357') +md5sums=('f6c22ddf494b3bcd860a751e38a8ef1c') [[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4' [[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b' diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD index d8a443be6..abcadda52 100644 --- a/extra/aspell-pt/PKGBUILD +++ b/extra/aspell-pt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188442 2013-06-14 04:11:14Z eric $ +# $Id: PKGBUILD 211658 2014-04-22 15:35:58Z fyan $ # Maintainer: pkgname=aspell-pt -_pkgverPT=20130331 +_pkgverPT=20140412 _pkgverBR=20090702 pkgver=$_pkgverPT pkgrel=1 @@ -17,8 +17,8 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.b http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-$_pkgverPT.tar.bz2 http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-preao-$_pkgverPT.tar.bz2) sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26' - '694b35b1a6fcb90ff808b730a4513ff283e1ceee' - 'fa164ac44adc4544c7fdbb3dc5c146c28f30525a') + '26d991841bb13d3dfa6fe2bb9a29edd6982d6657' + '492ace13679f5fa3824bb528e9017fbab4ef0d4c') build() { cd aspell6-pt_BR-$_pkgverBR-0 diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 4a3acbcd5..5e8f11c89 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 202708 2013-12-25 21:15:10Z dan $ +# $Id: PKGBUILD 211662 2014-04-22 16:39:27Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.6 +pkgver=1.8.7 pkgrel=1 license=('GPL') arch=(i686 x86_64) url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' 'texlive-latexextra' 'graphviz' 'python2') -source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz - doxygen-configure-python2.patch) -md5sums=('9385dc52f0627875f8fa758e754ec674' - 'a16ef06cd207292eda73801ea3835f1e') -sha1sums=('204f1b3695c73efac44a521609c5360241d64045' - '98f9f473f906c5cd363b29c65b54bbe998c0793e') + source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) +md5sums=('ff0529df773301f63db82c25137b7fd8') +sha1sums=('3728f183f390f96b4ec39d02782a7c2d91f7bfca') build() { export PATH=$PATH:/usr/lib/qt4/bin cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 < ../doxygen-configure-python2.patch QTDIR=/usr/lib/qt4 ./configure --prefix /usr --with-doxywizard make } diff --git a/extra/doxygen/doxygen-configure-python2.patch b/extra/doxygen/doxygen-configure-python2.patch deleted file mode 100644 index 9750d1eb2..000000000 --- a/extra/doxygen/doxygen-configure-python2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- doxygen-1.8.6/configure.orig 2013-12-25 20:54:22.171988706 +0000 -+++ doxygen-1.8.6/configure 2013-12-25 20:54:33.405247482 +0000 -@@ -560,7 +560,7 @@ - - printf " Checking for python... " - if test "$f_python" = NO; then -- python_names="python" -+ python_names="python2 python" - python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" - python_prog=NO - python_found=NO diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index 7210764cd..148c531f5 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $ +# $Id: PKGBUILD 211636 2014-04-22 06:47:43Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.6 -pkgrel=4 +pkgrel=5 pkgdesc="Fax Server" arch=('i686' 'x86_64') install='hylafax.install' @@ -14,7 +14,7 @@ backup=(var/spool/hylafax/bin/{faxrcvd,notify} usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} var/spool/hylafax/etc/hosts.hfaxd) source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz - hylafax.cron.daily + hylafax.{timer,service} config.local faxq.service hfaxd.service @@ -32,7 +32,6 @@ package () { mkdir -p "$pkgdir"/usr/{bin,lib/fax,share/ghostscript/fonts} mkdir -p "$pkgdir"/var/{spool/hylafax,lock} make ROOT="$pkgdir" install - install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax # add missing awk file for notify-4.1 script install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \ "$pkgdir"/var/spool/hylafax/bin/notify.awk @@ -43,9 +42,15 @@ package () { install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service install -D -m644 $srcdir/faxgetty@.service $pkgdir/usr/lib/systemd/system/faxgetty@.service install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT + # systemd timer + install -D -m644 ${srcdir}/hylafax.timer ${pkgdir}/usr/lib/systemd/system/hylafax.timer + install -D -m644 ${srcdir}/hylafax.service ${pkgdir}/usr/lib/systemd/system/hylafax.service + install -d -m755 ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants + ln -s ../shadow.timer ${pkgdir}//usr/lib/systemd/system/multi-user.target.wants/hylafax.timer } md5sums=('d063d45049c8fcbabefe09d662313067' - 'b0b8d19a10c2145476d9fbb18c0478fe' + '9ef38446d2a2aeac698c4ae178fd5c2b' + 'e5afba881859f018ee88d35fc62a488f' '5f3a89fbfb10c47755d3ca19183b8a59' 'a10aa2ef613551a88d750f6602b5f2f7' '38a00db6d9d765d130b2d8d3a98e5c24' diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily deleted file mode 100644 index 567dd8ed3..000000000 --- a/extra/hylafax/hylafax.cron.daily +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/usr/bin/faxqclean -/usr/bin/faxcron -rcv 30 diff --git a/extra/hylafax/hylafax.service b/extra/hylafax/hylafax.service new file mode 100644 index 000000000..27f571899 --- /dev/null +++ b/extra/hylafax/hylafax.service @@ -0,0 +1,11 @@ +[Unit] +Description=Daily fax queue cleanup and deletion of 30 days old faxes + +[Service] +Type=oneshot +ExecStart=/usr/bin/faxqclean +ExecStart=/usr/bin/faxcron -rcv 30 +Nice=19 +IOSchedulingClass=best-effort +IOSchedulingPriority=7 + diff --git a/extra/hylafax/hylafax.timer b/extra/hylafax/hylafax.timer new file mode 100644 index 000000000..867cc2eaa --- /dev/null +++ b/extra/hylafax/hylafax.timer @@ -0,0 +1,7 @@ +[Unit] +Description=Daily fax queue cleanup and deletion of 30 days old faxes + +[Timer] +OnCalendar=daily +AccuracySec=12h +Persistent=true diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 571c7f9fe..0cac6f681 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,47 +1,53 @@ -# $Id: PKGBUILD 200656 2013-12-01 09:50:21Z andyrtr $ +# $Id: PKGBUILD 211635 2014-04-22 02:11:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=13 +pkgrel=14 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.24.4' 'popt' +depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' 'python2-numpy: some extensions' 'python2-lxml: some extensions and filters' 'uniconvertor: reading/writing to some proprietary formats') -source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - spuriouscomma.patch - build_fix.diff) +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'spuriouscomma.patch' + 'ime-placement.patch' + 'freetype.patch' + 'gc74.patch') sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' '7d1d5a6d1d2b0926721a994d5889c52890fc57c1' - 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf') + 'b12b948ca5ee7e02703a13aa8b8bccdf67947f12' + 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf' + '3e1b5b6852d668388a857bc7a73fb7731fb262b8') install=install prepare() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../gc74.patch # FS#39106 + patch -p0 -i ../freetype.patch # FS#37956 + patch -p1 -i ../ime-placement.patch # FS#39898 patch -p0 -i ../spuriouscomma.patch - # fix build with freetype 2.5.1 - patch -Np0 -i ../build_fix.diff sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp} + sed -i '/extern unsigned GC_version;/c unsigned GC_version=GC_VERSION_MAJOR<<16+GC_VERSION_MINOR<<8+GC_VERSION_MICRO;' configure } build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --with-python \ @@ -53,6 +59,6 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/build_fix.diff b/extra/inkscape/freetype.patch index 84cdc1ca6..84cdc1ca6 100644 --- a/extra/inkscape/build_fix.diff +++ b/extra/inkscape/freetype.patch diff --git a/extra/inkscape/gc74.patch b/extra/inkscape/gc74.patch new file mode 100644 index 000000000..41615ac49 --- /dev/null +++ b/extra/inkscape/gc74.patch @@ -0,0 +1,54 @@ +--- inkscape-0.48.4/src/gc-core.h.old 2013-12-31 01:22:38.976653890 +0400 ++++ inkscape-0.48.4/src/gc-core.h 2013-12-31 01:22:48.525653608 +0400 +@@ -57,7 +57,7 @@ + CleanupFunc *old_func, + void **old_data); + int (*general_register_disappearing_link)(void **p_ptr, +- void *base); ++ const void *base); + int (*unregister_disappearing_link)(void **p_ptr); + std::size_t (*get_heap_size)(); + std::size_t (*get_free_bytes)(); +--- inkscape-0.48.4/src/gc.cpp.old 2013-12-31 01:23:50.462651778 +0400 ++++ inkscape-0.48.4/src/gc.cpp 2013-12-31 01:40:37.718622017 +0400 +@@ -70,8 +70,8 @@ + return base + debug_base_fixup(); + } + +-int debug_general_register_disappearing_link(void **p_ptr, void *base) { +- char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup(); ++int debug_general_register_disappearing_link(void **p_ptr, const void *base) { ++ char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base)) - debug_base_fixup(); + return GC_general_register_disappearing_link(p_ptr, real_base); + } + +@@ -90,7 +90,7 @@ + } + } + +-int dummy_general_register_disappearing_link(void **, void *) { return false; } ++int dummy_general_register_disappearing_link(void **, const void *) { return false; } + + int dummy_unregister_disappearing_link(void **/*link*/) { return false; } + +@@ -112,7 +112,11 @@ + &GC_malloc_atomic_uncollectable, + &GC_base, + &GC_register_finalizer_ignore_self, ++#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4) + &GC_general_register_disappearing_link, ++#else ++ (int (*)(void**, const void*))(&GC_general_register_disappearing_link), ++#endif + &GC_unregister_disappearing_link, + &GC_get_heap_size, + &GC_get_free_bytes, +@@ -202,7 +206,7 @@ + die_because_not_initialized(); + } + +-int stub_general_register_disappearing_link(void **, void *) { ++int stub_general_register_disappearing_link(void **, const void *) { + die_because_not_initialized(); + return 0; + } diff --git a/extra/inkscape/ime-placement.patch b/extra/inkscape/ime-placement.patch new file mode 100644 index 000000000..7f2e13a5e --- /dev/null +++ b/extra/inkscape/ime-placement.patch @@ -0,0 +1,62 @@ +diff -aur old/src/text-context.cpp new/src/text-context.cpp +--- old/src/text-context.cpp 2011-07-08 08:25:09.468790000 -1000 ++++ new/src/text-context.cpp 2014-04-21 14:48:22.668759004 -1000 +@@ -684,6 +684,17 @@ + // articifically here, for the text object does not exist yet: + double cursor_height = sp_desktop_get_font_size_tool(desktop); + sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), dtp, dtp + Geom::Point(0, cursor_height)); ++ if (tc->imc) { ++ GdkRectangle im_cursor; ++ Geom::Point const top_left = SP_EVENT_CONTEXT(tc)->desktop->get_display_area().corner(3); ++ Geom::Point const cursor_size(0, cursor_height); ++ Geom::Point const im_position = SP_EVENT_CONTEXT(tc)->desktop->d2w(dtp + cursor_size - top_left); ++ im_cursor.x = (int) floor(im_position[Geom::X]); ++ im_cursor.y = (int) floor(im_position[Geom::Y]); ++ im_cursor.width = 0; ++ im_cursor.height = (int) -floor(SP_EVENT_CONTEXT(tc)->desktop->d2w(cursor_size)[Geom::Y]); ++ gtk_im_context_set_cursor_location(tc->imc, &im_cursor); ++ } + event_context->_message_context->set(Inkscape::NORMAL_MESSAGE, _("Type text; <b>Enter</b> to start new line.")); // FIXME:: this is a copy of a string from _update_cursor below, do not desync + + event_context->within_tolerance = false; +@@ -1560,8 +1571,6 @@ + static void + sp_text_context_update_cursor(SPTextContext *tc, bool scroll_to_see) + { +- GdkRectangle im_cursor = { 0, 0, 1, 1 }; +- + // due to interruptible display, tc may already be destroyed during a display update before + // the cursor update (can't do both atomically, alas) + if (!tc->desktop) return; +@@ -1586,10 +1595,17 @@ + sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), d0, d1); + + /* fixme: ... need another transformation to get canvas widget coordinate space? */ +- im_cursor.x = (int) floor(d0[Geom::X]); +- im_cursor.y = (int) floor(d0[Geom::Y]); +- im_cursor.width = (int) floor(d1[Geom::X]) - im_cursor.x; +- im_cursor.height = (int) floor(d1[Geom::Y]) - im_cursor.y; ++ if (tc->imc) { ++ GdkRectangle im_cursor = { 0, 0, 1, 1 }; ++ Geom::Point const top_left = SP_EVENT_CONTEXT(tc)->desktop->get_display_area().corner(3); ++ Geom::Point const im_d0 = SP_EVENT_CONTEXT(tc)->desktop->d2w(d0 - top_left); ++ Geom::Point const im_d1 = SP_EVENT_CONTEXT(tc)->desktop->d2w(d1 - top_left); ++ im_cursor.x = (int) floor(im_d0[Geom::X]); ++ im_cursor.y = (int) floor(im_d1[Geom::Y]); ++ im_cursor.width = (int) floor(im_d1[Geom::X]) - im_cursor.x; ++ im_cursor.height = (int) floor(im_d0[Geom::Y]) - im_cursor.y; ++ gtk_im_context_set_cursor_location(tc->imc, &im_cursor); ++ } + + tc->show = TRUE; + tc->phase = 1; +@@ -1631,9 +1647,6 @@ + } + } + +- if (tc->imc) { +- gtk_im_context_set_cursor_location(tc->imc, &im_cursor); +- } + SP_EVENT_CONTEXT(tc)->desktop->emitToolSubselectionChanged((gpointer)tc); + } + diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD index 45f6be82d..f65d04674 100644 --- a/extra/perl-async-interrupt/PKGBUILD +++ b/extra/perl-async-interrupt/PKGBUILD @@ -1,10 +1,10 @@ # Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 186392 2013-05-26 09:24:51Z bluewind $ +# $Id: PKGBUILD 211640 2014-04-22 10:12:44Z fyan $ pkgname=perl-async-interrupt -_ver=1.1 -pkgver=1.10 -pkgrel=3 +_ver=1.2 +pkgver=1.20 +pkgrel=1 pkgdesc='allow C/XS libraries to interrupt perl asynchronously' arch=(i686 x86_64) license=(PerlArtistic GPL) @@ -12,8 +12,8 @@ options=(!emptydirs) depends=(perl-common-sense) url=https://metacpan.org/release/Async-Interrupt source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz") -md5sums=(18f19b1537ecf5d6195a6a243110e64b) -sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e) +md5sums=('3ec1355c266dfd77245d1c3a1de6fa8d') +sha512sums=('41091c445247597567c9470fd926318e42d08b1f71e4bee2ed9bad327f66ef679b9bfd89b3e0c66d820a3a82e423eac5a56dca97675a11566e917257f77a2a90') build() ( diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD index e05ead47b..6edeb1812 100644 --- a/extra/python-markupsafe/PKGBUILD +++ b/extra/python-markupsafe/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 208848 2014-03-27 14:43:32Z fyan $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 211647 2014-04-22 10:43:11Z fyan $ +# Maintainer : Felix Yan <felixonmars@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Alex Anthony <alex.anthony28991@gmail.com> pkgname=('python-markupsafe' 'python2-markupsafe') -pkgver=0.19 -pkgrel=2 +pkgver=0.21 +pkgrel=1 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" arch=('i686' 'x86_64') url="http://pypi.python.org/pypi/MarkupSafe" license=('custom') makedepends=('python-setuptools' 'python2-setuptools') source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz") -md5sums=('ccb3f746c807c5500850987006854a6d') +sha512sums=('ecedf56be7ad1723c4d7bf799e1aefb8ceb0a28840a1b8ffdc2dee0f734149430cf5dfd5d335591e9934cf223255475e9c04da5ab34ed69e7845298f599d81bc') build() { cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD index fe2652a11..1d9e7a0c2 100644 --- a/extra/zeitgeist/PKGBUILD +++ b/extra/zeitgeist/PKGBUILD @@ -1,47 +1,48 @@ -# $Id: PKGBUILD 211625 2014-04-21 18:17:51Z jgc $ +# $Id: PKGBUILD 211657 2014-04-22 13:55:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=zeitgeist -pkgver=0.9.14 -pkgrel=2 +pkgver=0.9.15 +pkgrel=1 pkgdesc="Service logging user activities and events" arch=(i686 x86_64) url="http://zeitgeist-project.com/" license=(GPL2 LGPL2.1) depends=(json-glib telepathy-glib gtk3) -makedepends=(intltool gobject-introspection vala raptor python2-rdflib) +makedepends=(intltool gobject-introspection vala raptor python2-rdflib gnome-common git) provides=(zeitgeist-datahub) conflicts=(zeitgeist-datahub) replaces=(zeitgeist-datahub) -source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz" - gio-dependency.patch) -sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061' - '4f2403b0695a6bf7b7cc10833e0e3a07d14fa22afeccc4ec89af0e89bbb35291') +source=("$pkgname::git://anongit.freedesktop.org/$pkgname/$pkgname#commit=d2c966f") +sha256sums=('SKIP') prepare() { - cd $pkgname-$pkgver - sed -i 's/python -/$PYTHON -/' configure configure.ac - patch -Np1 -i ../gio-dependency.patch + cd $pkgname + + sed -i 's/python -/$PYTHON -/' configure.ac + sed -i '1s/python$/python2/' data/ontology2code + + mkdir m4 + NOCONFIGURE=1 ./autogen.sh } build() { - cd $pkgname-$pkgver + cd $pkgname export PYTHON=/usr/bin/python2 - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname make } check() { - cd $pkgname-$pkgver + cd $pkgname # Log test fails in chroot, as we have no X and no proper dbus make -k check || : } package() { - cd $pkgname-$pkgver + cd $pkgname make DESTDIR="$pkgdir" install } diff --git a/extra/zeitgeist/gio-dependency.patch b/extra/zeitgeist/gio-dependency.patch deleted file mode 100644 index 5f5fe5a32..000000000 --- a/extra/zeitgeist/gio-dependency.patch +++ /dev/null @@ -1,20 +0,0 @@ -From ab624e66b0a1eccd4a605980be07726ac8ecb460 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <philip@tecnocode.co.uk> -Date: Sun, 16 Feb 2014 15:08:49 +0000 -Subject: [PATCH] libzeitgeist: Add a missing dependency on gio-2.0 - -This actually makes the zeitgeist vapi file usable. ---- - libzeitgeist/zeitgeist-2.0.deps | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps -index ff8d39b..59eec5d 100644 ---- a/libzeitgeist/zeitgeist-2.0.deps -+++ b/libzeitgeist/zeitgeist-2.0.deps -@@ -1 +1,2 @@ - zeitgeist-datamodel-2.0 -+gio-2.0 --- -1.8.5.3 - |