diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-05-14 10:43:52 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-05-14 10:43:52 +0000 |
| commit | bc0b0d492c03db37f375f0fd9a2aa80f14bcfce9 (patch) | |
| tree | 6b2ee597f0496ae4d44253b108cbf53d4db80485 /gnome-base | |
| parent | stable x86, bug 267768 (diff) | |
| download | gentoo-2-bc0b0d492c03db37f375f0fd9a2aa80f14bcfce9.tar.gz gentoo-2-bc0b0d492c03db37f375f0fd9a2aa80f14bcfce9.tar.bz2 gentoo-2-bc0b0d492c03db37f375f0fd9a2aa80f14bcfce9.zip | |
Add patch to make gphoto2 tests more strict, fixes bug 264941
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gvfs/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch | 28 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.2.2.ebuild | 10 |
3 files changed, 38 insertions, 6 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index 5e99e3f0e757..2c1a29c78a53 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/gvfs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.65 2009/05/10 18:33:54 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.66 2009/05/14 10:43:52 nirbheek Exp $ + + 14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> gvfs-1.2.2.ebuild, + +files/gvfs-1.2.2-gphoto2-stricter-checks.patch: + Add patch to make gphoto2 tests more strict, fixes bug 264941 10 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org> -gvfs-0.2.5-r3.ebuild, -files/gvfs-0.2.5-bash-completion.patch, diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch new file mode 100644 index 000000000000..78fecb7cd618 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch @@ -0,0 +1,28 @@ +Gentoo bug 264941 +Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027 +--- +diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac +--- gvfs-1.2.2/configure.ac 2009-04-03 13:00:54.000000000 +0530 ++++ gvfs-1.2.2-new/configure.ac 2009-05-04 22:53:24.000000000 +0530 +@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a " + ;; + esac + ++ if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then ++ AC_MSG_ERROR([gphoto2 support requested but not available]) ++ fi ++ + if test "x$msg_gphoto2" = "xyes"; then + if test "x$use_gphoto2" = "xyes"; then + PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0) + AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available]) + else +- AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.]) ++ if test "x$enable_gphoto2" = "xyes"; then ++ AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.]) ++ else ++ AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.]) ++ fi + msg_gphoto2=no + fi + fi diff --git a/gnome-base/gvfs/gvfs-1.2.2.ebuild b/gnome-base/gvfs/gvfs-1.2.2.ebuild index 2ff2c74be30e..b95325f4f96e 100644 --- a/gnome-base/gvfs/gvfs-1.2.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.2.2.ebuild,v 1.1 2009/05/10 18:18:33 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.2.2.ebuild,v 1.2 2009/05/14 10:43:52 nirbheek Exp $ EAPI="2" @@ -60,10 +60,10 @@ pkg_setup() { src_prepare() { gnome2_src_prepare - if use archive; then - epatch "${FILESDIR}/${P}-expose-archive-backend.patch" - eautoreconf - fi + # Conditional patching purely to avoid eautoreconf + use gphoto2 && epatch "${FILESDIR}/${P}-gphoto2-stricter-checks.patch" + use archive && epatch "${FILESDIR}/${P}-expose-archive-backend.patch" + use gphoto2 || use archive && eautoreconf } src_install() { |