Merge branch 'drop-rsvg-symbols' into 'master'

Drop rsvg.symbols

See merge request GNOME/librsvg!231

9 files changed, 43 insertions, 68 deletions

diff --git a/Makefile.am b/Makefile.am
index 072cdb8b..f9205080 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -255,7 +255,6 @@ EXTRA_DIST =				\
 	gtk-doc.make			\
 	Rsvg-2.0-custom.vala		\
 	Rsvg-2.0.metadata		\
-	rsvg.symbols			\
 	glib-tap.mk			\
 	tap-driver.sh			\
 	tap-test
diff --git a/librsvg/rsvg-base.c b/librsvg/rsvg-base.c
index 380176af..5ccc98ea 100644
--- a/librsvg/rsvg-base.c
+++ b/librsvg/rsvg-base.c
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include "rsvg.h"
 #include "rsvg-css.h"
 
 /* Implemented in rsvg_internals/src/dpi.rs */
diff --git a/librsvg/rsvg-cairo.h b/librsvg/rsvg-cairo.h
index 34649431..3a75c629 100644
--- a/librsvg/rsvg-cairo.h
+++ b/librsvg/rsvg-cairo.h
@@ -34,7 +34,9 @@
 
 G_BEGIN_DECLS 
 
+RSVG_API
 gboolean    rsvg_handle_render_cairo     (RsvgHandle *handle, cairo_t *cr);
+RSVG_API
 gboolean    rsvg_handle_render_cairo_sub (RsvgHandle *handle, cairo_t *cr, const char *id);
 
 G_END_DECLS
diff --git a/librsvg/rsvg-css.h b/librsvg/rsvg-css.h
index 12330c84..e5143eac 100644
--- a/librsvg/rsvg-css.h
+++ b/librsvg/rsvg-css.h
@@ -28,6 +28,11 @@
 
 #include <glib.h>
 
+/* Override to export public/semi-public APIs */
+#ifndef RSVG_API
+# define RSVG_API
+#endif
+
 G_BEGIN_DECLS
 
 /* Keep this in sync with rust/src/color.rs:ColorKind */
@@ -45,6 +50,7 @@ typedef struct {
 } RsvgCssColorSpec;
 
 /* This one is semi-public for mis-use in rsvg-convert */
+RSVG_API
 RsvgCssColorSpec rsvg_css_parse_color_ (const char *str);
 
 #ifdef RSVG_COMPILATION
diff --git a/librsvg/rsvg.h b/librsvg/rsvg.h
index 1b48e9f6..94d7e3a6 100644
--- a/librsvg/rsvg.h
+++ b/librsvg/rsvg.h
@@ -38,12 +38,17 @@ G_BEGIN_DECLS
 
 #ifndef __GTK_DOC_IGNORE__
 
+/* Override to export public/semi-public APIs */
+#ifndef RSVG_API
+# define RSVG_API
+#endif
+
 #if defined(RSVG_DISABLE_DEPRECATION_WARNINGS) || !GLIB_CHECK_VERSION (2, 31, 0)
-#define RSVG_DEPRECATED
-#define RSVG_DEPRECATED_FOR(f)
+#define RSVG_DEPRECATED RSVG_API
+#define RSVG_DEPRECATED_FOR(f) RSVG_API
 #else
-#define RSVG_DEPRECATED G_DEPRECATED
-#define RSVG_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
+#define RSVG_DEPRECATED G_DEPRECATED RSVG_API
+#define RSVG_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) RSVG_API
 #endif
 
 #endif /* __GTK_DOC_IGNORE__ */
@@ -55,6 +60,7 @@ G_BEGIN_DECLS
 #define RSVG_IS_HANDLE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), RSVG_TYPE_HANDLE))
 #define RSVG_HANDLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), RSVG_TYPE_HANDLE, RsvgHandleClass))
 
+RSVG_API
 GType rsvg_handle_get_type (void);
 
 /**
@@ -68,8 +74,10 @@ typedef enum {
 } RsvgError;
 
 #define RSVG_ERROR (rsvg_error_quark ())
+RSVG_API
 GQuark rsvg_error_quark (void) G_GNUC_CONST;
 
+RSVG_API
 GType rsvg_error_get_type (void);
 #define RSVG_TYPE_ERROR (rsvg_error_get_type())
 
@@ -169,9 +177,12 @@ void rsvg_set_default_dpi	(double dpi);
 RSVG_DEPRECATED
 void rsvg_set_default_dpi_x_y	(double dpi_x, double dpi_y);
 
+RSVG_API
 void rsvg_handle_set_dpi	(RsvgHandle *handle, double dpi);
+RSVG_API
 void rsvg_handle_set_dpi_x_y	(RsvgHandle *handle, double dpi_x, double dpi_y);
 
+RSVG_API
 RsvgHandle  *rsvg_handle_new		(void);
 
 RSVG_DEPRECATED_FOR(rsvg_handle_read_stream_sync)
@@ -182,12 +193,17 @@ gboolean     rsvg_handle_write		(RsvgHandle   *handle,
 RSVG_DEPRECATED_FOR(rsvg_handle_read_stream_sync)
 gboolean     rsvg_handle_close		(RsvgHandle *handle, GError **error);
 
+RSVG_API
 GdkPixbuf   *rsvg_handle_get_pixbuf	(RsvgHandle *handle);
+RSVG_API
 GdkPixbuf   *rsvg_handle_get_pixbuf_sub (RsvgHandle *handle, const char *id);
 
+RSVG_API
 const char  *rsvg_handle_get_base_uri (RsvgHandle *handle);
+RSVG_API
 void         rsvg_handle_set_base_uri (RsvgHandle *handle, const char *base_uri);
 
+RSVG_API
 void rsvg_handle_get_dimensions (RsvgHandle *handle, RsvgDimensionData *dimension_data);
 
 RSVG_DEPRECATED_FOR(rsvg_handle_get_geometry_for_element)
@@ -200,6 +216,7 @@ gboolean rsvg_handle_get_position_sub (RsvgHandle       *handle,
                                        RsvgPositionData *position_data,
                                        const char       *id);
 
+RSVG_API
 gboolean rsvg_handle_has_sub (RsvgHandle *handle, const char *id);
 
 /**
@@ -254,6 +271,7 @@ typedef struct {
     RsvgUnit unit;
 } RsvgLength;
 
+RSVG_API
 void rsvg_handle_get_intrinsic_dimensions (RsvgHandle *handle,
                                            gboolean   *out_has_width,
                                            RsvgLength *out_width,
@@ -262,6 +280,7 @@ void rsvg_handle_get_intrinsic_dimensions (RsvgHandle *handle,
                                            gboolean   *out_has_viewbox,
                                            RsvgRectangle *out_viewbox);
 
+RSVG_API
 gboolean rsvg_handle_get_geometry_for_element (RsvgHandle     *handle,
                                                const char     *id,
                                                const RsvgRectangle *viewport,
@@ -299,34 +318,43 @@ typedef enum /*< flags >*/
     RSVG_HANDLE_FLAG_KEEP_IMAGE_DATA = 1 << 1
 } RsvgHandleFlags;
 
+RSVG_API
 GType rsvg_handle_flags_get_type (void);
 #define RSVG_TYPE_HANDLE_FLAGS (rsvg_handle_flags_get_type())
 
+RSVG_API
 RsvgHandle *rsvg_handle_new_with_flags (RsvgHandleFlags flags);
 
+RSVG_API
 void        rsvg_handle_set_base_gfile (RsvgHandle *handle,
                                         GFile      *base_file);
 
+RSVG_API
 gboolean    rsvg_handle_read_stream_sync (RsvgHandle   *handle,
                                           GInputStream *stream,
                                           GCancellable *cancellable,
                                           GError      **error);
 
+RSVG_API
 RsvgHandle *rsvg_handle_new_from_gfile_sync (GFile          *file,
                                              RsvgHandleFlags flags,
                                              GCancellable   *cancellable,
                                              GError        **error);
 
+RSVG_API
 RsvgHandle *rsvg_handle_new_from_stream_sync (GInputStream   *input_stream,
                                               GFile          *base_file,
                                               RsvgHandleFlags flags,
                                               GCancellable   *cancellable,
                                               GError        **error);
 
+RSVG_API
 RsvgHandle *rsvg_handle_new_from_data (const guint8 *data, gsize data_len, GError **error);
+RSVG_API
 RsvgHandle *rsvg_handle_new_from_file (const gchar *filename, GError **error);
 
 #ifndef __GTK_DOC_IGNORE__
+RSVG_API
 void rsvg_handle_internal_set_testing (RsvgHandle *handle, gboolean testing);
 #endif /* __GTK_DOC_IGNORE__ */
 
diff --git a/rsvg.symbols b/rsvg.symbols
deleted file mode 100644
index 70f79802..00000000
--- a/rsvg.symbols
+++ /dev/null
@@ -1,54 +0,0 @@
-/* rsvg.h */
-rsvg_cleanup
-rsvg_error_quark
-rsvg_handle_close
-rsvg_handle_get_base_uri
-rsvg_handle_get_dimensions
-rsvg_handle_get_dimensions_sub
-rsvg_handle_get_geometry_for_element
-rsvg_handle_get_intrinsic_dimensions
-rsvg_handle_get_position_sub
-rsvg_handle_get_pixbuf
-rsvg_handle_get_pixbuf_sub
-rsvg_handle_get_type
-rsvg_handle_has_sub
-rsvg_handle_internal_set_testing
-rsvg_handle_new
-rsvg_handle_new_from_data
-rsvg_handle_new_from_file
-rsvg_handle_new_from_gfile_sync
-rsvg_handle_new_from_stream_sync
-rsvg_handle_new_with_flags
-rsvg_handle_read_stream_sync
-rsvg_handle_set_base_gfile
-rsvg_handle_set_base_uri
-rsvg_handle_set_dpi
-rsvg_handle_set_dpi_x_y
-rsvg_handle_write
-rsvg_set_default_dpi
-rsvg_set_default_dpi_x_y
-
-/* rsvg-cairo.h */
-rsvg_handle_render_cairo
-rsvg_handle_render_cairo_sub
-
-/* rsvg-css.h---semi-public for rsvg-convert */
-rsvg_css_parse_color_
-
-/* librsvg-enum-types.h */
-rsvg_error_get_type
-rsvg_handle_flags_get_type
-
-/* deprecated APIs */
-rsvg_handle_free
-rsvg_handle_set_size_callback
-rsvg_init
-rsvg_pixbuf_from_file
-rsvg_pixbuf_from_file_at_max_size
-rsvg_pixbuf_from_file_at_size
-rsvg_pixbuf_from_file_at_zoom
-rsvg_pixbuf_from_file_at_zoom_with_max
-rsvg_handle_get_desc
-rsvg_handle_get_metadata
-rsvg_handle_get_title
-rsvg_term
diff --git a/win32/build-rules-msvc.mak b/win32/build-rules-msvc.mak
index 863dbec3..ceb91d3a 100644
--- a/win32/build-rules-msvc.mak
+++ b/win32/build-rules-msvc.mak
@@ -55,12 +55,10 @@ $(LIBRSVG_LIB): $(LIBRSVG_DLL)
 # 	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
 $(LIBRSVG_DLL):	\
 $(RSVG_INTERNAL_LIB)		\
-$(OUTDIR)\librsvg\rsvg.def	\
 $(OUTDIR)\librsvg\config.h	\
 $(librsvg_OBJS)
 	link /DLL $(LDFLAGS) 	\
 	$(LIBRSVG_DEP_LIBS)	\
-	/def:$(OUTDIR)\librsvg\rsvg.def	\
 	/implib:$(LIBRSVG_LIB)	\
 	-out:$@ @<<
 $(librsvg_OBJS)
diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
index 0300ef79..cd9b5157 100644
--- a/win32/config-msvc.mak.in
+++ b/win32/config-msvc.mak.in
@@ -60,7 +60,8 @@ LIBRSVG_CFLAGS =				\
 	$(BASE_CFLAGS)				\
 	$(LIBRSVG_LOG_DOMAIN)			\
 	/DRSVG_DISABLE_DEPRECATION_WARNINGS	\
-	/DRSVG_COMPILATION
+	/DRSVG_COMPILATION			\
+	/DRSVG_API=__declspec(dllexport)
 
 LIBRSVG_INCLUDES =			\
 	/I..				\
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index b010e1df..ed22a20e 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -15,12 +15,6 @@ $(OUTDIR)\rsvg-tools			\
 $(OUTDIR)\rsvg-tests:
 	@-mkdir $@
 
-# Generate the .def file
-$(OUTDIR)\librsvg\rsvg.def: ..\rsvg.symbols
-	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
-	@echo EXPORTS > $@
-	$(CPP) /EP $** >> $@
-
 # Generate listing file for introspection
 $(OUTDIR)\librsvg\Rsvg_2_0_gir_list:	\
 $(librsvg_real_pub_HDRS)		\