From 2464d556c330139430bff664513581136bb20216 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Wed, 27 Apr 2016 15:14:53 +0900 Subject: [PATCH] Following 'Maintenance Models Supported by GBS' Change-Id: I1f5927b8b17854d2802eb6d72e2a13a67ba1f792 --- ...ght-callback-added-to-the-AtkComponentInt.patch | 64 +++++ .../0002-Added-missing-symbol-for-export.patch | 22 ++ ...ight-callback-added-to-the-AtkComponentIn.patch | 77 ++++++ ...ht_index-callback-added-to-the-AtkCompone.patch | 78 ++++++ .../0005-Tizen-2.4-spin-repo-configuration.patch | 261 +++++++++++++++++++++ packaging/atk.spec | 16 ++ 6 files changed, 518 insertions(+) create mode 100644 packaging/0001-grab_highlight-callback-added-to-the-AtkComponentInt.patch create mode 100644 packaging/0002-Added-missing-symbol-for-export.patch create mode 100644 packaging/0003-clear_highlight-callback-added-to-the-AtkComponentIn.patch create mode 100644 packaging/0004-get_highlight_index-callback-added-to-the-AtkCompone.patch create mode 100644 packaging/0005-Tizen-2.4-spin-repo-configuration.patch diff --git a/packaging/0001-grab_highlight-callback-added-to-the-AtkComponentInt.patch b/packaging/0001-grab_highlight-callback-added-to-the-AtkComponentInt.patch new file mode 100644 index 0000000..a2bfff2 --- /dev/null +++ b/packaging/0001-grab_highlight-callback-added-to-the-AtkComponentInt.patch @@ -0,0 +1,64 @@ +From: Maciej Florek +Date: Wed, 27 May 2015 10:34:37 +0200 +Subject: grab_highlight callback added to the AtkComponentInterface + +Change-Id: I3c66a9017f74403d38bd4d3b07949c3134f345cc +Signed-off-by: Maciej Florek +--- + atk/atkcomponent.c | 22 ++++++++++++++++++++++ + atk/atkcomponent.h | 2 ++ + 2 files changed, 24 insertions(+) + +diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c +index 2e5a19d..7edce9f 100755 +--- a/atk/atkcomponent.c ++++ b/atk/atkcomponent.c +@@ -469,6 +469,28 @@ atk_component_grab_focus (AtkComponent *component) + } + + /** ++ * atk_component_grab_highlight: ++ * @component: an #AtkComponent ++ * ++ * Grabs highlight for this @component. ++ * ++ * Returns: %TRUE if successful, %FALSE otherwise. ++ **/ ++gboolean ++atk_component_grab_highlight (AtkComponent *component) ++{ ++ AtkComponentIface *iface = NULL; ++ g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); ++ ++ iface = ATK_COMPONENT_GET_IFACE (component); ++ ++ if (iface->grab_highlight) ++ return (iface->grab_highlight) (component); ++ else ++ return FALSE; ++} ++ ++/** + * atk_component_set_extents: + * @component: an #AtkComponent + * @x: x coordinate +diff --git a/atk/atkcomponent.h b/atk/atkcomponent.h +index 541de53..aa5cd3f 100755 +--- a/atk/atkcomponent.h ++++ b/atk/atkcomponent.h +@@ -131,6 +131,7 @@ struct _AtkComponentIface + gint *width, + gint *height); + gboolean (* grab_focus) (AtkComponent *component); ++ gboolean (* grab_highlight) (AtkComponent *component); + void (* remove_focus_handler) (AtkComponent *component, + guint handler_id); + gboolean (* set_extents) (AtkComponent *component, +@@ -190,6 +191,7 @@ void atk_component_get_size (AtkComponent *com + AtkLayer atk_component_get_layer (AtkComponent *component); + gint atk_component_get_mdi_zorder (AtkComponent *component); + gboolean atk_component_grab_focus (AtkComponent *component); ++gboolean atk_component_grab_highlight (AtkComponent *component); + G_DEPRECATED + void atk_component_remove_focus_handler (AtkComponent *component, + guint handler_id); diff --git a/packaging/0002-Added-missing-symbol-for-export.patch b/packaging/0002-Added-missing-symbol-for-export.patch new file mode 100644 index 0000000..5e2c8ef --- /dev/null +++ b/packaging/0002-Added-missing-symbol-for-export.patch @@ -0,0 +1,22 @@ +From: Maciej Florek +Date: Wed, 3 Jun 2015 17:33:36 +0200 +Subject: Added missing symbol for export + +Change-Id: I09b8e78811717d15fdc1b79a3c1a7c6686d51cf9 +Signed-off-by: Maciej Florek +--- + atk/atk.symbols | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/atk/atk.symbols b/atk/atk.symbols +index 75579eb..7ac27b5 100644 +--- a/atk/atk.symbols ++++ b/atk/atk.symbols +@@ -23,6 +23,7 @@ + atk_component_get_size + atk_component_get_type + atk_component_grab_focus ++ atk_component_grab_highlight + atk_component_ref_accessible_at_point + atk_component_remove_focus_handler + atk_component_set_extents diff --git a/packaging/0003-clear_highlight-callback-added-to-the-AtkComponentIn.patch b/packaging/0003-clear_highlight-callback-added-to-the-AtkComponentIn.patch new file mode 100644 index 0000000..aaed4f1 --- /dev/null +++ b/packaging/0003-clear_highlight-callback-added-to-the-AtkComponentIn.patch @@ -0,0 +1,77 @@ +From: Maciej Florek +Date: Mon, 8 Jun 2015 18:09:33 +0200 +Subject: clear_highlight callback added to the AtkComponentInterface + +Change-Id: I8aa497f82998d862e2fb48cc643574d85f0c49e6 +Signed-off-by: Maciej Florek +--- + atk/atk.symbols | 1 + + atk/atkcomponent.c | 22 ++++++++++++++++++++++ + atk/atkcomponent.h | 2 ++ + 3 files changed, 25 insertions(+) + +diff --git a/atk/atk.symbols b/atk/atk.symbols +index 7ac27b5..09e9f40 100644 +--- a/atk/atk.symbols ++++ b/atk/atk.symbols +@@ -24,6 +24,7 @@ + atk_component_get_type + atk_component_grab_focus + atk_component_grab_highlight ++ atk_component_clear_highlight + atk_component_ref_accessible_at_point + atk_component_remove_focus_handler + atk_component_set_extents +diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c +index 7edce9f..822bd62 100755 +--- a/atk/atkcomponent.c ++++ b/atk/atkcomponent.c +@@ -491,6 +491,28 @@ atk_component_grab_highlight (AtkComponent *component) + } + + /** ++ * atk_component_clear_highlight: ++ * @component: an #AtkComponent ++ * ++ * Clears highlight for this @component. ++ * ++ * Returns: %TRUE if successful, %FALSE otherwise. ++ **/ ++gboolean ++atk_component_clear_highlight (AtkComponent *component) ++{ ++ AtkComponentIface *iface = NULL; ++ g_return_val_if_fail (ATK_IS_COMPONENT (component), FALSE); ++ ++ iface = ATK_COMPONENT_GET_IFACE (component); ++ ++ if (iface->clear_highlight) ++ return (iface->clear_highlight) (component); ++ else ++ return FALSE; ++} ++ ++/** + * atk_component_set_extents: + * @component: an #AtkComponent + * @x: x coordinate +diff --git a/atk/atkcomponent.h b/atk/atkcomponent.h +index aa5cd3f..33096c6 100755 +--- a/atk/atkcomponent.h ++++ b/atk/atkcomponent.h +@@ -132,6 +132,7 @@ struct _AtkComponentIface + gint *height); + gboolean (* grab_focus) (AtkComponent *component); + gboolean (* grab_highlight) (AtkComponent *component); ++ gboolean (* clear_highlight) (AtkComponent *component); + void (* remove_focus_handler) (AtkComponent *component, + guint handler_id); + gboolean (* set_extents) (AtkComponent *component, +@@ -192,6 +193,7 @@ AtkLayer atk_component_get_layer (AtkComponent *com + gint atk_component_get_mdi_zorder (AtkComponent *component); + gboolean atk_component_grab_focus (AtkComponent *component); + gboolean atk_component_grab_highlight (AtkComponent *component); ++gboolean atk_component_clear_highlight (AtkComponent *component); + G_DEPRECATED + void atk_component_remove_focus_handler (AtkComponent *component, + guint handler_id); diff --git a/packaging/0004-get_highlight_index-callback-added-to-the-AtkCompone.patch b/packaging/0004-get_highlight_index-callback-added-to-the-AtkCompone.patch new file mode 100644 index 0000000..50f241a --- /dev/null +++ b/packaging/0004-get_highlight_index-callback-added-to-the-AtkCompone.patch @@ -0,0 +1,78 @@ +From: Maciej Florek +Date: Wed, 17 Jun 2015 16:29:59 +0200 +Subject: get_highlight_index callback added to the AtkComponentInterface + +Change-Id: Ia428b9f52d9fe684660b2f817ab48317299ec007 +Signed-off-by: Maciej Florek +--- + atk/atk.symbols | 1 + + atk/atkcomponent.c | 22 ++++++++++++++++++++++ + atk/atkcomponent.h | 3 +++ + 3 files changed, 26 insertions(+) + +diff --git a/atk/atk.symbols b/atk/atk.symbols +index 09e9f40..2410d54 100644 +--- a/atk/atk.symbols ++++ b/atk/atk.symbols +@@ -25,6 +25,7 @@ + atk_component_grab_focus + atk_component_grab_highlight + atk_component_clear_highlight ++ atk_component_get_highlight_index + atk_component_ref_accessible_at_point + atk_component_remove_focus_handler + atk_component_set_extents +diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c +index 822bd62..6955fc9 100755 +--- a/atk/atkcomponent.c ++++ b/atk/atkcomponent.c +@@ -513,6 +513,28 @@ atk_component_clear_highlight (AtkComponent *component) + } + + /** ++ * atk_component_get_highlight_index: ++ * @component: an #AtkComponent ++ * ++ * Returns: highlight index of the @component (if >0), ++ * 0 if highlight index is not set or -1 if an error occured. ++ * ++ **/ ++gint ++atk_component_get_highlight_index (AtkComponent *component) ++{ ++ AtkComponentIface *iface = NULL; ++ g_return_val_if_fail (ATK_IS_COMPONENT (component), -1); ++ ++ iface = ATK_COMPONENT_GET_IFACE (component); ++ ++ if (iface->get_highlight_index) ++ return (iface->get_highlight_index) (component); ++ else ++ return -1; ++} ++ ++/** + * atk_component_set_extents: + * @component: an #AtkComponent + * @x: x coordinate +diff --git a/atk/atkcomponent.h b/atk/atkcomponent.h +index 33096c6..a19a23e 100755 +--- a/atk/atkcomponent.h ++++ b/atk/atkcomponent.h +@@ -133,6 +133,8 @@ struct _AtkComponentIface + gboolean (* grab_focus) (AtkComponent *component); + gboolean (* grab_highlight) (AtkComponent *component); + gboolean (* clear_highlight) (AtkComponent *component); ++ gint (* get_highlight_index) (AtkComponent *component); ++ + void (* remove_focus_handler) (AtkComponent *component, + guint handler_id); + gboolean (* set_extents) (AtkComponent *component, +@@ -194,6 +196,7 @@ gint atk_component_get_mdi_zorder (AtkComponent *com + gboolean atk_component_grab_focus (AtkComponent *component); + gboolean atk_component_grab_highlight (AtkComponent *component); + gboolean atk_component_clear_highlight (AtkComponent *component); ++gint atk_component_get_highlight_index (AtkComponent *component); + G_DEPRECATED + void atk_component_remove_focus_handler (AtkComponent *component, + guint handler_id); diff --git a/packaging/0005-Tizen-2.4-spin-repo-configuration.patch b/packaging/0005-Tizen-2.4-spin-repo-configuration.patch new file mode 100644 index 0000000..4dda134 --- /dev/null +++ b/packaging/0005-Tizen-2.4-spin-repo-configuration.patch @@ -0,0 +1,261 @@ +From: Patryk Kaczmarek +Date: Mon, 27 Apr 2015 15:11:03 +0200 +Subject: Tizen 2.4 spin repo configuration + +Change-Id: I4f21d433d0489c539ac33b33334e3d940dc83479 +Signed-off-by: Patryk Kaczmarek + +Conflicts: + packaging/atk.spec +--- + Makefile.am | 5 ++- + atk/Makefile.am | 29 ----------------- + autogen.sh | 35 +++++++++++++++----- + configure.ac | 7 ++-- + m4/introspection.m4 | 94 ----------------------------------------------------- + 5 files changed, 30 insertions(+), 140 deletions(-) + delete mode 100644 m4/introspection.m4 + +diff --git a/Makefile.am b/Makefile.am +index 6c5fe01..608dc7d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + # Process this file with automake to create Makefile.in. + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +-SUBDIRS=atk tests docs po build ++SUBDIRS=atk tests docs build + + EXTRA_DIST = \ + MAINTAINERS \ +@@ -10,13 +10,12 @@ EXTRA_DIST = \ + atk.spec.in \ + atk.spec \ + atk-zip.sh.in \ +- m4/introspection.m4 \ + config.h.win32 + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = atk.pc + +-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection ++DISTCHECK_CONFIGURE_FLAGS = + + DISTCLEANFILES = \ + atk-uninstalled.pc \ +diff --git a/atk/Makefile.am b/atk/Makefile.am +index c049470..c7152df 100644 +--- a/atk/Makefile.am ++++ b/atk/Makefile.am +@@ -158,35 +158,6 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile + && rm -f tmp-atk-enum-types.c \ + && echo timestamp > $(@F) + +- +-if HAVE_INTROSPECTION +-introspection_sources = \ +- $(atk_headers) \ +- $(atk_sources) +-introspection_generated_sources = \ +- $(top_builddir)/atk/atkversion.h \ +- atk-enum-types.c \ +- atk-enum-types.h +- +-Atk-1.0.gir: libatk-1.0.la Makefile +-Atk_1_0_gir_INCLUDES = GObject-2.0 +-Atk_1_0_gir_CFLAGS = $(AM_CPPFLAGS) +-Atk_1_0_gir_LIBS = libatk-1.0.la +-Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk --warn-all --c-include "atk/atk.h" +-Atk_1_0_gir_FILES = \ +- $(addprefix $(srcdir)/, $(introspection_sources)) \ +- $(introspection_generated_sources) +-INTROSPECTION_GIRS += Atk-1.0.gir +- +-girdir = $(datadir)/gir-1.0 +-gir_DATA = $(INTROSPECTION_GIRS) +- +-typelibsdir = $(libdir)/girepository-1.0 +-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +- +-CLEANFILES += $(gir_DATA) $(typelibs_DATA) +-endif +- + # ---------- Win32 stuff ---------- + + if OS_WIN32 +diff --git a/autogen.sh b/autogen.sh +index 615d8d8..a36eba3 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,15 +1,32 @@ + #!/bin/sh + # Run this to generate all the initial makefiles, etc. + +-srcdir=`dirname $0` +-test -z "$srcdir" && srcdir=. ++test -n "$srcdir" || srcdir=`dirname "$0"` ++test -n "$srcdir" || srcdir=. + +-PKG_NAME="atk" +-REQUIRED_AUTOMAKE_VERSION=1.7 ++olddir=`pwd` ++cd "$srcdir" + +-which gnome-autogen.sh || { +- echo "You need to install gnome-common from the GNOME CVS" +- exit 1 +-} ++if test -z $GTKDOCIZE; then ++ echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." ++ rm -f gtk-doc.make ++ cat > gtk-doc.make <@]], +- [Enable introspection for this build]),, +- [enable_introspection=auto]) +- ])dnl +- +- AC_MSG_CHECKING([for gobject-introspection]) +- +- dnl presence/version checking +- AS_CASE([$enable_introspection], +- [no], [dnl +- found_introspection="no (disabled, use --enable-introspection to enable)" +- ],dnl +- [yes],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0],, +- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], +- found_introspection=yes, +- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) +- ],dnl +- [auto],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) +- ],dnl +- [dnl +- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) +- ])dnl +- +- AC_MSG_RESULT([$found_introspection]) +- +- INTROSPECTION_SCANNER= +- INTROSPECTION_COMPILER= +- INTROSPECTION_GENERATE= +- INTROSPECTION_GIRDIR= +- INTROSPECTION_TYPELIBDIR= +- if test "x$found_introspection" = "xyes"; then +- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` +- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` +- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +- fi +- AC_SUBST(INTROSPECTION_SCANNER) +- AC_SUBST(INTROSPECTION_COMPILER) +- AC_SUBST(INTROSPECTION_GENERATE) +- AC_SUBST(INTROSPECTION_GIRDIR) +- AC_SUBST(INTROSPECTION_TYPELIBDIR) +- AC_SUBST(INTROSPECTION_CFLAGS) +- AC_SUBST(INTROSPECTION_LIBS) +- AC_SUBST(INTROSPECTION_MAKEFILE) +- +- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +-]) +- +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) +- +-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +-]) +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) +- +- +-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +-]) diff --git a/packaging/atk.spec b/packaging/atk.spec index 097876c..e02579e 100644 --- a/packaging/atk.spec +++ b/packaging/atk.spec @@ -9,6 +9,12 @@ Group: System/Libraries Source: http://download.gnome.org/sources/%{name}/%{baseline}/%{name}-%{version}.tar.xz Source98: baselibs.conf Source1001: %{name}.manifest +# Patches auto-generated by git-buildpackage: +Patch0: 0001-grab_highlight-callback-added-to-the-AtkComponentInt.patch +Patch1: 0002-Added-missing-symbol-for-export.patch +Patch2: 0003-clear_highlight-callback-added-to-the-AtkComponentIn.patch +Patch3: 0004-get_highlight_index-callback-added-to-the-AtkCompone.patch +Patch4: 0005-Tizen-2.4-spin-repo-configuration.patch BuildRequires: fdupes BuildRequires: gcc-c++ @@ -58,6 +64,16 @@ to develop applications that require these. %prep %setup -q +# 0001-grab_highlight-callback-added-to-the-AtkComponentInt.patch +%patch0 -p1 +# 0002-Added-missing-symbol-for-export.patch +%patch1 -p1 +# 0003-clear_highlight-callback-added-to-the-AtkComponentIn.patch +%patch2 -p1 +# 0004-get_highlight_index-callback-added-to-the-AtkCompone.patch +%patch3 -p1 +# 0005-Tizen-2.4-spin-repo-configuration.patch +%patch4 -p1 %build %autogen \ -- 2.7.4