From patchwork Tue Jul 10 23:42:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Kogut X-Patchwork-Id: 942282 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V0pY+v11"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41QJf268j7z9s2L for ; Wed, 11 Jul 2018 09:42:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CD9A78795E; Tue, 10 Jul 2018 23:42:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TZizOotb0ic3; Tue, 10 Jul 2018 23:42:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5C585879F5; Tue, 10 Jul 2018 23:42:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 99B651C1310 for ; Tue, 10 Jul 2018 23:42:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9752A870FB for ; Tue, 10 Jul 2018 23:42:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FmX1SXU0i7BS for ; Tue, 10 Jul 2018 23:42:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id B533986E3F for ; Tue, 10 Jul 2018 23:42:19 +0000 (UTC) Received: by mail-pf0-f171.google.com with SMTP id y8-v6so17121295pfm.10 for ; Tue, 10 Jul 2018 16:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jbLSpR1lcJlF3nWHtxOv804lWV03298RjO8DU2BtP1o=; b=V0pY+v111eLiIs4wEe4ZUC4iza1x02alKgxUev5iJMYp5CQOuqoczds2ePPJtUmMfu uiGxze1KozDrZP8cM1/bEQacJn+fteJYZcXtqt4yhl2XYQeHoqPiXlyPvN0pgMmbrzDT pXPEGEsdfAjJoR7etcVG+Hij5vXtjgDNHMtco5ZyMsEedmf1W4Iwqc7V9aBpqSe9vEmt 0JvzOmkFcilxu51qmFgxqBglkfmSx7+nSFtLW9olagrBnp4hB4EW0OK8YosENN36qXqk CzWVcI7K5I2F+ZmFRFHp8mhv5WQvwY5K4HfHSVkxX8G+XN0PwRiFOI6xcUY46fA82aal YUGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jbLSpR1lcJlF3nWHtxOv804lWV03298RjO8DU2BtP1o=; b=SqnE8iVl+fgC4vLEIhhjcjDolG44Dr/p8fPUjiqYgOkm0LaogIbliK1frddDDz8yoE H+pQ0AWGMRqikCFuXQIdlyCqnNKnZz/SYFAmEO62DeUr2mQvcZfnLK8ouuHrVP1pDl0U 9TuP7SsPgvFDvncMw9b3t6qOns5oPTWhcHO19TjOSs690GcMAzk9/cfZABk9POl1WoQC Pbq9UbWe+RXVdYK9NBS0drgG6z9mpDBxwpSYVkcYFx+sORpv3K18flIPxXA0zef7AYVe XOscPB0/xaOXn3LKF7ynHzCNtS/ZfXx1WPffzQ4aZaBwVGGfna9tg3H97mtcw3zDaH+H mJiA== X-Gm-Message-State: APt69E3MKZwF7HMfXQvfaBK8c21I17psJeN4ltbKKgkzubo1M8gtOhnw pLkQ4B+jEYoQobsCtipl1I8VcDjw31Y= X-Google-Smtp-Source: AAOMgpdfObF1HvUPrUNlISWDMg4c+NabADvmLi4BAWuce8eJmQF5J1HNuaFIH0gDIrKUqJjNOlEbQg== X-Received: by 2002:a65:57c9:: with SMTP id q9-v6mr24883939pgr.128.1531266139007; Tue, 10 Jul 2018 16:42:19 -0700 (PDT) Received: from JAKWS.YakimaSteel.local ([162.251.69.147]) by smtp.gmail.com with ESMTPSA id b62-v6sm83147464pfm.97.2018.07.10.16.42.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 16:42:18 -0700 (PDT) From: Joseph Kogut To: buildroot@buildroot.org Date: Tue, 10 Jul 2018 16:42:09 -0700 Message-Id: <20180710234212.4297-2-joseph.kogut@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180710234212.4297-1-joseph.kogut@gmail.com> References: <20180710234212.4297-1-joseph.kogut@gmail.com> Subject: [Buildroot] [PATCH v6 1/4] libgtk3: convert atk-bridge to optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joseph Kogut , Valentin Korenblit , Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Joseph Kogut --- ...3-convert-atk-bridge-to-optional-dep.patch | 76 +++++++++++++++++++ package/libgtk3/0003-disable-atk-bridge.patch | 45 ----------- package/libgtk3/libgtk3.mk | 4 + 3 files changed, 80 insertions(+), 45 deletions(-) create mode 100644 package/libgtk3/0003-convert-atk-bridge-to-optional-dep.patch delete mode 100644 package/libgtk3/0003-disable-atk-bridge.patch diff --git a/package/libgtk3/0003-convert-atk-bridge-to-optional-dep.patch b/package/libgtk3/0003-convert-atk-bridge-to-optional-dep.patch new file mode 100644 index 0000000000..d92bc96d5e --- /dev/null +++ b/package/libgtk3/0003-convert-atk-bridge-to-optional-dep.patch @@ -0,0 +1,76 @@ +From 83aaf47828d40dbafc315c5184ff62fe9914e80a Mon Sep 17 00:00:00 2001 +From: Joseph Kogut +Date: Thu, 21 Jun 2018 10:55:04 -0700 +Subject: [PATCH] convert atk-bridge to optional dep + +Signed-off-by: Joseph Kogut +--- + configure | 2 +- + configure.ac | 9 ++++++--- + gtk/a11y/gtkaccessibility.c | 4 ++-- + 3 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index 9a68486..6504451 100755 +--- a/configure ++++ b/configure +@@ -27037,7 +27037,7 @@ $as_echo "yes" >&6; } + fi + + GTK_PACKAGES="atk >= 2.15.1 cairo >= 1.14.0 cairo-gobject >= 1.14.0 gdk-pixbuf-2.0 >= 2.30.0 gio-2.0 >= 2.49.4" +-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= 1.0" ++GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $ATK_BRIDGE_PACKAGE $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= 1.0" + if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then + GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" + fi +diff --git a/configure.ac b/configure.ac +index fef0ece..ddb4e04 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1394,15 +1394,18 @@ AC_SUBST(GDK_DEP_CFLAGS) + ######################################## + + if test x$enable_x11_backend = xyes; then +- ATK_PACKAGES="atk atk-bridge-2.0" +-else + ATK_PACKAGES="atk" ++ PKG_CHECK_MODULES(ATK_BRIDGE, atk-bridge-2.0, ++ AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define to 1 if atk-bridge is available]) ++ ATK_BRIDGE_PACKAGE="atk-bridge-2.0", ++ [] ++ ) + fi + + PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) + + GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" +-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version" ++GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $ATK_BRIDGE_PACKAGE $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version" + if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then + GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2" + fi +diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c +index 7f0e520..f2ef2eb 100644 +--- a/gtk/a11y/gtkaccessibility.c ++++ b/gtk/a11y/gtkaccessibility.c +@@ -37,7 +37,7 @@ + #include + #include + +-#ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + #include + #endif + +@@ -988,7 +988,7 @@ _gtk_accessibility_init (void) + _gtk_accessibility_override_atk_util (); + do_window_event_initialization (); + +-#ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + atk_bridge_adaptor_init (NULL, NULL); + #endif + +-- +2.17.1 + diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0003-disable-atk-bridge.patch deleted file mode 100644 index c92174f400..0000000000 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ /dev/null @@ -1,45 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1349,11 +1349,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -987,9 +983,5 @@ - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 1b85d00aae..75624a4203 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -31,6 +31,10 @@ LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango gdk-pi ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi +ifeq ($(BR2_PACKAGE_AT_SPI2_ATK),y) +LIBGTK3_DEPENDENCIES += at-spi2-atk +endif + LIBGTK3_CONF_OPTS += \ --enable-x11-backend \ --x-includes=$(STAGING_DIR)/usr/include/X11 \