From patchwork Thu Aug 29 13:12:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Devoogdt X-Patchwork-Id: 1978440 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WvhXr3pq0z1yfn for ; Thu, 29 Aug 2024 23:13:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A76FF40FD7; Thu, 29 Aug 2024 13:12:58 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id lbWL25dtIaxN; Thu, 29 Aug 2024 13:12:57 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 69B5740423 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 69B5740423; Thu, 29 Aug 2024 13:12:57 +0000 (UTC) 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 0607D1BF8B4 for ; Thu, 29 Aug 2024 13:12:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E5B5681D67 for ; Thu, 29 Aug 2024 13:12:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id AlE4eHpgL7bJ for ; Thu, 29 Aug 2024 13:12:48 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.221.50; helo=mail-wr1-f50.google.com; envelope-from=thomas.devoogdt@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org BFD0581D4D DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BFD0581D4D Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by smtp1.osuosl.org (Postfix) with ESMTPS id BFD0581D4D for ; Thu, 29 Aug 2024 13:12:47 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-3718b5e9c4fso407821f8f.0 for ; Thu, 29 Aug 2024 06:12:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724937165; x=1725541965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3g4WNhkO9AGB7kuQLaX8o3SONTR9ockmiidUoXXqbVY=; b=fiFrTdVY1ghMlRahn7oAyQ77+Nadr+eTs+RybQyWTqGP1aZDG9lPgyBxV3KQgf7ZJr cEIXe2wctbEYW40VTMWNnJ0uyoIHiMY1QQxe9Q0SVTTXDmsdMMhILamszGQ5wzlboEaJ lZ+H4Wjcp87pRmriZ4QC52qQ/UcsI8qy6Ijf28s7TBA9m+IX8NXmZw3OwcDPUsLG2lga Rgl4d9ENBsswZd0tKKTGryG5CRFDvEj9pGO+ga4e1mMOEtr51zJXkyR5qfLnbn28b+AN ThmTa/tzCum1jVORw28dN551djw7ug82AYV2ZrpZeNxhNEAggmQBebQQtl2R1yjWlKf3 PKJA== X-Gm-Message-State: AOJu0YwrBJhksvfkpZK8VjYDHVZwrrGVf6htiQ0d+k9EV0Z5atsmoFOp Ag3/eAmFpRuMyizjA9oVVHl2efxt0Pzmn/OsKXKbSqgOoTU4m4/bgWwPZqaz X-Google-Smtp-Source: AGHT+IGE6DCV7eH2Bq8sCfio6kxK4wOaI8YxzIaHHsOV5WWadzf0GWhI1w1T1d5+Lb37Jb4vJTY/pQ== X-Received: by 2002:a5d:4451:0:b0:371:8cb7:5d6b with SMTP id ffacd0b85a97d-3749b5852b5mr2020479f8f.53.1724937165263; Thu, 29 Aug 2024 06:12:45 -0700 (PDT) Received: from thomas-Precision-7670.barco.com (d528f5fdd.static.telenet.be. [82.143.95.221]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42bb6e273bcsm17119455e9.31.2024.08.29.06.12.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2024 06:12:44 -0700 (PDT) From: Thomas Devoogdt To: buildroot@buildroot.org Date: Thu, 29 Aug 2024 15:12:31 +0200 Message-ID: <20240829131232.2132854-4-thomas@devoogdt.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240829131232.2132854-1-thomas@devoogdt.com> References: <20240829131232.2132854-1-thomas@devoogdt.com> MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=devoogdt.com Subject: [Buildroot] [PATCH v1] package/webkitgtk: start using GTK4 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: Adrian Perez de Castro , Thomas Devoogdt , Thomas Devoogdt Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Devoogdt See https://webkitgtk.org/2024/03/27/webkigit-2.44.html. GTK4 is now used by default, so use it. Signed-off-by: Thomas Devoogdt --- package/webkitgtk/Config.in | 14 +++++++------- package/webkitgtk/webkitgtk.mk | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 8ee90dda1c..31d34be8ba 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,10 +16,10 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" +comment "webkitgtk needs libgtk4 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT - depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_PACKAGE_LIBGTK4 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ !BR2_HOST_GCC_AT_LEAST_4_9 @@ -35,7 +35,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup3 - depends on BR2_PACKAGE_LIBGTK3 + depends on BR2_PACKAGE_LIBGTK4 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG @@ -54,10 +54,10 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_LIBGTK3_X11 + select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK4_X11 + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK4_X11 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK4_X11 + select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_LIBGTK4_X11 help WebKit is an open source, standards compliant web browser engine. diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 468fefab0e..2131aef0c1 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ - enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk3 libsecret \ + enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk4 libsecret \ libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2 WEBKITGTK_CMAKE_BACKEND = ninja @@ -28,7 +28,6 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ -DUSE_AVIF=OFF \ - -DUSE_GTK4=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_WOFF2=ON @@ -103,7 +102,7 @@ else WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF endif -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) +ifeq ($(BR2_PACKAGE_LIBGTK4_X11),y) WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt @@ -111,7 +110,7 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=OFF endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) +ifeq ($(BR2_PACKAGE_LIBGTK4_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON else WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF