diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 15:38:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-20 15:38:15 -0300 |
| commit | c28258d27bd9d58760eb647f912bb98a536aa753 (patch) | |
| tree | 261e61872b291c02790e5483c769710942547731 /extra/gvfs | |
| parent | eefed5e3db847eccce0207f89c7430b9ec4994b7 (diff) | |
| parent | 949fa4e5ed405aaddcebff7e21008f03cdffa580 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/geda-gaf/PKGBUILD
community/mplayer2/PKGBUILD
community/parcellite/PKGBUILD
community/python2-pytables/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/kbd/PKGBUILD
core/systemd/PKGBUILD
extra/calligra/PKGBUILD
extra/dmapi/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/libtorrent-rasterbar/PKGBUILD
extra/llvm/PKGBUILD
extra/nx/PKGBUILD
extra/ocaml/PKGBUILD
extra/php-xcache/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/vcdimager/PKGBUILD
extra/w3m/PKGBUILD
extra/xorg-bdftopcf/PKGBUILD
extra/xorg-xcalc/PKGBUILD
extra/xorg-xconsole/PKGBUILD
extra/xorg-xedit/PKGBUILD
extra/xorg-xmag/PKGBUILD
extra/xorg-xmessage/PKGBUILD
extra/xorg-xvidtune/PKGBUILD
libre/unzip-libre/PKGBUILD
social/opentracker/PKGBUILD
Diffstat (limited to 'extra/gvfs')
| -rw-r--r-- | extra/gvfs/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/gvfs/fix-paranoia-include.patch | 11 |
2 files changed, 20 insertions, 6 deletions
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 22276c35f..c4af1c2b7 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 173130 2012-12-11 14:42:18Z jgc $ +# $Id: PKGBUILD 175145 2013-01-15 11:34:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.14.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + fix-paranoia-include.patch) +sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc' + '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76') build() { cd "$pkgbase-$pkgver" + patch -Np0 -i ../fix-paranoia-include.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ @@ -24,7 +27,7 @@ build() { package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch new file mode 100644 index 000000000..02856a06f --- /dev/null +++ b/extra/gvfs/fix-paranoia-include.patch @@ -0,0 +1,11 @@ +--- daemon/gvfsbackendcdda.c.orig 2013-01-08 11:19:52.311593338 +0000 ++++ daemon/gvfsbackendcdda.c 2013-01-08 11:20:05.778169190 +0000 +@@ -55,7 +55,7 @@ + #include "gvfsjobenumerate.h" + + #define DO_NOT_WANT_PARANOIA_COMPATIBILITY +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/paranoia.h> + #include <cdio/cdio.h> + + /* TODO: |