diff options
Diffstat (limited to 'community')
28 files changed, 335 insertions, 152 deletions
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index f05535f4a..47c0f06fb 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67633 2012-03-13 14:56:32Z spupykin $ +# $Id: PKGBUILD 69418 2012-04-16 09:39:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime24' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') + 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') optdepends=('postgresql-libs: for PostgreSQL storage backend' - 'sqlite3: for SQLite storage backend' + 'sqlite: for SQLite storage backend' 'libmysqlclient: for MySQL storage backend' 'libldap: for LDAP authentication' 'libsieve: for dbmail-sieve') @@ -26,7 +26,7 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail.rc.d) md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'e7f72bc360decdb2475266391ad12329' - '099225611da20ec194c092ac9befc33c') + '6e287912650675011169b2dff42822cc') build() { cd $srcdir/dbmail-${pkgver/_/-}/ diff --git a/community/dbmail/dbmail.rc.d b/community/dbmail/dbmail.rc.d index 92c34e5d2..9286809df 100644 --- a/community/dbmail/dbmail.rc.d +++ b/community/dbmail/dbmail.rc.d @@ -7,9 +7,11 @@ case "$1" in start) + mkdir -p /var/run/dbmail + chown -R nobody:nobody /var/run/dbmail for daemon in $DBMAIL_DAEMONS; do stat_busy "Starting DbMail ${daemon}" - /usr/sbin/${daemon} + /usr/sbin/${daemon} -p /var/run/dbmail/${daemon}.pid if [ $? -gt 0 ]; then stat_fail else @@ -21,7 +23,7 @@ case "$1" in stop) for daemon in $DBMAIL_DAEMONS; do stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/${daemon}.pid) + pid=$(cat /var/run/dbmail/${daemon}.pid) kill $pid sleep 4 stat_done diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index 732145cef..106c0ec9b 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63528 2012-02-05 11:53:40Z ibiru $ +# $Id: PKGBUILD 69446 2012-04-16 11:44:58Z spupykin $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,16 +6,16 @@ pkgname=dia pkgver=0.97.2 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64') license=('GPL') url="http://live.gnome.org/Dia" install=dia.install -depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2') +depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme') makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') -options=('!libtool' 'docs') +options=('!libtool' 'docs' '!emptydirs') source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" "dia-overflow-fix.patch") md5sums=('1e1180a513fb567709b09bc19f12105e' @@ -25,6 +25,9 @@ build() { 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-overflow-fix.patch @@ -44,5 +47,5 @@ package() { make DESTDIR="${pkgdir}" install cd doc make DESTDIR="${pkgdir}" install-html - ln -sf dia/html "${pkgdir}"/usr/share/dia/help + ln -sf ../doc/dia/html "${pkgdir}"/usr/share/dia/help } diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 050157357..074b0d457 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61824 2012-01-08 18:20:40Z spupykin $ +# $Id: PKGBUILD 69466 2012-04-16 15:09:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -6,18 +6,21 @@ pkgname=dmenu pkgver=4.5 -pkgrel=1 +pkgrel=2 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" arch=('i686' 'x86_64') license=('MIT') -depends=('sh' 'libxinerama') -source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -md5sums=('9c46169ed703732ec52ed946c27d84b4') +depends=('sh' 'libxinerama' 'libxft' 'freetype2') +source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz" + "http://tools.suckless.org/dmenu/patches/dmenu-$pkgver-xft.diff") +md5sums=('9c46169ed703732ec52ed946c27d84b4' + 'd448ec9120718b0aedbdb338f4fa69ba') build(){ cd $srcdir/$pkgname-$pkgver - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 + patch -p1 <$srcdir/dmenu-$pkgver-xft.diff + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 XFTINC=-I/usr/include/freetype2 } package() { diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD index aaf86e69f..4055dd567 100644 --- a/community/e4rat/PKGBUILD +++ b/community/e4rat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67597 2012-03-13 13:26:27Z lcarlier $ +# $Id: PKGBUILD 69434 2012-04-16 10:26:17Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> pkgname=e4rat -pkgver=0.2.1 -pkgrel=6 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions." arch=('i686' 'x86_64') url="http://e4rat.sourceforge.net/" @@ -13,14 +13,18 @@ depends=('e2fsprogs' 'util-linux') makedepends=('audit' 'boost' 'cmake') options=(!strip) backup=(etc/e4rat.conf) -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz) -md5sums=('cbb1f3cdd2b8c96b4402028da07b11f2') -sha256sums=('c509f165eff317f80f5d13d7b370514c457df4542ff3b31bee4c26f97ce89769') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz e4rat-static_core.patch) +md5sums=('dada998e857794dc7f76ffc887e04c19' + '9432ac4a8658812828d90b2676e8519f') +sha256sums=('ec40740ac05fb0470edd682232fb6c7be0bb57420b70f6c39d1df234753f3ec9' + '9381d3cee3c24de8b1df9a4c4d626a2d9d20bad695133e3dcecc9f0a8277880a') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/e4rat-static_core.patch" unset LDFLAGS + sed -i '/stdlib.h/a #include <unistd.h>' src/fiemap.cc cmake -DCMAKE_BUILD_TYPE=Release . make } @@ -31,4 +35,3 @@ package() { make DESTDIR="$pkgdir" install install -dm755 "$pkgdir/var/lib/$pkgname" } - diff --git a/community/e4rat/e4rat-static_core.patch b/community/e4rat/e4rat-static_core.patch new file mode 100644 index 000000000..f9aac8208 --- /dev/null +++ b/community/e4rat/e4rat-static_core.patch @@ -0,0 +1,15 @@ +--- src/CMakeLists.txt.orig 2012-04-16 13:52:10.993586393 +0200 ++++ src/CMakeLists.txt 2012-04-16 13:52:22.503586159 +0200 +@@ -5,11 +5,7 @@ + MESSAGE(FATAL_ERROR "Do not run cmake on subdirectories") + ENDIF() + +-if(CMAKE_SIZEOF_VOID_P MATCHES 4) +- SET(BUILD_CORE_LIBRARY_STATIC 0) +-else(CMAKE_SIZEOF_VOID_P MATCHES 4) +- SET(BUILD_CORE_LIBRARY_STATIC 1) +-endif(CMAKE_SIZEOF_VOID_P MATCHES 4) ++SET(BUILD_CORE_LIBRARY_STATIC 1) + + #TODO permit link dependencies not static + #set(LINK_DEPENDENIES "static") diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index c64ad3e44..046113a27 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55563 2011-09-14 10:20:14Z andrea $ +# $Id: PKGBUILD 69436 2012-04-16 10:50:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> pkgname=incron -pkgver=0.5.9 -pkgrel=2 +pkgver=0.5.10 +pkgrel=1 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64') url="http://incron.aiken.cz/" @@ -15,26 +15,27 @@ install=incron.install source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" 'incron.init') options=('emptydirs') -md5sums=('a285b9e14af7bf9f9524fe051a06255f' +md5sums=('67f8b671db8169edccc8ef11c7d2c8be' '648e1ca1a4b1e624401d9d71aa3756b3') build() { cd "${srcdir}"/$pkgname-$pkgver - - install -D -m 755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond - install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin - + sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp - make } package() { cd "${srcdir}"/$pkgname-$pkgver + + install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin + make PREFIX="${pkgdir}"/usr \ MANPATH="${pkgdir}"/usr/share/man \ USERDATADIR="${pkgdir}"/var/spool/incron \ CFGDIR="${pkgdir}"/etc \ SYSDATADIR="${pkgdir}"/etc/incron.d install + + install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond } diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index f6d86b4ad..13eb9b4ae 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68074 2012-03-17 18:50:38Z spupykin $ +# $Id: PKGBUILD 69442 2012-04-16 11:13:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.54 -pkgrel=1 +pkgver=0.7.56 +pkgrel=2 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') url="http://mediainfo.sourceforge.net" @@ -13,11 +13,15 @@ depends=( 'curl' 'libmms' 'libzen') makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 - libmediainfo-0.7.50-libmms.patch) -md5sums=('4d936fc2122ad1199e3185d2d6053715' - '2f4b21cc250f663d52b497dedb963e3b') + libmediainfo-0.7.50-libmms.patch + gcc-4.7.patch) +md5sums=('a41c484fea74d34f8f1b430a4d444a72' + '2f4b21cc250f663d52b497dedb963e3b' + '3221024ca99fb941d8eb5302ae470c6d') build() { + cd $srcdir/MediaInfoLib/ + patch -p1 <$srcdir/gcc-4.7.patch cd $srcdir/MediaInfoLib/Project/GNU/Library sh ./autogen ./configure --prefix=/usr --enable-shared --disable-static --with-libcurl --with-libmms diff --git a/community/libmediainfo/gcc-4.7.patch b/community/libmediainfo/gcc-4.7.patch new file mode 100644 index 000000000..5bdfc53e3 --- /dev/null +++ b/community/libmediainfo/gcc-4.7.patch @@ -0,0 +1,79 @@ +diff -aur MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp +--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-08 20:25:35.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-13 05:14:46.924995168 +0200 +@@ -249,15 +249,15 @@ + #else
+ libcurl_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!libcurl_Module)
+ {
+diff -aur MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h +--- MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-08 12:08:50.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-13 05:14:05.481020899 +0200 +@@ -248,24 +248,24 @@ +
+ #ifdef MEDIAINFO_GLIBC
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfo_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfo_##_Name)) \
+ Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfoList_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfoList_##_Name)) \
+ Errors++;
+ #elif defined (_WIN32) || defined (WIN32)
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #else
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #endif
+
+@@ -317,15 +317,15 @@ + #else
+ MediaInfo_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!MediaInfo_Module)
+ return (size_t)-1;
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 15ed35a87..d73ad83cc 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69188 2012-04-10 02:21:11Z spupykin $ +# $Id: PKGBUILD 69468 2012-04-16 15:11:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.11 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -36,15 +36,17 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d openbsd-netcat-default.patch unixperms.patch - yajl-2.x.patch) + yajl-2.x.patch + "libvirt-qemu-ssh-user.patch::http://libvirt.org/git/?p=libvirt.git;a=patch;h=4eb1c2560d1ab8bae620788d343e9e7b32ddc066") md5sums=('6e9fab115075a8fd21d9bd0d7e558a52' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - '4091cf082b1b743f5e7af060b3760276' + '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' 'b0be50eb9dfe4d133decf23b60880f7d' 'db95aecdf2ccf3693fef5821cdcb7eba' - '5745bb8d0b254abb7a3528c66e03b0f9') + '5745bb8d0b254abb7a3528c66e03b0f9' + '40f6ad1d227ae2c41b4a83f7a3165ffb') build() { cd "$srcdir/$pkgname-$pkgver" @@ -62,6 +64,7 @@ build() { # patch -Np1 -i "$srcdir"/unixperms.patch [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch + [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/libvirt-qemu-ssh-user.patch export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d index e07478534..670b5431a 100755 --- a/community/libvirt/libvirtd-guests.rc.d +++ b/community/libvirt/libvirtd-guests.rc.d @@ -15,7 +15,34 @@ libvirt_get_guest_state() # list IDs of running guests libvirt_list() { - virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}' + + list=$(virsh $LIBVIRTD_URI list) + + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + uuids= + for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do + uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') + if [ -z "$uuid" ]; then + RETVAL=1 + return 1 + fi + uuids="$uuids $uuid" + done + + echo $uuids + +} + +libvirt_domname() +{ + uuid=$1 + name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') + + echo $name } # suspend guest by name @@ -57,9 +84,11 @@ libvirt_stop_all() { mkdir -p `dirname $LIBVIRTD_LISTFILE` echo -n >$LIBVIRTD_LISTFILE + for i in `libvirt_list`; do + name=`libvirt_domname $i` if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then - stat_busy "Suspending libvirtd/$i guest" + stat_busy "Suspending libvirtd/$name guest" libvirt_suspend "$i" else stat_busy "Shutting libvirtd/$i guest down" @@ -75,7 +104,8 @@ libvirt_start_all() { if [ -f $LIBVIRTD_LISTFILE ]; then for i in `cat $LIBVIRTD_LISTFILE`; do - stat_busy "Starting/resuming libvirtd/$i guest" + name='libvirt_domname $i' + stat_busy "Starting/resuming libvirtd/$name guest" libvirt_start "$i" [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail done @@ -101,7 +131,7 @@ case "$1" in $0 start ;; *) - echo $"Usage: $0 {start|stop|restart}" - ;; + echo $"Usage: $0 {start|stop|restart}" + ;; esac exit 0 diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index fd77c2bba..fdb19d7a2 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68076 2012-03-17 18:51:40Z spupykin $ +# $Id: PKGBUILD 69420 2012-04-16 09:40:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.25 +pkgver=0.4.26 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f30a139d506170aeeb3bc47d15e10fae') +md5sums=('6509bd3787509f4e62e48a99884db636') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 63c9fbf79..fd6efbb56 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68080 2012-03-17 18:53:14Z spupykin $ +# $Id: PKGBUILD 69429 2012-04-16 09:59:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.54 +pkgver=0.7.56 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('c851998158213a6b837048d67e1c2b9a') +md5sums=('fdd41eb501e0936035046a9277c29fa5') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index b1dea9d3a..a513bfcf4 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68078 2012-03-17 18:52:26Z spupykin $ +# $Id: PKGBUILD 69427 2012-04-16 09:59:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.54 +pkgver=0.7.56 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('c851998158213a6b837048d67e1c2b9a') +md5sums=('fdd41eb501e0936035046a9277c29fa5') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index fc9961fb1..c8385d68d 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64114 2012-02-08 23:57:08Z cbrannon $ +# $Id: PKGBUILD 69477 2012-04-16 17:52:09Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey -pkgver=3.1.0 -pkgrel=3 +pkgver=3.1.1 +pkgrel=1 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" @@ -18,8 +18,7 @@ backup=('etc/conf.d/mldonkey') install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 mldonkeyd - mldonkey.conf - mldonkey.desktop) + mldonkey.conf) build() { cd "$srcdir/$pkgname-$pkgver" @@ -34,13 +33,12 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \ "$pkgdir/usr/share/icons/mldonkey.svg" - install -Dm644 "$srcdir/mldonkey.desktop" \ - "$pkgdir/usr/share/applications/mldonkey.desktop" install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey" install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" + install -Dm644 "distrib/mldonkey.desktop" \ + "$pkgdir/usr/share/applications/mldonkey.desktop" } -md5sums=('072726d158ba1e936c554be341e7ceff' +md5sums=('5954ee7cfae18afb2732549fd990e7d6' '9e90003a012cf17b548dcc647961ffa6' - '1f86d92db51c62cded0e6f3833057dee' - '1de3266caa49f82bee73ba891eea12cf') + '1f86d92db51c62cded0e6f3833057dee') diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index f1fba79b9..255c0933e 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67622 2012-03-13 14:24:57Z spupykin $ +# $Id: PKGBUILD 69438 2012-04-16 10:51:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils -pkgver=0.45 -pkgrel=3 +pkgver=0.46 +pkgrel=1 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64') url="http://kitenet.net/~joey/code/moreutils.html" @@ -15,7 +15,7 @@ optdepends=('perl-timedate' 'perl-time-duration' 'perl-ipc-run') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) -md5sums=('b30306cd7312219551b890fbcbf984c4') +md5sums=('658f9cc6b6dcc0b50dcff714e13b22dc') build() { cd $srcdir/moreutils diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index b3e0f345b..dd7628a23 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66247 2012-02-23 05:19:47Z spupykin $ +# $Id: PKGBUILD 69462 2012-04-16 14:21:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nicolas Doualot <packages@slubman.info> pkgname=neatx pkgver=0.3.1 -pkgrel=11 +pkgrel=12 pkgdesc="A free NX server by google" arch=('i686' 'x86_64') url="http://code.google.com/p/neatx/" @@ -24,7 +24,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" patch -i "$srcdir/constants.archlinux.patch" -p2 - ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html + ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2 make make DESTDIR="$pkgdir/" install chmod 777 "$pkgdir/var/lib/neatx/sessions" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 204250733..5e10553d9 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,10 +1,18 @@ -# $Id: PKGBUILD 67860 2012-03-15 15:25:27Z spupykin $ +# $Id: PKGBUILD 69421 2012-04-16 09:40:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> +_doc_root=/usr/share/nginx/http +_server_root=/etc/nginx +_conf_path=${_server_root}/conf +_tmp_path=/var/spool/nginx +_log_path=/var/log/nginx +_user=http +_group=http + pkgname=nginx -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') @@ -26,17 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" "etc/conf.d/nginx") source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'nginx') -md5sums=('58360774e4875e8fc4c4286448cb54d0' - '0e8032d3ba26c3276e8c7c30588d375f') - -_doc_root=/usr/share/nginx/http -_server_root=/etc/nginx -_conf_path=${_server_root}/conf -_tmp_path=/var/spool/nginx -_log_path=/var/log/nginx -_user=http -_group=http -md5sums=('019844e48c34952253ca26dd6e28c35c' +md5sums=('17da4802209b83d9bebb0f0edd975dfc' '0e8032d3ba26c3276e8c7c30588d375f') build() { @@ -59,6 +57,7 @@ build() { --with-http_gzip_static_module \ --with-ipv6 \ --add-module=/usr/lib/passenger/ext/nginx \ + --conf-path=${_conf_path}/nginx.conf \ --http-scgi-temp-path=${_tmp_path} \ --http-uwsgi-temp-path=${_tmp_path} #--with-http_mp4_module \ @@ -92,7 +91,7 @@ package() { } EOF - sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf + sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/${_conf_path}/nginx.conf install -d $pkgdir/$_tmp_path diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 363b16dcc..97b236233 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64351 2012-02-11 23:23:24Z allan $ +# $Id: PKGBUILD 69456 2012-04-16 13:52:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64') url="http://www.apsis.ch/pound/index_html" @@ -15,18 +15,14 @@ backup=(etc/pound/pound.cfg) source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.init pound.runit - pound.cfg - pound-2.5-openssl.patch) + pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' - '4df8548f106fca08323e8e4071beaa43' - '716cc0bf334b594751bece24c7d1df2d' - '8937808acd22c6391ebe4340af8df854' - 'c2c48dc395ffc045f9d35394992292d0') + 'bd3bddb6dc17fdcab824815a4705b055' + '4bd5e2a8d8e707eb900ae88929e00d4c' + '8937808acd22c6391ebe4340af8df854') build() { cd $srcdir/Pound-$pkgver - # Patch to build against OpenSSL 1.0.0 (Thanks Fedora!) -# patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc/pound make } diff --git a/community/pound/pound.init b/community/pound/pound.init index 369d6626d..b8187c81f 100755 --- a/community/pound/pound.init +++ b/community/pound/pound.init @@ -6,33 +6,33 @@ case "$1" in start) - stat_busy "Starting Pound" - /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pound - stat_done - fi - ;; + stat_busy "Starting Pound" + /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pound + stat_done + fi + ;; stop) - stat_busy "Stopping Pound" + stat_busy "Stopping Pound" [ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid` - if [ $? -gt 0 ]; then - stat_fail - else + if [ $? -gt 0 ]; then + stat_fail + else rm -f /var/run/pound.pid - rm_daemon pound - stat_done - fi - ;; + rm_daemon pound + stat_done + fi + ;; restart) - $0 stop + $0 stop sleep 1 - $0 start - ;; + $0 start + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" ;; esac exit 0 diff --git a/community/pound/pound.runit b/community/pound/pound.runit index 2e0be991e..ed59ea046 100755 --- a/community/pound/pound.runit +++ b/community/pound/pound.runit @@ -11,7 +11,7 @@ SVC=pound PID=`pidof $BIN` if [ -z "$PID" ] then - if [ -f /var/run/$SVC.pid ] + if [ -f /var/run/$SVC.pid ] then rm /var/run/$SVC.pid rm_daemon $SVC @@ -21,4 +21,3 @@ then else [ -z $PID ] || exec watchpid $PID fi - diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD index 1c6159218..79f236c20 100644 --- a/community/qtemu/PKGBUILD +++ b/community/qtemu/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 65491 2012-02-21 06:36:26Z spupykin $ +# $Id: PKGBUILD 69470 2012-04-16 15:12:06Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=qtemu pkgver=1.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="Graphical user interface for QEMU written in Qt4" url="http://qtemu.org" license=("GPL") arch=('i686' 'x86_64') makedepends=('cmake') depends=('qemu' 'qt>=4.1') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('3b93e209dc62e52a1d94c8eb24d0b149') +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') build() { cd "$srcdir/$pkgname-$pkgver" @@ -21,4 +23,5 @@ build() { make DESTDIR="$pkgdir" install install -d "$pkgdir/usr/bin" ln -s /opt/qtemu/bin/qtemu "$pkgdir/usr/bin/qtemu" + install -Dm0644 $srcdir/qtemu.desktop $pkgdir/usr/share/applications/qtemu.desktop } diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index f9f42c0d9..5b1a5f675 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67278 2012-03-06 10:44:14Z arodseth $ +# $Id: PKGBUILD 69444 2012-04-16 11:14:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,13 +6,14 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.16.2 -pkgrel=2 +pkgver=1.17.1 +pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" -arch=('x86_64' 'i686') +arch=('i686' 'x86_64') url="http://www.lesbonscomptes.com/recoll/" license=('GPL') -depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme') +depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme' 'qtwebkit') +makedepends=('python2') optdepends=('libxslt: for XML based formats (fb2,etc)' 'unzip: for the OpenOffice.org documents' 'xpdf: for pdf' @@ -30,16 +31,21 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355') +md5sums=('10726fdb6c35898f6349d475fc4097c8') build() { cd "$srcdir/$pkgname-$pkgver" msg2 "Python2 fix" - for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} doc/user/usermanual.html; do + export PYTHON=/usr/bin/python2 + for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} \ + doc/user/usermanual.html; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" done - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py + sed -i 's_python$_python2_' desktop/hotrecoll.py + sed -i 's_python _python2 _' python/recoll/Makefile recollinstall* + + sed -i '1,1i#include <unistd.h>' utils/rclionice.cpp ./configure \ --prefix=/usr \ diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index f2edde214..76335d7d6 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69336 2012-04-14 04:21:10Z lcarlier $ +# $Id: PKGBUILD 69472 2012-04-16 15:12:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Remmina is a remote desktop client written in GTK+. " arch=(i686 x86_64) url="http://remmina.sourceforge.net/" @@ -11,7 +11,11 @@ license=('GPL') depends=('gtk2' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') makedepends=('intltool' 'pkgconfig' 'cmake' 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') -optdepends=('avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') +optdepends=('avahi' + 'libxkbfile' + 'freerdp' + 'telepathy-glib' + 'gnome-keyring') replaces=('remmina-plugins') provides=("grdc" "grdc=$pkgver" 'remmina-plugins') conflicts=("grdc") diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 7e6523384..5dfee7b83 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68925 2012-04-06 00:04:01Z dreisner $ +# $Id: PKGBUILD 69475 2012-04-16 15:31:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog @@ -29,7 +29,6 @@ md5sums=('03e237abaa5d47f92c6e655f92f22532' build() { cd ${srcdir}/${pkgname}-${pkgver} - export LDFLAGS="-lestr" ./configure --prefix=/usr \ --enable-mysql \ --enable-pgsql \ @@ -40,6 +39,7 @@ build() { --enable-gnutls \ --enable-inet \ --with-systemdsystemunitdir=/usr/lib/systemd/system + echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile make } package() { diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 13b6c006f..3ef7e4962 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 67933 2012-03-16 10:22:42Z spupykin $ +# $Id: PKGBUILD 69440 2012-04-16 10:52:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=5 +pkgrel=6 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" license=('LGPL') backup=('etc/conf.d/xmms2d.conf') -depends=('sqlite3' 'libmad') +depends=('sqlite' 'libmad') makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' - 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') # avahi + 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi') optdepends=('alsa-lib: ALSA audio output' 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' 'boost: C++ language bindings' @@ -24,6 +24,7 @@ optdepends=('alsa-lib: ALSA audio output' 'flac: FLAC support' 'jack: JACK audio output' 'libao: liboa audio output' + 'libgme: game-music-emu support' 'libofa: MusicDNS fingerprinting' 'libmms: play MMS streams' 'libmodplug: to play MOD files' @@ -57,15 +58,19 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf +# sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf ./waf configure --prefix=/usr \ - --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps \ + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \ --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` ./waf build ./waf --destdir=${pkgdir} install + PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d + ./waf build + ./waf --destdir=${pkgdir} install + install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf } diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index d07fa4820..d693be4f5 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69170 2012-04-09 22:13:58Z spupykin $ +# $Id: PKGBUILD 69464 2012-04-16 14:22:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura pkgver=0.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="a document viewer" arch=('i686' 'x86_64') url="http://pwmt.org/projects/zathura/" @@ -13,8 +13,10 @@ depends=('girara-gtk2' 'cairo' 'sqlite') makedepends=('docutils') optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') install=zathura.install -source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz) -md5sums=('c018b0385a392adb87b465b0f759aaf9') +source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz + bash-completion) +md5sums=('c018b0385a392adb87b465b0f759aaf9' + 'cac20c37f0e77ba62a8138788f4ccabb') build() { cd $srcdir/zathura-$pkgver @@ -25,6 +27,5 @@ package() { cd $srcdir/zathura-$pkgver make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - mkdir -p $pkgdir/usr/share/bash-completion/completions - echo "complete -f -X '!*.[pf]df' zathura" >$pkgdir/usr/share/bash-completion/completions/zathura + install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura } diff --git a/community/zathura/bash-completion b/community/zathura/bash-completion new file mode 100644 index 000000000..41c3825b6 --- /dev/null +++ b/community/zathura/bash-completion @@ -0,0 +1,29 @@ +_zathura() { + _init_completion || return + + EXTENTIONS='' + for PLUGIN in /usr/lib/zathura/*.so; do + case ${PLUGIN##*/} in + pdf.so) + EXTENTIONS="$EXTENTIONS|pdf" + ;; + ps.so) + EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf" + ;; + djvu.so) + EXTENTIONS="$EXTENTIONS|djvu|djv" + ;; + epub.so) + EXTENTIONS="$EXTENTIONS|epub" + ;; + cb.so) + EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar" + ;; + *) + ;; + esac + done + + _filedir "${EXTENTIONS#|}" +} && +complete -F _zathura zathura |