[maemo-commits] [maemo-commits] r9298 - in projects/haf/trunk/sapwood: . src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Jan 24 15:41:22 EET 2007
- Previous message: [maemo-commits] r9297 - projects/haf/trunk/python-runtime/debian
- Next message: [maemo-commits] r9299 - in projects/haf/trunk/sapwood: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: tko Date: 2007-01-24 15:41:18 +0200 (Wed, 24 Jan 2007) New Revision: 9298 Added: projects/haf/trunk/sapwood/src/abicheck.sh Modified: projects/haf/trunk/sapwood/ChangeLog projects/haf/trunk/sapwood/src/Makefile.am projects/haf/trunk/sapwood/src/sapwood-pixmap.h projects/haf/trunk/sapwood/src/sapwood-proto.h projects/haf/trunk/sapwood/src/sapwood-rc-style.h projects/haf/trunk/sapwood/src/sapwood-style.h projects/haf/trunk/sapwood/src/theme-pixbuf.h Log: Export only symbols needed for the theme engine ABI 2007-01-24 Tommi Komulainen <tommi.komulainen at nokia.com> Export only symbols needed for the theme engine ABI * src/sapwood-pixmap.h * src/sapwood-proto.h * src/sapwood-rc-style.h * src/sapwood-style.h * src/theme-pixbuf.h: Tag internal functions with G_GNUC_INTERNAL to avoid symbol leakage. * src/Makefile.am: Add check target to verify the ABI. Modified: projects/haf/trunk/sapwood/ChangeLog =================================================================== --- projects/haf/trunk/sapwood/ChangeLog 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/ChangeLog 2007-01-24 13:41:18 UTC (rev 9298) @@ -1,3 +1,15 @@ +2007-01-24 Tommi Komulainen <tommi.komulainen at nokia.com> + + Export only symbols needed for the theme engine ABI + + * src/sapwood-pixmap.h + * src/sapwood-proto.h + * src/sapwood-rc-style.h + * src/sapwood-style.h + * src/theme-pixbuf.h: Tag internal functions with G_GNUC_INTERNAL to + avoid symbol leakage. + * src/Makefile.am: Add check target to verify the ABI. + 2007-01-24 Jose Dapena Paz <jdapena at igalia.com> * src/sapwood-server.c (extract_pixmap_single, main, Modified: projects/haf/trunk/sapwood/src/Makefile.am =================================================================== --- projects/haf/trunk/sapwood/src/Makefile.am 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/src/Makefile.am 2007-01-24 13:41:18 UTC (rev 9298) @@ -29,5 +29,8 @@ sapwood_server_CFLAGS = $(AM_CFLAGS) # created both with libtool and without MAINTAINERCLEANFILES = Makefile.in +CLEANFILES = actual-abi actual-abi2 expected-abi expected-abi2 optional-abi -EXTRA_DIST = README.pixbuf README.server +EXTRA_DIST = README.pixbuf README.server abicheck.sh + +TESTS = abicheck.sh Added: projects/haf/trunk/sapwood/src/abicheck.sh =================================================================== --- projects/haf/trunk/sapwood/src/abicheck.sh 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/src/abicheck.sh 2007-01-24 13:41:18 UTC (rev 9298) @@ -0,0 +1,30 @@ +#! /bin/sh + +# Check that a theme engine does not export any +# functions that may interfere with symbol resolution + +cat >expected-abi <<EOF +theme_create_rc_style +theme_exit +theme_init +EOF + +cat >optional-abi <<EOF +__bss_start +_edata +_end +_fini +_init +g_module_check_init +g_module_unload +EOF + +nm -D -g --defined-only .libs/libsapwood.so | cut -d ' ' -f 3 > actual-abi + +cat optional-abi >>expected-abi +sort expected-abi | uniq >expected-abi2 + +cat optional-abi >>actual-abi +sort actual-abi | uniq >actual-abi2 + +diff -u expected-abi2 actual-abi2 && rm expected-abi optional-abi actual-abi expected-abi2 actual-abi2 Property changes on: projects/haf/trunk/sapwood/src/abicheck.sh ___________________________________________________________________ Name: svn:executable + * Modified: projects/haf/trunk/sapwood/src/sapwood-pixmap.h =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-pixmap.h 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/src/sapwood-pixmap.h 2007-01-24 13:41:18 UTC (rev 9298) @@ -45,13 +45,13 @@ int border_right, int border_top, int border_bottom, - GError **err); + GError **err) G_GNUC_INTERNAL; -void sapwood_pixmap_free (SapwoodPixmap *self); +void sapwood_pixmap_free (SapwoodPixmap *self) G_GNUC_INTERNAL; gboolean sapwood_pixmap_get_geometry (SapwoodPixmap *self, gint *width, - gint *height); + gint *height) G_GNUC_INTERNAL; void sapwood_pixmap_render (SapwoodPixmap *self, GdkWindow *window, @@ -64,7 +64,7 @@ gint dest_x, gint dest_y, gint dest_width, - gint dest_height); + gint dest_height) G_GNUC_INTERNAL; void sapwood_pixmap_render_rects (SapwoodPixmap *self, GdkDrawable *draw, @@ -76,7 +76,7 @@ gboolean mask_required, GdkRectangle *clip_rect, gint n_rects, - SapwoodRect *rects); + SapwoodRect *rects) G_GNUC_INTERNAL; G_END_DECLS Modified: projects/haf/trunk/sapwood/src/sapwood-proto.h =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-proto.h 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/src/sapwood-proto.h 2007-01-24 13:41:18 UTC (rev 9298) @@ -61,8 +61,8 @@ guint32 pixmask[3][3]; /* 0 if not applicable (full opacity) */ } PixbufOpenResponse; -G_CONST_RETURN char *sapwood_socket_path_get_default (void); -G_CONST_RETURN char *sapwood_socket_path_get_for_display (GdkDisplay *display); +G_CONST_RETURN char *sapwood_socket_path_get_default (void) G_GNUC_INTERNAL; +G_CONST_RETURN char *sapwood_socket_path_get_for_display (GdkDisplay *display) G_GNUC_INTERNAL; G_END_DECLS Modified: projects/haf/trunk/sapwood/src/sapwood-rc-style.h =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-rc-style.h 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/src/sapwood-rc-style.h 2007-01-24 13:41:18 UTC (rev 9298) @@ -27,7 +27,7 @@ typedef struct _SapwoodRcStyle SapwoodRcStyle; typedef struct _SapwoodRcStyleClass SapwoodRcStyleClass; -extern GType sapwood_type_rc_style; +extern GType sapwood_type_rc_style G_GNUC_INTERNAL; #define SAPWOOD_TYPE_RC_STYLE sapwood_type_rc_style #define SAPWOOD_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), SAPWOOD_TYPE_RC_STYLE, SapwoodRcStyle)) @@ -48,4 +48,4 @@ GtkRcStyleClass parent_class; }; -void sapwood_rc_style_register_type (GTypeModule *module); +void sapwood_rc_style_register_type (GTypeModule *module) G_GNUC_INTERNAL; Modified: projects/haf/trunk/sapwood/src/sapwood-style.h =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-style.h 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/src/sapwood-style.h 2007-01-24 13:41:18 UTC (rev 9298) @@ -27,7 +27,7 @@ typedef struct _SapwoodStyle SapwoodStyle; typedef struct _SapwoodStyleClass SapwoodStyleClass; -extern GType sapwood_type_style; +extern GType sapwood_type_style G_GNUC_INTERNAL; #define SAPWOOD_TYPE_STYLE sapwood_type_style #define SAPWOOD_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), SAPWOOD_TYPE_STYLE, SapwoodStyle)) @@ -46,6 +46,6 @@ GtkStyleClass parent_class; }; -void sapwood_style_register_type (GTypeModule *module); +void sapwood_style_register_type (GTypeModule *module) G_GNUC_INTERNAL; Modified: projects/haf/trunk/sapwood/src/theme-pixbuf.h =================================================================== --- projects/haf/trunk/sapwood/src/theme-pixbuf.h 2007-01-24 13:34:14 UTC (rev 9297) +++ projects/haf/trunk/sapwood/src/theme-pixbuf.h 2007-01-24 13:41:18 UTC (rev 9298) @@ -166,20 +166,20 @@ }; -ThemePixbuf *theme_pixbuf_new (void); -void theme_pixbuf_unref (ThemePixbuf *theme_pb); +ThemePixbuf *theme_pixbuf_new (void) G_GNUC_INTERNAL; +void theme_pixbuf_unref (ThemePixbuf *theme_pb) G_GNUC_INTERNAL; void theme_pixbuf_set_filename (ThemePixbuf *theme_pb, - const char *filename); + const char *filename) G_GNUC_INTERNAL; gboolean theme_pixbuf_get_geometry (ThemePixbuf *theme_pb, gint *width, - gint *height); + gint *height) G_GNUC_INTERNAL; void theme_pixbuf_set_border (ThemePixbuf *theme_pb, gint left, gint right, gint top, - gint bottom); + gint bottom) G_GNUC_INTERNAL; void theme_pixbuf_set_stretch (ThemePixbuf *theme_pb, - gboolean stretch); + gboolean stretch) G_GNUC_INTERNAL; gboolean theme_pixbuf_render (ThemePixbuf *theme_pb, GdkWindow *window, GdkBitmap *mask, @@ -189,8 +189,8 @@ gint dest_x, gint dest_y, gint dest_width, - gint dest_height); + gint dest_height) G_GNUC_INTERNAL; -extern GtkStyleClass pixmap_default_class; +extern GtkStyleClass pixmap_default_class G_GNUC_INTERNAL;
- Previous message: [maemo-commits] r9297 - projects/haf/trunk/python-runtime/debian
- Next message: [maemo-commits] r9299 - in projects/haf/trunk/sapwood: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]