From 7c8af42fb20fdd06d5ab5c9172f334c7c1388d5e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 10 2018 07:55:49 +0000 Subject: Update to 2.30.0 --- diff --git a/.gitignore b/.gitignore index 4b02ba6..b30ac10 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ atk-1.30.0.tar.bz2 /atk-2.28.0.tar.xz /atk-2.28.1.tar.xz /atk-2.29.92.tar.xz +/atk-2.30.0.tar.xz diff --git a/0001-Revert-atkimplementor-use-the-G_DEFINE_INTERFACE-mac.patch b/0001-Revert-atkimplementor-use-the-G_DEFINE_INTERFACE-mac.patch deleted file mode 100644 index 9bd2c5a..0000000 --- a/0001-Revert-atkimplementor-use-the-G_DEFINE_INTERFACE-mac.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 442add7223169202ef5aea363184fcdb5c4fb250 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Fri, 7 Sep 2018 20:29:37 +0200 -Subject: [PATCH] Revert "atkimplementor: use the G_DEFINE_INTERFACE macro to - declare it as interface in the introspection" - -https://gitlab.gnome.org/GNOME/atk/issues/1 -https://bugzilla.redhat.com/show_bug.cgi?id=1626575 - -This reverts commit 30f2712c5bbffbc03e98272c852d29b4bdf8b52e. ---- - atk/atkobject.c | 22 +++++++++++++++++----- - atk/atkobject.h | 2 +- - 2 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/atk/atkobject.c b/atk/atkobject.c -index f8e855e..d50be54 100644 ---- a/atk/atkobject.c -+++ b/atk/atkobject.c -@@ -57,9 +57,6 @@ - * - */ - --typedef AtkImplementorIface AtkImplementorInterface; --G_DEFINE_INTERFACE (AtkImplementor, atk_implementor, G_TYPE_OBJECT) -- - static GPtrArray *role_names = NULL; - - enum -@@ -680,9 +677,24 @@ atk_object_init (AtkObject *accessible, - accessible->role = ATK_ROLE_UNKNOWN; - } - --static void --atk_implementor_default_init (AtkImplementorInterface *iface) -+GType -+atk_implementor_get_type (void) - { -+ static GType type = 0; -+ -+ if (!type) -+ { -+ static const GTypeInfo typeInfo = -+ { -+ sizeof (AtkImplementorIface), -+ (GBaseInitFunc) NULL, -+ (GBaseFinalizeFunc) NULL, -+ } ; -+ -+ type = g_type_register_static (G_TYPE_INTERFACE, "AtkImplementorIface", &typeInfo, 0) ; -+ } -+ -+ return type; - } - - /** -diff --git a/atk/atkobject.h b/atk/atkobject.h -index 4cb8ce2..711dda7 100644 ---- a/atk/atkobject.h -+++ b/atk/atkobject.h -@@ -678,7 +678,7 @@ struct _AtkImplementorIface - }; - - ATK_AVAILABLE_IN_ALL --GType atk_implementor_get_type (void) G_GNUC_CONST; -+GType atk_implementor_get_type (void); - ATK_AVAILABLE_IN_ALL - AtkObject* atk_implementor_ref_accessible (AtkImplementor *implementor); - --- -2.19.0.rc0 - diff --git a/atk.spec b/atk.spec index c1465ea..0b1b2b4 100644 --- a/atk.spec +++ b/atk.spec @@ -1,15 +1,11 @@ Name: atk -Version: 2.29.92 -Release: 2%{?dist} +Version: 2.30.0 +Release: 1%{?dist} Summary: Interfaces for accessibility support -# https://gitlab.gnome.org/GNOME/atk/issues/1 -# https://bugzilla.redhat.com/show_bug.cgi?id=1626575 -Patch0: 0001-Revert-atkimplementor-use-the-G_DEFINE_INTERFACE-mac.patch - License: LGPLv2+ URL: http://developer.gnome.org/platform-overview/stable/atk -Source0: http://download.gnome.org/sources/atk/2.29/atk-%{version}.tar.xz +Source0: http://download.gnome.org/sources/atk/2.30/atk-%{version}.tar.xz BuildRequires: glib2-devel BuildRequires: gettext @@ -58,6 +54,9 @@ needed for development of applications or toolkits which use ATK. %{_datadir}/gir-1.0 %changelog +* Mon Sep 10 2018 Kalev Lember - 2.30.0-1 +- Update to 2.30.0 + * Fri Sep 07 2018 Kalev Lember - 2.29.92-2 - Revert a commit that broke introspection (#1626575) diff --git a/sources b/sources index d382e58..f08f1e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atk-2.29.92.tar.xz) = 866001093545bf911c97d702681210853ee03091a0204b958dc1336b6f74ad65d47ba504b4164768adc270703230a3ee638cb44a53bfd3e985114e37d347d63c +SHA512 (atk-2.30.0.tar.xz) = 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e