2006-05-30 Damien Carbery <[email protected]>
authordc144907
Tue, 30 May 2006 08:13:59 +0000
changeset 7337 1d11d4ecbc10
parent 7336 42bdccb939ca
child 7338 2d0246fd9b22
2006-05-30 Damien Carbery <[email protected]> * gimp.spec: Add patch, 04-hidden. * gimp-04-hidden.diff: Added to fix G_GNUC_INTERNAL usage.
ChangeLog
gimp.spec
patches/gimp-04-hidden.diff
--- a/ChangeLog	Tue May 30 00:44:43 2006 +0000
+++ b/ChangeLog	Tue May 30 08:13:59 2006 +0000
@@ -1,3 +1,8 @@
+2006-05-30  Damien Carbery <[email protected]>
+
+	* gimp.spec: Add patch, 04-hidden.
+	* gimp-04-hidden.diff: Added to fix G_GNUC_INTERNAL usage.
+
 2006-05-30  Glynn Foster  <[email protected]>
 
 	* ext-sources/mozilla.desktop: 2 changes, 1 of which may need to
--- a/gimp.spec	Tue May 30 00:44:43 2006 +0000
+++ b/gimp.spec	Tue May 30 08:13:59 2006 +0000
@@ -24,6 +24,7 @@
 Patch1:       gimp-01-menu-entry.diff
 Patch2:       gimp-02-Xext.diff
 Patch3:       gimp-03-void-return.diff
+Patch4:       gimp-04-hidden.diff
 URL:          http://www.gimp.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -93,6 +94,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 gunzip -c %SOURCE1|tar xf -
 
@@ -234,6 +236,9 @@
 %{_mandir}/man1/gimptool-%{subver_install}.1*
 
 %changelog
+* Tue May 30 2006 - [email protected]
+- Add patch, 04-hidden, for new G_GNUC_INTERNAL usage.
+
 * Wed May 03 2006 - [email protected]
 - Bump help version to 2.0.10.
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-04-hidden.diff	Tue May 30 08:13:59 2006 +0000
@@ -0,0 +1,320 @@
+37,38c37,38
+< gboolean _gimp_reloc_init            (GError **error) G_GNUC_INTERNAL;
+< gboolean _gimp_reloc_init_lib        (GError **error) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL gboolean _gimp_reloc_init            (GError **error);
+> G_GNUC_INTERNAL gboolean _gimp_reloc_init_lib        (GError **error);
+40,49c40,49
+< gchar * _gimp_reloc_find_exe         (const gchar *default_exe)         G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_exe_dir     (const gchar *default_dir)         G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_prefix      (const gchar *default_prefix)      G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_bin_dir     (const gchar *default_bin_dir)     G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_data_dir    (const gchar *default_data_dir)    G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_plugin_dir  (const gchar *default_plugin_dir)  G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_locale_dir  (const gchar *default_locale_dir)  G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_lib_dir     (const gchar *default_lib_dir)     G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_libexec_dir (const gchar *default_libexec_dir) G_GNUC_INTERNAL;
+< gchar * _gimp_reloc_find_etc_dir     (const gchar *default_etc_dir)     G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_exe         (const gchar *default_exe);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_exe_dir     (const gchar *default_dir);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_prefix      (const gchar *default_prefix);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_bin_dir     (const gchar *default_bin_dir);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_data_dir    (const gchar *default_data_dir);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_plugin_dir  (const gchar *default_plugin_dir);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_locale_dir  (const gchar *default_locale_dir);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_lib_dir     (const gchar *default_lib_dir);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_libexec_dir (const gchar *default_libexec_dir);
+> G_GNUC_INTERNAL gchar * _gimp_reloc_find_etc_dir     (const gchar *default_etc_dir);
+84c84
+< gboolean  _gimp_wire_read_int32   (GIOChannel      *channel,
+---
+> G_GNUC_INTERNAL gboolean  _gimp_wire_read_int32   (GIOChannel      *channel,
+87,88c87,88
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_read_int16   (GIOChannel           *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_read_int16   (GIOChannel           *channel,
+91,92c91,92
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_read_int8    (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_read_int8    (GIOChannel      *channel,
+95,96c95,96
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_read_double  (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_read_double  (GIOChannel      *channel,
+99,100c99,100
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_read_string  (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_read_string  (GIOChannel      *channel,
+103,104c103,104
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_read_color   (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_read_color   (GIOChannel      *channel,
+107,108c107,108
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_write_int32  (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_write_int32  (GIOChannel      *channel,
+111,112c111,112
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_write_int16  (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_write_int16  (GIOChannel      *channel,
+115,116c115,116
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_write_int8   (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_write_int8   (GIOChannel      *channel,
+119,120c119,120
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_write_double (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_write_double (GIOChannel      *channel,
+123,124c123,124
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_write_string (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_write_string (GIOChannel      *channel,
+127,128c127,128
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+< gboolean  _gimp_wire_write_color  (GIOChannel      *channel,
+---
+>                                    gpointer         user_data);
+> G_GNUC_INTERNAL gboolean  _gimp_wire_write_color  (GIOChannel      *channel,
+131c131
+<                                    gpointer         user_data) G_GNUC_INTERNAL;
+---
+>                                    gpointer         user_data);
+61,63c61,63
+< void                _gimp_thumbs_delete_others        (const gchar    *uri,
+<                                                        GimpThumbSize   size) G_GNUC_INTERNAL;
+< gchar *             _gimp_thumb_filename_from_uri     (const gchar    *uri) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL void                _gimp_thumbs_delete_others        (const gchar    *uri,
+>                                                        GimpThumbSize   size);
+> G_GNUC_INTERNAL gchar *             _gimp_thumb_filename_from_uri     (const gchar    *uri);
+93c93
+< void        _gimp_color_area_render_buf     (GtkWidget         *widget,
+---
+> G_GNUC_INTERNAL void        _gimp_color_area_render_buf     (GtkWidget         *widget,
+100c100
+<                                              GimpRGB           *color) G_GNUC_INTERNAL;
+---
+>                                              GimpRGB           *color);
+31c31
+< void  _gimp_help_init              (void) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL void  _gimp_help_init              (void);
+29,30c29,30
+< gint          _gimp_unit_cache_get_number_of_units          (void) G_GNUC_INTERNAL;
+< gint          _gimp_unit_cache_get_number_of_built_in_units (void) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL gint          _gimp_unit_cache_get_number_of_units          (void);
+> G_GNUC_INTERNAL gint          _gimp_unit_cache_get_number_of_built_in_units (void);
+32c32
+< GimpUnit      _gimp_unit_cache_new               (gchar   *identifier,
+---
+> G_GNUC_INTERNAL GimpUnit      _gimp_unit_cache_new               (gchar   *identifier,
+38,48c38,48
+<                                                   gchar   *plural) G_GNUC_INTERNAL;
+< gboolean      _gimp_unit_cache_get_deletion_flag (GimpUnit unit) G_GNUC_INTERNAL;
+< void          _gimp_unit_cache_set_deletion_flag (GimpUnit unit,
+<                                                   gboolean deletion_flag) G_GNUC_INTERNAL;
+< gdouble       _gimp_unit_cache_get_factor        (GimpUnit unit) G_GNUC_INTERNAL;
+< gint          _gimp_unit_cache_get_digits        (GimpUnit unit) G_GNUC_INTERNAL;
+< const gchar * _gimp_unit_cache_get_identifier    (GimpUnit unit) G_GNUC_INTERNAL;
+< const gchar * _gimp_unit_cache_get_symbol        (GimpUnit unit) G_GNUC_INTERNAL;
+< const gchar * _gimp_unit_cache_get_abbreviation  (GimpUnit unit) G_GNUC_INTERNAL;
+< const gchar * _gimp_unit_cache_get_singular      (GimpUnit unit) G_GNUC_INTERNAL;
+< const gchar * _gimp_unit_cache_get_plural        (GimpUnit unit) G_GNUC_INTERNAL;
+---
+>                                                   gchar   *plural);
+> G_GNUC_INTERNAL gboolean      _gimp_unit_cache_get_deletion_flag (GimpUnit unit);
+> G_GNUC_INTERNAL void          _gimp_unit_cache_set_deletion_flag (GimpUnit unit,
+>                                                   gboolean deletion_flag);
+> G_GNUC_INTERNAL gdouble       _gimp_unit_cache_get_factor        (GimpUnit unit);
+> G_GNUC_INTERNAL gint          _gimp_unit_cache_get_digits        (GimpUnit unit);
+> G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_identifier    (GimpUnit unit);
+> G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_symbol        (GimpUnit unit);
+> G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_abbreviation  (GimpUnit unit);
+> G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_singular      (GimpUnit unit);
+> G_GNUC_INTERNAL const gchar * _gimp_unit_cache_get_plural        (GimpUnit unit);
+32,34c32,34
+< gint     _gimp_unit_get_number_of_units          (void) G_GNUC_INTERNAL;
+< gint     _gimp_unit_get_number_of_built_in_units (void) G_GNUC_INTERNAL;
+< GimpUnit _gimp_unit_new                          (const gchar *identifier,
+---
+> G_GNUC_INTERNAL gint     _gimp_unit_get_number_of_units          (void);
+> G_GNUC_INTERNAL gint     _gimp_unit_get_number_of_built_in_units (void);
+> G_GNUC_INTERNAL GimpUnit _gimp_unit_new                          (const gchar *identifier,
+40,50c40,50
+<                                                   const gchar *plural) G_GNUC_INTERNAL;
+< gboolean _gimp_unit_get_deletion_flag            (GimpUnit     unit_id) G_GNUC_INTERNAL;
+< gboolean _gimp_unit_set_deletion_flag            (GimpUnit     unit_id,
+<                                                   gboolean     deletion_flag) G_GNUC_INTERNAL;
+< gchar*   _gimp_unit_get_identifier               (GimpUnit     unit_id) G_GNUC_INTERNAL;
+< gdouble  _gimp_unit_get_factor                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
+< gint     _gimp_unit_get_digits                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
+< gchar*   _gimp_unit_get_symbol                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
+< gchar*   _gimp_unit_get_abbreviation             (GimpUnit     unit_id) G_GNUC_INTERNAL;
+< gchar*   _gimp_unit_get_singular                 (GimpUnit     unit_id) G_GNUC_INTERNAL;
+< gchar*   _gimp_unit_get_plural                   (GimpUnit     unit_id) G_GNUC_INTERNAL;
+---
+>                                                   const gchar *plural);
+> G_GNUC_INTERNAL gboolean _gimp_unit_get_deletion_flag            (GimpUnit     unit_id);
+> G_GNUC_INTERNAL gboolean _gimp_unit_set_deletion_flag            (GimpUnit     unit_id,
+>                                                   gboolean     deletion_flag);
+> G_GNUC_INTERNAL gchar*   _gimp_unit_get_identifier               (GimpUnit     unit_id);
+> G_GNUC_INTERNAL gdouble  _gimp_unit_get_factor                   (GimpUnit     unit_id);
+> G_GNUC_INTERNAL gint     _gimp_unit_get_digits                   (GimpUnit     unit_id);
+> G_GNUC_INTERNAL gchar*   _gimp_unit_get_symbol                   (GimpUnit     unit_id);
+> G_GNUC_INTERNAL gchar*   _gimp_unit_get_abbreviation             (GimpUnit     unit_id);
+> G_GNUC_INTERNAL gchar*   _gimp_unit_get_singular                 (GimpUnit     unit_id);
+> G_GNUC_INTERNAL gchar*   _gimp_unit_get_plural                   (GimpUnit     unit_id);
+45c45
+< gint32   _gimp_selection_float      (gint32          drawable_ID,
+---
+> G_GNUC_INTERNAL gint32   _gimp_selection_float      (gint32          drawable_ID,
+47c47
+<                                      gint            offy) G_GNUC_INTERNAL;
+---
+>                                      gint            offy);
+98c98
+< gboolean      _gimp_drawable_thumbnail         (gint32                      drawable_ID,
+---
+> G_GNUC_INTERNAL gboolean      _gimp_drawable_thumbnail         (gint32                      drawable_ID,
+105,106c105,106
+<                                                 guint8                    **thumbnail_data) G_GNUC_INTERNAL;
+< gboolean      _gimp_drawable_sub_thumbnail     (gint32                      drawable_ID,
+---
+>                                                 guint8                    **thumbnail_data);
+> G_GNUC_INTERNAL gboolean      _gimp_drawable_sub_thumbnail     (gint32                      drawable_ID,
+117c117
+<                                                 guint8                    **thumbnail_data) G_GNUC_INTERNAL;
+---
+>                                                 guint8                    **thumbnail_data);
+72c72
+< void          _gimp_drawable_preview_area_draw_thumb  (GimpPreviewArea *area,
+---
+> G_GNUC_INTERNAL void          _gimp_drawable_preview_area_draw_thumb  (GimpPreviewArea *area,
+75,76c75,76
+<                                                        gint             height) G_GNUC_INTERNAL;
+< gboolean      _gimp_drawable_preview_get_bounds       (GimpDrawable    *drawable,
+---
+>                                                        gint             height);
+> G_GNUC_INTERNAL gboolean      _gimp_drawable_preview_get_bounds       (GimpDrawable    *drawable,
+80c80
+<                                                        gint            *ymax) G_GNUC_INTERNAL;
+---
+>                                                        gint            *ymax);
+39c39
+< gchar*   _gimp_get_color_configuration (void) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL gchar*   _gimp_get_color_configuration (void);
+32c32
+< gint32   _gimp_channel_new               (gint32           image_ID,
+---
+> G_GNUC_INTERNAL gint32   _gimp_channel_new               (gint32           image_ID,
+37c37
+<                                           const GimpRGB   *color) G_GNUC_INTERNAL;
+---
+>                                           const GimpRGB   *color);
+122,124c122,124
+< guint8*           _gimp_image_get_colormap            (gint32                image_ID,
+<                                                        gint                 *num_bytes) G_GNUC_INTERNAL;
+< gboolean          _gimp_image_set_colormap            (gint32                image_ID,
+---
+> G_GNUC_INTERNAL guint8*           _gimp_image_get_colormap            (gint32                image_ID,
+>                                                        gint                 *num_bytes);
+> G_GNUC_INTERNAL gboolean          _gimp_image_set_colormap            (gint32                image_ID,
+126c126
+<                                                        const guint8         *colormap) G_GNUC_INTERNAL;
+---
+>                                                        const guint8         *colormap);
+129c129
+< gboolean          _gimp_image_thumbnail               (gint32                image_ID,
+---
+> G_GNUC_INTERNAL gboolean          _gimp_image_thumbnail               (gint32                image_ID,
+136c136
+<                                                        guint8              **thumbnail_data) G_GNUC_INTERNAL;
+---
+>                                                        guint8              **thumbnail_data);
+32c32
+< gint32               _gimp_layer_new                 (gint32                image_ID,
+---
+> G_GNUC_INTERNAL gint32               _gimp_layer_new                 (gint32                image_ID,
+38c38
+<                                                       GimpLayerModeEffects  mode) G_GNUC_INTERNAL;
+---
+>                                                       GimpLayerModeEffects  mode);
+41,42c41,42
+< gint32               _gimp_layer_copy                (gint32                layer_ID,
+<                                                       gboolean              add_alpha) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL gint32               _gimp_layer_copy                (gint32                layer_ID,
+>                                                       gboolean              add_alpha);
+40c40
+< gboolean _gimp_plugin_icon_register       (const gchar  *procedure_name,
+---
+> G_GNUC_INTERNAL gboolean _gimp_plugin_icon_register       (const gchar  *procedure_name,
+43c43
+<                                            const guint8 *icon_data) G_GNUC_INTERNAL;
+---
+>                                            const guint8 *icon_data);
+43c43
+< gboolean _gimp_procedural_db_proc_info    (const gchar       *procedure_name,
+---
+> G_GNUC_INTERNAL gboolean _gimp_procedural_db_proc_info    (const gchar       *procedure_name,
+51c51
+<                                            gint              *num_values) G_GNUC_INTERNAL;
+---
+>                                            gint              *num_values);
+62c62
+< gboolean _gimp_procedural_db_get_data     (const gchar       *identifier,
+---
+> G_GNUC_INTERNAL gboolean _gimp_procedural_db_get_data     (const gchar       *identifier,
+64c64
+<                                            guint8           **data) G_GNUC_INTERNAL;
+---
+>                                            guint8           **data);
+66c66
+< gboolean _gimp_procedural_db_set_data     (const gchar       *identifier,
+---
+> G_GNUC_INTERNAL gboolean _gimp_procedural_db_set_data     (const gchar       *identifier,
+68c68
+<                                            const guint8      *data) G_GNUC_INTERNAL;
+---
+>                                            const guint8      *data);
+32,34c32,34
+< gboolean _gimp_progress_init             (const gchar *message,
+<                                           gint32       gdisplay_ID) G_GNUC_INTERNAL;
+< gboolean _gimp_progress_update           (gdouble      percentage) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL gboolean _gimp_progress_init             (const gchar *message,
+>                                           gint32       gdisplay_ID);
+> G_GNUC_INTERNAL gboolean _gimp_progress_update           (gdouble      percentage);
+38,39c38,39
+< gboolean _gimp_progress_install          (const gchar *progress_callback) G_GNUC_INTERNAL;
+< gboolean _gimp_progress_uninstall        (const gchar *progress_callback) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL gboolean _gimp_progress_install          (const gchar *progress_callback);
+> G_GNUC_INTERNAL gboolean _gimp_progress_uninstall        (const gchar *progress_callback);
+56c56
+< void    _gimp_tile_cache_flush_drawable (GimpDrawable *drawable) G_GNUC_INTERNAL;
+---
+> G_GNUC_INTERNAL void    _gimp_tile_cache_flush_drawable (GimpDrawable *drawable);