From nobody Sun Jan 15 20:29:52 2023 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 4Nw6G82pcTz2sYY8; Sun, 15 Jan 2023 20:29:52 +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 4Nw6G82KC9z3ryT; Sun, 15 Jan 2023 20:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673814592; 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=FbhqTFUmmf5lyMYLzQVh5V0C6MTaBdipw+T/ORXSIBo=; b=iv/qd4ZkGl4O7hkt9InNCa+gLJcJ1J66ay+tCtfzW+JhOUX1e7mD9GlR7JIQg4IiJjP/7A 2762zJO4SckVC3cWsSmWiDiuiYPN/kMOLhqTCvM8dow3vxUzpDfOdV8IgSXEatspcKqeYW T2WS4yHNu6e9i0lG07bKftfb+Qqi7Sv0eH6tEEctWzSRiaOBn1Mn3hvCOj2nu32BIka0AA /jxSHzlc734HiHBee0U3xuSNJvzP3M1aTMcKeU9gVrLr20nRWJmb2lHeKjwWP64h6PpQv/ ImwYAIiBwRSaIUo4sy8ciSTJCYpsfKrUAX+jwqLqzSaU1JK34JtPEQZWDku2oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673814592; 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=FbhqTFUmmf5lyMYLzQVh5V0C6MTaBdipw+T/ORXSIBo=; b=OZPM8Kr9zosYVx0eR0ser7ldKxWAE2oTqwOVPURds60HGnpsowjhQNccJkESnCYbxg5UkE 2ZU744SJyElbMqyTQYCIMbna1+qreJFZQ3+jq9H97IHI3J15uDLhrMfclnBLtDIrvrhRYr eWBd9zSdI66Irdz1lH1BSI9ePhcw1fguIPNhy5c2Qp46aB4jo4KiQsAhdtX//5wPON72uy nyVUo7/DMfROYn3Zj7e4fosVGLd4m0t7EqOEo0aDYtQwIFjnaSMbAiLmbV5jUENjYaFHDN Mtq+SCbfXI8eddjfD9KJaeLHi+BweNtVO7Q/86ODCPfVw68sVPp3N0KWodeNmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673814592; a=rsa-sha256; cv=none; b=l/JnPV9Pz1mdVx41BmNvqPFRMzOZZ5gnj0A4R63cvgRdBsAd8/eHNc2hqpdLjdODuK8tqf X1pOHCdwTLfVn19zCxKpYt3zCtGv6Kg/Ffrg4I1r2paPiAMDB/eRCq/Z9ajLRxDY6d53ke 1ZjZ4W43JSEZzqo882MZYBS2/18o3RGFBuQk9b3itpyrgveBwgHoKlg8bTI6VmFFHD1YJk BqCifAz3DZ6OharndpqY9dKjAgKEdvzY9YVjEJJ2HQin1OHOGbMWX3tMn1NogZs4W2EyFW 7dhNeuz3ZnG31+tI/1wr91xVHfkIDKQWpbCFUPcdv6aQ0cWX49J12Gm1rO+1/A== 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 4Nw6G81NXHzgcl; Sun, 15 Jan 2023 20:29:52 +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 30FKTq2P088682; Sun, 15 Jan 2023 20:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30FKTqXa088681; Sun, 15 Jan 2023 20:29:52 GMT (envelope-from git) Date: Sun, 15 Jan 2023 20:29:52 GMT Message-Id: <202301152029.30FKTqXa088681@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 684427097cfe - main - www/qt6-webengine: Fix hardcoded path 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 684427097cfe719882adef380fcae0142d375fef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=684427097cfe719882adef380fcae0142d375fef commit 684427097cfe719882adef380fcae0142d375fef Author: Guido Falsi AuthorDate: 2023-01-15 20:27:35 +0000 Commit: Guido Falsi CommitDate: 2023-01-15 20:27:35 +0000 www/qt6-webengine: Fix hardcoded path Replace hardcoded path causing runtime failures by replacing with LOCALBASE. Approved by: kde (kai) Fixes: 3227b809dd69aa15c0798b4e5ffaa5adc9fe0b98 Differential Revision: https://reviews.freebsd.org/D38067 --- www/qt6-webengine/Makefile | 4 +++- ...ozone_layout_xkb_xkb__keyboard__layout__engine.cc | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index b9a0e87c6be4..af9590a670e6 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -15,6 +15,7 @@ PORTNAME= webengine DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -124,7 +125,8 @@ post-patch: ${WRKSRC}/src/host/BUILD.toolchain.gn.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp \ - ${WRKSRC}/src/3rdparty/chromium/third_party/wayland/features.gni + ${WRKSRC}/src/3rdparty/chromium/third_party/wayland/features.gni \ + ${WRKSRC}/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc pre-configure: # We used to remove bundled libraries to be sure that webengine uses diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc new file mode 100644 index 000000000000..97d3d0c562d1 --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_ozone_layout_xkb_xkb__keyboard__layout__engine.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc.orig 2022-12-12 18:53:13 UTC ++++ src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc +@@ -638,7 +638,7 @@ void LoadKeymap(const std::string& layout_name, + .options = ""}; + std::unique_ptr context; + context.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES)); +- xkb_context_include_path_append(context.get(), "/usr/share/X11/xkb"); ++ xkb_context_include_path_append(context.get(), "%%LOCALBASE%%/share/X11/xkb"); + std::unique_ptr keymap; + keymap.reset(xkb_keymap_new_from_names(context.get(), &names, + XKB_KEYMAP_COMPILE_NO_FLAGS)); +@@ -672,7 +672,7 @@ XkbKeyboardLayoutEngine::XkbKeyboardLayoutEngine( + // TODO: add XKB_CONTEXT_NO_ENVIRONMENT_NAMES + xkb_context_.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES)); + xkb_context_include_path_append(xkb_context_.get(), +- "/usr/share/X11/xkb"); ++ "%%LOCALBASE%%/share/X11/xkb"); + } + + XkbKeyboardLayoutEngine::~XkbKeyboardLayoutEngine() {