diff options
22 files changed, 989 insertions, 13 deletions
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index c335af06b..5cc7dca1b 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -8,7 +8,7 @@ config BR2_TARGET_BAREBOX if BR2_TARGET_BAREBOX choice prompt "version" - default BR2_TARGET_BAREBOX_2012_02 + default BR2_TARGET_BAREBOX_2012_03 help Select the specific Barebox version you want to use @@ -22,6 +22,9 @@ config BR2_TARGET_BAREBOX_2012_01 config BR2_TARGET_BAREBOX_2012_02 bool "2012.02" +config BR2_TARGET_BAREBOX_2012_03 + bool "2012.03" + config BR2_TARGET_BAREBOX_CUSTOM_TARBALL bool "Custom tarball" @@ -42,6 +45,7 @@ config BR2_TARGET_BAREBOX_VERSION default "2011.12.0" if BR2_TARGET_BAREBOX_2011_12 default "2012.01.0" if BR2_TARGET_BAREBOX_2012_01 default "2012.02.0" if BR2_TARGET_BAREBOX_2012_02 + default "2012.03.0" if BR2_TARGET_BAREBOX_2012_02 default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default $BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig index de7ac42f6..3cd58ac7e 100644 --- a/configs/at91sam9260dfc_defconfig +++ b/configs/at91sam9260dfc_defconfig @@ -15,7 +15,7 @@ BR2_TARGET_UBOOT_2011_12=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260ek" +BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260" # Filesystem BR2_TARGET_ROOTFS_TAR=y diff --git a/package/Makefile.package.in b/package/Makefile.package.in index ea44c6cef..59adce1b0 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -235,10 +235,14 @@ define SHOW_EXTERNAL_DEPS_HG echo $($(PKG)_SOURCE) endef - +# Download a file using wget. Only download the file if it doesn't +# already exist in the download directory. If the download fails, +# remove the file (because wget -O creates a 0-byte file even if the +# download fails). define DOWNLOAD_WGET test -e $(DL_DIR)/$(2) || \ - $(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2) + $(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2) || \ + (rm -f $(DL_DIR)/$(2) ; exit 1) endef define SOURCE_CHECK_WGET diff --git a/package/atk/atk-glib-fix.patch b/package/atk/atk-glib-fix.patch new file mode 100644 index 000000000..3cbb47b07 --- /dev/null +++ b/package/atk/atk-glib-fix.patch @@ -0,0 +1,681 @@ +[PATCH] Fix build with modern glib versions + +G_CONST_RETURN is deprecated, so replace with 'const' instead. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + atk/atkaction.c | 8 ++++---- + atk/atkaction.h | 16 ++++++++-------- + atk/atkdocument.c | 6 +++--- + atk/atkdocument.h | 12 ++++++------ + atk/atkimage.c | 4 ++-- + atk/atkimage.h | 8 ++++---- + atk/atkobject.c | 18 +++++++++--------- + atk/atkobject.h | 12 ++++++------ + atk/atkrelation.c | 2 +- + atk/atkrelation.h | 2 +- + atk/atkstate.c | 2 +- + atk/atkstate.h | 2 +- + atk/atkstreamablecontent.c | 2 +- + atk/atkstreamablecontent.h | 10 +++++----- + atk/atktable.c | 4 ++-- + atk/atktable.h | 8 ++++---- + atk/atktext.c | 4 ++-- + atk/atktext.h | 4 ++-- + atk/atkutil.c | 6 +++--- + atk/atkutil.h | 10 +++++----- + tests/testrelation.c | 6 +++--- + tests/teststateset.c | 2 +- + 22 files changed, 74 insertions(+), 74 deletions(-) + +Index: atk-1.33.6/atk/atkaction.c +=================================================================== +--- atk-1.33.6.orig/atk/atkaction.c ++++ atk-1.33.6/atk/atkaction.c +@@ -101,7 +101,7 @@ + * 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 @@ + * 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 @@ + * 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 @@ + * if there is no keybinding for this action. + * + **/ +-G_CONST_RETURN gchar* ++const gchar* + atk_action_get_keybinding (AtkAction *obj, + gint i) + { +Index: atk-1.33.6/atk/atkaction.h +=================================================================== +--- atk-1.33.6.orig/atk/atkaction.h ++++ atk-1.33.6/atk/atkaction.h +@@ -55,16 +55,16 @@ + 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 @@ + 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 @@ + + /* 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); + + /* +Index: atk-1.33.6/atk/atkdocument.c +=================================================================== +--- atk-1.33.6.orig/atk/atkdocument.c ++++ atk-1.33.6/atk/atkdocument.c +@@ -93,7 +93,7 @@ + * + * 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 @@ + * 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 @@ + * 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) + { +Index: atk-1.33.6/atk/atkdocument.h +=================================================================== +--- atk-1.33.6.orig/atk/atkdocument.h ++++ atk-1.33.6/atk/atkdocument.h +@@ -49,12 +49,12 @@ + 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 @@ + + 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, +Index: atk-1.33.6/atk/atkimage.c +=================================================================== +--- atk-1.33.6.orig/atk/atkimage.c ++++ atk-1.33.6/atk/atkimage.c +@@ -46,7 +46,7 @@ + * + * 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 @@ + * 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) + { + +Index: atk-1.33.6/atk/atkimage.h +=================================================================== +--- atk-1.33.6.orig/atk/atkimage.h ++++ atk-1.33.6/atk/atkimage.h +@@ -53,13 +53,13 @@ + 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 @@ + + 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 @@ + 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 + +Index: atk-1.33.6/atk/atkobject.c +=================================================================== +--- atk-1.33.6.orig/atk/atkobject.c ++++ atk-1.33.6/atk/atkobject.c +@@ -285,9 +285,9 @@ + 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 @@ + * + * 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 @@ + * of the accessible. + * + **/ +-G_CONST_RETURN gchar* ++const gchar* + atk_object_get_description (AtkObject *accessible) + { + AtkObjectClass *klass; +@@ -1125,7 +1125,7 @@ + AtkState state, + gboolean value) + { +- G_CONST_RETURN gchar* name; ++ const gchar* name; + + g_return_if_fail (ATK_IS_OBJECT (accessible)); + +@@ -1323,13 +1323,13 @@ + 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; +@@ -1491,7 +1491,7 @@ + * + * 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) +@@ -1518,7 +1518,7 @@ + * + * Returns: the localized string describing the AtkRole + **/ +-G_CONST_RETURN gchar* ++const gchar* + atk_role_get_localized_name (AtkRole role) + { + gettext_initialization (); +Index: atk-1.33.6/atk/atkobject.h +=================================================================== +--- atk-1.33.6.orig/atk/atkobject.h ++++ atk-1.33.6/atk/atkobject.h +@@ -381,11 +381,11 @@ + /* + * 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 @@ + * 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_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_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); + + /* */ + +Index: atk-1.33.6/atk/atkrelation.c +=================================================================== +--- atk-1.33.6.orig/atk/atkrelation.c ++++ atk-1.33.6/atk/atkrelation.c +@@ -130,7 +130,7 @@ + * + * Returns: the string describing the AtkRelationType + */ +-G_CONST_RETURN gchar* ++const gchar* + atk_relation_type_get_name (AtkRelationType type) + { + GTypeClass *type_class; +Index: atk-1.33.6/atk/atkrelation.h +=================================================================== +--- atk-1.33.6.orig/atk/atkrelation.h ++++ atk-1.33.6/atk/atkrelation.h +@@ -61,7 +61,7 @@ + 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); + + /* +Index: atk-1.33.6/atk/atkstate.c +=================================================================== +--- atk-1.33.6.orig/atk/atkstate.c ++++ atk-1.33.6/atk/atkstate.c +@@ -57,7 +57,7 @@ + * + * Returns: the string describing the AtkStateType + */ +-G_CONST_RETURN gchar* ++const gchar* + atk_state_type_get_name (AtkStateType type) + { + GTypeClass *type_class; +Index: atk-1.33.6/atk/atkstate.h +=================================================================== +--- atk-1.33.6.orig/atk/atkstate.h ++++ atk-1.33.6/atk/atkstate.h +@@ -170,7 +170,7 @@ + + 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 +Index: atk-1.33.6/atk/atkstreamablecontent.c +=================================================================== +--- atk-1.33.6.orig/atk/atkstreamablecontent.c ++++ atk-1.33.6/atk/atkstreamablecontent.c +@@ -73,7 +73,7 @@ + * 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) + { +Index: atk-1.33.6/atk/atkstreamablecontent.h +=================================================================== +--- atk-1.33.6.orig/atk/atkstreamablecontent.h ++++ atk-1.33.6/atk/atkstreamablecontent.h +@@ -54,11 +54,11 @@ + * 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 @@ + * 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,12 +92,12 @@ + + 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); + +-G_CONST_RETURN gchar* atk_streamable_content_get_uri (AtkStreamableContent *streamable, ++const gchar* atk_streamable_content_get_uri (AtkStreamableContent *streamable, + const gchar *mime_type); + + G_END_DECLS +Index: atk-1.33.6/atk/atktable.c +=================================================================== +--- atk-1.33.6.orig/atk/atktable.c ++++ atk-1.33.6/atk/atktable.c +@@ -301,7 +301,7 @@ + * 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) + { +@@ -405,7 +405,7 @@ + * 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) + { +Index: atk-1.33.6/atk/atktable.h +=================================================================== +--- atk-1.33.6.orig/atk/atktable.h ++++ atk-1.33.6/atk/atktable.h +@@ -69,12 +69,12 @@ + 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 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, +Index: atk-1.33.6/atk/atktext.c +=================================================================== +--- atk-1.33.6.orig/atk/atktext.c ++++ atk-1.33.6/atk/atktext.c +@@ -1054,7 +1054,7 @@ + * + * 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 @@ + * 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) + { +Index: atk-1.33.6/atk/atktext.h +=================================================================== +--- atk-1.33.6.orig/atk/atktext.h ++++ atk-1.33.6/atk/atktext.h +@@ -355,9 +355,9 @@ + 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 +Index: atk-1.33.6/atk/atkutil.c +=================================================================== +--- atk-1.33.6.orig/atk/atkutil.c ++++ atk-1.33.6/atk/atkutil.c +@@ -342,7 +342,7 @@ + * + * 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; +@@ -367,7 +367,7 @@ + * + * 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; +@@ -394,7 +394,7 @@ + * + * Since: 1.20 + */ +-G_CONST_RETURN gchar * ++const gchar * + atk_get_version (void) + { + return VERSION; +Index: atk-1.33.6/atk/atkutil.h +=================================================================== +--- atk-1.33.6.orig/atk/atkutil.h ++++ atk-1.33.6/atk/atkutil.h +@@ -147,8 +147,8 @@ + 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 @@ + /* + * 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: +Index: atk-1.33.6/tests/testrelation.c +=================================================================== +--- atk-1.33.6.orig/tests/testrelation.c ++++ atk-1.33.6/tests/testrelation.c +@@ -28,7 +28,7 @@ + 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 @@ + 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 @@ + 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); +Index: atk-1.33.6/tests/teststateset.c +=================================================================== +--- atk-1.33.6.orig/tests/teststateset.c ++++ atk-1.33.6/tests/teststateset.c +@@ -208,7 +208,7 @@ + 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); diff --git a/package/expat/expat-2.0.1-CVE-2009-3560.patch b/package/expat/expat-2.0.1-CVE-2009-3560.patch new file mode 100644 index 000000000..7cadc47b0 --- /dev/null +++ b/package/expat/expat-2.0.1-CVE-2009-3560.patch @@ -0,0 +1,14 @@ +http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560 + +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser, + return XML_ERROR_UNCLOSED_TOKEN; + case XML_TOK_PARTIAL_CHAR: + return XML_ERROR_PARTIAL_CHAR; ++ case -XML_TOK_PROLOG_S: ++ tok = -tok; ++ break; + case XML_TOK_NONE: + #ifdef XML_DTD + /* for internal PE NOT referenced between declarations */ diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index b1ad62110..47415d85d 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -16,7 +16,9 @@ GLIB_NETWORKING_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libin ifeq ($(BR2_PACKAGE_GNUTLS),y) GLIB_NETWORKING_DEPENDENCIES += gnutls -GLIB_NETWORKING_CONF_OPT = --with-libgcrypt-prefix=$(STAGING_DIR)/usr +GLIB_NETWORKING_CONF_OPT += --with-libgcrypt-prefix=$(STAGING_DIR)/usr +else +GLIB_NETWORKING_CONF_OPT += --without-gnutls endif $(eval $(call AUTOTARGETS)) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index d387abdd9..16635dc0d 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_GPSD making all data on the location/course/velocity of the sensors available to be queried on TCP port 2947 of the host computer. + The D-Bus interface is included if dbus-glib is enabled. + http://gpsd.berlios.de/ config BR2_PACKAGE_GPSD_DEVICES diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index be6daeb8a..94f39aaa6 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -30,9 +30,9 @@ ifeq ($(BR2_PACKAGE_LIBUSB),y) GPSD_DEPENDENCIES += libusb endif -ifeq ($(strip $(BR2_PACKAGE_DBUS)),y) +ifeq ($(BR2_PACKAGE_DBUS_GLIB),y) GPSD_CONF_OPT += --enable-dbus - GPSD_DEPENDENCIES += dbus dbus-glib + GPSD_DEPENDENCIES += dbus-glib endif ifeq ($(BR2_PACKAGE_NCURSES),y) diff --git a/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch b/package/imagemagick/imagemagick-use-xml2-config.patch index bff4c7364..bff4c7364 100644 --- a/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch +++ b/package/imagemagick/imagemagick-use-xml2-config.patch diff --git a/package/imagemagick/imagemagick-zlib-fix.patch b/package/imagemagick/imagemagick-zlib-fix.patch new file mode 100644 index 000000000..1a147af1d --- /dev/null +++ b/package/imagemagick/imagemagick-zlib-fix.patch @@ -0,0 +1,227 @@ +[PATCH] Fix build with recent versions of zlib + +From upstream: +r6633 + r6636 @ https://www.imagemagick.org/subversion/ImageMagick + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + magick/blob.c | 68 ++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 28 deletions(-) + +Index: ImageMagick-6.7.2-10/magick/blob.c +=================================================================== +--- ImageMagick-6.7.2-10.orig/magick/blob.c ++++ ImageMagick-6.7.2-10/magick/blob.c +@@ -120,8 +120,20 @@ + StreamType + type; + +- FILE +- *file; ++ union { ++ FILE ++ *file; ++ ++#if defined(MAGICKCORE_ZLIB_DELEGATE) ++ gzFile ++ gzfile; ++#endif ++ ++#if defined(MAGICKCORE_BZLIB_DELEGATE) ++ BZFILE ++ *bzfile; ++#endif ++ }; + + struct stat + properties; +@@ -505,14 +517,14 @@ + case ZipStream: + { + #if defined(MAGICKCORE_ZLIB_DELEGATE) +- (void) gzerror(image->blob->file,&status); ++ (void) gzerror(image->blob->gzfile,&status); + #endif + break; + } + case BZipStream: + { + #if defined(MAGICKCORE_BZLIB_DELEGATE) +- (void) BZ2_bzerror((BZFILE *) image->blob->file,&status); ++ (void) BZ2_bzerror(image->blob->bzfile,&status); + #endif + break; + } +@@ -546,14 +558,14 @@ + case ZipStream: + { + #if defined(MAGICKCORE_ZLIB_DELEGATE) +- status=gzclose(image->blob->file); ++ status=gzclose(image->blob->gzfile); + #endif + break; + } + case BZipStream: + { + #if defined(MAGICKCORE_BZLIB_DELEGATE) +- BZ2_bzclose((BZFILE *) image->blob->file); ++ BZ2_bzclose(image->blob->bzfile); + #endif + break; + } +@@ -843,7 +855,7 @@ + status; + + status=0; +- (void) BZ2_bzerror((BZFILE *) image->blob->file,&status); ++ (void) BZ2_bzerror(image->blob->bzfile,&status); + image->blob->eof=status == BZ_UNEXPECTED_EOF ? MagickTrue : MagickFalse; + #endif + break; +@@ -2486,8 +2498,8 @@ + ((int) magick[2] == 0x08)) + { + (void) fclose(image->blob->file); +- image->blob->file=(FILE *) gzopen(filename,type); +- if (image->blob->file != (FILE *) NULL) ++ image->blob->gzfile=gzopen(filename,type); ++ if (image->blob->gzfile != (gzFile) NULL) + image->blob->type=ZipStream; + } + #endif +@@ -2495,8 +2507,8 @@ + if (strncmp((char *) magick,"BZh",3) == 0) + { + (void) fclose(image->blob->file); +- image->blob->file=(FILE *) BZ2_bzopen(filename,type); +- if (image->blob->file != (FILE *) NULL) ++ image->blob->bzfile=BZ2_bzopen(filename,type); ++ if (image->blob->bzfile != (BZFILE *) NULL) + image->blob->type=BZipStream; + } + #endif +@@ -2555,8 +2567,8 @@ + { + if (mode == WriteBinaryBlobMode) + type="wb"; +- image->blob->file=(FILE *) gzopen(filename,type); +- if (image->blob->file != (FILE *) NULL) ++ image->blob->gzfile=gzopen(filename,type); ++ if (image->blob->gzfile != (gzFile) NULL) + image->blob->type=ZipStream; + } + else +@@ -2564,8 +2576,8 @@ + #if defined(MAGICKCORE_BZLIB_DELEGATE) + if (LocaleCompare(extension,".bz2") == 0) + { +- image->blob->file=(FILE *) BZ2_bzopen(filename,type); +- if (image->blob->file != (FILE *) NULL) ++ image->blob->bzfile=BZ2_bzopen(filename,type); ++ if (image->blob->bzfile != (BZFILE *) NULL) + image->blob->type=BZipStream; + } + else +@@ -2771,12 +2783,12 @@ + { + default: + { +- count=(ssize_t) gzread(image->blob->file,q,(unsigned int) length); ++ count=(ssize_t) gzread(image->blob->gzfile,q,(unsigned int) length); + break; + } + case 2: + { +- c=gzgetc(image->blob->file); ++ c=gzgetc(image->blob->gzfile); + if (c == EOF) + break; + *q++=(unsigned char) c; +@@ -2784,7 +2796,7 @@ + } + case 1: + { +- c=gzgetc(image->blob->file); ++ c=gzgetc(image->blob->gzfile); + if (c == EOF) + break; + *q++=(unsigned char) c; +@@ -2799,7 +2811,7 @@ + case BZipStream: + { + #if defined(MAGICKCORE_BZLIB_DELEGATE) +- count=(ssize_t) BZ2_bzread((BZFILE *) image->blob->file,q,(int) length); ++ count=(ssize_t) BZ2_bzread(image->blob->bzfile,q,(int) length); + #endif + break; + } +@@ -3527,7 +3539,7 @@ + case ZipStream: + { + #if defined(MAGICKCORE_ZLIB_DELEGATE) +- if (gzseek(image->blob->file,(off_t) offset,whence) < 0) ++ if (gzseek(image->blob->gzfile,(off_t) offset,whence) < 0) + return(-1); + #endif + image->blob->offset=TellBlob(image); +@@ -3791,14 +3803,14 @@ + case ZipStream: + { + #if defined(MAGICKCORE_ZLIB_DELEGATE) +- status=gzflush(image->blob->file,Z_SYNC_FLUSH); ++ status=gzflush(image->blob->gzfile,Z_SYNC_FLUSH); + #endif + break; + } + case BZipStream: + { + #if defined(MAGICKCORE_BZLIB_DELEGATE) +- status=BZ2_bzflush((BZFILE *) image->blob->file); ++ status=BZ2_bzflush(image->blob->bzfile); + #endif + break; + } +@@ -3865,7 +3877,7 @@ + case ZipStream: + { + #if defined(MAGICKCORE_ZLIB_DELEGATE) +- offset=(MagickOffsetType) gztell(image->blob->file); ++ offset=(MagickOffsetType) gztell(image->blob->gzfile); + #endif + break; + } +@@ -4014,20 +4026,20 @@ + { + default: + { +- count=(ssize_t) gzwrite(image->blob->file,(void *) data, ++ count=(ssize_t) gzwrite(image->blob->gzfile,(void *) data, + (unsigned int) length); + break; + } + case 2: + { +- c=gzputc(image->blob->file,(int) *p++); ++ c=gzputc(image->blob->gzfile,(int) *p++); + if (c == EOF) + break; + count++; + } + case 1: + { +- c=gzputc(image->blob->file,(int) *p++); ++ c=gzputc(image->blob->gzfile,(int) *p++); + if (c == EOF) + break; + count++; +@@ -4041,8 +4053,8 @@ + case BZipStream: + { + #if defined(MAGICKCORE_BZLIB_DELEGATE) +- count=(ssize_t) BZ2_bzwrite((BZFILE *) image->blob->file,(void *) data, +- (int) length); ++ count=(ssize_t) BZ2_bzwrite(image->blob->bzfile,(void *) data,(int) ++ length); + #endif + break; + } diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index b2a65e136..602b7a5a4 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,10 +4,10 @@ # ############################################################# -IMAGEMAGICK_MAJOR = 6.6.7 -IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-6 +IMAGEMAGICK_MAJOR = 6.7.2 +IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-10 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2 -IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick +IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick/legacy IMAGEMAGICK_INSTALL_STAGING = YES IMAGEMAGICK_AUTORECONF = YES @@ -30,6 +30,8 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \ --without-fpx \ --without-x +IMAGEMAGICK_DEPENDENCIES = host-pkg-config + ifeq ($(BR2_PACKAGE_FONTCONFIG),y) IMAGEMAGICK_CONF_OPT += --with-fontconfig IMAGEMAGICK_DEPENDENCIES += fontconfig @@ -67,7 +69,7 @@ endif ifeq ($(BR2_PACKAGE_LIBXML2),y) IMAGEMAGICK_CONF_OPT += --with-xml -IMAGEMAGICK_CONF_ENV += ac_cv_prog_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config +IMAGEMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config IMAGEMAGICK_DEPENDENCIES += libxml2 else IMAGEMAGICK_CONF_OPT += --without-xml @@ -89,6 +91,20 @@ else IMAGEMAGICK_CONF_OPT += --without-fftw endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +IMAGEMAGICK_CONF_OPT += --with-zlib +IMAGEMAGICK_DEPENDENCIES += zlib +else +IMAGEMAGICK_CONF_OPT += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_BZIP2),y) +IMAGEMAGICK_CONF_OPT += --with-bzlib +IMAGEMAGICK_DEPENDENCIES += bzip2 +else +IMAGEMAGICK_CONF_OPT += --without-bzip2 +endif + define IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/, \ $(addsuffix -config, \ diff --git a/package/lite/lite-pkg-config.patch b/package/lite/lite-pkg-config.patch new file mode 100644 index 000000000..cdd24162c --- /dev/null +++ b/package/lite/lite-pkg-config.patch @@ -0,0 +1,22 @@ +From 7982cccbb6ad58f3802bb266467290200d130a48 Mon Sep 17 00:00:00 2001 +From: Ville Syrjala <syrjala@sci.fi> +Date: Sat, 27 Nov 2010 01:14:25 +0200 +Subject: [PATCH] Too many '\' characters in the .pc file + +--- + lite.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lite.pc.in b/lite.pc.in +index 48eb969..3a21eaa 100644 +--- a/lite.pc.in ++++ b/lite.pc.in +@@ -9,4 +9,4 @@ Description: "LiTE" is a Toolkit Engine + Requires: directfb >= @DFB_REQUIRED_VERSION@ + Version: @VERSION@ + Libs: -L${libdir} -llite +-Cflags: -I${includedir} -DLITEFONTDIR=\\\"@LITEFONTDIR@\\\" ++Cflags: -I${includedir} -DLITEFONTDIR=\"@LITEFONTDIR@\" +-- +1.7.1 + diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index b68e82548..de5ecd6d8 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -32,7 +32,7 @@ $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE) $(MICROPERL_DIR)/.host_configured: $(MICROPERL_DIR)/.source # we need to build a perl for the host just for Errno.pm - (cd $(MICROPERL_DIR); ./Configure -Dcc="$(HOSTCC)" -de ) + (cd $(MICROPERL_DIR); ./Configure -Dcc="$(HOSTCC)" -de -A libs='-lm' ) touch $@ diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 42fa7aa8b..8ccd4dd04 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -10,6 +10,10 @@ ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) MTD_DEPENDENCIES = zlib lzo endif +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +MTD_DEPENDENCIES += busybox +endif + HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs define HOST_MTD_BUILD_CMDS diff --git a/toolchain/gcc/4.6.2/100-uclibc-conf.patch b/toolchain/gcc/4.6.3/100-uclibc-conf.patch index cca8c8229..cca8c8229 100644 --- a/toolchain/gcc/4.6.2/100-uclibc-conf.patch +++ b/toolchain/gcc/4.6.3/100-uclibc-conf.patch diff --git a/toolchain/gcc/4.6.2/301-missing-execinfo_h.patch b/toolchain/gcc/4.6.3/301-missing-execinfo_h.patch index 0e2092f3f..0e2092f3f 100644 --- a/toolchain/gcc/4.6.2/301-missing-execinfo_h.patch +++ b/toolchain/gcc/4.6.3/301-missing-execinfo_h.patch diff --git a/toolchain/gcc/4.6.2/302-c99-snprintf.patch b/toolchain/gcc/4.6.3/302-c99-snprintf.patch index ba51a0e1d..ba51a0e1d 100644 --- a/toolchain/gcc/4.6.2/302-c99-snprintf.patch +++ b/toolchain/gcc/4.6.3/302-c99-snprintf.patch diff --git a/toolchain/gcc/4.6.2/305-libmudflap-susv3-legacy.patch b/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch index 374b1f865..374b1f865 100644 --- a/toolchain/gcc/4.6.2/305-libmudflap-susv3-legacy.patch +++ b/toolchain/gcc/4.6.3/305-libmudflap-susv3-legacy.patch diff --git a/toolchain/gcc/4.6.2/810-arm-softfloat-libgcc.patch b/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch index e6a30a3f0..e6a30a3f0 100644 --- a/toolchain/gcc/4.6.2/810-arm-softfloat-libgcc.patch +++ b/toolchain/gcc/4.6.3/810-arm-softfloat-libgcc.patch diff --git a/toolchain/gcc/4.6.2/820-arm-unbreak-armv4t.patch b/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch index 8651afcd8..8651afcd8 100644 --- a/toolchain/gcc/4.6.2/820-arm-unbreak-armv4t.patch +++ b/toolchain/gcc/4.6.3/820-arm-unbreak-armv4t.patch diff --git a/toolchain/gcc/4.6.2/powerpc-link-with-math-lib.patch.conditional b/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional index 7e75e87f2..7e75e87f2 100644 --- a/toolchain/gcc/4.6.2/powerpc-link-with-math-lib.patch.conditional +++ b/toolchain/gcc/4.6.3/powerpc-link-with-math-lib.patch.conditional diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index acaa3a88d..349d9df3a 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -59,7 +59,7 @@ config BR2_GCC_VERSION default "4.3.6" if BR2_GCC_VERSION_4_3_X default "4.4.6" if BR2_GCC_VERSION_4_4_X default "4.5.3" if BR2_GCC_VERSION_4_5_X - default "4.6.2" if BR2_GCC_VERSION_4_6_X + default "4.6.3" if BR2_GCC_VERSION_4_6_X default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP config BR2_EXTRA_GCC_CONFIG_OPTIONS |