security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-09 21:28:51 +01:00
Code Activity
cf3cec982d
gnupg/build-aux/speedo/patches/atk-1.32.0.patch
Werner Koch e06d5d1a3b speedo: Revamped speedo and include a w32 installer. 
* build-aux/speedo/: New.
* build-aux/speedo/w32/: New.
--

The new installer uses some code from Gpg4win but is much smaller and
easier to maintain.  To build an installer, unpack GnuPG and then run

  make -f build-aux/speedo.mk  TARBALLS=~/mytarballs installer

~/mytarballs is a directory with tarballs of external libraries.  See
speedo.mk for a list of them.

WARNING: The installed W32 version does not correctly work right now.
2014-06-10 21:34:39 +02:00

672 lines
28 KiB
Diff
Executable File
Raw Blame History

#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
diff -urpb orig/atk-1.32.0/atk/atkaction.c atk/atk/atkaction.c
--- orig/atk-1.32.0/atk/atkaction.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkaction.c 2014-02-17 12:30:53.263192763 +0100
@@ -101,7 +101,7 @@ atk_action_get_n_actions (AtkAction *ob
* Returns a description string, or %NULL
* if @action does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_description (AtkAction *obj,
gint i)
{
@@ -140,7 +140,7 @@ atk_action_get_description (AtkAction *o
* Returns a name string, or %NULL
* if @action does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_name (AtkAction *obj,
gint i)
{
@@ -166,7 +166,7 @@ atk_action_get_name (AtkAction *obj,
* Returns a name string, or %NULL
* if @action does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_localized_name (AtkAction *obj,
gint i)
{
@@ -203,7 +203,7 @@ atk_action_get_localized_name (AtkAction
* if there is no keybinding for this action.
*
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_action_get_keybinding (AtkAction *obj,
gint i)
{
Only in atk/atk: atkaction.c~
diff -urpb orig/atk-1.32.0/atk/atkaction.h atk/atk/atkaction.h
--- orig/atk-1.32.0/atk/atkaction.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkaction.h 2014-02-17 12:30:58.907192071 +0100
@@ -55,16 +55,16 @@ struct _AtkActionIface
gboolean (*do_action) (AtkAction *action,
gint i);
gint (*get_n_actions) (AtkAction *action);
- G_CONST_RETURN gchar* (*get_description) (AtkAction *action,
+ const gchar* (*get_description) (AtkAction *action,
gint i);
- G_CONST_RETURN gchar* (*get_name) (AtkAction *action,
+ const gchar* (*get_name) (AtkAction *action,
gint i);
- G_CONST_RETURN gchar* (*get_keybinding) (AtkAction *action,
+ const gchar* (*get_keybinding) (AtkAction *action,
gint i);
gboolean (*set_description) (AtkAction *action,
gint i,
const gchar *desc);
- G_CONST_RETURN gchar* (*get_localized_name)(AtkAction *action,
+ const gchar* (*get_localized_name)(AtkAction *action,
gint i);
AtkFunction pad2;
};
@@ -85,11 +85,11 @@ GType atk_action_get_type (void);
gboolean atk_action_do_action (AtkAction *action,
gint i);
gint atk_action_get_n_actions (AtkAction *action);
-G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action,
+const gchar* atk_action_get_description (AtkAction *action,
gint i);
-G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action,
+const gchar* atk_action_get_name (AtkAction *action,
gint i);
-G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action,
+const gchar* atk_action_get_keybinding (AtkAction *action,
gint i);
gboolean atk_action_set_description (AtkAction *action,
gint i,
@@ -97,7 +97,7 @@ gboolean atk_action_set_des
/* NEW in ATK 1.1: */
-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action,
+const gchar* atk_action_get_localized_name (AtkAction *action,
gint i);
/*
Only in atk/atk: atkaction.h~
diff -urpb orig/atk-1.32.0/atk/atkdocument.c atk/atk/atkdocument.c
--- orig/atk-1.32.0/atk/atkdocument.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkdocument.c 2014-02-17 12:30:58.535192391 +0100
@@ -93,7 +93,7 @@ atk_document_base_init (AtkDocumentIface
*
* Returns: a string indicating the document type
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_document_get_document_type (AtkDocument *document)
{
AtkDocumentIface *iface;
@@ -155,7 +155,7 @@ atk_document_get_document (AtkDocument *
* locale of the document content as a whole, or NULL if
* the document content does not specify a locale.
**/
-G_CONST_RETURN gchar *
+const gchar *
atk_document_get_locale (AtkDocument *document)
{
AtkDocumentIface *iface;
@@ -219,7 +219,7 @@ atk_document_get_attributes (AtkDocument
* document, or NULL if a value for #attribute_name has not been specified
* for this document.
*/
-G_CONST_RETURN gchar *
+const gchar *
atk_document_get_attribute_value (AtkDocument *document,
const gchar *attribute_name)
{
Only in atk/atk: atkdocument.c~
diff -urpb orig/atk-1.32.0/atk/atkdocument.h atk/atk/atkdocument.h
--- orig/atk-1.32.0/atk/atkdocument.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkdocument.h 2014-02-17 12:31:31.691190631 +0100
@@ -49,12 +49,12 @@ typedef struct _AtkDocumentIface AtkDocu
struct _AtkDocumentIface
{
GTypeInterface parent;
- G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument *document);
+ const gchar* ( *get_document_type) (AtkDocument *document);
gpointer ( *get_document) (AtkDocument *document);
- G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument *document);
+ const gchar* ( *get_document_locale) (AtkDocument *document);
AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document);
- G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument *document,
+ const gchar* ( *get_document_attribute_value) (AtkDocument *document,
const gchar *attribute_name);
gboolean ( *set_document_attribute) (AtkDocument *document,
const gchar *attribute_name,
@@ -68,11 +68,11 @@ struct _AtkDocumentIface
GType atk_document_get_type (void);
-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument *document);
+const gchar* atk_document_get_document_type (AtkDocument *document);
gpointer atk_document_get_document (AtkDocument *document);
-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
+const gchar* atk_document_get_locale (AtkDocument *document);
AtkAttributeSet* atk_document_get_attributes (AtkDocument *document);
-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document,
+const gchar* atk_document_get_attribute_value (AtkDocument *document,
const gchar *attribute_name);
gboolean atk_document_set_attribute_value (AtkDocument *document,
const gchar *attribute_name,
Only in atk/atk: atkdocument.h~
diff -urpb orig/atk-1.32.0/atk/atkimage.c atk/atk/atkimage.c
--- orig/atk-1.32.0/atk/atkimage.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkimage.c 2014-02-17 12:30:58.119192299 +0100
@@ -46,7 +46,7 @@ atk_image_get_type (void)
*
* Returns: a string representing the image description
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_image_get_image_description (AtkImage *image)
{
AtkImageIface *iface;
@@ -192,7 +192,7 @@ atk_image_get_image_position (AtkImage *
* Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale.
*
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_image_get_image_locale (AtkImage *image)
{
Only in atk/atk: atkimage.c~
diff -urpb orig/atk-1.32.0/atk/atkimage.h atk/atk/atkimage.h
--- orig/atk-1.32.0/atk/atkimage.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkimage.h 2014-02-17 12:28:31.599200223 +0100
@@ -53,13 +53,13 @@ struct _AtkImageIface
gint *x,
gint *y,
AtkCoordType coord_type);
- G_CONST_RETURN gchar* ( *get_image_description) (AtkImage *image);
+ const gchar* ( *get_image_description) (AtkImage *image);
void ( *get_image_size) (AtkImage *image,
gint *width,
gint *height);
gboolean ( *set_image_description) (AtkImage *image,
const gchar *description);
- G_CONST_RETURN gchar* ( *get_image_locale) (AtkImage *image);
+ const gchar* ( *get_image_locale) (AtkImage *image);
AtkFunction pad1;
@@ -67,7 +67,7 @@ struct _AtkImageIface
GType atk_image_get_type (void);
-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage *image);
+const gchar* atk_image_get_image_description (AtkImage *image);
void atk_image_get_image_size (AtkImage *image,
gint *width,
@@ -80,7 +80,7 @@ void atk_image_get_image_position
gint *y,
AtkCoordType coord_type);
-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage *image);
+const gchar* atk_image_get_image_locale (AtkImage *image);
G_END_DECLS
Only in atk/atk: atkimage.h~
diff -urpb orig/atk-1.32.0/atk/atkobject.c atk/atk/atkobject.c
--- orig/atk-1.32.0/atk/atkobject.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkobject.c 2014-02-17 12:28:39.467199803 +0100
@@ -285,9 +285,9 @@ static void atk_object_real_g
GValue *value,
GParamSpec *pspec);
static void atk_object_finalize (GObject *object);
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_name (AtkObject *object);
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_description
(AtkObject *object);
static AtkObject* atk_object_real_get_parent (AtkObject *object);
@@ -692,7 +692,7 @@ atk_implementor_get_type (void)
*
* Returns: a character string representing the accessible name of the object.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_object_get_name (AtkObject *accessible)
{
AtkObjectClass *klass;
@@ -716,7 +716,7 @@ atk_object_get_name (AtkObject *accessib
* of the accessible.
*
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_object_get_description (AtkObject *accessible)
{
AtkObjectClass *klass;
@@ -1123,7 +1123,7 @@ atk_object_notify_state_change (AtkObjec
AtkState state,
gboolean value)
{
- G_CONST_RETURN gchar* name;
+ const gchar* name;
g_return_if_fail (ATK_IS_OBJECT (accessible));
@@ -1319,13 +1319,13 @@ atk_object_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_name (AtkObject *object)
{
return object->name;
}
-static G_CONST_RETURN gchar*
+static const gchar*
atk_object_real_get_description (AtkObject *object)
{
return object->description;
@@ -1487,7 +1487,7 @@ atk_object_notify (GObject *obj,
*
* Returns: the string describing the AtkRole
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_role_get_name (AtkRole role)
{
if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
@@ -1514,7 +1514,7 @@ atk_role_get_name (AtkRole role)
*
* Returns: the localized string describing the AtkRole
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_role_get_localized_name (AtkRole role)
{
gettext_initialization ();
Only in atk/atk: atkobject.c~
diff -urpb orig/atk-1.32.0/atk/atkobject.h atk/atk/atkobject.h
--- orig/atk-1.32.0/atk/atkobject.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkobject.h 2014-02-17 12:28:48.851199302 +0100
@@ -381,11 +381,11 @@ struct _AtkObjectClass
/*
* Gets the accessible name of the object
*/
- G_CONST_RETURN gchar* (* get_name) (AtkObject *accessible);
+ const gchar* (* get_name) (AtkObject *accessible);
/*
* Gets the accessible description of the object
*/
- G_CONST_RETURN gchar* (* get_description) (AtkObject *accessible);
+ const gchar* (* get_description) (AtkObject *accessible);
/*
* Gets the accessible parent of the object
*/
@@ -535,8 +535,8 @@ AtkObject* atk_implementor_
* Properties directly supported by AtkObject
*/
-G_CONST_RETURN gchar* atk_object_get_name (AtkObject *accessible);
-G_CONST_RETURN gchar* atk_object_get_description (AtkObject *accessible);
+const gchar* atk_object_get_name (AtkObject *accessible);
+const gchar* atk_object_get_description (AtkObject *accessible);
AtkObject* atk_object_get_parent (AtkObject *accessible);
gint atk_object_get_n_accessible_children (AtkObject *accessible);
AtkObject* atk_object_ref_accessible_child (AtkObject *accessible,
@@ -571,7 +571,7 @@ void atk_object_notify_s
void atk_object_initialize (AtkObject *accessible,
gpointer data);
-G_CONST_RETURN gchar* atk_role_get_name (AtkRole role);
+const gchar* atk_role_get_name (AtkRole role);
AtkRole atk_role_for_name (const gchar *name);
@@ -582,7 +582,7 @@ gboolean atk_object_add_rel
gboolean atk_object_remove_relationship (AtkObject *object,
AtkRelationType relationship,
AtkObject *target);
-G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role);
+const gchar* atk_role_get_localized_name (AtkRole role);
/* */
Only in atk/atk: atkobject.h~
diff -urpb orig/atk-1.32.0/atk/atkrelation.c atk/atk/atkrelation.c
--- orig/atk-1.32.0/atk/atkrelation.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkrelation.c 2014-02-17 12:29:04.307198532 +0100
@@ -130,7 +130,7 @@ atk_relation_type_register (const gchar
*
* Returns: the string describing the AtkRelationType
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_relation_type_get_name (AtkRelationType type)
{
GTypeClass *type_class;
Only in atk/atk: atkrelation.c~
diff -urpb orig/atk-1.32.0/atk/atkrelation.h atk/atk/atkrelation.h
--- orig/atk-1.32.0/atk/atkrelation.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkrelation.h 2014-02-17 12:29:12.167198142 +0100
@@ -61,7 +61,7 @@ struct _AtkRelationClass
GType atk_relation_get_type (void);
AtkRelationType atk_relation_type_register (const gchar *name);
-G_CONST_RETURN gchar* atk_relation_type_get_name (AtkRelationType type);
+const gchar* atk_relation_type_get_name (AtkRelationType type);
AtkRelationType atk_relation_type_for_name (const gchar *name);
/*
Only in atk/atk: atkrelation.h~
diff -urpb orig/atk-1.32.0/atk/atkstate.c atk/atk/atkstate.c
--- orig/atk-1.32.0/atk/atkstate.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstate.c 2014-02-17 12:29:19.023197754 +0100
@@ -57,7 +57,7 @@ atk_state_type_register (const gchar *na
*
* Returns: the string describing the AtkStateType
*/
-G_CONST_RETURN gchar*
+const gchar*
atk_state_type_get_name (AtkStateType type)
{
GTypeClass *type_class;
Only in atk/atk: atkstate.c~
diff -urpb orig/atk-1.32.0/atk/atkstate.h atk/atk/atkstate.h
--- orig/atk-1.32.0/atk/atkstate.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstate.h 2014-02-17 12:26:44.459205944 +0100
@@ -170,7 +170,7 @@ typedef guint64 AtkState;
AtkStateType atk_state_type_register (const gchar *name);
-G_CONST_RETURN gchar* atk_state_type_get_name (AtkStateType type);
+const gchar* atk_state_type_get_name (AtkStateType type);
AtkStateType atk_state_type_for_name (const gchar *name);
G_END_DECLS
Only in atk/atk: atkstate.h~
diff -urpb orig/atk-1.32.0/atk/atkstreamablecontent.c atk/atk/atkstreamablecontent.c
--- orig/atk-1.32.0/atk/atkstreamablecontent.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstreamablecontent.c 2014-02-17 12:30:57.659192412 +0100
@@ -73,7 +73,7 @@ atk_streamable_content_get_n_mime_types
* Returns : a gchar* representing the specified mime type; the caller
* should not free the character string.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
gint i)
{
Only in atk/atk: atkstreamablecontent.c~
diff -urpb orig/atk-1.32.0/atk/atkstreamablecontent.h atk/atk/atkstreamablecontent.h
--- orig/atk-1.32.0/atk/atkstreamablecontent.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkstreamablecontent.h 2014-02-17 12:29:49.487196042 +0100
@@ -54,11 +54,11 @@ struct _AtkStreamableContentIface
* at index 0 should be considered the "default" data type for the stream.
*
* This assumes that the strings for the mime types are stored in the
- * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
+ * AtkStreamableContent. Alternatively the const could be removed
* and the caller would be responsible for calling g_free() on the
* returned value.
*/
- G_CONST_RETURN gchar* (* get_mime_type) (AtkStreamableContent *streamable,
+ const gchar* (* get_mime_type) (AtkStreamableContent *streamable,
gint i);
/*
* One possible implementation for this method is that it constructs the
@@ -80,7 +80,7 @@ struct _AtkStreamableContentIface
* constructed. Note that it is possible for get_uri to return NULL but for
* get_stream to work nonetheless, since not all GIOChannels connect to URIs.
*/
- G_CONST_RETURN gchar* (* get_uri) (AtkStreamableContent *streamable,
+ const gchar* (* get_uri) (AtkStreamableContent *streamable,
const gchar *mime_type);
@@ -92,7 +92,7 @@ GType atk_streamable_co
gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
-G_CONST_RETURN gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
gint i);
GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable,
const gchar *mime_type);
Only in atk/atk: atkstreamablecontent.h~
diff -urpb orig/atk-1.32.0/atk/atktable.c atk/atk/atktable.c
--- orig/atk-1.32.0/atk/atktable.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atktable.c 2014-02-17 12:30:57.319192444 +0100
@@ -300,7 +300,7 @@ atk_table_get_n_columns (AtkTable *table
* Returns: a gchar* representing the column description, or %NULL
* if value does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_column_description (AtkTable *table,
gint column)
{
@@ -404,7 +404,7 @@ atk_table_get_n_rows (AtkTable *table)
* Returns: a gchar* representing the row description, or %NULL
* if value does not implement this interface.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_row_description (AtkTable *table,
gint row)
{
Only in atk/atk: atktable.c~
diff -urpb orig/atk-1.32.0/atk/atktable.h atk/atk/atktable.h
--- orig/atk-1.32.0/atk/atktable.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atktable.h 2014-02-17 12:30:08.035195073 +0100
@@ -69,12 +69,12 @@ struct _AtkTableIface
gint column);
AtkObject*
(* get_caption) (AtkTable *table);
- G_CONST_RETURN gchar*
+ const gchar*
(* get_column_description) (AtkTable *table,
gint column);
AtkObject* (* get_column_header) (AtkTable *table,
gint column);
- G_CONST_RETURN gchar*
+ const gchar*
(* get_row_description) (AtkTable *table,
gint row);
AtkObject* (* get_row_header) (AtkTable *table,
@@ -163,12 +163,12 @@ gint atk_table_get_row_exte
gint column);
AtkObject*
atk_table_get_caption (AtkTable *table);
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_column_description (AtkTable *table,
gint column);
AtkObject* atk_table_get_column_header (AtkTable *table,
gint column);
-G_CONST_RETURN gchar*
+const gchar*
atk_table_get_row_description (AtkTable *table,
gint row);
AtkObject* atk_table_get_row_header (AtkTable *table,
Only in atk/atk: atktable.h~
diff -urpb orig/atk-1.32.0/atk/atktext.c atk/atk/atktext.c
--- orig/atk-1.32.0/atk/atktext.c 2010-09-27 09:07:09.000000000 +0200
+++ atk/atk/atktext.c 2014-02-17 12:30:56.871192495 +0100
@@ -1054,7 +1054,7 @@ atk_text_attribute_register (const gchar
*
* Returns: a string containing the name; this string should not be freed
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_text_attribute_get_name (AtkTextAttribute attr)
{
GTypeClass *type_class;
@@ -1150,7 +1150,7 @@ atk_text_attribute_for_name (const gchar
* Returns: a string containing the value; this string should not be freed;
* NULL is returned if there are no values maintained for the attr value.
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_text_attribute_get_value (AtkTextAttribute attr,
gint index)
{
Only in atk/atk: atktext.c~
diff -urpb orig/atk-1.32.0/atk/atktext.h atk/atk/atktext.h
--- orig/atk-1.32.0/atk/atktext.h 2010-09-27 09:07:09.000000000 +0200
+++ atk/atk/atktext.h 2014-02-17 12:30:56.475192626 +0100
@@ -355,9 +355,9 @@ AtkTextRange** atk_text_get_bounded_ran
AtkTextClipType y_clip_type);
void atk_text_free_ranges (AtkTextRange **ranges);
void atk_attribute_set_free (AtkAttributeSet *attrib_set);
-G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
+const gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
AtkTextAttribute atk_text_attribute_for_name (const gchar *name);
-G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
+const gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
gint index_);
G_END_DECLS
Only in atk/atk: atktext.h~
diff -urpb orig/atk-1.32.0/atk/atkutil.c atk/atk/atkutil.c
--- orig/atk-1.32.0/atk/atkutil.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkutil.c 2014-02-17 12:30:33.651193705 +0100
@@ -340,7 +340,7 @@ atk_get_focus_object (void)
*
* Returns: name string for the GUI toolkit implementing ATK for this application
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_get_toolkit_name (void)
{
const gchar *retval;
@@ -365,7 +365,7 @@ atk_get_toolkit_name (void)
*
* Returns: version string for the GUI toolkit implementing ATK for this application
**/
-G_CONST_RETURN gchar*
+const gchar*
atk_get_toolkit_version (void)
{
const gchar *retval;
@@ -391,7 +391,7 @@ atk_get_toolkit_version (void)
* Returns: version string for ATK
**/
-G_CONST_RETURN gchar *
+const gchar *
atk_get_version (void)
{
return VERSION;
Only in atk/atk: atkutil.c~
diff -urpb orig/atk-1.32.0/atk/atkutil.h atk/atk/atkutil.h
--- orig/atk-1.32.0/atk/atkutil.h 2010-09-06 08:45:45.000000000 +0200
+++ atk/atk/atkutil.h 2014-02-17 12:30:40.635193333 +0100
@@ -147,8 +147,8 @@ struct _AtkUtilClass
gpointer data);
void (* remove_key_event_listener) (guint listener_id);
AtkObject* (* get_root) (void);
- G_CONST_RETURN gchar* (* get_toolkit_name) (void);
- G_CONST_RETURN gchar* (* get_toolkit_version) (void);
+ const gchar* (* get_toolkit_name) (void);
+ const gchar* (* get_toolkit_version) (void);
};
GType atk_util_get_type (void);
@@ -229,17 +229,17 @@ AtkObject* atk_get_focus_object (void);
/*
* Returns name string for the GUI toolkit.
*/
-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
+const gchar *atk_get_toolkit_name (void);
/*
* Returns version string for the GUI toolkit.
*/
-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
+const gchar *atk_get_toolkit_version (void);
/*
* Gets the current version of ATK
*/
-G_CONST_RETURN gchar *atk_get_version (void);
+const gchar *atk_get_version (void);
/* --- GType boilerplate --- */
/* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
Only in atk/atk: atkutil.h~
diff -urpb orig/atk-1.32.0/tests/testrelation.c atk/tests/testrelation.c
--- orig/atk-1.32.0/tests/testrelation.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/tests/testrelation.c 2014-02-17 12:53:42.095119569 +0100
@@ -28,7 +28,7 @@ static gboolean
test_relation (void)
{
AtkRelationType type1, type2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
AtkObject *obj;
gboolean ret_value;
AtkRelationSet *set;
@@ -169,7 +169,7 @@ static gboolean
test_role (void)
{
AtkRole role1, role2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
g_return_val_if_fail (name, FALSE);
@@ -230,7 +230,7 @@ static gboolean
test_text_attr (void)
{
AtkTextAttribute attr1, attr2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
g_return_val_if_fail (name, FALSE);
Only in atk/tests/: testrelation.c~
diff -urpb orig/atk-1.32.0/tests/teststateset.c atk/tests/teststateset.c
--- orig/atk-1.32.0/tests/teststateset.c 2010-09-06 08:45:45.000000000 +0200
+++ atk/tests/teststateset.c 2014-02-17 12:53:55.675118832 +0100
@@ -208,7 +208,7 @@ static gboolean
test_state (void)
{
AtkStateType type1, type2;
- G_CONST_RETURN gchar *name;
+ const gchar *name;
name = atk_state_type_get_name (ATK_STATE_VISIBLE);
g_return_val_if_fail (name, FALSE);
--- orig/atk-1.32.0/atk/Makefile.in 2010-09-27 09:53:57.000000000 +0200
+++ atk/atk/Makefile.in 2014-02-17 12:52:40.443122866 +0100
@@ -40,7 +40,7 @@ host_triplet = @host@
@HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelibs_DATA)
# ---------- Win32 stuff ----------
-@OS_WIN32_TRUE@am__append_3 = -export-symbols $(srcdir)/atk.def -no-undefined -Wl,atk-win32-res.o
+@OS_WIN32_TRUE@am__append_3 = -export-symbols atk.def -no-undefined -Wl,atk-win32-res.o
@OS_WIN32_FALSE@libatk_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@OS_WIN32_FALSE@ $(am__DEPENDENCIES_1)
subdir = atk
@@ -861,7 +861,7 @@ s-enum-types-c: @REBUILD@ $(atk_headers)
@HAVE_INTROSPECTION_TRUE@Atk-1.0.gir: libatk-1.0.la Makefile
@OS_WIN32_TRUE@install-def-file:
-@OS_WIN32_TRUE@ $(INSTALL) $(srcdir)/atk.def $(DESTDIR)$(libdir)/atk-1.0.def
+@OS_WIN32_TRUE@ $(INSTALL) atk.def $(DESTDIR)$(libdir)/atk-1.0.def
@OS_WIN32_TRUE@uninstall-def-file:
@OS_WIN32_TRUE@ -rm $(DESTDIR)$(libdir)/atk-1.0.def
@OS_WIN32_FALSE@install-def-file:
View Git Blame Copy Permalink