From 2030e810a5cfd4d3ff6e0f8930560c96f2990eb2 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 4 Nov 2012 01:49:10 -0700 Subject: Sun Nov 4 01:48:41 PDT 2012 --- community/armagetronad/PKGBUILD | 7 ++- community/ccrypt/PKGBUILD | 18 +++--- community/duplicity/PKGBUILD | 10 ++-- community/fcgiwrap/PKGBUILD | 22 +++---- ...Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch | 58 ++++++++++++++++++ community/gdlmm/PKGBUILD | 13 ++-- community/gecko-mediaplayer/PKGBUILD | 6 +- community/gmtk/PKGBUILD | 6 +- community/gnome-mplayer/PKGBUILD | 6 +- community/libvirt/PKGBUILD | 6 +- community/libvirt/libvirtd-guests.rc.d | 30 +++++++++- community/mathomatic/PKGBUILD | 8 +-- community/nemiver/PKGBUILD | 4 +- community/simple-scan/PKGBUILD | 4 +- community/sysprof/PKGBUILD | 4 +- community/tightvnc/PKGBUILD | 54 +++++++++++------ community/tightvnc/vncserver.service | 29 +++++++++ community/tor/PKGBUILD | 6 +- community/tor/tor.service | 1 + community/tuxpaint/PKGBUILD | 70 +++++++++++++--------- community/webfs/PKGBUILD | 10 ++-- community/webfs/webfsd.service | 4 +- community/xmms2/PKGBUILD | 6 +- community/xmms2/xmms2d.rc | 4 +- 24 files changed, 268 insertions(+), 118 deletions(-) create mode 100644 community/gdlmm/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch create mode 100644 community/tightvnc/vncserver.service (limited to 'community') diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD index aa5d842bc..24e6db6e9 100644 --- a/community/armagetronad/PKGBUILD +++ b/community/armagetronad/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 70736 2012-05-16 00:12:56Z kkeen $ +# $Id: PKGBUILD 79394 2012-11-04 02:16:41Z kkeen $ # Maintainer: Kyle Keen # Contributor: Mateusz Herych # Contributor: Filippo 'JoeyrS' Civiletti pkgname=armagetronad pkgver=0.2.8.3.2 -pkgrel=2 +pkgrel=3 pkgdesc='A Tron Clone in 3D.' arch=('i686' 'x86_64') url='http://armagetronad.net/' license=('GPL') -depends=('sdl_image' 'libxml2' 'sdl_mixer' 'mesa' 'ftgl') +depends=('sdl_image' 'libxml2' 'sdl_mixer' 'ftgl') +optdepends=('python2: language updater') source=(http://downloads.sourceforge.net/sourceforge/armagetronad/armagetronad-$pkgver.src.tar.gz) md5sums=('f7796de4ef50bd33553e0a3f93fd67e6') diff --git a/community/ccrypt/PKGBUILD b/community/ccrypt/PKGBUILD index 9a99deec7..453f40c3a 100644 --- a/community/ccrypt/PKGBUILD +++ b/community/ccrypt/PKGBUILD @@ -1,28 +1,30 @@ -# $Id: PKGBUILD 64159 2012-02-09 16:27:49Z ttopper $ +# $Id: PKGBUILD 79357 2012-11-03 16:20:57Z ttopper $ # Contributor: Andrea Scarpino # Contributor: Giovanni Scafora # Contributor: Daniel J Griffiths # Maintainer: Thorsten Töpper pkgname=ccrypt -pkgver=1.9 -pkgrel=2 -pkgdesc="A command-line utility for encrypting and decrypting files and streams" +pkgver=1.10 +pkgrel=1 +pkgdesc='A command-line utility for encrypting and decrypting files and streams' arch=('i686' 'x86_64') url="http://ccrypt.sourceforge.net" license=('GPL2') depends=('glibc') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c3f78019d7a166dd66f1d4b1390c62c2') +sha1sums=('95d4e524abb146946fe6af9d53ed0e5e294b34e2') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}/" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index b28c2b551..080359ec7 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 78184 2012-10-17 10:23:31Z allan $ +# $Id: PKGBUILD 79351 2012-11-03 14:29:23Z lfleischer $ # Maintainer: Kaiting Chen # Contributor: Aaron Schaefer pkgname=duplicity -pkgver=0.6.19 -pkgrel=2 +pkgver=0.6.20 +pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('c88122d0b651f84f3bfa42e55591c36b' - 'df672ed47b8eb4fd8ffa99711623b6b5') +md5sums=('83a56c4c17fc50961c961943867deae4' + '2bd2d4a3a331ab728473f46963dc87da') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD index 2237fc3a7..e5a83ca0a 100644 --- a/community/fcgiwrap/PKGBUILD +++ b/community/fcgiwrap/PKGBUILD @@ -1,44 +1,40 @@ -# $Id: PKGBUILD 75304 2012-08-18 12:28:57Z lfleischer $ +# $Id: PKGBUILD 79378 2012-11-03 21:00:27Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Aaron Bull Schaefer # Contributor: Ron Huang pkgname=fcgiwrap pkgver=1.0.3 -_gitrev='2e301c8' -pkgrel=3 +_gitrev='b9f03e6' +pkgrel=4 pkgdesc='A simple server for running CGI applications over FastCGI.' arch=('i686' 'x86_64') url='http://nginx.localdomain.pl/wiki/FcgiWrap' license=('MIT') -depends=('fcgi' 'spawn-fcgi') +depends=('fcgi' 'systemd') backup=('etc/conf.d/fcgiwrap') -source=("https://github.com/downloads/gnosek/fcgiwrap/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${_gitrev}.tar.gz" 'fcgiwrap.conf.d' 'fcgiwrap.rc.d' - 'fcgiwrap.service' 'LICENSE') -md5sums=('be73d90df7c4442084463e2815fc213d' +md5sums=('96d5f5a82b96f6eb7b4117fbab5e1e58' '9fbb5b0e861ffea74e655143a4c1a8f9' '71ea12f43aebca39f73ff2e0b684f361' - 'fda6e50f609ede7c599caac8a7bb127a' '5aee62c27b4308f25ab32f05da387366') build() { - cd "${srcdir}/gnosek-${pkgname}-${_gitrev}" + cd "${srcdir}/${pkgname}" autoreconf --install - ./configure --prefix=/usr + ./configure --prefix=/usr --mandir=/share/man make } package() { - cd "${srcdir}/gnosek-${pkgname}-${_gitrev}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install install -Dm0644 ../fcgiwrap.conf.d "${pkgdir}/etc/conf.d/${pkgname}" install -Dm0755 ../fcgiwrap.rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - install -Dm0644 "${srcdir}/fcgiwrap.service" "${pkgdir}/usr/lib/systemd/system/fcgiwrap.service" } diff --git a/community/gdlmm/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch b/community/gdlmm/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch new file mode 100644 index 000000000..c8e3218a9 --- /dev/null +++ b/community/gdlmm/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch @@ -0,0 +1,58 @@ +From ce395bc27cf08e5f40c4ee4142cbb4795397ddc6 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sun, 22 Apr 2012 21:23:58 +0300 +Subject: [PATCH] Don't wrap gdl_dock_layout_get_layouts_ui + +Removed from gdl in commit 2b3b292. +--- + gdl/src/docklayout.hg | 2 -- + gdl/src/gdl_method.defs | 6 ------ + 2 files changed, 8 deletions(-) + +diff --git a/gdl/src/docklayout.hg b/gdl/src/docklayout.hg +index 155d58b..bf532a7 100644 +--- a/gdl/src/docklayout.hg ++++ b/gdl/src/docklayout.hg +@@ -58,8 +58,6 @@ public: + + _WRAP_METHOD(bool is_dirty() const, gdl_dock_layout_is_dirty) + +- _WRAP_METHOD(Gtk::Widget* get_layouts_ui(), gdl_dock_layout_get_layouts_ui) +- + + _WRAP_PROPERTY("dirty", bool) + +diff --git a/gdl/src/gdl_method.defs b/gdl/src/gdl_method.defs +index a7f84bb..8c80bc7 100644 +--- a/gdl/src/gdl_method.defs ++++ b/gdl/src/gdl_method.defs +@@ -556,12 +556,6 @@ + (return-type "gboolean") + ) + +-(define-method get_layouts_ui +- (of-object "GdlDockLayout") +- (c-name "gdl_dock_layout_get_layouts_ui") +- (return-type "GtkWidget*") +-) +- + + + ;; From gdl-dock-master.h +-- +1.7.10 + +--- gdlmm-3.3.2/gdl/gdlmm/docklayout.cc.get_layouts_ui 2011-11-23 19:47:10.000000000 +0200 ++++ gdlmm-3.3.2/gdl/gdlmm/docklayout.cc 2012-04-23 00:35:26.839494884 +0300 +@@ -180,11 +180,6 @@ + return gdl_dock_layout_is_dirty(const_cast(gobj())); + } + +-Gtk::Widget* DockLayout::get_layouts_ui() +-{ +- return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj())); +-} +- + + #ifdef GLIBMM_PROPERTIES_ENABLED + Glib::PropertyProxy_ReadOnly DockLayout::property_dirty() const diff --git a/community/gdlmm/PKGBUILD b/community/gdlmm/PKGBUILD index 3c5d0091f..fb02bfec9 100644 --- a/community/gdlmm/PKGBUILD +++ b/community/gdlmm/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 69726 2012-04-23 09:06:41Z ibiru $ +# $Id: PKGBUILD 79334 2012-11-03 04:07:35Z bgyorgy $ # Maintainer: Alexander Rødseth pkgname=gdlmm pkgver=3.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="C++ bindings for the gdl library" arch=('x86_64' 'i686') url="http://git.gnome.org/browse/gdlmm/" depends=('gdl' 'gtkmm3') options=(!libtool !emptydirs) license=('LGPL') -source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz") -sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46') +source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz" + "0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch") +sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46' + '8fb0d920c5c3d4279738f048cbff65b5b4fa544c9f004f8e64d39e54f52653d5') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix build with gdl 3.6 + patch -Np1 -i "$srcdir/0001-Don-t-wrap-gdl_dock_layout_get_layouts_ui.patch" + ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 56470a0f6..8a1100d66 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69616 2012-04-20 13:43:38Z lfleischer $ +# $Id: PKGBUILD 79363 2012-11-03 16:29:50Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Allan McRae # Contributor: fancris3 # Contributor: Daniel J Griffiths pkgname=gecko-mediaplayer -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('7675c8622c47ff8ccd22b685c48635f8') +md5sums=('d35e3307126f874afba93bd896d605dc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD index 8141da27f..9a8758d0d 100644 --- a/community/gmtk/PKGBUILD +++ b/community/gmtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69612 2012-04-20 13:39:41Z lfleischer $ +# $Id: PKGBUILD 79359 2012-11-03 16:28:22Z lfleischer $ # Maintainer: Lukas Fleischer pkgname=gmtk -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplay.' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glib2' 'gtk3' 'dconf') makedepends=('intltool' 'pkg-config') options=(!libtool) source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('6bf1c63788541272717f63ec370f6b6c') +md5sums=('919ea155b755a33ab052dacbbc6e7f03') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index ebfde0805..2ae3a66c2 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69614 2012-04-20 13:41:25Z lfleischer $ +# $Id: PKGBUILD 79361 2012-11-03 16:29:00Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Allan McRae # Contributor: Daniel J Griffiths pkgname=gnome-mplayer -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('mplayer' 'dbus-glib' 'libnotify' 'hicolor-icon-theme' 'dconf' 'gmtk') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('c1fc23faf70f3bbc23daf60f9b34832d') +md5sums=('d0cdabdf1b3eaa25d5c007b5cbd2d9ce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 505767fd8..e5bedda12 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79301 2012-11-02 14:27:34Z spupykin $ +# $Id: PKGBUILD 79340 2012-11-03 08:23:48Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -39,7 +39,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" md5sums=('7c8b006de7338e30866bb56738803b21' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - 'b47419dfd8c40d1b37fae6576d07baa0' + '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '8d98e62915785686b0b6c8c070628392' '456723b41903d3aaa7ec948c1feea265') diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d index 02b26ecfa..3100b34fb 100755 --- a/community/libvirt/libvirtd-guests.rc.d +++ b/community/libvirt/libvirtd-guests.rc.d @@ -1,8 +1,32 @@ #!/bin/bash -. /etc/conf.d/libvirtd-guests -. /etc/rc.conf -. /etc/rc.d/functions +source /etc/conf.d/libvirtd-guests +[ -f /etc/rc.conf ] && source /etc/rc.conf + +if [ -f /etc/rc.d/functions ]; then + . /etc/rc.d/functions +else + stat_busy() { + echo "$*" + } + + stat_fail() { + echo "FAIL" + } + + stat_done() { + echo "DONE" + } + + add_daemon() { + true + } + + rm_daemon() { + true + } +fi + LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index eb7b68c6d..d3067ade0 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76011 2012-09-08 21:04:59Z ttopper $ +# $Id: PKGBUILD 79365 2012-11-03 16:31:24Z ttopper $ # Contributor: G_Syme # Contributor: Stefan Husmann # Maintainer: Thorsten Töpper pkgname=mathomatic -pkgver=16.0.3 +pkgver=16.0.5 pkgrel=1 -pkgdesc="General purpose Computer Algebra System written in C" +pkgdesc='General purpose Computer Algebra System written in C' arch=('i686' 'x86_64') license=('LGPL') url="http://mathomatic.orgserve.de/math/" @@ -18,7 +18,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'rlwrap: for readline editing' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('0bd4b73e364d05b7a5b855f19c91b6bd') +md5sums=('dd04913a98a5073b56f3bc78a01820f3') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 49ec571c1..641b13b5f 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75745 2012-08-30 17:41:15Z arodseth $ +# $Id: PKGBUILD 79336 2012-11-03 04:08:33Z bgyorgy $ # Maintainer: Alexander Rødseth # Contributor: jordz pkgname=nemiver pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index ef3d06274..f511792ac 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang pkgname=simple-scan -pkgver=3.4.1 +pkgver=3.6.0 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') makedepends=('yelp-tools' 'intltool') install=simple-scan.install source=(https://launchpad.net/$pkgname/${pkgver:0:3}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha256sums=('e1ed8f90f95300c7b75249d0e6abbc06185db2afd4d44be4b8d98822d25d4ece') +sha256sums=('d00684d4697de6753b6633d7c87b9c067fdbf99b732da9007ea2bb6cbdad1cde') build() { cd $pkgname-$pkgver diff --git a/community/sysprof/PKGBUILD b/community/sysprof/PKGBUILD index 729d1dac6..9b0e55fb0 100644 --- a/community/sysprof/PKGBUILD +++ b/community/sysprof/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76036 2012-09-09 18:03:25Z spupykin $ +# $Id: PKGBUILD 79392 2012-11-04 01:05:10Z ebelanger $ # Maintainer: Sergej Pupykin # Maintainer: Geoffroy Carrier # Previous Contributor: Eric Belanger @@ -13,7 +13,7 @@ url="http://www.daimi.au.dk/~sandmann/sysprof/" license=("GPL") source=(http://www.daimi.au.dk/~sandmann/$pkgname/$pkgname-$pkgver.tar.gz) depends=('libglade' 'binutils') -makedepends=('libglade' 'binutils' 'kernel26-headers') +makedepends=('libglade' 'binutils' 'linux-headers') md5sums=('a81808d847732f8dafb59d26ec2eebbf') build() { diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD index 9d680a1ae..f911b2e26 100644 --- a/community/tightvnc/PKGBUILD +++ b/community/tightvnc/PKGBUILD @@ -1,30 +1,43 @@ -# $Id: PKGBUILD 72020 2012-06-05 20:37:51Z arodseth $ +# $Id: PKGBUILD 79388 2012-11-04 00:54:52Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Paul Mattal # Contributor: Andrew Hills +# Contributor: John pkgname=tightvnc pkgver=1.3.10 -pkgrel=8 -pkgdesc="VNC Unix server && viewer" -arch=('i686' 'x86_64') +pkgrel=9 +pkgdesc='VNC server and viewer' +arch=('x86_64' 'i686') license=('GPL') -url="http://www.tightvnc.com" +url='http://www.tightvnc.com' depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl') -makedepends=('imake' 'setconf') +makedepends=('imake' 'setconf' 'gendesk') options=('!makeflags') source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" - 'http://people.csail.mit.edu/jaffer/Color/rgb.txt') + 'http://people.csail.mit.edu/jaffer/Color/rgb.txt' + 'vncserver.service' + 'tightvnc.png::http://virtual.itca.edu.sv/dokeos/sinapsis/cd/redes/vnc/tightvnc/documentos/TightVNC%20Frequently%20Asked%20Questions_archivos/tightvnc-logo.jpg') sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d' - 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73') + 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73' + 'ccadf1fc708fad601e6113464d6c533a629f6dc9116f6071347cd0b465c1f48b' + '2592196a56444143c2f0c3738dce98f89ea0d46b125a3ea54ac1dbb50914b945') +_exec=('vncviewer') +_name=('TightVNC Viewer') build() { - cd $srcdir/vnc_unixsrc + cd $srcdir + gendesk -n + setconf $pkgname.desktop Categories 'Application;Network;' + cd vnc_unixsrc setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\; - setconf vncserver '$fontPath' \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\; + setconf vncserver '$fontPath' \ + \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\; + sed -i 's:/lib/cpp:/usr/bin/cpp:' Xvnc/config/cf/linux.cf xmkmf make World + cd Xvnc ./configure setconf programs/Xserver/dix/Makefile DEFAULTRGBDATABASE '/usr/share/tightvnc/rgb' @@ -34,14 +47,21 @@ build() { } package() { - cd "$srcdir/vnc_unixsrc" + cd $srcdir/vnc_unixsrc + mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man + mkdir -p $pkgdir/usr/share/$pkgname - mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" - ./vncinstall "$pkgdir/usr/bin" "$pkgdir/usr/share/man" - mkdir -p "$pkgdir/usr/share/$pkgname" - install -Dm644 "$srcdir/vnc_unixsrc/classes/"* \ - "$pkgdir/usr/share/$pkgname" - install -Dm644 "$srcdir/rgb.txt" "$pkgdir/usr/share/$pkgname/rgb.txt" + cd $srcdir + install -Dm644 vnc_unixsrc/classes/* \ + $pkgdir/usr/share/$pkgname + install -Dm644 rgb.txt $pkgdir/usr/share/$pkgname/rgb.txt + install -Dm644 $pkgname.desktop \ + $pkgdir/usr/share/applications/$pkgname.desktop + install -Dm644 $pkgname.png \ + $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 vncserver.service \ + $pkgdir/usr/lib/systemd/system/vncserver.service } # vim:set ts=2 sw=2 et: diff --git a/community/tightvnc/vncserver.service b/community/tightvnc/vncserver.service new file mode 100644 index 000000000..b64e729a6 --- /dev/null +++ b/community/tightvnc/vncserver.service @@ -0,0 +1,29 @@ +# The vncserver service unit file +# +# 1. Copy this file to /etc/systemd/system/vncserver@:.service +# 2. Edit User= +# ("User=foo") +# 3. Edit and vncserver parameters appropriately +# ("/usr/bin/vncserver %i -arg1 -arg2 -argn") +# 4. Run `systemctl --system daemon-reload` +# 5. Run `systemctl enable vncserver@:.service` +# +# DO NOT RUN THIS SERVICE if your local area network is untrusted! +# +# See the wiki page for more on security +# https://wiki.archlinux.org/index.php/Vncserver + +[Unit] +Description=Remote desktop service (VNC) +After=syslog.target network.target + +[Service] +Type=forking +User= +# Clean any existing files in /tmp/.X11-unix environment, especially useful for VMs +ExecStartPre=-/usr/bin/vncserver -kill %i +ExecStart=/usr/bin/vncserver %i +ExecStop=/usr/bin/vncserver -kill %i + +[Install] +WantedBy=multi-user.target diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 2bda18183..d4dc0067b 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76252 2012-09-15 09:03:52Z lfleischer $ +# $Id: PKGBUILD 79370 2012-11-03 16:57:39Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: simo pkgname=tor pkgver=0.2.2.39 -pkgrel=1 +pkgrel=2 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64') url='http://www.torproject.org/' @@ -26,7 +26,7 @@ md5sums=('9157a1f02fcda9d7d2c5744176373abd' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa' - 'cf23b97a1da09670214da6229a3ecb09') + '98901f7dfa85b352b806ba7b0d66b7d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/tor/tor.service b/community/tor/tor.service index eb9b556b5..a4bc1ac51 100644 --- a/community/tor/tor.service +++ b/community/tor/tor.service @@ -1,5 +1,6 @@ [Unit] Description=Anonymizing Overlay Network +After=network.target [Service] Type=forking diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD index d0b06469d..3a67c2021 100644 --- a/community/tuxpaint/PKGBUILD +++ b/community/tuxpaint/PKGBUILD @@ -1,39 +1,53 @@ -# $Id: PKGBUILD 63759 2012-02-05 12:12:25Z ibiru $ -# Maintainer: Mateusz Herych +# $Id: PKGBUILD 79380 2012-11-03 21:29:07Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Mateusz Herych # Contributor: Sergio Jovani Guzman -# Adopted: royrocks +# Contributor: royrocks + pkgname=tuxpaint pkgver=0.9.21 -pkgrel=5 -pkgdesc="Tux Paint is a free drawing program designed for young children." -arch=('i686' 'x86_64') -url="http://www.tuxpaint.org" +pkgrel=7 +pkgdesc='Drawing program designed for young children' +arch=('x86_64' 'i686') +url='http://www.tuxpaint.org/' license=('GPL') backup=('etc/tuxpaint/tuxpaint.conf') -depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg') -source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch) -md5sums=('a88401d1860648098eeed819cff038fa' - '11d11119b3316c13f7b7a77048317bce') -sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4' - '5595a65ebabc46bebd2d0670589effc8dbdd4e0c') +depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' + 'libpaper' 'librsvg') +makedepends=('setconf') +optdepends=('tuxpaint-stamps: more stamps' + 'tuxpaint-conf: configuration manager') +source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz" + 'tuxpaint-0.9.21-libpng1.5.patch') +sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9' + '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20') build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch - sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile - echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop - make PREFIX=/usr + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do + sed -i '0,/on/s//on2/' $f + done + + patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch + sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile + setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;' + sed -i 's:# fu:fu:' src/tuxpaint.conf + make PREFIX=/usr } package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install - chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/* - chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html" + cd "$srcdir/$pkgname-$pkgver" + + make \ + PREFIX=/usr \ + DESTDIR="$pkgdir" \ + GNOME_PREFIX=/usr \ + X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" \ + install + chmod -R 644 "$pkgdir/usr/share/doc/tuxpaint-dev/"* + chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html" } + +# vim:set ts=2 sw=2 et: diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD index 4b2310ea9..e15dba63e 100644 --- a/community/webfs/PKGBUILD +++ b/community/webfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79157 2012-10-31 05:28:18Z kkeen $ +# $Id: PKGBUILD 79331 2012-11-03 03:32:04Z kkeen $ # Maintainer: Kyle Keen # Contributor: Roman Kyrylych # Contributor: Mark Rosenstand @@ -7,7 +7,7 @@ pkgname=webfs pkgver=1.21 -pkgrel=8 +pkgrel=9 pkgdesc="Simple and instant http server for mostly static content." arch=(i686 x86_64) url="http://linux.bytesex.org/misc/webfs.html" @@ -16,13 +16,12 @@ depends=('mime-types' 'openssl') backup=(etc/conf.d/webfsd) source=(http://dl.bytesex.org/releases/webfs/webfs-${pkgver}.tar.gz webfsd.rc webfsd.conf webfs.patch - webfsd.launcher webfsd.service) + webfsd.service) md5sums=('6dc125fe160479404147e7bbfc781dbc' '3ae9fcdcf79b193aa88e386055e9ebd7' 'b2c1ab041a82acd8391b06dc38d986be' '7294edcec2589df04bb775270d56536e' - '256533a2fa5a293a55da1f32fab2cb28' - '7ee2bcd77e4113f5bfe7540844cbabd3') + 'e1202dd915cba1a02e0016aa3a516b4a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -37,6 +36,5 @@ package() { make prefix=/usr DESTDIR="$pkgdir" install install -Dm755 "$srcdir/webfsd.rc" "$pkgdir/etc/rc.d/webfsd" install -Dm644 "$srcdir/webfsd.conf" "$pkgdir/etc/conf.d/webfsd" - install -Dm755 "$srcdir/webfsd.launcher" "$pkgdir/usr/lib/systemd/scripts/webfsd" install -Dm755 "$srcdir/webfsd.service" "$pkgdir/usr/lib/systemd/system/webfsd.service" } diff --git a/community/webfs/webfsd.service b/community/webfs/webfsd.service index 18c07d7ce..b4095fc6f 100644 --- a/community/webfs/webfsd.service +++ b/community/webfs/webfsd.service @@ -1,9 +1,11 @@ [Unit] Description=Simple and instant http server. +Documentation=man:webfsd(1) After=network.target [Service] -ExecStart=/usr/lib/systemd/scripts/webfsd +EnvironmentFile=/etc/conf.d/webfsd +ExecStart=/usr/bin/webfsd $WEBFSD_ARGS -F [Install] WantedBy=multi-user.target diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 6629ac7ee..2da88d1f1 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78342 2012-10-17 14:41:57Z spupykin $ +# $Id: PKGBUILD 79342 2012-11-03 08:25:25Z spupykin $ # Maintainer: Sergej Pupykin pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=8 +pkgrel=9 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -54,7 +54,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz "ffmpeg-0.11.diff") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' - '9d8e3e1a434f271423bdd228a1e9bd7c' + '31ab8c0980966dbe3e9f5e80b7b82612' '19167aa54e4745853689abad72443b3e' 'e176971ef96807f72fa8fc17d260c20a') diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc index 9d4d2b7e9..5387448d9 100755 --- a/community/xmms2/xmms2d.rc +++ b/community/xmms2/xmms2d.rc @@ -8,7 +8,7 @@ PID=`pidof xmms2d xmms2-et` case "$1" in start) stat_busy "Starting xmms2d" - [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER + [ -z "$PID" ] && su -c "/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null" - $XMMS2_USER if [ $? -gt 0 ]; then stat_fail else @@ -34,6 +34,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 -- cgit v1.2.3-54-g00ecf