From nobody Thu Mar 31 12:17:11 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 27EB11A48C29; Thu, 31 Mar 2022 12:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTj3W6Zflz3Fqr; Thu, 31 Mar 2022 12:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648729032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hFym1TVkvHP4WzPs+aITbawQPkXdTNa8lPBIzlC29pM=; b=IOPaPPGetL65j/DtP86AOC7DhV5FrJcYRdFZPz8IhvdmIMbl9gVFX9Q9jtd6wYmo0nvgkv 8LIIVp0sRKIWPsjQolfChLEGlrIkIklD6YKtnEjw3CxJoVbDGyAUJur/1E0iwpcgIGEuz9 hVPXXCdoXH5lmxp6LI1t5mz9vv2UOCmaZYMpytT4tk0a3Y6F04TFXAIEzQeOURymMcjFus yucbCC5ExHCoP05nTjkiSgvPFcj1jYZLuUqqhxdK8PrbdXw5Vqb3Gt46z8vX4zcOfP5E60 k2YHZpA0VZz7ir8zCaSAvaedmwi5w/s6Hy4VDxSS5xim+B3N5MO+T7eVOCvSxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C14F927886; Thu, 31 Mar 2022 12:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22VCHBju084248; Thu, 31 Mar 2022 12:17:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VCHBm0084247; Thu, 31 Mar 2022 12:17:11 GMT (envelope-from git) Date: Thu, 31 Mar 2022 12:17:11 GMT Message-Id: <202203311217.22VCHBm0084247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: cdaa56f46ba7 - main - www/iridium: enable suppport for Wayland List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdaa56f46ba7308278fc655f7467983a481502ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648729032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hFym1TVkvHP4WzPs+aITbawQPkXdTNa8lPBIzlC29pM=; b=njwr1uE+a1Dhoov4a0UsJoQlKMmAzUC9CNWCYbaXkvMidy+wCgfEvgDHQl6dAoenzzlK6b C/jT7UQgbIhEBCtExuKG8QDiTG0ttnzdN9icaTy1jNs9PljxccPylzlhJ/G9N2s8H/xsP4 Ize+ePdjuN/pN/7592s4xo9r6PiV6clWthcOzsxy531rsDASqY7YY9VSfcn77zZmRyrmrc PxP1ysmwMChw8M/lCbseHjUvRqJBBsBVaz9YZbdv9PhVdDYVercN5QoD2D0M5aeoc6YfCD rj+9JOfAz7IMG9Pn5GDIY7Vng8BRF7Roio89v3BMLeIbnzOriX75N1n8DTA3bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648729032; a=rsa-sha256; cv=none; b=krntAEDBBoqASZoGM84LwUmy72PN1L7TkOh0kJHA318u8Pu/SxzIfGAsXWAIRCqxuFB63f DBME3RWfXBJ5Pg60rhDOYb293QxLzhYqp1wykw7D4IW9D3NsWfsJjKYZDfltCg/eBexlLc hqJLvu1gO0oenqj9hKhE1bLoW88gCUo+3Vh9Kdft7Jk/Qp3ixx/GDRRp+e21vAGOeZVQey 5+pgZbZLzLJ9CSPCHtNA2Idjn7f167nQ/hn5H3beFkI8z4JAwMv9CqQZS58lnT1wNmwfzY my5UFd3CoMPMXgsWvBaOHI62+ipjIZhIdYeCcixzacP5CMb9xU70JR8bDnaQ+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=cdaa56f46ba7308278fc655f7467983a481502ee commit cdaa56f46ba7308278fc655f7467983a481502ee Author: Robert Nagy AuthorDate: 2022-03-31 12:16:32 +0000 Commit: Rene Ladan CommitDate: 2022-03-31 12:16:48 +0000 www/iridium: enable suppport for Wayland --- www/iridium/Makefile | 2 ++ www/iridium/files/patch-build_config_ozone.gni | 14 +++++------ .../files/patch-third__party_wayland_features.gni | 17 +++++++++++++ ...ch-ui_events_keycodes_dom_keycode__converter.cc | 29 +++++++++++++++++++++- ...tch-ui_events_keycodes_dom_keycode__converter.h | 11 ++++++++ 5 files changed, 64 insertions(+), 9 deletions(-) diff --git a/www/iridium/Makefile b/www/iridium/Makefile index e89c8ce41d51..d60528c33260 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,5 +1,6 @@ PORTNAME= iridium PORTVERSION= 2022.03.99.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -106,6 +107,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libjpeg=true \ + use_system_wayland_scanner=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" diff --git a/www/iridium/files/patch-build_config_ozone.gni b/www/iridium/files/patch-build_config_ozone.gni index 68386f36fa87..75e60dc7adf7 100644 --- a/www/iridium/files/patch-build_config_ozone.gni +++ b/www/iridium/files/patch-build_config_ozone.gni @@ -1,21 +1,19 @@ ---- build/config/ozone.gni.orig 2022-03-28 18:11:04 UTC +--- build/config/ozone.gni.orig 2022-03-31 09:38:28 UTC +++ build/config/ozone.gni -@@ -91,9 +91,17 @@ declare_args() { +@@ -91,7 +91,15 @@ declare_args() { } else if (is_chromeos_lacros) { ozone_platform = "wayland" ozone_platform_wayland = true - } else if (is_linux) { + } else if (is_linux && !is_bsd) { - ozone_platform = "x11" - ozone_platform_wayland = true ++ ozone_platform = "x11" ++ ozone_platform_wayland = true + ozone_platform_x11 = true + } else if (is_openbsd) { + ozone_platform = "x11" + ozone_platform_wayland = false + ozone_platform_x11 = true + } else if (is_freebsd) { -+ ozone_platform = "x11" -+ ozone_platform_wayland = false + ozone_platform = "x11" + ozone_platform_wayland = true ozone_platform_x11 = true - } else if (is_win) { - ozone_platform = "windows" diff --git a/www/iridium/files/patch-third__party_wayland_features.gni b/www/iridium/files/patch-third__party_wayland_features.gni new file mode 100644 index 000000000000..654328e54f36 --- /dev/null +++ b/www/iridium/files/patch-third__party_wayland_features.gni @@ -0,0 +1,17 @@ +--- third_party/wayland/features.gni.orig 2022-03-31 09:38:28 UTC ++++ third_party/wayland/features.gni +@@ -13,8 +13,12 @@ declare_args() { + default_toolchain != "//build/toolchain/cros:target" + + # Path to wayland-scanner. Has effect only when the system libwayland is used. +- assert(host_os == "linux") +- system_wayland_scanner_path = "/usr/bin/wayland-scanner" ++ assert(host_os == "linux" || host_os == "freebsd") ++ if (is_bsd) { ++ system_wayland_scanner_path = "/usr/local/bin/wayland-scanner" ++ } else { ++ system_wayland_scanner_path = "/usr/bin/wayland-scanner" ++ } + + # This may be set by Chromium packagers who do not wish to use the bundled + # wayland scanner. diff --git a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index b79b1ef3f8f7..aca72b59d75d 100644 --- a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,5 +1,14 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2022-03-28 18:11:04 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2022-03-31 09:38:28 UTC +++ ui/events/keycodes/dom/keycode_converter.cc +@@ -11,7 +11,7 @@ + #include "ui/events/keycodes/dom/dom_code.h" + #include "ui/events/keycodes/dom/dom_key.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) + #include + #endif + @@ -24,7 +24,7 @@ namespace { #if BUILDFLAG(IS_WIN) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ @@ -9,3 +18,21 @@ #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, xkb, code } #elif BUILDFLAG(IS_APPLE) +@@ -67,7 +67,7 @@ struct DomKeyMapEntry { + #undef DOM_KEY_MAP + #undef DOM_KEY_UNI + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) + + // The offset between XKB Keycode and evdev code. + constexpr int kXkbKeycodeOffset = 8; +@@ -148,7 +148,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c + return UsbKeycodeToNativeKeycode(static_cast(code)); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) + // static + DomCode KeycodeConverter::XkbKeycodeToDomCode(uint32_t xkb_keycode) { + // Currently XKB keycode is the native keycode. diff --git a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h new file mode 100644 index 000000000000..28ab75435bc5 --- /dev/null +++ b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h @@ -0,0 +1,11 @@ +--- ui/events/keycodes/dom/keycode_converter.h.orig 2022-03-31 09:38:28 UTC ++++ ui/events/keycodes/dom/keycode_converter.h +@@ -63,7 +63,7 @@ class KeycodeConverter { + // Convert a DomCode into a native keycode. + static int DomCodeToNativeKeycode(DomCode code); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) + // Convert a XKB keycode into a DomCode. + static DomCode XkbKeycodeToDomCode(uint32_t xkb_keycode); +