diff options
Diffstat (limited to 'gnome-base/gvfs/files')
| -rw-r--r-- | gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch | 56 | ||||
| -rw-r--r-- | gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch | 28 |
2 files changed, 84 insertions, 0 deletions
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch new file mode 100644 index 0000000..86222e5 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch @@ -0,0 +1,56 @@ +Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora) +Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829 +---- +Index: mount-archive.desktop.in.in +=================================================================== +--- mount-archive.desktop.in.in (revision 0) ++++ mount-archive.desktop.in.in (revision 0) +@@ -0,0 +1,14 @@ ++[Desktop Entry] ++Encoding=UTF-8 ++_Name=Archive Mounter ++Exec=@libexecdir@/gvfsd-archive file=%u ++X-Gnome-Vfs-System=gio ++MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar; ++Terminal=false ++StartupNotify=false ++Type=Application ++NoDisplay=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=gvfs ++X-GNOME-Bugzilla-Component=archive-backend ++X-GNOME-Bugzilla-Version=@VERSION@ +Index: Makefile.am +=================================================================== +--- Makefile.am.orig 2008-07-22 15:35:49.000000000 +0200 ++++ Makefile.am 2008-07-22 17:56:59.417180064 +0200 +@@ -1,5 +1,20 @@ + NULL = + ++@INTLTOOL_DESKTOP_RULE@ ++ ++desktop_in_files = mount-archive.desktop.in ++ ++mount-archive.desktop.in: mount-archive.desktop.in.in ++ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ ++ ++desktopdir = $(datadir)/applications ++if HAVE_ARCHIVE ++desktop_DATA = mount-archive.desktop ++else ++desktop_DATA = ++endif ++ ++ + SUBDIRS = \ + common \ + client \ +@@ -15,6 +30,8 @@ + + EXTRA_DIST = \ + MAINTAINERS \ ++ mount-archive.desktop.in.in \ ++ $(desktop_in_files) \ + $(NULL) + + DISTCLEANFILES = \ 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 0000000..78fecb7 --- /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 |