Commit a127f375 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

Dropped support for the GnomeVFS file-uri backend. Recent GNOME releases

2009-03-23  Sven Neumann  <sven@gimp.org>

	Dropped support for the GnomeVFS file-uri backend. Recent GNOME
	releases use GIO/GVfs and libgnomeui will also go away soon.

	* INSTALL 
	* configure.in: removed checks for libgnomeui and 
libgnome-keyring.

	* plug-ins/file-uri/Makefile.am
	* plug-ins/file-uri/uri-backend-gnomevfs.c: removed.


svn path=/trunk/; revision=28211
parent 45e89543
2009-03-23 Sven Neumann <sven@gimp.org>
Dropped support for the GnomeVFS file-uri backend. Recent GNOME
releases use GIO/GVfs and libgnomeui will also go away soon.
* INSTALL
* configure.in: removed checks for libgnomeui and libgnome-keyring.
* plug-ins/file-uri/Makefile.am
* plug-ins/file-uri/uri-backend-gnomevfs.c: removed.
2009-03-23 Michael Natterer <mitch@gimp.org> 2009-03-23 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpgradienteditor.c: use GtkAdjustment's accessors. * app/widgets/gimpgradienteditor.c: use GtkAdjustment's accessors.
......
...@@ -186,11 +186,8 @@ These are: ...@@ -186,11 +186,8 @@ These are:
--without-gvfs. If you don't want to use GIO/GVfs to access remote --without-gvfs. If you don't want to use GIO/GVfs to access remote
files, you can pass --without-gvfs to the configure script. files, you can pass --without-gvfs to the configure script.
--without-gnomevfs. If you don't want to use gnomevfs to access remote
files, you can pass --without-gnomevfs to the configure script.
--without-libcurl. If you don't want to use libcurl to access remote --without-libcurl. If you don't want to use libcurl to access remote
files, you can pass --without-gnomevfs to the configure script. files, you can pass --without-libcurl to the configure script.
--without-alsa. If you don't want to compile ALSA support into the --without-alsa. If you don't want to compile ALSA support into the
MIDI input controller module, you can use the --without-alsa option. MIDI input controller module, you can use the --without-alsa option.
......
...@@ -1327,10 +1327,9 @@ fi ...@@ -1327,10 +1327,9 @@ fi
AC_SUBST(FILE_PDF) AC_SUBST(FILE_PDF)
############################################### ################################
# Check for gio/gvfs, gnome-vfs and libcurl # Check for gio/gvfs and libcurl
# (and optionally libgnomeui and gnome-keyring) ################################
###############################################
uri_plugin=no uri_plugin=no
...@@ -1340,39 +1339,6 @@ AC_ARG_WITH(gvfs, [ --without-gvfs build without GIO/GVfs support]) ...@@ -1340,39 +1339,6 @@ AC_ARG_WITH(gvfs, [ --without-gvfs build without GIO/GVfs support])
AM_CONDITIONAL(HAVE_GVFS, test "x$with_gvfs" != xno) AM_CONDITIONAL(HAVE_GVFS, test "x$with_gvfs" != xno)
AC_ARG_WITH(gnomevfs, [ --without-gnomevfs build without gnomevfs support])
have_gnomeui="no (disabled)"
have_gnome_keyring="no (disabled)"
have_gnomevfs="no (disabled)"
if test "x$with_gnomevfs" != xno; then
gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
have_gnomeui=yes
gnome_vfs_modules="$gnome_vfs_modules libgnomeui-2.0"
else
have_gnomeui="no (libgnomeui-2.0 not found)"
fi
if $PKG_CONFIG --atleast-version=gnome_keyring_required_version gnome-keyring-1; then
have_gnome_keyring=yes
gnome_vfs_modules="$gnome_vfs_modules gnome-keyring-1"
else
have_gnome_keyring="no (gnome-keyring-1 not found)"
fi
PKG_CHECK_MODULES(GNOME_VFS, $gnome_vfs_modules,
have_gnomevfs=yes,
have_gnomevfs="no (gnome-vfs-2.0 not found)")
fi
AM_CONDITIONAL(HAVE_GNOMEVFS, test "x$have_gnomevfs" = xyes)
AC_ARG_WITH(libcurl, [ --without-libcurl build without curl support]) AC_ARG_WITH(libcurl, [ --without-libcurl build without curl support])
have_libcurl="no (disabled)" have_libcurl="no (disabled)"
...@@ -1390,8 +1356,6 @@ AM_CONDITIONAL(HAVE_LIBCURL, test "x$have_libcurl" = xyes) ...@@ -1390,8 +1356,6 @@ AM_CONDITIONAL(HAVE_LIBCURL, test "x$have_libcurl" = xyes)
if test "x$with_gvfs" != xno; then if test "x$with_gvfs" != xno; then
uri_plugin="yes (using GIO/GVfs)" uri_plugin="yes (using GIO/GVfs)"
elif test "x$have_gnomevfs" = xyes; then
uri_plugin="yes (using gnome-vfs)"
elif test "x$have_libcurl" = xyes; then elif test "x$have_libcurl" = xyes; then
uri_plugin="yes (using libcurl)" uri_plugin="yes (using libcurl)"
elif test "x$os_win32" = xno; then elif test "x$os_win32" = xno; then
...@@ -1399,15 +1363,6 @@ elif test "x$os_win32" = xno; then ...@@ -1399,15 +1363,6 @@ elif test "x$os_win32" = xno; then
fi fi
if test "x$have_gnomeui" = xyes; then
AC_DEFINE(HAVE_GNOMEUI, 1, [Define to 1 if libgnomeui is available])
fi
if test "x$have_gnome_keyring" = xyes; then
AC_DEFINE(HAVE_GNOME_KEYRING, 1, [Define to 1 if gnome-keyring is available])
fi
################### ###################
# Check for libwmf2 # Check for libwmf2
################### ###################
...@@ -2138,8 +2093,6 @@ Optional Plug-Ins: ...@@ -2138,8 +2093,6 @@ Optional Plug-Ins:
Plug-In Features: Plug-In Features:
EXIF support: $have_libexif EXIF support: $have_libexif
GNOME UI: $have_gnomeui
GNOME keyring: $have_gnome_keyring
Optional Modules: Optional Modules:
ALSA (MIDI Input): $have_alsa ALSA (MIDI Input): $have_alsa
......
...@@ -23,11 +23,6 @@ backend_sources = uri-backend-gvfs.c ...@@ -23,11 +23,6 @@ backend_sources = uri-backend-gvfs.c
backend_cflags = $(GIO_CFLAGS) backend_cflags = $(GIO_CFLAGS)
backend_libs = $(GIO_LIBS) backend_libs = $(GIO_LIBS)
else else
if HAVE_GNOMEVFS
backend_sources = uri-backend-gnomevfs.c
backend_cflags = $(GNOME_VFS_CFLAGS)
backend_libs = $(GNOME_VFS_LIBS)
else
if HAVE_LIBCURL if HAVE_LIBCURL
backend_sources = uri-backend-libcurl.c backend_sources = uri-backend-libcurl.c
backend_cflags = $(CURL_CFLAGS) backend_cflags = $(CURL_CFLAGS)
...@@ -38,7 +33,6 @@ backend_cflags = ...@@ -38,7 +33,6 @@ backend_cflags =
backend_libs = backend_libs =
endif endif
endif endif
endif
file_uri_SOURCES = \ file_uri_SOURCES = \
uri.c \ uri.c \
......
This diff is collapsed.
2009-03-23 Sven Neumann <sven@gimp.org>
* POTFILES.in: removed plug-ins/file-uri/uri-backend-gnomevfs.c.
2009-03-18 Mișu Moldovan <dumol@gnome.ro> 2009-03-18 Mișu Moldovan <dumol@gnome.ro>
* ro.po: updated Romanian translation by Cristian Secară * ro.po: updated Romanian translation by Cristian Secară
2009-03-18 Marco Ciampa <ciampix@libero.it> 2009-03-18 Marco Ciampa <ciampix@libero.it>
it.po: updated italian translation. * it.po: updated italian translation.
2009-03-10 Ulf-D. Ehlert <ulfehlert@svn.gnome.org> 2009-03-10 Ulf-D. Ehlert <ulfehlert@svn.gnome.org>
......
...@@ -171,7 +171,6 @@ plug-ins/file-psd/psd-thumb-load.c ...@@ -171,7 +171,6 @@ plug-ins/file-psd/psd-thumb-load.c
plug-ins/file-psd/psd-util.c plug-ins/file-psd/psd-util.c
plug-ins/file-psd/psd.c plug-ins/file-psd/psd.c
plug-ins/file-sgi/sgi.c plug-ins/file-sgi/sgi.c
plug-ins/file-uri/uri-backend-gnomevfs.c
plug-ins/file-uri/uri-backend-gvfs.c plug-ins/file-uri/uri-backend-gvfs.c
plug-ins/file-uri/uri-backend-libcurl.c plug-ins/file-uri/uri-backend-libcurl.c
plug-ins/file-uri/uri-backend-wget.c plug-ins/file-uri/uri-backend-wget.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment