commit c6d4ab78ed1a2c0d83c85b4fec8b21dc72737c1b
Author: Vincent Untz <vuntz gnome org>
Date: Fri Mar 26 14:01:10 2010 +0100
Drop mozilla plugin
It doesn't build against recent xulrunner, and xulrunner now has builtin
support for svg anyway.
https://bugzilla.gnome.org/show_bug.cgi?id=593961
Makefile.am | 2 +-
TODO | 7 -
configure.in | 32 ---
librsvg.spec.in | 2 -
moz-plugin/.cvsignore | 2 -
moz-plugin/Makefile.am | 14 --
moz-plugin/moz-plugin.c | 587 -----------------------------------------------
7 files changed, 1 insertions(+), 645 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 82dd543..3f24b79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ else
target_rsvg_view =
endif
-SUBDIRS = . moz-plugin gdk-pixbuf-loader gtk-engine data tests doc
+SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests doc
lib_LTLIBRARIES = librsvg-2.la
bin_PROGRAMS = rsvg-convert $(target_rsvg_view)
diff --git a/TODO b/TODO
index 8dbf0d4..c9f1c00 100644
--- a/TODO
+++ b/TODO
@@ -5,13 +5,6 @@ Higher priority:
to use it to load PNGs/JPEGs/etc., but that piece of code's implementation will be flexible so that it isn't exclusively
dependant on GdkPixbuf.
- * Improvements to the Mozilla plugin
- * Possibly use a Cairo backend to draw directly onto Mozilla's Drawable, rather than using our XEmbed hack.
- * Should enable proper translucency, but could be SLOW
- * Enable printing support, integrated with Mozilla's (http://wp.netscape.com/eng/mozilla/3.0/handbook/plugins/pi4.htm#npprint)
- * Ideally would use Cairo->PS for this
- * In a pinch, embedding a PNG inside of a PS snippet would also work
-
* Areas in need of improvement:
* multiImage
* Text
diff --git a/configure.in b/configure.in
index dd64a2b..76b1286 100644
--- a/configure.in
+++ b/configure.in
@@ -272,36 +272,6 @@ fi
AM_CONDITIONAL(ENABLE_PIXBUF_LOADER, test x$enable_pixbuf_loader = xyes)
##################################################
-##################################################
-
-MOZILLA_CFLAGS=
-build_mozilla_plugin=no
-
-test_mozilla_plugin=true
-AC_ARG_ENABLE(mozilla-plugin, [ --enable-mozilla-plugin Build a Mozilla/Firefox SVG viewing plugin [default = auto]],
- test_mozilla_plugin="$enableval")
-
-if test "x$test_mozilla_plugin" != "xno"; then
- if test -z "$MOZILLA_CONFIG"; then
- AC_PATH_PROGS(MOZILLA_CONFIG, mozilla-config firefox-config xulrunner-config, no)
- fi
-
- if test "x$MOZILLA_CONFIG" != "xno"; then
- MOZILLA_CFLAGS=`$MOZILLA_CONFIG --cflags plugin java`
- else
- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, build_mozilla_plugin=yes,
- [AC_MSG_WARN([mozilla-config not found. Mozilla/Netscape plugin will not be built])])
- fi
-
- if test "x$MOZILLA_CFLAGS" != "x"; then
- build_mozilla_plugin=yes
- fi
-fi
-
-AM_CONDITIONAL(WITH_MOZILLA,[test "x$build_mozilla_plugin" = "xyes"])
-AC_SUBST(MOZILLA_CFLAGS)
-
-##################################################
# Checks for gtk-doc and docbook-tools
##################################################
gtk_doc_installed=true
@@ -344,7 +314,6 @@ gtk-engine/examples/Makefile
gtk-engine/examples/bubble/Makefile
gtk-engine/examples/bubble/gtk-2.0/Makefile
gdk-pixbuf-loader/Makefile
-moz-plugin/Makefile
tests/Makefile
tests/pdiff/Makefile
doc/Makefile
@@ -361,7 +330,6 @@ librsvg-$LIBRSVG_VERSION
Build GdkPixbuf loader: ${enable_pixbuf_loader}
Build theme engine: ${enable_gtk_theme}
- Build Netscape plugin: ${build_mozilla_plugin}
Handle svgz files: ${test_gsf}
Use GIO: ${test_gio}
Use libcroco for css parsing: ${test_croco}
diff --git a/librsvg.spec.in b/librsvg.spec.in
index e4aaaf8..fb973ce 100644
--- a/librsvg.spec.in
+++ b/librsvg.spec.in
@@ -71,7 +71,6 @@ rm -rf $RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/engines/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/loaders/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/libmozsvgdec.la
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
mkdir -p $RPM_BUILD_DIR/librsvg-%{version}
touch $RPM_BUILD_DIR/librsvg-%{version}/debugfiles.list
@@ -106,7 +105,6 @@ gdk-pixbuf-query-loaders-32 > %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
%{_bindir}/rsvg*
%{_libdir}/gtk-2.0/2.4.0/engines/*
%{_libdir}/gtk-2.0/2.4.0/loaders/*
-%{_libdir}/mozilla/plugins/*
%{_datadir}/pixmaps/*
# %{_datadir}/themes/bubble/gtk-2.0/*
# %{_datadir}/themes/bubble/README