mx 1.2.0-2 correction port: patch à la place de snapshot

4 files changed, 283 insertions, 9 deletions

diff --git a/mx/.md5sum.i686 b/mx/.md5sum.i686
index 005beea..49fba96 100644
--- a/mx/.md5sum.i686
+++ b/mx/.md5sum.i686
@@ -1 +1,2 @@
-38412a172c823d6ad7e87456e313689d  clutter-project-mx-1.2.0-9-g0dbbb1a.tar.gz
+52bf38db466925632074653f455b947c  mx-1.2.0.tar.bz2
+e4bc497d8f09b8c94cdd5abf0835620f  mx_glib_deprecated.patch
diff --git a/mx/.md5sum.x86_64 b/mx/.md5sum.x86_64
index 005beea..49fba96 100644
--- a/mx/.md5sum.x86_64
+++ b/mx/.md5sum.x86_64
@@ -1 +1,2 @@
-38412a172c823d6ad7e87456e313689d  clutter-project-mx-1.2.0-9-g0dbbb1a.tar.gz
+52bf38db466925632074653f455b947c  mx-1.2.0.tar.bz2
+e4bc497d8f09b8c94cdd5abf0835620f  mx_glib_deprecated.patch
diff --git a/mx/Pkgfile b/mx/Pkgfile
index c6e18c2..6ff4131 100644
--- a/mx/Pkgfile
+++ b/mx/Pkgfile
@@ -7,15 +7,13 @@
 
 name=mx
 version=1.2.0
-release=1
-revision=9
-commit=0dbbb1a
-pname=clutter-project
-source=(https://download.github.com/$pname-$name-$version-$revision-g$commit.tar.gz)
+release=2
+source=(http://source.clutter-project.org/sources/$name/${version%.*}/$name-$version.tar.bz2
+	mx_glib_deprecated.patch)
 
 build() {
-	cd $pname-$name-$commit
-	./autogen.sh
+	cd $name-$version
+	patch -p1 < ../mx_glib_deprecated.patch
 	./configure --prefix=/usr --sysconfdir=/etc
 	make
 	make DESTDIR=$PKG install
diff --git a/mx/mx_glib_deprecated.patch b/mx/mx_glib_deprecated.patch
new file mode 100644
index 0000000..7cdbc76
--- /dev/null
+++ b/mx/mx_glib_deprecated.patch
@@ -0,0 +1,274 @@
+diff -u -r mx-1.2.0/mx/mx-application.c clutter-project-mx-0dbbb1a/mx/mx-application.c
+--- mx-1.2.0/mx/mx-application.c	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-application.c	2011-07-04 11:36:13.000000000 +0200
+@@ -829,7 +829,7 @@
+  *   of #MxWindow<!-- -->s. The returned list is owned by
+  *   @application and must not be altered.
+  */
+-G_CONST_RETURN GList*
++const GList*
+ mx_application_get_windows (MxApplication *application)
+ {
+   g_return_val_if_fail (MX_IS_APPLICATION (application), NULL);
+diff -u -r mx-1.2.0/mx/mx-application.h clutter-project-mx-0dbbb1a/mx/mx-application.h
+--- mx-1.2.0/mx/mx-application.h	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-application.h	2011-07-04 11:36:13.000000000 +0200
+@@ -115,7 +115,7 @@
+ void                  mx_application_remove_window (MxApplication *application,
+                                                     MxWindow      *window);
+ 
+-G_CONST_RETURN GList* mx_application_get_windows   (MxApplication *application);
++const GList         * mx_application_get_windows   (MxApplication *application);
+ 
+ void                  mx_application_add_action    (MxApplication *application,
+                                                     MxAction      *action);
+diff -u -r mx-1.2.0/mx/mx-button.c clutter-project-mx-0dbbb1a/mx/mx-button.c
+--- mx-1.2.0/mx/mx-button.c	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-button.c	2011-07-04 11:36:13.000000000 +0200
+@@ -1015,7 +1015,7 @@
+  *
+  * Returns: the text for the button. This must not be freed by the application
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ mx_button_get_label (MxButton *button)
+ {
+   g_return_val_if_fail (MX_IS_BUTTON (button), NULL);
+@@ -1346,7 +1346,7 @@
+  *
+  * Since: 1.2
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ mx_button_get_icon_name (MxButton *button)
+ {
+   g_return_val_if_fail (MX_IS_BUTTON (button), NULL);
+diff -u -r mx-1.2.0/mx/mx-button-group.c clutter-project-mx-0dbbb1a/mx/mx-button-group.c
+--- mx-1.2.0/mx/mx-button-group.c	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-button-group.c	2011-07-04 11:36:13.000000000 +0200
+@@ -453,7 +453,7 @@
+  * Returns: a list of buttons. The list is owned by the #MxButtonGroup and
+  * should not be modified by the application.
+  */
+-G_CONST_RETURN GSList *
++const GSList *
+ mx_button_group_get_buttons (MxButtonGroup *group)
+ {
+   g_return_val_if_fail (MX_IS_BUTTON_GROUP (group), NULL);
+diff -u -r mx-1.2.0/mx/mx-button-group.h clutter-project-mx-0dbbb1a/mx/mx-button-group.h
+--- mx-1.2.0/mx/mx-button-group.h	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-button-group.h	2011-07-04 11:36:13.000000000 +0200
+@@ -105,7 +105,7 @@
+                                                gboolean       allow_no_active);
+ gboolean  mx_button_group_get_allow_no_active (MxButtonGroup *group);
+ 
+-G_CONST_RETURN GSList *mx_button_group_get_buttons (MxButtonGroup *group);
++const GSList *mx_button_group_get_buttons (MxButtonGroup *group);
+ 
+ G_END_DECLS
+ 
+diff -u -r mx-1.2.0/mx/mx-button.h clutter-project-mx-0dbbb1a/mx/mx-button.h
+--- mx-1.2.0/mx/mx-button.h	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-button.h	2011-07-04 11:36:13.000000000 +0200
+@@ -82,10 +82,10 @@
+ 
+ ClutterActor         *mx_button_new             (void);
+ ClutterActor         *mx_button_new_with_label  (const gchar *text);
+-G_CONST_RETURN gchar *mx_button_get_label       (MxButton    *button);
++const gchar          *mx_button_get_label       (MxButton    *button);
+ void                  mx_button_set_label       (MxButton    *button,
+                                                  const gchar *text);
+-G_CONST_RETURN gchar *mx_button_get_icon_name   (MxButton    *button);
++const gchar          *mx_button_get_icon_name   (MxButton    *button);
+ void                  mx_button_set_icon_name   (MxButton    *button,
+                                                  const gchar *icon_name);
+ guint                 mx_button_get_icon_size   (MxButton    *button);
+diff -u -r mx-1.2.0/mx/mx-entry.c clutter-project-mx-0dbbb1a/mx/mx-entry.c
+--- mx-1.2.0/mx/mx-entry.c	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-entry.c	2011-07-04 11:36:13.000000000 +0200
+@@ -1068,7 +1068,7 @@
+  *
+  * Returns: the text for the entry. This must not be freed by the application
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ mx_entry_get_text (MxEntry *entry)
+ {
+   g_return_val_if_fail (MX_IS_ENTRY (entry), NULL);
+@@ -1188,7 +1188,7 @@
+  * Returns: the current value of the hint property. This string is owned by the
+  * #MxEntry and should not be freed or modified.
+  */
+-G_CONST_RETURN
++const
+ gchar *
+ mx_entry_get_hint_text (MxEntry *entry)
+ {
+diff -u -r mx-1.2.0/mx/mx-entry.h clutter-project-mx-0dbbb1a/mx/mx-entry.h
+--- mx-1.2.0/mx/mx-entry.h	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-entry.h	2011-07-04 11:36:13.000000000 +0200
+@@ -79,14 +79,14 @@
+ 
+ ClutterActor         *mx_entry_new              (void);
+ ClutterActor         *mx_entry_new_with_text    (const gchar *text);
+-G_CONST_RETURN gchar *mx_entry_get_text         (MxEntry     *entry);
++const gchar          *mx_entry_get_text         (MxEntry     *entry);
+ void                  mx_entry_set_text         (MxEntry     *entry,
+                                                  const gchar *text);
+ ClutterActor*         mx_entry_get_clutter_text (MxEntry     *entry);
+ 
+ void                  mx_entry_set_hint_text    (MxEntry     *entry,
+                                                  const gchar *text);
+-G_CONST_RETURN gchar *mx_entry_get_hint_text    (MxEntry     *entry);
++const gchar          *mx_entry_get_hint_text    (MxEntry     *entry);
+ 
+ void                  mx_entry_set_password_char (MxEntry  *entry,
+                                                   gunichar  password_char);
+diff -u -r mx-1.2.0/mx/mx-label.c clutter-project-mx-0dbbb1a/mx/mx-label.c
+--- mx-1.2.0/mx/mx-label.c	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-label.c	2011-07-04 11:36:13.000000000 +0200
+@@ -635,7 +635,7 @@
+  *
+  * Returns: the text for the label. This must not be freed by the application
+  */
+-G_CONST_RETURN gchar *
++const gchar *
+ mx_label_get_text (MxLabel *label)
+ {
+   g_return_val_if_fail (MX_IS_LABEL (label), NULL);
+diff -u -r mx-1.2.0/mx/mx-label.h clutter-project-mx-0dbbb1a/mx/mx-label.h
+--- mx-1.2.0/mx/mx-label.h	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-label.h	2011-07-04 11:36:13.000000000 +0200
+@@ -74,7 +74,7 @@
+ 
+ ClutterActor         *mx_label_new              (void);
+ ClutterActor         *mx_label_new_with_text    (const gchar *text);
+-G_CONST_RETURN gchar *mx_label_get_text         (MxLabel     *label);
++const gchar          *mx_label_get_text         (MxLabel     *label);
+ void                  mx_label_set_text         (MxLabel     *label,
+                                                  const gchar *text);
+ gboolean              mx_label_get_use_markup   (MxLabel *label);
+diff -u -r mx-1.2.0/mx/mx-stylable.c clutter-project-mx-0dbbb1a/mx/mx-stylable.c
+--- mx-1.2.0/mx/mx-stylable.c	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-stylable.c	2011-07-04 11:36:13.000000000 +0200
+@@ -784,7 +784,7 @@
+  * Returns: the pseudo class string. The string is owned by the #MxWidget and
+  * should not be modified or freed.
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ mx_stylable_get_style_pseudo_class (MxStylable *stylable)
+ {
+   MxStylableIface *iface;
+@@ -963,7 +963,7 @@
+  * Returns: the class name string. The string is owned by the #MxWidget and
+  * should not be modified or freed.
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ mx_stylable_get_style_class (MxStylable *stylable)
+ {
+   MxStylableIface *iface;
+diff -u -r mx-1.2.0/mx/mx-stylable.h clutter-project-mx-0dbbb1a/mx/mx-stylable.h
+--- mx-1.2.0/mx/mx-stylable.h	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-stylable.h	2011-07-04 11:36:13.000000000 +0200
+@@ -70,13 +70,13 @@
+   void       (* set_style) (MxStylable *stylable,
+                             MxStyle    *style);
+ 
+-  G_CONST_RETURN gchar* (* get_style_class) (MxStylable  *stylable);
+-  void                  (* set_style_class) (MxStylable  *stylable,
+-                                             const gchar *style_class);
+-
+-  G_CONST_RETURN gchar* (* get_style_pseudo_class) (MxStylable  *stylable);
+-  void                  (* set_style_pseudo_class) (MxStylable  *stylable,
+-                                                    const gchar *pseudo_class);
++  const gchar* (* get_style_class) (MxStylable  *stylable);
++  void         (* set_style_class) (MxStylable  *stylable,
++                                    const gchar *style_class);
++
++  const gchar* (* get_style_pseudo_class) (MxStylable  *stylable);
++  void         (* set_style_pseudo_class) (MxStylable  *stylable,
++                                           const gchar *pseudo_class);
+ 
+   /* context virtual functions */
+ 
+@@ -119,13 +119,13 @@
+                                                  GValue            *value_out);
+ 
+ 
+-G_CONST_RETURN gchar* mx_stylable_get_style_class (MxStylable  *stylable);
+-void                  mx_stylable_set_style_class (MxStylable  *stylable,
+-                                                   const gchar *style_class);
+-
+-G_CONST_RETURN gchar* mx_stylable_get_style_pseudo_class (MxStylable  *stylable);
+-void                  mx_stylable_set_style_pseudo_class (MxStylable  *stylable,
+-                                                          const gchar *pseudo_class);
++const gchar* mx_stylable_get_style_class (MxStylable  *stylable);
++void         mx_stylable_set_style_class (MxStylable  *stylable,
++                                          const gchar *style_class);
++
++const gchar* mx_stylable_get_style_pseudo_class (MxStylable  *stylable);
++void         mx_stylable_set_style_pseudo_class (MxStylable  *stylable,
++                                                 const gchar *pseudo_class);
+ 
+ void mx_stylable_style_changed (MxStylable *stylable, MxStyleChangedFlags flags);
+ void mx_stylable_connect_change_notifiers (MxStylable *stylable);
+diff -u -r mx-1.2.0/mx/mx-tooltip.c clutter-project-mx-0dbbb1a/mx/mx-tooltip.c
+--- mx-1.2.0/mx/mx-tooltip.c	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-tooltip.c	2011-07-04 11:36:13.000000000 +0200
+@@ -722,7 +722,7 @@
+  * Returns: the text for the tooltip. This must not be freed by the application
+  */
+ 
+-G_CONST_RETURN gchar *
++const gchar *
+ mx_tooltip_get_text (MxTooltip *tooltip)
+ {
+   g_return_val_if_fail (MX_IS_TOOLTIP (tooltip), NULL);
+@@ -841,10 +841,12 @@
+ mx_tooltip_hide (MxTooltip *tooltip)
+ {
+   ClutterAnimation *animation;
+-  MxTooltipPrivate *priv = tooltip->priv;
++  MxTooltipPrivate *priv;
+ 
+   g_return_if_fail (MX_IS_TOOLTIP (tooltip));
+ 
++  priv = tooltip->priv;
++
+   /* make sure we're not currently already animating (e.g. hiding) */
+   animation = clutter_actor_get_animation (CLUTTER_ACTOR (tooltip));
+   if (animation)
+@@ -909,7 +911,7 @@
+  * Returns: the #ClutterGeometry, owned by the tooltip which must not be freed
+  * by the application.
+  */
+-G_CONST_RETURN ClutterGeometry*
++const ClutterGeometry*
+ mx_tooltip_get_tip_area (MxTooltip *tooltip)
+ {
+   g_return_val_if_fail (MX_IS_TOOLTIP (tooltip), NULL);
+diff -u -r mx-1.2.0/mx/mx-tooltip.h clutter-project-mx-0dbbb1a/mx/mx-tooltip.h
+--- mx-1.2.0/mx/mx-tooltip.h	2011-05-18 12:36:17.000000000 +0200
++++ clutter-project-mx-0dbbb1a/mx/mx-tooltip.h	2011-07-04 11:36:13.000000000 +0200
+@@ -74,16 +74,16 @@
+ GType mx_tooltip_get_type (void) G_GNUC_CONST;
+ 
+ 
+-G_CONST_RETURN gchar *mx_tooltip_get_text (MxTooltip   *tooltip);
++const gchar          *mx_tooltip_get_text (MxTooltip   *tooltip);
+ void                  mx_tooltip_set_text (MxTooltip   *tooltip,
+                                            const gchar *text);
+ 
+ void                  mx_tooltip_show      (MxTooltip   *tooltip);
+ void                  mx_tooltip_hide      (MxTooltip   *tooltip);
+ 
+-void                            mx_tooltip_set_tip_area (MxTooltip             *tooltip,
+-                                                         const ClutterGeometry *area);
+-G_CONST_RETURN ClutterGeometry* mx_tooltip_get_tip_area (MxTooltip             *tooltip);
++void                   mx_tooltip_set_tip_area (MxTooltip             *tooltip,
++                                                const ClutterGeometry *area);
++const ClutterGeometry* mx_tooltip_get_tip_area (MxTooltip             *tooltip);
+ 
+ gboolean              mx_tooltip_is_in_browse_mode (void);