Skip to content

Commit

Permalink
www/qt6-webengine: Fix hardcoded path
Browse files Browse the repository at this point in the history
Replace hardcoded path causing runtime failures by replacing with
LOCALBASE.

Approved by:		kde (kai)
Fixes:			3227b80
Differential Revision:	https://reviews.freebsd.org/D38067
  • Loading branch information
madpilot78 committed Jan 15, 2023
1 parent 9fbad51 commit 6844270
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
4 changes: 3 additions & 1 deletion www/qt6-webengine/Makefile
Expand Up @@ -15,6 +15,7 @@

PORTNAME= webengine
DISTVERSION= ${QT6_VERSION}
PORTREVISION= 1
CATEGORIES= www
PKGNAMEPREFIX= qt6-

Expand Down Expand Up @@ -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
Expand Down
@@ -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<xkb_context, XkbContextDeleter> 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<xkb_keymap, XkbKeymapDeleter> 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() {

0 comments on commit 6844270

Please sign in to comment.