diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-25 16:50:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-25 19:52:59 +0000 |
| commit | 7660120e37c0727c884fe04ae99ae4a456129bad (patch) | |
| tree | fb7620fd84ae9ad1a20e8089b5897663fe31ab2c /main | |
| parent | 46ee63f7d8feabdf4ceeebf230b24a8cadff585b (diff) | |
| download | aports-7660120e37c0727c884fe04ae99ae4a456129bad.tar.bz2 aports-7660120e37c0727c884fe04ae99ae4a456129bad.tar.xz | |
main/gvfs: rebuild against glib-2.32
Diffstat (limited to 'main')
| -rw-r--r-- | main/gvfs/APKBUILD | 13 | ||||
| -rw-r--r-- | main/gvfs/gvfs-1.10.1-unneeded-include.patch | 27 |
2 files changed, 37 insertions, 3 deletions
diff --git a/main/gvfs/APKBUILD b/main/gvfs/APKBUILD index c8ac285188..154c31acbc 100644 --- a/main/gvfs/APKBUILD +++ b/main/gvfs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gvfs pkgver=1.9.1 -pkgrel=2 +pkgrel=4 pkgdesc="Backends for the gio framework in GLib" url="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/" arch="all" @@ -15,11 +15,17 @@ makedepends="dbus-glib-dev intltool fuse-dev udev-dev bluez-dev expat-dev install= subpackages="$pkgname-dev $pkgname-fuse $pkgname-smb $pkgname-archive $pkgname-obexftp $pkgname-gphoto2 $pkgname-lang" -source="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/gvfs-$pkgver.tar.bz2" +source="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/gvfs-$pkgver.tar.bz2 + gvfs-1.10.1-unneeded-include.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) patch -p1 -i "$srcdir"/$i || return 1 + esac + done } build() { @@ -93,4 +99,5 @@ gphoto2() { # pkgdesc="AFC support for gvfs" #} -md5sums="875748f5d6995149e94fdab247d29a8a gvfs-1.9.1.tar.bz2" +md5sums="875748f5d6995149e94fdab247d29a8a gvfs-1.9.1.tar.bz2 +6a251c3870b9e101eb01fff63ba22526 gvfs-1.10.1-unneeded-include.patch" diff --git a/main/gvfs/gvfs-1.10.1-unneeded-include.patch b/main/gvfs/gvfs-1.10.1-unneeded-include.patch new file mode 100644 index 0000000000..96663e6b04 --- /dev/null +++ b/main/gvfs/gvfs-1.10.1-unneeded-include.patch @@ -0,0 +1,27 @@ +From 42d800f377dfa4e7338c516d286aef0b76bb1f72 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Thu, 13 Oct 2011 18:58:57 -0400 +Subject: [PATCH] Drop an unneeded include + +GLib recently became less forgiving about single includes +like this. +--- + client/gvfsfusedaemon.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c +index b41e83b..a4ba32c 100644 +--- a/client/gvfsfusedaemon.c ++++ b/client/gvfsfusedaemon.c +@@ -41,8 +41,6 @@ + #include <glib/gprintf.h> + #include <gio/gio.h> + +-#include <glib/gurifuncs.h> +- + /* stuff from common/ */ + #include <gdaemonmount.h> + #include <gvfsdaemonprotocol.h> +-- +1.7.8.4 + |