diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-13 15:20:32 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-13 15:20:32 +0100 |
| commit | c0a02f08d66969b92325d421354f4def5c23f84c (patch) | |
| tree | 1f97a2b8ea84967f808112b173ab1e7a494b0a26 /extra/gvfs | |
| parent | d830c3b1d23d90c928c68bf821049db3abf897b8 (diff) | |
| parent | a29329c38e50afd28d28c3a99e35d8774b9b19f8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/gvfs/PKGBUILD
libre/libretools/libretools.install
Diffstat (limited to 'extra/gvfs')
| -rw-r--r-- | extra/gvfs/PKGBUILD | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 8ec9a6aa6..2c5065393 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,38 +1,20 @@ -# $Id: PKGBUILD 170569 2012-11-08 21:40:53Z jgc $ +# $Id: PKGBUILD 170856 2012-11-12 20:04:56Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.14.1 -pkgrel=2 +pkgver=1.14.2 +pkgrel=1 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') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - do-not-emit-connected-added-signals-at-object-creation.patch - gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch - proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch - proxy-volume-monitor-Dont-force-close-the-session-bus.patch) -sha256sums=('0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a' - '2596b5a35e08566c4c3a8c8cc48f93534ee93c47eb13b649a8b399a9b656f9d0' - '0d509e335f931aceff2b5ce613dd3dec5a7f8ebbca379d8b3e3e4cf0848a9a72' - '26225a7ebfa0144d0481b4af0e9c141920c91c022c67003e92b875f8ecc38069' - 'af7d7bcc5777f356169b13aa86308222fb59c8ba56744f6393a97db0f80c3ed6') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc') build() { cd "$pkgbase-$pkgver" - - # https://bugzilla.gnome.org/show_bug.cgi?id=687525 - # https://bugzilla.gnome.org/show_bug.cgi?id=684677 - patch -Np1 -i "$srcdir/do-not-emit-connected-added-signals-at-object-creation.patch" - - # Fixes from gnome-3-6 branch - patch -Np1 -i "$srcdir/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch" - patch -Np1 -i "$srcdir/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch" - patch -Np1 -i "$srcdir/proxy-volume-monitor-Dont-force-close-the-session-bus.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ |