From patchwork Tue Feb 21 16:15:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1745748 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 4PLl1s2jVvz240n for ; Wed, 22 Feb 2023 03:22:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 43B3842CAD; Tue, 21 Feb 2023 16:22:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 43B3842CAD 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 CvC8pzt1ldRg; Tue, 21 Feb 2023 16:22:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 13EE942CDF; Tue, 21 Feb 2023 16:22:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 13EE942CDF X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D6F331BF344 for ; Tue, 21 Feb 2023 16:22:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B0FEB4013B for ; Tue, 21 Feb 2023 16:22:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B0FEB4013B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8r_Ok4_Q2Dwx for ; Tue, 21 Feb 2023 16:22:32 +0000 (UTC) X-Greylist: delayed 00:07:04 by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C40DA40132 Received: from smtpcmd04131.aruba.it (smtpcmd04131.aruba.it [62.149.158.131]) by smtp2.osuosl.org (Postfix) with ESMTPS id C40DA40132 for ; Tue, 21 Feb 2023 16:22:31 +0000 (UTC) Received: from localhost.localdomain ([212.103.203.10]) by Aruba Outgoing Smtp with ESMTPSA id UVIZplbyt73vcUVIZpSHah; Tue, 21 Feb 2023 17:15:24 +0100 From: Giulio Benetti To: buildroot@buildroot.org Date: Tue, 21 Feb 2023 17:15:21 +0100 Message-Id: <20230221161522.3749804-1-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4xfJX+5/6cwyDcSY+pCRba5kmGathW3nagI4MxAKEOL3exCH2m2ty4CPgbqvcAhpaxtcy/L8ONf+TSfm6TxuGo/ArRGG9CHtjmf56wO1vsVabCSqgk2qv4 SDjrv5/yKzJTstjNHE6SJXq2ceIJaCwFf8Z04Tr1fT3Cj2FYPeszkkObdM9sG+cPmU4P2spYUQuEBdGKIkAJowToe+/9H7AXSK4j+8TAmo5PxEW/h7FDAWAN YDUyXYanZnvndBJBuzmEKZ/z1KzLG4B7X+79+Dba+Gzwb1rl+kx74itlN1GQyFyhvE8L7qe+CcxzGZuK1GShfbhx+NcEKfUFpVa7hGdli9+IU0FbyS4RFh3j azEtL14F X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1676996124; bh=5K543r+LDDnl4XXsJj6NBBcSefLJDz94JzuFLcd4TTo=; h=From:To:Subject:Date:MIME-Version:Content-Type; b=JaGtezEcTTvA7TwmqcoimbKh248joRv3TK2r0tpWkStB0BOElscl4vibaYkdlXh4R IiX9imbPVVd4MuHya6xMUfeIlkLhdWhv32RECxgrJCJ7mw8EAsN/2TVwscJA4PnlmZ KIhYZpseMBDPx2W+DhRso/fZ7ilfBv9zDwdAEa8OVrhd7QzffQApy0U7oZVmQKpqdz u7v2oVvuvR6bA7/NMxx5bj7zRboi/jUYEaY8AvkMYGNz4AeKWpC8Dg08jvI38cZhpE 7cdbPyZU6YhJi6AzW0Njn13siwF48E2YaPWZVy/hgBPXsK82VT+/TcbbjDKd1E5PKH Y9Gwbthk5abyw== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=JaGtezEc Subject: [Buildroot] [PATCH] package/webkitgtk: fix build failure with mixed boolean types 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 , Giulio Benetti Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Add local patch pending upstream[0] to fix build failure due to mixed typedef enum { FALSE = 0, TRUE = 1 } boolean; and Fixes: still not failed [0]: https://github.com/WebKit/WebKit/pull/10447 Signed-off-by: Giulio Benetti --- ...oder-boolean-enum-and-define-TRUE-FA.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch diff --git a/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch b/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch new file mode 100644 index 0000000000..7648ce8f29 --- /dev/null +++ b/package/webkitgtk/0001-Fix-JPEGImageDecoder-boolean-enum-and-define-TRUE-FA.patch @@ -0,0 +1,53 @@ +From 37f07b014126f8ca56b60b3a4ed38f96f07d2ec9 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 21 Feb 2023 16:43:05 +0100 +Subject: [PATCH] Fix JPEGImageDecoder boolean enum and #define TRUE/FALSE mix + https://bugs.webkit.org/show_bug.cgi?id=252666 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed by NOBODY (OOPS!). + +jpeglib.h contains a typedef enum for boolean type but LCMSUniquePtr.h +include files that can contain #define TRUE/FALSE. This way build fails +with: +JPEGImageDecoder.cpp:343:43: error: invalid conversion from ‘int’ to ‘boolean’ + +This is because TRUE or FALSE should be an enum instead they get defined +as 1 or 0. To fix this move jpeglib.h inclusion after LCMSUniquePtr.h +inclusion. + +Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h: + +Signed-off-by: Giulio Benetti +--- + .../platform/image-decoders/jpeg/JPEGImageDecoder.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +index aa875de00faa..c396e1086d41 100644 +--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h ++++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h +@@ -32,14 +32,15 @@ + // ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers + #undef TRUE + #undef FALSE +-extern "C" { +-#include "jpeglib.h" +-} + + #if USE(LCMS) + #include "LCMSUniquePtr.h" + #endif + ++extern "C" { ++#include "jpeglib.h" ++} ++ + namespace WebCore { + + class JPEGImageReader; +-- +2.34.1 +