diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-04 21:17:00 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-04 21:17:00 -0300 |
| commit | 7d1ef93386fa989f029f02c870375cd8de31129d (patch) | |
| tree | 273d347b08a16e14a50201dda79940d1f45ec338 | |
| parent | 01d33129001ab92abc5c2244d846f53250c2e9cc (diff) | |
| parent | 188c20297098b706ee2687fe404b0c63eb2600d9 (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
72 files changed, 877 insertions, 319 deletions
diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD index 3703a1448..3c30de49d 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 <keenerd@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com> pkgname=armagetronad pkgver=0.2.8.3.2 -pkgrel=2 +pkgrel=3 pkgdesc='A Tron Clone in 3D.' arch=('i686' 'x86_64' 'mips64el') 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/calf/PKGBUILD b/community/calf/PKGBUILD index 1189cc8ad..9e0919b60 100644 --- a/community/calf/PKGBUILD +++ b/community/calf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79263 2012-11-02 00:01:25Z arodseth $ +# $Id: PKGBUILD 79299 2012-11-02 14:14:33Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ray Rashif <schiv@archlinux.org> pkgname=calf pkgver=0.0.19 -pkgrel=2 +pkgrel=3 pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host' arch=('i686' 'x86_64' 'mips64el') url='http://calf.sf.net/' diff --git a/community/ccrypt/PKGBUILD b/community/ccrypt/PKGBUILD index f765d7f77..74c9de428 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 <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> 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' 'mips64el') 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 b9c55eaf2..5465eeb87 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 <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> 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' 'mips64el') 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 4f6a4f374..f3d818fea 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 <archlinux at cryptocrack dot de> # Contributor: Aaron Bull Schaefer <aaron@elasticdog.com> # Contributor: Ron Huang <ronhuang+aur at gmail dot com> 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' 'mips64el') 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 <kalevlember@gmail.com> +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<GdlDockLayout*>(gobj())); + } + +-Gtk::Widget* DockLayout::get_layouts_ui() +-{ +- return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj())); +-} +- + + #ifdef GLIBMM_PROPERTIES_ENABLED + Glib::PropertyProxy_ReadOnly<bool> DockLayout::property_dirty() const diff --git a/community/gdlmm/PKGBUILD b/community/gdlmm/PKGBUILD index 68b56b12c..97319e18c 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 <rodseth@gmail.com> pkgname=gdlmm pkgver=3.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="C++ bindings for the gdl library" arch=('x86_64' 'i686' 'mips64el') 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 630a3e5ab..6da1e9d1a 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 <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> 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' 'mips64el') @@ -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 11d89fe2b..1a826e993 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 <archlinux at cryptocrack dot de> 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' 'mips64el') @@ -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 028e43ded..3d68230ec 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 <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64' 'mips64el') @@ -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/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index d10671dab..8b2e80db6 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79255 2012-11-01 21:56:27Z spupykin $ +# $Id: PKGBUILD 79325 2012-11-02 19:21:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.18 -pkgrel=2 +pkgrel=3 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -15,10 +15,10 @@ makedepends=('fpc' 'cmake' 'haskell-network' 'haskell-bytestring-show' 'haskell-utf8-string' 'haskell-dataenc' 'haskell-hslogger' 'haskell-vector') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-2.tar.bz2 +source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2 hedgewars.desktop hedgewars.png) -md5sums=('94f6c998591e2fae18e8e2d173e1fe93' +md5sums=('02465736fdcf48feea1cacaa0aa5960e' '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1') diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index bae3ce039..ef42954e5 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 68017 2012-03-17 00:56:59Z ebelanger $ +# $Id: PKGBUILD 79278 2012-11-02 10:15:38Z bpiotrowski $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.2.7 +pkgver=1.4.99.20121006 pkgrel=1 -pkgdesc="Japanese input method Anthy IMEngine for IBus Framework" +pkgdesc='Japanese input method Anthy IMEngine for IBus Framework' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -url="http://ibus.googlecode.com" -depends=('ibus' 'anthy' 'python2') +url='http://ibus.googlecode.com' +depends=('ibus' 'anthy' 'python2' 'pygtk') makedepends=('swig' 'intltool') options=('!libtool') source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('091a13ff950171981768463993ffb683') +md5sums=('518aa503ce40054e0027f2a79c9df640') build() { - cd "${srcdir}/${pkgname}-${pkgver}" -# python2 fix + cd $srcdir/$pkgname-$pkgver + + # python2 fix for file in setup/ibus-setup-anthy.in engine/ibus-engine-anthy.in; do sed -i 's_exec python_exec python2_' $file done @@ -28,6 +29,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir/ install } diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index a17381cf0..6fbafeac3 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79227 2012-11-01 10:30:17Z bpiotrowski $ +# $Id: PKGBUILD 79276 2012-11-02 10:03:48Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ pkgname=libfm pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for file management" url="http://pcmanfm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') @@ -31,4 +31,8 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + + # Temporary fix to FS#32361 + rm $pkgdir/usr/include/libfm + mv $pkgdir/usr/include/libfm-1.0/ $pkgdir/usr/include/libfm } diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD index 2c827773c..87b060b06 100644 --- a/community/libpaper/PKGBUILD +++ b/community/libpaper/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 67411 2012-03-11 13:41:08Z cbrannon $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# $Id: PKGBUILD 79303 2012-11-02 14:41:55Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: royrocks <royrocks13@gmail.com> pkgname=libpaper pkgver=1.1.24 -pkgrel=2 -pkgdesc="Library for handling paper characteristics" -arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/unstable/source/libpaper" +pkgrel=3 +pkgdesc='Library for handling paper characteristics' +arch=('x86_64' 'i686' 'mips64el') +url='http://packages.debian.org/unstable/source/libpaper' license=('GPL') -source=(http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_${pkgver}.tar.gz) -md5sums=('5bc87d494ba470aba54f6d2d51471834') +source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz") +sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver+nmu2 ./configure --prefix=/usr \ --mandir=$pkgdir/usr/share/man \ --sysconfdir=/etc @@ -21,6 +22,8 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver+nmu2 make prefix=$pkgdir/usr install } + +# vim:set ts=2 sw=2 et: diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 441d40dfd..7b9bd9ef5 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79047 2012-10-29 16:19:15Z spupykin $ +# $Id: PKGBUILD 79340 2012-11-03 08:23:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.10.2 -pkgrel=4 +pkgver=1.0.0 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -36,11 +36,11 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d libvirt.tmpfiles.d openbsd-netcat-default.patch) -md5sums=('a5e50860d9da238ba270b528411c4a0d' +md5sums=('7c8b006de7338e30866bb56738803b21' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - 'b47419dfd8c40d1b37fae6576d07baa0' - 'bc2971dacdbac967fc3474e50affc345' + '0ee5b6c58590ff392a266f20f7928d1f' + '0a96ed876ffb1fcb9dff5a9b3a609c1e' '8d98e62915785686b0b6c8c070628392' '456723b41903d3aaa7ec948c1feea265') @@ -86,6 +86,10 @@ package() { install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf mv $pkgdir/lib/* $pkgdir/usr/lib/ + sed -i \ + 's|After=.*|After=syslog.target network.target libvirtd.service|' \ + $pkgdir/usr/lib/systemd/system/libvirt-guests.service + rm -rf \ $pkgdir/var/run \ $pkgdir/etc/sysconfig \ diff --git a/community/libvirt/libvirt.install b/community/libvirt/libvirt.install index 3881386d2..32c28d559 100644 --- a/community/libvirt/libvirt.install +++ b/community/libvirt/libvirt.install @@ -1,4 +1,5 @@ _libvirt_setup() { + systemd-tmpfiles --create libvirt.conf rm -f /usr/lib/python?.?/site-packages/libvirt.pyc echo ">>> To use libvirt as a non-root user:" echo ">>> Use polkit to grant access." @@ -16,16 +17,16 @@ post_install() { echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon" echo ">>> booting." echo "" - /bin/true } post_upgrade() { _libvirt_setup || return 1 - echo ">>> To finish the upgrade, restart libvirtd by running the command:" - echo ">>> '/etc/rc.d/libvirtd restart' as root or rebooting." + echo ">>> To finish the upgrade, restart libvirtd by:" + echo ">>> 'systemctl restart libvirtd' as root (systemd) or" + echo ">>> '/etc/rc.d/libvirtd restart' as root (initscripts) or" + echo ">>> rebooting." echo ">>> You may also need to run 'rm -rf ~/.libvirt'" echo "" - /bin/true } post_remove() { @@ -34,5 +35,4 @@ post_remove() { echo ">>> It can be removed by running 'groupdel libvirt' as root." echo "" depmod -a - /bin/true } diff --git a/community/libvirt/libvirtd-guests.conf.d b/community/libvirt/libvirtd-guests.conf.d index 02a933715..dd987611b 100644 --- a/community/libvirt/libvirtd-guests.conf.d +++ b/community/libvirt/libvirtd-guests.conf.d @@ -8,4 +8,4 @@ LIBVIRTD_BYPASS_CACHE="" LIBVIRTD_START_DELAY=0 -LIBVIRTD_SHUTDOWN_TIMEOUT=3 +LIBVIRTD_SHUTDOWN_TIMEOUT=60 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/luajit/PKGBUILD b/community/luajit/PKGBUILD index 0c9df4b32..fc556957f 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79221 2012-11-01 10:19:51Z bpiotrowski $ +# $Id: PKGBUILD 79274 2012-11-02 08:02:31Z bpiotrowski $ # Maintainer: Chris Brannon <chris@the-brannons.com> # Maintainer: Bartłomiej Piotrowski # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -6,20 +6,17 @@ pkgname=luajit pkgver=2.0.0rc1 -pkgrel=1 +pkgrel=2 pkgdesc='A Just-In-Time Compiler for Lua' arch=('i686' 'x86_64' 'mips64el') url='http://luajit.org/' license=('MIT') depends=('gcc-libs') -source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz - Makefile.patch) -md5sums=('26dc243c12cab80b8fe2d9cfa02a81a6' - 'c9dff2a84424fa0af322379a5f115fb7') +source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz) +md5sums=('26dc243c12cab80b8fe2d9cfa02a81a6') build() { cd $srcdir/LuaJIT-${pkgver/rc1} - patch -Np0 -i $srcdir/Makefile.patch make PREFIX=/usr } @@ -29,7 +26,4 @@ package() { install -Dm644 $srcdir/LuaJIT-${pkgver/rc1}/COPYRIGHT \ $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT - - # Poor man's slot system - ln -s /usr/share/$pkgname $pkgdir/usr/share/$pkgname-${pkgver/rc1} } diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index d96c9bcbf..7707de2df 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 <demichan(at)mail(dot)upb(dot)de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> 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' 'mips64el') 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/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 7ff2dd8be..eaffe00d1 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76403 2012-09-17 10:17:02Z spupykin $ +# $Id: PKGBUILD 79291 2012-11-02 13:50:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,15 +7,15 @@ pkgname=minidlna pkgver=1.0.25 -pkgrel=2 +pkgrel=3 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" license=('GPL') depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite') -conflicts=('minidlna-cvs') backup=('etc/minidlna.conf' 'etc/conf.d/minidlna') +install=minidlna.install changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc @@ -29,6 +29,7 @@ md5sums=('d966256baf2f9b068b9de871ab5dade5' build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh + find -type f -name '*.c' -exec sed -i '1,1i#include </usr/include/time.h>' {} \; make } diff --git a/community/minidlna/minidlna.install b/community/minidlna/minidlna.install new file mode 100644 index 000000000..c9cdc0f13 --- /dev/null +++ b/community/minidlna/minidlna.install @@ -0,0 +1,7 @@ +post_install() { + systemd-tmpfiles --create minidlna.conf +} + +post_upgrade() { + systemd-tmpfiles --create minidlna.conf +} diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 049527180..3cffd0c2a 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76844 2012-10-01 05:33:09Z svenstaro $ +# $Id: PKGBUILD 79282 2012-11-02 11:36:48Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Mathias Stearn <mathias@10gen.com> # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -20,7 +20,7 @@ install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' 'mongodb.conf' 'mongodb.service' 'SConscript.client.patch' 'boost1.50.patch') -md5sums=('832bdb6cc659176fd8d6b16a660ccfc6' +md5sums=('f41ee6fd3ac3f21ac5309db3e20e10ea' '9c67e00f4626ad761a8f7d4e037a54d7' '4839fe1d638187ca3226e8267b947318' '96ab4517b48974ce0e566d9746a75a4f' @@ -28,6 +28,7 @@ md5sums=('832bdb6cc659176fd8d6b16a660ccfc6' 'da8a9d78e4a38d1ed8e92a210d4b5ba7') build() { + # fucking mongo aint no fun to package export SCONSFLAGS="$MAKEFLAGS" cd mongodb-src-r${pkgver} @@ -66,6 +67,7 @@ package() { install -dm755 $pkgdir/var/log/mongodb # the earlier SConscript patch actually gives us some trouble on x86_64 so we need to hack it out again - mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ - rm -r ${pkgdir}/usr/lib64 + mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true + rm -r ${pkgdir}/usr/lib64 || true + } 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 <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> 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/paraview/PKGBUILD b/community/paraview/PKGBUILD index efa138d53..01483e7fc 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -5,19 +5,19 @@ pkgname=paraview pkgver=3.14.1 -pkgrel=1 +pkgrel=2 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' license=('custom') depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' - 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2' + 'libmysqlclient' 'openmpi' 'boost-libs' 'libcgns2' # export as avi support #'ffmpeg' # The following is a list of libraries we explicitly tell cmake to use the system library of 'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora' ) -makedepends=('cmake' 'desktop-file-utils' 'boost') +makedepends=('cmake' 'desktop-file-utils' 'boost' 'mesa') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}-Source.tar.gz" 'paraview.png' 'paraview.desktop' diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index 78023c43b..acd7959e3 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71825 2012-06-02 10:31:58Z bluewind $ +# $Id: PKGBUILD 79319 2012-11-02 19:11:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-params-validate -pkgver=1.06 -pkgrel=3 +pkgver=1.07 +pkgrel=1 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Params-Validate" @@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic') depends=('perl' 'perl-module-implementation') options=('!emptydirs') source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('4f7a281269cd30d7c3994ba5acb50857') +md5sums=('7cb0e18bd547f3ba9c492712d1795ac6') build() { cd Params-Validate-${pkgver} diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 7d454558f..f06ad27b3 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78790 2012-10-24 21:59:59Z arodseth $ +# $Id: PKGBUILD 79309 2012-11-02 16:29:05Z spupykin $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar @@ -6,8 +6,8 @@ pkgname=plan9port pkgver=20121022 -pkgrel=1 -pkgdesc='Port of many programs from Plan 9' +pkgrel=2 +pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems" arch=('i686' 'x86_64' 'mips64el') url="http://swtch.com/plan9port/" license=('custom') @@ -15,6 +15,7 @@ depends=(xorg-server libxt libxext sh fuse) optdepends=('python2: for the codereview script') provides=('plan9') install=plan9.install +options=(!zipman) source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh) sha256sums=('1293b5d2e46d0d6f7be2adbdb285ce278a25c77e88b5cd7c230e16a47d0f8638' '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d') @@ -60,4 +61,12 @@ package() { install -m644 $i "$pkgdir/usr/share/doc/$pkgname" rm -f $i done + + echo "==> Decompressing plan9 man pages" + for i in `find /opt/plan9/man -type f`; do + if [ ${i##*.} = "gz" ]; then +# echo " ${i%%.*}..." + gunzip $i + fi + done } diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install index 97ca74fa6..5c76552f3 100644 --- a/community/plan9port/plan9.install +++ b/community/plan9port/plan9.install @@ -1,12 +1,4 @@ post_install() { - echo "==> Decompressing plan9 man pages" - for i in `find /opt/plan9/man -type f`; do - if [ ${i##*.} = "gz" ]; then -# echo " ${i%%.*}..." - gunzip $i - fi - done - echo "" echo "==> In order to use Plan9 specific apps, run them" echo " as arguments to the '9' script, i.e. '9 date'" @@ -15,16 +7,15 @@ post_install() { source /etc/profile.d/plan9.sh } -pre_upgrade() { - post_remove -} - post_upgrade() { post_install } +pre_upgrade() { + post_remove +} + post_remove() { #we had to unpack them so they won't get removed.... rm -rf /opt/plan9/man } - diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index afde6eb8a..01e7a7557 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=3.4.1 +pkgver=3.6.0 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') @@ -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 03bc87442..22e9ab701 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 <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Previous Contributor: Eric Belanger <belanger@astro.umontreal.ca> @@ -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/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index 2e0e43573..7e56b4be0 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73952 2012-07-17 11:36:12Z spupykin $ +# $Id: PKGBUILD 79289 2012-11-02 13:49:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.2.0 -pkgrel=7 +pkgrel=8 _xorgver=1.12.3 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') @@ -16,11 +16,12 @@ depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' - 'xtrans' 'mesa') + 'xtrans' 'mesa' 'glproto' 'dri2proto') options=(!libtool) conflicts=('tightvnc') source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 + vncserver.service xorg111.patch xorg112.patch gnutls.patch @@ -28,6 +29,7 @@ source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz cmakelists.patch) md5sums=('3a5755b4ed600a81c3a17976c6f8420d' '65a53b11bc01dcc97ee9b201dc620c32' + 'ce06ff57ba53bd386d71249dfc3cb719' 'b680b55f7f9f569cd26ac0b330012a8b' 'f73e055153889ae7b5aac8e697f7a841' '1a5fe8867ab3e49e20aafc70c415494f' @@ -66,4 +68,5 @@ package() { cd unix/xserver/hw/vnc make DESTDIR=${pkgdir} install sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver + install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service } diff --git a/community/tigervnc/vncserver.service b/community/tigervnc/vncserver.service new file mode 100644 index 000000000..85f77b9a0 --- /dev/null +++ b/community/tigervnc/vncserver.service @@ -0,0 +1,44 @@ +# The vncserver service unit file +# +# Quick HowTo: +# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service +# 2. Edit <USER> and vncserver parameters appropriately +# ("su <USER> -c /usr/bin/vncserver %i -arg1 -arg2") +# 3. Run `systemctl daemon-reload` +# 4. Run `systemctl enable vncserver@:<display>.service` +# +# DO NOT RUN THIS SERVICE if your local area network is +# untrusted! For a secure way of using VNC, you should +# limit connections to the local host and then tunnel from +# the machine you want to view VNC on (host A) to the machine +# whose VNC output you want to view (host B) +# +# [user@hostA ~]$ ssh -v -C -L 590N:localhost:590M hostB +# +# this will open a connection on port 590N of your hostA to hostB's port 590M +# (in fact, it ssh-connects to hostB and then connects to localhost (on hostB). +# See the ssh man page for details on port forwarding) +# +# You can then point a VNC client on hostA at vncdisplay N of localhost and with +# the help of ssh, you end up seeing what hostB makes available on port 590M +# +# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP. +# +# Use "-localhost" to prevent remote VNC clients connecting except when +# doing so through a secure tunnel. See the "-via" option in the +# `man vncviewer' manual page. + + +[Unit] +Description=Remote desktop service (VNC) +After=syslog.target network.target + +[Service] +Type=forking +# Clean any existing files in /tmp/.X11-unix environment +ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || true' +ExecStart=/bin/su <USER> -c "/usr/bin/vncserver %i" +ExecStop=/bin/su <USER> -c "/usr/bin/vncserver -kill %i" + +[Install] +WantedBy=multi-user.target 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 <rodseth@gmail.com> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Hills <hills.as@gmail.com> +# Contributor: John <graysky@archlinux.us> 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@:<display>.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@:<display>.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 1d2be2c85..be803b822 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 <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor pkgver=0.2.2.39 -pkgrel=1 +pkgrel=2 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') 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 6922a5706..3b51c3188 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 <heniekk@gmail.com> +# $Id: PKGBUILD 79380 2012-11-03 21:29:07Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com> -# Adopted: royrocks <royrocks13@gmail.com> +# Contributor: royrocks <royrocks13@gmail.com> + pkgname=tuxpaint pkgver=0.9.21 -pkgrel=5 -pkgdesc="Tux Paint is a free drawing program designed for young children." -arch=('i686' 'x86_64' 'mips64el') -url="http://www.tuxpaint.org" +pkgrel=7 +pkgdesc='Drawing program designed for young children' +arch=('x86_64' 'i686' 'mips64el') +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 aac9bd806..e23bd81d8 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 <keenerd@gmail.com> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: Mark Rosenstand <mark@archlinux.org> @@ -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 'mips64el') 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 3cc9f715b..cbf481a01 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 <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=8 +pkgrel=9 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -55,7 +55,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 diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 567b7c9a9..34389323e 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163854 2012-07-21 11:22:49Z allan $ +# $Id: PKGBUILD 170164 2012-11-04 00:51:49Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash _basever=4.2 -_patchlevel=037 #prepare for some patches +_patchlevel=039 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -153,4 +153,8 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '9c3142956064d175a880bcb186e51ef9' 'a1a87649853f20fe99572ddc02b0c67f' 'c10692f447d4966c879f8fb8d7c8ebc9' - '1bf5e34ad46566bc2d0eb7560ff8968e') + '1bf5e34ad46566bc2d0eb7560ff8968e' + '9ef3c308cde413e95866c1266cfb4e98' + 'afbb94e04dab29bd4ce92199892f2b5e' + 'cd48f57a404498d4e5c73a3501c4b1a5' + 'd2693a2728b5a0448947d23ce47cb4b3') diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index 83957b28c..da5b43bb8 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 142864 2011-11-17 18:34:18Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 170150 2012-11-03 17:53:42Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.2.2 -pkgrel=1.1 +pkgver=3.2.3.2 +pkgrel=1 pkgdesc="GNOME Solitaire card games" -arch=(mips64el) +arch=(i686 x86_64 mips64el) license=(GPL) url="http://www.gnome.org" groups=('gnome-extra') depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf) -makedepends=(gnome-doc-utils intltool itstool) +makedepends=(intltool itstool docbook-xsl) options=('!emptydirs' '!libtool') install=aisleriot.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -27,7 +27,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index a00df2c22..9379c84a6 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166581 2012-09-12 17:27:00Z jgc $ +# $Id: PKGBUILD 170129 2012-11-03 12:27:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou pkgver=0.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Caribou" @@ -13,11 +13,14 @@ depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxkla makedepends=('intltool' 'docbook-xsl') install=caribou.install options=(!libtool !emptydirs) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz + fix-crash.patch) +sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2' + '813229104fcb15ae5d3c197362fa7474a4963eb31d241d4f5354f7000d03f9e1') build() { cd $pkgname-$pkgver + patch -Np1 -i ../fix-crash.patch sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py export PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/extra/caribou/fix-crash.patch b/extra/caribou/fix-crash.patch new file mode 100644 index 000000000..98e5baab9 --- /dev/null +++ b/extra/caribou/fix-crash.patch @@ -0,0 +1,25 @@ +From a8fb1d8fba1e9557a3370edd62501f0a866c6774 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno <ueno@unixuser.org> +Date: Fri, 02 Nov 2012 06:19:47 +0000 +Subject: Fix border-image slice values in antler's gtk CSS + +According to CSS spec, border-image slice values are not denoted +with length units. + +https://bugzilla.gnome.org/show_bug.cgi?id=687409 +--- +diff --git a/data/antler/style.css b/data/antler/style.css +index 0e830dc..7553cf6 100644 +--- a/data/antler/style.css ++++ b/data/antler/style.css +@@ -12,7 +12,7 @@ + .antler-keyboard-button { + border-width: 0px; + border-radius: 2px; +- border-image: url("dark-key-border.svg") 2px 2px 2px 2px repeat stretch; ++ border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch; + font: Sans 14px; + background-image: -gtk-gradient (linear, + left top, +-- +cgit v0.9.0.2 diff --git a/extra/celt/PKGBUILD b/extra/celt/PKGBUILD new file mode 100644 index 000000000..e1f07e228 --- /dev/null +++ b/extra/celt/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Lauri Niskanen <ape@ape3000.com> +# Contributor: Ray Rashif <schivmeister@gmail.com> + +pkgname=celt +pkgver=0.11.1 +pkgrel=4 +pkgdesc='Low-latency audio communication codec' +arch=('i686' 'x86_64') +url='http://www.celt-codec.org' +license=('BSD') +depends=('libogg') +options=('!libtool') +source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('94fe4acd241da8702c295bcd13a555e6') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr \ + --enable-custom-modes + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + install -D -m644 COPYING \ + ${pkgdir}/usr/share/licenses/${pkgname}/BSD +} diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD new file mode 100644 index 000000000..439292d9b --- /dev/null +++ b/extra/chromaprint/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 170160 2012-11-03 19:43:21Z heftig $ +# Contributor: Wieland Hoffmann <the_mineo@web.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=chromaprint +pkgver=0.7 +pkgrel=1 +pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' +url='http://acoustid.org/chromaprint/' +arch=('i686' 'x86_64') +license=('LGPL') +depends=('ffmpeg') +makedepends=('cmake') +source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index fbcdc06b6..849c303cb 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 168635 2012-10-13 17:04:17Z thomas $ +# $Id: PKGBUILD 170145 2012-11-03 17:35:36Z heftig $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.4.1 -_pkgver=4.2.4-P1 +pkgver=4.2.4.2 +_pkgver=4.2.4-P2 -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" @@ -17,8 +17,8 @@ source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service dhcp-4.1.1-missing-ipv6-not-fatal.patch dhclient-script-pathFixes.patch) -md5sums=('0ca7181024651f6323951d5498c8020b' - '0dfe000dd88555ea06b282ae5e574d5f' +md5sums=('fe36056f2d274fa4b82a5422f192e65f' + '1f20126efd33c34d52a4148db780921f' 'c49b1497837ba56c54e401a66e1bab9b' '12c2f3ae47ed23eb698eb7f1bfd80f20' '8f357e46e1efcbb746f38737a3f977a2' @@ -37,10 +37,10 @@ build() { patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch" ./configure --prefix=/usr --sysconfdir=/etc \ - --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ - --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \ - --with-cli-lease-file=/var/state/dhclient/dhclient.leases \ - --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases + --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ + --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ + --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \ + --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases make @@ -59,12 +59,10 @@ package_dhcp(){ install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4" install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6" install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}" - install -d "${pkgdir}/var/state/dhcp" + install -d "${pkgdir}/var/lib/dhcp" install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service" install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service" - ln -s dhcpd4.service "${pkgdir}/usr/lib/systemd/system/dhcp4.service" - ln -s dhcpd6.service "${pkgdir}/usr/lib/systemd/system/dhcp6.service" # Remove dhclient make -C client DESTDIR="${pkgdir}" uninstall @@ -83,7 +81,7 @@ package_dhclient(){ # move dhclient.conf to dhclient.conf.example mv "${pkgdir}"/etc/dhclient.conf{,.example} - install -d "${pkgdir}/var/state/dhclient" + install -d "${pkgdir}/var/lib/dhclient" # install dhclient linux script install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script" diff --git a/extra/dhcp/dhcp.install b/extra/dhcp/dhcp.install index 5302be4b5..2bcd9ea82 100644 --- a/extra/dhcp/dhcp.install +++ b/extra/dhcp/dhcp.install @@ -1,18 +1,14 @@ -# arg 1: the new package version post_install() { - [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases - [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases - #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded." - - echo - echo "==> The dhcp server has now two rc.d scripts." - echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or" - echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server." - echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!" + [[ -f var/lib/dhcp/dhcpd.leases ]] || : >var/lib/dhcp/dhcpd.leases + [[ -f var/lib/dhcp/dhcpd6.leases ]] || : >var/lib/dhcp/dhcpd6.leases } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - post_install $1 + if (( $(vercmp $2 4.2.4.2) < 0 )); then + echo ">>> Lease directory moved from /var/state/dhcp" + echo " to /var/lib/dhcp. Move your old lease files" + echo " if you want to keep using them." + fi + + post_install } diff --git a/extra/eventlog/ChangeLog b/extra/eventlog/ChangeLog new file mode 100644 index 000000000..1c139bdf5 --- /dev/null +++ b/extra/eventlog/ChangeLog @@ -0,0 +1,19 @@ +2011-11-02 Andrea Scarpino <andrea@archlinux.org> + + * Sign package + +2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> + + * Rebuild of old package + * Tidy up PKGBUILD + +2010-07-10 Dan McGee <dan@archlinux.org> + + * Updated PKGBUILD to be in line with standard style + * Upstream update + +2009-01-03 Eric Belanger <eric@archlinux.org> + + * eventlog 0.2.9-1 + * Upstream update + * Added ChangeLog diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD new file mode 100644 index 000000000..f32a2e4a8 --- /dev/null +++ b/extra/eventlog/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 170165 2012-11-04 01:36:23Z dreisner $ +# Maintainer: +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=eventlog +pkgver=0.2.12 +pkgrel=3 +pkgdesc="API to format and send structured log messages" +arch=('i686' 'x86_64') +url="http://www.balabit.com/support/community/products/" +license=('BSD') +depends=('glibc') +options=('!libtool') +changelog=ChangeLog +source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz") +sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index caa016131..d98153472 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169878 2012-10-30 22:25:45Z heftig $ +# $Id: PKGBUILD 170142 2012-11-03 17:25:25Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm pkgver=3.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Display Manager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -14,8 +14,8 @@ backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-e groups=(gnome) options=('!libtool') depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd - xorg-xrdb nss polkit-gnome) -makedepends=(itstool intltool gnome-doc-utils xorg-server gobject-introspection) + xorg-xrdb nss polkit-gnome xorg-server) +makedepends=(itstool intltool gnome-doc-utils gobject-introspection) optdepends=('gnome-shell: new login interface' 'fprintd: fingerprint authentication') install=gdm.install diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index 569f24473..697e93523 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159121 2012-05-16 06:34:12Z eric $ +# $Id: PKGBUILD 170173 2012-11-04 03:56:58Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glsof -pkgver=2.0 -_fmver=2.0 +pkgver=2.1.0 +_fmver=2.1.0 _qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" @@ -15,7 +15,7 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) -sha1sums=('4bb1ca87aa8aedcf793cd704d4ea5dfec5c53bb1' +sha1sums=('cb5c31639f0aafb5ef45b9f3895fa05dceda9b7d' 'd5a17d66dd02cd78bad5ffdda0b936c7848e4890' 'c5dd12e9b2860f1c427ed7cd482e898978051d2c' '197b58f40880995d6442fd42a58fa1f4594fd19d' diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 0fe6d3ea0..b1b9121dc 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169305 2012-10-19 02:10:54Z heftig $ +# $Id: PKGBUILD 170151 2012-11-03 17:55:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.11 +pkgver=2.6.12 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ec227549062120af006ed0842baab921e133aa520353ca0fff004390c68af9ab') +sha256sums=('85ccdf29bc8c4801123e28c27d1afadf0b2c5618aae17e6ec78d40d03ef431a8') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index 4357911c1..7ff3ec0d9 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165330 2012-08-15 21:16:25Z heftig $ +# $Id: PKGBUILD 170135 2012-11-03 12:57:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets -pkgver=3.4.1 -pkgrel=2.1 +pkgver=3.5.92 +pkgrel=1 pkgdesc="GNOME Applets" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gnome-applets.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e') +sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-applets/gnome-applets.install b/extra/gnome-applets/gnome-applets.install index dd9c34269..e3441e722 100644 --- a/extra/gnome-applets/gnome-applets.install +++ b/extra/gnome-applets/gnome-applets.install @@ -1,7 +1,8 @@ pkgname=gnome-applets post_install() { - usr/sbin/gconfpkg --install ${pkgname} + gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -14,9 +15,10 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall ${pkgname} } post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index c0ae57272..3ee2be9d0 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 170067 2012-10-31 13:36:50Z ibiru $ +# $Id: PKGBUILD 170143 2012-11-03 17:26:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="The next generation GNOME Shell" -arch=('i686' 'x86_64' 'mips64el') +arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" -license=('GPL2') -depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip') -makedepends=('intltool' 'gnome-doc-utils') +license=(GPL2) +depends=(caribou folks gcr gjs gnome-bluetooth gnome-desktop gnome-menus libcroco libpulse mutter + nautilus networkmanager telepathy-logger telepathy-mission-control unzip gdm) +makedepends=(intltool gnome-doc-utils) optdepends=('network-manager-applet: shell integration for networkmanager') options=('!libtool' '!emptydirs') install=gnome-shell.install diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD index 1afc3ed0a..fd5284709 100644 --- a/extra/grantlee/PKGBUILD +++ b/extra/grantlee/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 142010 2011-11-03 23:27:16Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 170108 2012-11-02 08:45:56Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=grantlee -pkgver=0.2.0 -pkgrel=1.1 +pkgver=0.3.0 +pkgrel=1 pkgdesc="A string template engine based on the Django template system and written in Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.gitorious.org/grantlee/pages/Home" license=('LGPL3') depends=('qt') -makedepends=('cmake') +makedepends=('cmake' 'doxygen') source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz") -md5sums=('0622ed30630a44b5fac0bfa7e176d3fe') +md5sums=('195763a3238f51f8885881fc8012cd83') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -25,6 +23,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install -} +} diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD new file mode 100644 index 000000000..94526a7a5 --- /dev/null +++ b/extra/gsasl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 170167 2012-11-04 02:30:50Z eric $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Orivej Desh <smpuj@bk.ru> +# Maintainer: Orivej Desh <smpuj@bk.ru> + +pkgname=gsasl +pkgver=1.8.0 +pkgrel=2 +pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" +arch=("i686" "x86_64") +url="http://josefsson.org/gsasl/" +license=("GPL") +depends=('gnutls' 'libidn' 'krb5' 'libgcrypt') +source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") +md5sums=('982fe54a20016aa46a871c084c990c36') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --with-gssapi-impl=mit + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" +} diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 33cb31baf..6b14b32b4 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164515 2012-08-01 13:53:49Z jgc $ +# $Id: PKGBUILD 170131 2012-11-03 12:34:41Z ibiru $ # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod pkgver=2.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64' 'mips64el') url="http://gtkpod.sourceforge.net" @@ -18,11 +18,14 @@ optdepends=('libmp4v2: MP4/h264 support' 'faad2: m4a conversion support') install=gtkpod.install options=('!libtool') -source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") -md5sums=('88fef3f947cbb7ae6b714080733a3b6b') +source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz" + "gtkpod-2.1.2-anjuta.patch") +md5sums=('88fef3f947cbb7ae6b714080733a3b6b' + '0a5f4ce0c9ef3d4d8db57290df43db27') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch" sed -i 's#python#python2#' scripts/sync-palm-jppy.py ./configure --prefix=/usr make diff --git a/extra/gtkpod/gtkpod-2.1.2-anjuta.patch b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch new file mode 100644 index 000000000..08c64f71b --- /dev/null +++ b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch @@ -0,0 +1,11 @@ +--- src/anjuta-app.c~ 2012-06-01 03:14:23.000000000 -0500 ++++ src/anjuta-app.c 2012-07-25 08:15:37.289630966 -0500 +@@ -501,7 +501,7 @@ + g_list_free(plugins_dirs); + + /* Preferences */ +- app->preferences = anjuta_preferences_new(app->plugin_manager); ++ app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA); + g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences); + + g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app); diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index 91109b346..e9be3a918 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157080 2012-04-23 13:11:44Z heftig $ +# $Id: PKGBUILD 170152 2012-11-03 17:56:09Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thijs Vermeir <thijsvermeir@gmail.com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=gupnp-av -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('gupnp') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4863c9bcbfa2e9fcb215d43c8d1e4090fbd078f8ae65e45a3314e7f6d59a8cbf') +sha256sums=('d0dbb727d87bc9f2dc834455d14a30700b16b41a57e9dcde2e822b378ca8f1e2') build() { cd $pkgname-$pkgver diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD index 35b7e1e46..fead6c341 100644 --- a/extra/libsecret/PKGBUILD +++ b/extra/libsecret/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsecret -pkgver=0.10 +pkgver=0.11 pkgrel=1 pkgdesc='library for storing and retrieving passwords and other secrets.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'libgcrypt') makedepends=('intltool' 'docbook-xsl') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880') +sha256sums=('e5399dfb61376a7500d20cb22715152780aa3a2c8a64281ec6bc8f0ebeb8b689') build() { cd "$pkgname-$pkgver" diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index c91706a49..3090e756a 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159694 2012-05-26 04:30:08Z foutrelis $ +# $Id: PKGBUILD 170122 2012-11-03 06:32:33Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://thunar.xfce.org" @@ -23,13 +23,19 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2 + thunar-1.4.0-dont-add-duplicates-of-devices.patch thunar-1.4.0-show-loop-devices-hack.patch) sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba' + 'c25f86a4c298c24327b0681702167aea9f9d712a738c8f3883f5d66da7f08f19' '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e') build() { cd "$srcdir/Thunar-$pkgver" + # https://bugzilla.xfce.org/show_bug.cgi?id=9440 + # Backport of http://git.xfce.org/xfce/thunar/commit/?id=70a4301 + patch -Np1 -i "$srcdir/thunar-1.4.0-dont-add-duplicates-of-devices.patch" + # Fix: Loop devices not appearing in Thunar side pane # https://bugs.archlinux.org/task/29894 # https://bugzilla.xfce.org/show_bug.cgi?id=8947 diff --git a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch new file mode 100644 index 000000000..ee8636392 --- /dev/null +++ b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch @@ -0,0 +1,59 @@ +diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c +--- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c 2012-11-03 07:42:39.000000000 +0200 ++++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c 2012-11-03 08:13:25.000000000 +0200 +@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo + GVolume *volume, + ThunarShortcutsModel *model) + { ++ GList *lp; ++ gint idx; ++ + _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); + _thunar_return_if_fail (model->volume_monitor == volume_monitor); + _thunar_return_if_fail (G_IS_VOLUME (volume)); + _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model)); + ++ /* check that the volume is not in the internal list already */ ++ if (g_list_find (model->hidden_volumes, volume) != NULL) ++ return; ++ ++ /* nor in the list of visible volumes */ ++ for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next) ++ { ++ if (THUNAR_SHORTCUT (lp->data)->volume == volume) ++ return; ++ } ++ + /* place the volume on the hidden list */ + model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); + +diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c +--- Thunar-1.4.0.orig/thunar/thunar-tree-model.c 2012-11-03 07:42:39.000000000 +0200 ++++ Thunar-1.4.0/thunar/thunar-tree-model.c 2012-11-03 08:09:36.000000000 +0200 +@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM + GVolume *volume, + ThunarTreeModel *model) + { ++ ThunarTreeModelItem *item = NULL; ++ GNode *node; ++ + _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); + _thunar_return_if_fail (model->volume_monitor == volume_monitor); + _thunar_return_if_fail (G_IS_VOLUME (volume)); + _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model)); + ++ /* check that the volume is not in the internal list already */ ++ if (g_list_find (model->hidden_volumes, volume) != NULL) ++ return; ++ ++ /* nor in the list of visible volumes */ ++ for (node = model->root->children; node != NULL; node = node->next) ++ { ++ item = THUNAR_TREE_MODEL_ITEM (node->data); ++ if (item->volume == volume) ++ return; ++ } ++ + /* place the volume on the hidden list */ + model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); + diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index b2a1167a1..e42a4b34e 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 164816 2012-08-06 17:52:50Z giovanni $ +# $Id: PKGBUILD 170154 2012-11-03 18:23:13Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice -pkgver=2.3 -pkgrel=6 +pkgver=2.4 +pkgrel=1 pkgdesc="The Versatile Commodore 8-bit Emulator" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.viceteam.org/" -depends=('alsa-lib' 'giflib' 'libxxf86vm' 'gtk2') +depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte') makedepends=('xorg-font-utils') options=('!makeflags') install=vice.install source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-${pkgver}.tar.gz" - 'vice-2.3-x11video.patch' - 'vice-2.3-no-fc-cache.patch' - 'vice-2.3-notexi-notxt.patch' - 'vice-2.3-zlib-1.2.7.patch') -md5sums=('b48d137874daad50c087a0686cbdde34' - '088292ce9efe785edfb2b0c7c670785e' - '873042d07f3768819b589a4c8fe24607' - '05159b6ef78e3b7dd5d362f766da4cd4' - '6d8736974a21c3862a4bf0fe0ee6e266') + 'vice-2.4-x11video.patch' + 'vice-2.4-no-fc-cache-no-lib64.patch' + 'vice-2.4-notexi-notxt.patch' + 'vice-2.4-zlib-1.2.7.patch') +md5sums=('b017647a0c159bbe43cdb81762d1c577' + '99931efcb779734c9df069e94f0b38a5' + 'b0d1392664decd3169740baf90661710' + '877f93db1550ea81386aae7c3b578442' + '9d9f62f05a967a5926df496e86404148') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/vice-2.3-x11video.patch" - patch -Np1 -i "${srcdir}/vice-2.3-no-fc-cache.patch" - patch -Np1 -i "${srcdir}/vice-2.3-notexi-notxt.patch" - patch -Np1 -i "${srcdir}/vice-2.3-zlib-1.2.7.patch" + patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" + patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" + patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch" + patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch" autoreconf ./configure --prefix=/usr \ diff --git a/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch new file mode 100644 index 000000000..bb27aa3e7 --- /dev/null +++ b/extra/vice/vice-2.4-no-fc-cache-no-lib64.patch @@ -0,0 +1,25 @@ +--- a/configure.in 2012-11-01 16:37:51.000000000 +0100 ++++ b/configure.in 2012-11-03 18:07:35.000000000 +0100 +@@ -2090,12 +2090,7 @@ + + fi + +-AC_PATH_PROGS(FCCACHE, fc-cache, false) +-if test x"$FCCACHE" = "xfalse"; then +- AM_CONDITIONAL(HAVE_FC_CACHE, false) +-else +- AM_CONDITIONAL(HAVE_FC_CACHE, true) +-fi ++AM_CONDITIONAL(HAVE_FC_CACHE, false) + + if test x"$is_amigaos4" = "xyes"; then + if test x"$enable_sdlui" != "xyes"; then +@@ -3424,7 +3419,7 @@ + ;; + linux*) + if test x"$host_cpu" = "xx86_64"; then +- VICEDIR="$PREFIX/lib64/vice" ++ VICEDIR="$PREFIX/lib/vice" + AM_CONDITIONAL(ALTERNATE_DOCDIR, false) + else + VICEDIR="$PREFIX/lib/vice" diff --git a/extra/vice/vice-2.4-notexi-notxt.patch b/extra/vice/vice-2.4-notexi-notxt.patch new file mode 100644 index 000000000..58121b702 --- /dev/null +++ b/extra/vice/vice-2.4-notexi-notxt.patch @@ -0,0 +1,28 @@ +--- a/doc/Makefile.am 2012-10-20 01:32:30.000000000 +0200 ++++ b/doc/Makefile.am 2012-11-03 18:29:03.000000000 +0100 +@@ -79,19 +79,6 @@ + $(srcdir)/fixdox.sh txt <vicetmp.txt | sed 's/ \+$$//' >$(builddir)/vice.txt + rm -f vicetmp.txt + +-$(builddir)/vice.pdf: $(srcdir)/vice.texi +-if BUILD_PDF +- sed 's/@heading NO WARRANTY/@center NO WARRANTY/g' <$(srcdir)/vice.texi >vicepdf.texi +- $(TEXI2DVI) -q --clean --pdf -o $(builddir)/vice.pdf vicepdf.texi +- rm -f vicepdf.texi +- +-PDF_DEPS=$(builddir)/vice.pdf +-else +- touch $(builddir)/vice.pdf +- +-PDF_DEPS= +-endif +- + $(builddir)/vice.guide: $(srcdir)/vice.texi + if BUILD_AMIGAGUIDE + $(srcdir)/texi2guide.sh $(MAKEGUIDE) $(builddir)/vice.guide $(srcdir)/vice.texi +@@ -148,4 +135,4 @@ + touch $(builddir)/vice.info + $(MAKEINFO) -o $(builddir)/vice.info --no-split $(srcdir)/vice.texi + +-INFO_DEPS = $(builddir)/vice.txt $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS) ++INFO_DEPS = $(builddir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS) diff --git a/extra/vice/vice-2.4-x11video.patch b/extra/vice/vice-2.4-x11video.patch new file mode 100644 index 000000000..423688ba9 --- /dev/null +++ b/extra/vice/vice-2.4-x11video.patch @@ -0,0 +1,11 @@ +--- a/src/arch/unix/x11/xaw/x11video.c 2012-10-28 22:26:24.000000000 +0100 ++++ b/src/arch/unix/x11/xaw/x11video.c 2012-11-03 18:54:08.000000000 +0100 +@@ -60,6 +60,8 @@ + #include <X11/Xutil.h> + #include <X11/Intrinsic.h> + #include <X11/cursorfont.h> ++#include <X11/Xmd.h> ++#include <X11/extensions/shmproto.h> + + #include <stdio.h> + #include <stdlib.h> diff --git a/extra/vice/vice-2.4-zlib-1.2.7.patch b/extra/vice/vice-2.4-zlib-1.2.7.patch new file mode 100644 index 000000000..f41c8afc5 --- /dev/null +++ b/extra/vice/vice-2.4-zlib-1.2.7.patch @@ -0,0 +1,37 @@ +--- a/src/zfile.c 2012-10-13 14:53:16.000000000 +0200 ++++ b/src/zfile.c 2012-11-03 18:47:40.000000000 +0100 +@@ -198,10 +198,10 @@ + do { + char buf[256]; + +- len = gzread(fdsrc, (void *)buf, 256); ++ len = gzread((gzFile)fdsrc, (void *)buf, 256); + if (len > 0) { + if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) { +- gzclose(fdsrc); ++ gzclose((gzFile)fdsrc); + fclose(fddest); + ioutil_remove(tmp_name); + lib_free(tmp_name); +@@ -210,7 +210,7 @@ + } + } while (len > 0); + +- gzclose(fdsrc); ++ gzclose((gzFile)fdsrc); + fclose(fddest); + + return tmp_name; +@@ -779,10 +779,10 @@ + char buf[256]; + len = fread((void *)buf, 256, 1, fdsrc); + if (len > 0) +- gzwrite(fddest, (void *)buf, (unsigned int)len); ++ gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len); + } while (len > 0); + +- gzclose(fddest); ++ gzclose((gzFile)fddest); + fclose(fdsrc); + + archdep_file_set_gzip(dest); diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 6f64a9ca8..f23c9fd41 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169442 2012-10-21 09:07:49Z giovanni $ +# $Id: PKGBUILD 170110 2012-11-02 09:09:21Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -19,7 +19,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'fluidsynth' 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus') + 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2') [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' @@ -29,7 +29,8 @@ optdepends=('avahi: for service discovery using bonjour protocol' optdepends+=('libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration') -[ "$CARCH" = "mips64el" ] || optdepends+=('libva-driver-intel: back-end for intel cards') +[ "$CARCH" = "mips64el" ] || optdepends+=('libva-vdpau-driver: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') optdepends+=('libbluray: for Blu-Ray support' 'flac: for Free Lossless Audio Codec plugin') [ "$CARCH" = "mips64el" ] || optdepends+=('oss: for OSS audio support') @@ -50,7 +51,8 @@ optdepends+=('libcaca: for colored ASCII art video output' 'libcdio: for audio CD playback support' 'ttf-freefont: for subtitle font ' 'ttf-dejavu: for subtitle font' - 'opus: for opus support') + 'opus: for opus support' + 'libssh2: for sftp support') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' @@ -82,6 +84,7 @@ build() { --enable-vcdx \ --enable-upnp \ --enable-opus \ + --enable-sftp \ $extraconf make } diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD index dca09edbf..df275e4b3 100644 --- a/extra/xdg-user-dirs-gtk/PKGBUILD +++ b/extra/xdg-user-dirs-gtk/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 157004 2012-04-23 09:11:01Z ibiru $ +# $Id: PKGBUILD 170124 2012-11-03 07:24:35Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=xdg-user-dirs-gtk -pkgver=0.8 -pkgrel=1.1 +pkgver=0.9 +pkgrel=1 pkgdesc="Creates user dirs and asks to relocalize them" arch=(i686 x86_64 mips64el) license=('GPL') -depends=('gtk2' 'xdg-user-dirs') +depends=('gtk3' 'xdg-user-dirs') makedepends=('intltool') options=('!libtool' '!emptydirs') url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2 - lxde.patch) -sha256sums=('971e5cd121606c437c2b07e189c8f34791ae0c4d81e155266d71acc7b263ad32' - '5db6a2fd5bb293deff0322e9f20a383130e05df2d35d64568a47b5fe63d6ebf4') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8') build() { cd $pkgname-$pkgver - patch -p1 -i ../lxde.patch ./configure --prefix=/usr --sysconfdir=/etc make } |