From patchwork Mon Feb 27 10:58:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1748612 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQHYW60vLz1yX0 for ; Mon, 27 Feb 2023 21:58:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AD766408B0; Mon, 27 Feb 2023 10:58:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org AD766408B0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nE1yFcfPABDj; Mon, 27 Feb 2023 10:58:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 6AA8B408C9; Mon, 27 Feb 2023 10:58:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6AA8B408C9 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 282E91BF25F for ; Mon, 27 Feb 2023 10:58:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 01B7E60BDB for ; Mon, 27 Feb 2023 10:58:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 01B7E60BDB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7HZSFqUNs-yl for ; Mon, 27 Feb 2023 10:58:49 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9074F60BB0 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9074F60BB0 for ; Mon, 27 Feb 2023 10:58:48 +0000 (UTC) Received: by mail-wm1-x336.google.com with SMTP id o11-20020a05600c4fcb00b003eb33ea29a8so3048127wmq.1 for ; Mon, 27 Feb 2023 02:58:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Qj+OQi8J1U1RtiJWV6dOBCaHmcczpObPUqc48QF7O9M=; b=W3iASpfnSneC5BJ3rqsMf5f0sa/BtQmWD+iAWAwyCsR94g52ok1jYruOcTry/zOOMU wwzO9b1dLo+DGY+yeH6aUWl5FqOQLUoAEs0WRSEQrb3c6PNVEAbLH1EIFbQ7ks8cW6Kq 6DgyEuKRz3ihZzypUiT++M3TFdRaymj56ZYwhPOU7qQ2cK5KnNjEhoanhgU/Nl3YC1Uk AvYWaOsoI/tXH9Z4ucD37eeo3uycDhqEz7E+Ez3arpiz3XwdOwDWudryVnDscqoIQZ09 FY/D4ZMeycjANQYepVrPb6YXPCQcVHieh3VAZS4Xa6lxxKmV4CT6/uoWTU052C8u/ZLi HUxg== X-Gm-Message-State: AO0yUKUCHMzhy8h1R21A/mUc1yjTevq+5NUP+Lwotoo4XFpb1H7cEO5K /iunxjSwlnuR5jfiPG0rEey3EocsS8/chbTJ X-Google-Smtp-Source: AK7set9aJVckcZkHMGurr95KVhCjZES6YQrQLVroj43bQnC5w9xvJGU4CmKtbZuWBqlC5mi+Pz7fNA== X-Received: by 2002:a05:600c:358f:b0:3eb:3104:efef with SMTP id p15-20020a05600c358f00b003eb3104efefmr5561620wmq.31.1677495526381; Mon, 27 Feb 2023 02:58:46 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id l1-20020a1ced01000000b003ea57808179sm12055048wmh.38.2023.02.27.02.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 02:58:46 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Mon, 27 Feb 2023 11:58:34 +0100 Message-Id: <20230227105838.358916-1-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=Qj+OQi8J1U1RtiJWV6dOBCaHmcczpObPUqc48QF7O9M=; b=U/5eGk+Zg861y5F5mhRDE/FfNOfvx4tgIRyxUxeDdW59yNPRv77KOTnx9RFUjMD6Pw a+AaprIUFdRTJRjts4lOStqzScd+N5q6/wB0+sTeeWyLRAj6NuAIjY/b4pycB6V4dKPY gqRiQ4KtfopvhB1EVLc4VD+1lpOSO8MinL3T3kRhhVEsTGYI93FinBngtILNw63Cuy8K I4gDg0/Lhmymjg2s8Fe7i/2WUZ4QioO5ouXr8bkK2ZnVNo3DUAoMz0hZSCIoc9FfBxGu GlepXNNGCEKmkSiWjJOL3gFbeqiY8tJZjZ/BjafguFeyadpbc8/OEQZ3qw+lCKWcqA33 tLKQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=U/5eGk+Z Subject: [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Lang , Thomas Devoogdt , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Daniel Lang https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_47_1/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt@barco.com/) v5: rebased + grouped patches --- package/at-spi2-core/Config.in | 8 ++------ package/at-spi2-core/at-spi2-core.hash | 4 ++-- package/at-spi2-core/at-spi2-core.mk | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in index f56c5b93c4..1f6c421777 100644 --- a/package/at-spi2-core/Config.in +++ b/package/at-spi2-core/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_AT_SPI2_CORE bool "at-spi2-core" - depends on BR2_PACKAGE_XORG7 # xlib-libxtst depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 depends on BR2_USE_MMU # glib2 depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11 help The At-Spi2 Core package is a part of the GNOME Accessibility Project. It provides a Service Provider @@ -19,7 +19,3 @@ config BR2_PACKAGE_AT_SPI2_CORE comment "at-spi2-core needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-core depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 764e4c3661..4531bf396c 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum -sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz +# From https://download.gnome.org/sources/at-spi2-core/2.47/at-spi2-core-2.47.1.sha256sum +sha256 c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c at-spi2-core-2.47.1.tar.xz # locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index f0b019c0ed..e98e779884 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,17 +4,31 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.36 -AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 +AT_SPI2_CORE_VERSION_MAJOR = 2.47 +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES -AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ +AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \ $(TARGET_NLS_DEPENDENCIES) AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon +ifeq ($(BR2_PACKAGE_XORG7),y) +AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled +AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst +else +AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled +AT_SPI2_CORE_DEPENDENCIES += gobject-introspection +else +AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled +endif + AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) From patchwork Mon Feb 27 10:58:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1748613 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQHYn6cbqz1yX0 for ; Mon, 27 Feb 2023 21:59:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8A174409EA; Mon, 27 Feb 2023 10:59:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8A174409EA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CmYNszNJ4l9W; Mon, 27 Feb 2023 10:59:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id F193241554; Mon, 27 Feb 2023 10:59:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F193241554 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 696031BF25F for ; Mon, 27 Feb 2023 10:58:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 42C3B60BDB for ; Mon, 27 Feb 2023 10:58:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 42C3B60BDB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6yEOMe43qAfD for ; Mon, 27 Feb 2023 10:58:52 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org ED71960BB0 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by smtp3.osuosl.org (Postfix) with ESMTPS id ED71960BB0 for ; Mon, 27 Feb 2023 10:58:51 +0000 (UTC) Received: by mail-wm1-x329.google.com with SMTP id o38-20020a05600c512600b003e8320d1c11so6396613wms.1 for ; Mon, 27 Feb 2023 02:58:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lLSGN2+g3ybhBX3VhlcvyntHM0PSvbGTEHoysqZ+HFo=; b=wZ9jOkiI5RjBRR1S/FTGQh0cUzj4X7Nso5lC+67YVmC2w6/1tS1o+PNfRbliF7MK1r KypQ9JJAjWbKWdgrUKQ6SYnld80oxmwhahZgLhEocnVxHk7cTH+PUz1ZWew7niLeBoww VUNqDIyFesO2C7mMaObHpxwMC3X5NCuucZrGwW1/nVJFhcU7SPpB83dB5+ypED0O7trb s56OzlpYeSY3l2P4RSxOY9FPb0xsnkizohoXwqRt+Y/NiNoRN6qcoX5d0BcEza691ptB U8N9IoeVwavs04xy7ShA+c13ce0eIbSE9Q11ajgiQIAR9eXe7Uo6A6lDVdFJf8l0DNm1 S7eg== X-Gm-Message-State: AO0yUKVUVBa7NL0CvC1KcAFn7O2mD0/Iyi7QBvBNH7YoiRGLMgb9jG4A GZnhpvuhKZJ/9zs0xqn/XBMqRbvNoVexBSqt X-Google-Smtp-Source: AK7set9W8ZKPmZBFfx0dABmFf4a2q/sr5fos8fkYuY4Sgi/p96evUEDJ75gy9IiNV7UxChNliOVekA== X-Received: by 2002:a05:600c:1c8b:b0:3ea:f883:5ac with SMTP id k11-20020a05600c1c8b00b003eaf88305acmr8415213wms.5.1677495529847; Mon, 27 Feb 2023 02:58:49 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id l1-20020a1ced01000000b003ea57808179sm12055048wmh.38.2023.02.27.02.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 02:58:49 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Mon, 27 Feb 2023 11:58:35 +0100 Message-Id: <20230227105838.358916-2-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=lLSGN2+g3ybhBX3VhlcvyntHM0PSvbGTEHoysqZ+HFo=; b=G5wsIEZSnlTA4N9Jzm9Uax3GbKL8srEyi6c5KGZIXvIq8aMaQixpxDiNSs0fausbCH xrJRMPDkN3N5nnLP6GNmBBmfSj2XR1fG35PomMK9lc+fnqBWz2UnpiY49K+t1/tH0eXJ URIwkOApUlt6OW3+U8Or+rtSZ2rdAfXc6Oo0y3Q3nJnjFY9QVy7Ax9b3FJg1T8iaOkCh msf0AHtbQL1zpEZeIObHJeONq7r5J1zTJkLsC9n3Dn7z2r7LWBollesH48N+Gav690mw LhrrE5LUKVKYNU+IRFjncwYpyu+SsIy8fT1ukjR/6fyI9VuEK2GdX5KBXrk2hjIcjBlA uMfQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=G5wsIEZS Subject: [Buildroot] [PATCH v5 2/5] package/at-spi2-atk: remove package X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Lang , Thomas Devoogdt , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Daniel Lang at-spi2-atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt@barco.com/) v5: rebased + grouped patches --- Config.in.legacy | 7 +++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-meson-add-tests-option.patch | 43 ------------------- package/at-spi2-atk/Config.in | 22 ---------- package/at-spi2-atk/at-spi2-atk.hash | 5 --- package/at-spi2-atk/at-spi2-atk.mk | 19 -------- 7 files changed, 7 insertions(+), 91 deletions(-) delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch delete mode 100644 package/at-spi2-atk/Config.in delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 381e1e3a8c..b303677d3f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_AT_SPI2_ATK + bool "at-spi2-atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + at-spi2-atk is now part of at-spi2-core. + config BR2_PACKAGE_UCCP420WLAN bool "uccp420wlan removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6256576e02..9530c4cfb2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1612,7 +1612,6 @@ F: support/testing/tests/package/test_avocado.py F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut -F: package/at-spi2-atk/ F: package/at-spi2-core/ F: package/clang/ F: package/earlyoom/ diff --git a/package/Config.in b/package/Config.in index 3ace25c665..42173fa2b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1552,7 +1552,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" - source "package/at-spi2-atk/Config.in" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch deleted file mode 100644 index 3a2aefa090..0000000000 --- a/package/at-spi2-atk/0001-meson-add-tests-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 May 2020 10:29:36 +0200 -Subject: [PATCH] meson: add tests option - -Add tests option to allow the user to build at-spi2-atk without tests, -it is especially useful as one of the test requires libxml-2.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9fce5d6..61bc93d 100644 ---- a/meson.build -+++ b/meson.build -@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', - - subdir('droute') - subdir('atk-adaptor') --subdir('tests') -+if get_option('tests') -+ subdir('tests') -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 24c9228..a4abdc2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,3 +2,7 @@ option('disable_p2p', - description: 'Disable peer-to-peer DBus connections', - type: 'boolean', - value: false) -+option('tests', -+ description: 'Whether to build tests', -+ type: 'boolean', -+ value: true) --- -2.26.2 - diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in deleted file mode 100644 index 9a7cfde0af..0000000000 --- a/package/at-spi2-atk/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_AT_SPI2_ATK - bool "at-spi2-atk" - depends on BR2_PACKAGE_XORG7 # at-spi2-core - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_USE_WCHAR # glib2 - select BR2_PACKAGE_ATK - select BR2_PACKAGE_AT_SPI2_CORE - select BR2_PACKAGE_LIBGLIB2 - help - The At-Spi2 Atk package contains a library that bridges - ATK to At-Spi2 D-Bus service. - - https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/ - -comment "at-spi2-atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "at-spi2-atk depends on X.org" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_XORG7 diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash deleted file mode 100644 index 9c564c32af..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum -sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz - -# locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk deleted file mode 100644 index 232b577230..0000000000 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# at-spi2-atk -# -################################################################################ - -AT_SPI2_ATK_VERSION_MAJOR = 2.34 -AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 -AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.1+ -AT_SPI2_ATK_LICENSE_FILES = COPYING -AT_SPI2_ATK_CPE_ID_VENDOR = gnome -AT_SPI2_ATK_INSTALL_STAGING = YES -AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf -AT_SPI2_ATK_CONF_OPTS = -Dtests=false - -$(eval $(meson-package)) From patchwork Mon Feb 27 10:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1748614 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQHZ34Wydz1yX0 for ; Mon, 27 Feb 2023 21:59:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F34924154A; Mon, 27 Feb 2023 10:59:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F34924154A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8JfCX3DODWWi; Mon, 27 Feb 2023 10:59:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id F11AA415F0; Mon, 27 Feb 2023 10:59:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F11AA415F0 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id AA3531BF25F for ; Mon, 27 Feb 2023 10:58:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 91243410D3 for ; Mon, 27 Feb 2023 10:58:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 91243410D3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BJClmnXx0zz8 for ; Mon, 27 Feb 2023 10:58:55 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D4153408C9 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by smtp4.osuosl.org (Postfix) with ESMTPS id D4153408C9 for ; Mon, 27 Feb 2023 10:58:54 +0000 (UTC) Received: by mail-wm1-x32c.google.com with SMTP id j19-20020a05600c191300b003eb3e1eb0caso2169170wmq.1 for ; Mon, 27 Feb 2023 02:58:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LPA7I/SXRYZrtecYzZBmJcBIm49qYesqYthDvhOvC50=; b=SAYZfzc2fj9pUbi78U5qGmbDejvDrwIjxpSZYGDzFKO3TIMK1X19JebJDEVmlYYUCT 865GflTG7dYsj0eOVYq9u+txBw3fK+ZZeUgyUMGlJ567xk1GNmknwvlZ4RaA/eCpqZub Z1tIvx2RvrWA9R1+S77VKNYds3yDmICv7mOHFuByIzR5zcXOo1Ij/eNYkvw7/JH3DJOc km7mleDDO+WmsefVlqXxw7ihBAEknxmz2fjqfri62lKZOGMYwUQ3qxBnQX24UN2xZYPR 5fzeeg06FLO17QSjsaGuU39HoltrFM5xTQoPIPuerUjbaJEcEuIetK4AbnK54MENeEkH zR5A== X-Gm-Message-State: AO0yUKVqTH9EL4JKb0EuRZHOBSvbp1Ul5KXHmaTzIXvoZSkzFS2T2Yf1 fFLu8vTHTLNtuJTzraYUWQgA0+181G3LYOMf X-Google-Smtp-Source: AK7set/RHXlrDZVRIl//jkYWkqTwkT0OgJuI4Jgbl5usaNxuOIazDFoVhqRjK4m7keki8Yc9VN0yUQ== X-Received: by 2002:a05:600c:990:b0:3eb:2f3b:4478 with SMTP id w16-20020a05600c099000b003eb2f3b4478mr5709656wmp.15.1677495532641; Mon, 27 Feb 2023 02:58:52 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id l1-20020a1ced01000000b003ea57808179sm12055048wmh.38.2023.02.27.02.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 02:58:52 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Mon, 27 Feb 2023 11:58:36 +0100 Message-Id: <20230227105838.358916-3-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=LPA7I/SXRYZrtecYzZBmJcBIm49qYesqYthDvhOvC50=; b=SttM0YtALUlCncZlWDlGQE5MdFr7Q4lraANVcb/yYNDRLYnJ7LK0C8DqfNkRDEpaDH xijW/8qcZRmqMjAWuqS49Lu8dUiqAL9hCe8dLhaSMvwIJDWxpq4yCi9d9dG0+el2LjBS 1ceB+xjxdBqFUhK/mbbvU+GFXEHmfB9jj7Dy6+JHr1COWsYDXPXOAX/pnXCPTxmi4p3a X5w8zEf8iICeNYXzXNk0B8gEkYdoSq7EHjOEF1akOUcdehgz5F9r5Xo/jrabSBZax4kC 6/DBnHHv5Re+WdA+XhzQ5ux51X1+SruElncc2VT16OTtMcK08/8IARkjBj9MDR2kUCAR 7F9g== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=SttM0YtA Subject: [Buildroot] [PATCH v5 3/5] package/atk: remove package X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Lang , Thomas Devoogdt , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Daniel Lang atk has been merged into at-spi2-core with version 2.45.1. https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78 Signed-off-by: Daniel Lang Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro --- v3: - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254 - needed to fix the webkitgtk 2.38.5 compilation (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt@barco.com/) v5: rebased + grouped patches --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/atk/Config.in | 14 -------------- package/atk/atk.hash | 5 ----- package/atk/atk.mk | 25 ------------------------- package/atkmm/Config.in | 8 ++++---- package/atkmm/atkmm.mk | 2 +- package/libglade/Config.in | 2 +- package/libglade/libglade.mk | 2 +- package/libgtk2/Config.in | 2 +- package/libgtk2/libgtk2.mk | 2 +- package/libgtk3/Config.in | 2 +- package/libgtk3/libgtk3.mk | 2 +- 13 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 package/atk/Config.in delete mode 100644 package/atk/atk.hash delete mode 100644 package/atk/atk.mk diff --git a/Config.in.legacy b/Config.in.legacy index b303677d3f..2d3b1d41ea 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_PACKAGE_ATK + bool "atk removed" + select BR2_LEGACY + select BR2_PACKAGE_AT_SPI2_CORE + help + atk is now part of at-spi2-core. + config BR2_PACKAGE_AT_SPI2_ATK bool "at-spi2-atk removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 42173fa2b1..3891f5abdd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1553,7 +1553,6 @@ endmenu menu "Graphics" source "package/assimp/Config.in" source "package/at-spi2-core/Config.in" - source "package/atk/Config.in" source "package/atkmm/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" diff --git a/package/atk/Config.in b/package/atk/Config.in deleted file mode 100644 index d9371b879b..0000000000 --- a/package/atk/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ATK - bool "atk" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - The ATK accessibility toolkit, needed to build GTK+-2.x. - - https://gitlab.gnome.org/GNOME/atk - -comment "atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atk/atk.hash b/package/atk/atk.hash deleted file mode 100644 index d8cd69ff1f..0000000000 --- a/package/atk/atk.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum -sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz - -# Hash for license file -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk deleted file mode 100644 index 2820fb486d..0000000000 --- a/package/atk/atk.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# atk -# -################################################################################ - -ATK_VERSION_MAJOR = 2.38 -ATK_VERSION = $(ATK_VERSION_MAJOR).0 -ATK_SOURCE = atk-$(ATK_VERSION).tar.xz -ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) -ATK_LICENSE = LGPL-2.0+ -ATK_LICENSE_FILES = COPYING -ATK_INSTALL_STAGING = YES -ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) - -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -ATK_CONF_OPTS += -Dintrospection=true -ATK_DEPENDENCIES += gobject-introspection -else -ATK_CONF_OPTS += -Dintrospection=false -endif - -ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) - -$(eval $(meson-package)) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593..f6f2ca8fc2 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM bool "atkmm" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - select BR2_PACKAGE_ATK + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2 + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2 + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_GLIBMM select BR2_PACKAGE_LIBSIGC diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b047..da763c8386 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -11,6 +11,6 @@ ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf +ATKMM_DEPENDENCIES = at-spi2-core glibmm libsigc host-pkgconf $(eval $(meson-package)) diff --git a/package/libglade/Config.in b/package/libglade/Config.in index c97c9becd2..8d0d26f159 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGLADE depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_USE_MMU # glib2 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_LIBXML2 help Libglade allows you to load glade interface files in a program diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk index 21aed60605..af73d8bd00 100644 --- a/package/libglade/libglade.mk +++ b/package/libglade/libglade.mk @@ -9,7 +9,7 @@ LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 +LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2 LIBGLADE_LICENSE = LGPL-2.0+ LIBGLADE_LICENSE_FILES = COPYING diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index c75c37fb63..f2888b2f51 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 859925e8d3..608c263e4d 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -23,7 +23,7 @@ LIBGTK2_CONF_ENV = \ LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk \ +LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \ gdk-pixbuf $(TARGET_NLS_DEPENDENCIES) LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 82ca68d2da..34b8d49eb3 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBGTK3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_ATK + select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PS select BR2_PACKAGE_CAIRO_PDF diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..2821c7eb52 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -14,7 +14,7 @@ LIBGTK3_CPE_ID_VENDOR = gnome LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 at-spi2-core libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) From patchwork Mon Feb 27 10:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1748615 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQHZJ6RvPz1yX0 for ; Mon, 27 Feb 2023 21:59:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0717A414FA; Mon, 27 Feb 2023 10:59:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0717A414FA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bo4tuunFPhOt; Mon, 27 Feb 2023 10:59:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id ADB8541607; Mon, 27 Feb 2023 10:59:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org ADB8541607 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 704251BF25F for ; Mon, 27 Feb 2023 10:58:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4A105410D3 for ; Mon, 27 Feb 2023 10:58:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4A105410D3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SQl-UEbhssfS for ; Mon, 27 Feb 2023 10:58:57 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E41BD408C9 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by smtp4.osuosl.org (Postfix) with ESMTPS id E41BD408C9 for ; Mon, 27 Feb 2023 10:58:56 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id q16so5752375wrw.2 for ; Mon, 27 Feb 2023 02:58:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5O1x8TJex/u2xPPHJw+D2nO+ELwyMaeFoEkgly3I8tA=; b=L0qw9JUSD/BzAWknjU7DpzVpthFTZ3VjHiwS0AWbS6b+SQe8bUdKwOpK7+PotoF/Hl /RQz8oPJBZObIp1qLLNm8/j6T08aL08v2NwTmS6HAgJPTMp6WJkfJmCW0WEUswqrR+a+ dYCHCK557Htv6G2Sp06K2zNY3FPMFIpf6EPeZBHAU0z30C2O9YYUJ7svVyPOyvzLGwyp XdYIR/XZ1SpCd/UTBv0OrAp5XnlJJ6+4/oOUT8jd2KgGDXcVDxKhqnOsfS2nUbr7v104 skc/hM6vjHHkXi0M+9yxge6GGApVwWJbHZWGvoYpzqiHZgaOiulI8lF7GLN5V5JIHrWY +qbw== X-Gm-Message-State: AO0yUKXa+2DBy3B+tb8uKV/BvIizjLgAUKHOgbLev+nWbcURTd0rBeNd u4CMpU8FJaO+LULH20036YUHGA1WrSx8///b X-Google-Smtp-Source: AK7set9Tc0FUrmBsQYJl0uC+GQdkb84wcLRxlkWIMmkGolY0XpwvJbtMlHLpMQl4kviEEsBne6nHHA== X-Received: by 2002:a5d:4e8d:0:b0:2c7:daa:1c56 with SMTP id e13-20020a5d4e8d000000b002c70daa1c56mr14202354wru.4.1677495534792; Mon, 27 Feb 2023 02:58:54 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id l1-20020a1ced01000000b003ea57808179sm12055048wmh.38.2023.02.27.02.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 02:58:54 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Mon, 27 Feb 2023 11:58:37 +0100 Message-Id: <20230227105838.358916-4-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=5O1x8TJex/u2xPPHJw+D2nO+ELwyMaeFoEkgly3I8tA=; b=M0XJf6dVEG9YV0ba1wXbSME3xrKPieKfXl0m9XhPCHHhSOR0QHr4MIG7JNnPQrZc6M VfwQoz9rJ9h/lKFEN+kyPB7rEH0ZOoOlZtbOf0bcKT/gx7pu9Cv+W5YQvIz6s2BfRvpN 80YUsGYJy5AMPkOmqsg4B+4Yigc5ioCFRgmNRRVCQPxtrH4LdlMIpcTYtEfKaW2MdbjU KeF2fFZZvg07U+iMavPtTaUcSdLxm0NhHM8Co3UUIVn+Esz8J+qle4Pk7YcmSBRuy11c ZcZVxYJAkJn0tyOFGC2Uw4TpCpff6YtDwNs5dOyus7jyn/86qWQo92C/NVF2iNjSrR3h n0tg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=M0XJf6dV Subject: [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Devoogdt , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The at-spi2-core and at-spi2-atk were merged, and are now built by default, so this patch is no longer required. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro --- v5: added re-enable atk-bridge patch to the package/at-spi2-core: bump to version 2.47.1 group --- package/libgtk3/0001-disable-atk-bridge.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch deleted file mode 100644 index f3e9bff2ba..0000000000 --- a/package/libgtk3/0001-disable-atk-bridge.patch +++ /dev/null @@ -1,41 +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/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, -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) - _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); - } ---- a/meson.build -+++ b/meson.build -@@ -564,7 +564,7 @@ if x11_enabled - xfixes_dep = dependency('xfixes', required: false) - xcomposite_dep = dependency('xcomposite', required: false) - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) - - backend_immodules += ['xim'] - From patchwork Mon Feb 27 10:58:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1748616 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQHZZ1b5hz1yX0 for ; Mon, 27 Feb 2023 21:59:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 809C24162D; Mon, 27 Feb 2023 10:59:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 809C24162D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xo6_N7FQKBQZ; Mon, 27 Feb 2023 10:59:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4C0C9415F0; Mon, 27 Feb 2023 10:59:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4C0C9415F0 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A8BE81BF25F for ; Mon, 27 Feb 2023 10:58:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 82CD0814AB for ; Mon, 27 Feb 2023 10:58:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 82CD0814AB X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7z5AeWKiAGZk for ; Mon, 27 Feb 2023 10:58:59 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D0D12814A1 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by smtp1.osuosl.org (Postfix) with ESMTPS id D0D12814A1 for ; Mon, 27 Feb 2023 10:58:58 +0000 (UTC) Received: by mail-wm1-x336.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso3373060wmb.0 for ; Mon, 27 Feb 2023 02:58:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=U7cBB6Lwyb6soNUTrFaP2+erd1S7iQihxWRuoi2cD7I=; b=EOoLZ9NXYCEr1Z1f3eE9IEQID9375dxRkyXQE4VizwrpCF4I18vWlLw8qD+oVgMH9x lXW7pjQt1AmLIb9H6Z+2V+YdUEaHhlJD+72Cf9Pauattm0+sdzzNDRMmLgTX11G5rcaU u1v1UzpRCsxT2CwF6oIpmwWgjYf0XcsC985JqYh+5qDdJzt5uR3SD9C8EqCmN0cV3v38 Od35BAWl8uBANghfw60dTfuJINF3lyJyrjDEto5+BYJ8ej4puBSk6i/lHFD1IYgYOXiY klpnpX8Uh4qz0zHHYbd6eHZj8uZAF2cY7pRLLEXpHCQSfcZx/5KaYdGq0pQ4pBa/DWyU BH+A== X-Gm-Message-State: AO0yUKWFxhr/FcJoqj0/HC/y+yKnpcMe3D7g5fghcvAwugdNoB6EncBv J2vWV0krVxX3UcU6c5yB4BwTIo4sLnAKNQ89 X-Google-Smtp-Source: AK7set8Pm23n+cIFViJAEwCsYNZVlReSQSLhsTo6sj4ZSc79YfmuypM0k90i+UphtCZm0/9dxSup+g== X-Received: by 2002:a05:600c:6015:b0:3ea:f883:4f5 with SMTP id az21-20020a05600c601500b003eaf88304f5mr8973949wmb.17.1677495536848; Mon, 27 Feb 2023 02:58:56 -0800 (PST) Received: from thomas-OptiPlex-7090.nmg.localnet (d528f5fc4.static.telenet.be. [82.143.95.196]) by smtp.gmail.com with ESMTPSA id l1-20020a1ced01000000b003ea57808179sm12055048wmh.38.2023.02.27.02.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 02:58:56 -0800 (PST) From: Thomas Devoogdt X-Google-Original-From: Thomas Devoogdt To: buildroot@buildroot.org Date: Mon, 27 Feb 2023 11:58:38 +0100 Message-Id: <20230227105838.358916-5-thomas.devoogdt@barco.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230227105838.358916-1-thomas.devoogdt@barco.com> References: <20230227105838.358916-1-thomas.devoogdt@barco.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=U7cBB6Lwyb6soNUTrFaP2+erd1S7iQihxWRuoi2cD7I=; b=oWhgBPRwM9vgLLVlh6e0e6qM/QOLWct1sAp2EY4g88GmvRLvT+4VVOFya1OVlBjpmH Yg63nzUwnkVIKiTZhuIyA49Jbey/e7rzR+4UZt9K/c7XTw42/KGTnxSB8tS/ciB8G2xr r4iOEpvqjnZ5POUhEzQgdH6XJnWDvitHhpBdISKWahN9RAZpIWyGIFORvQ7/b2fsGDBL K4m8eG7iwp8w6yp8/DU3gFeLAVPqWcEu9MwhmT4xOiDoHorBAMHb2z93+KbUZrBjSHao FPQrySJRPnRVSoLEtD/KMoGlWBzui9UnF2RBzgU8ELzk/eBCkoayjwzLDrMIqbSM5Bh7 X4bg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=oWhgBPRw Subject: [Buildroot] [PATCH v5 5/5] package/libgtk3: fix update-icon-cache on empty directory X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Devoogdt , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" If both, hicolor-icon-theme (selected by libgtk3-demo) and adwaita-icon-theme is not selected, then the /usr/share/icons folder is empty, causing find to fail. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro --- v5: - Fixed indentation. - Grouped patches. --- package/libgtk3/libgtk3.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 2821c7eb52..191e28dda6 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -146,8 +146,9 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE