diff options
Diffstat (limited to 'editors/bee-host/files')
| -rw-r--r-- | editors/bee-host/files/patch-CMakeLists.txt | 11 | ||||
| -rw-r--r-- | editors/bee-host/files/patch-vars.sh | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/editors/bee-host/files/patch-CMakeLists.txt b/editors/bee-host/files/patch-CMakeLists.txt index e5040671000d..cfc68a29e43f 100644 --- a/editors/bee-host/files/patch-CMakeLists.txt +++ b/editors/bee-host/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-03-12 06:35:07 UTC +--- CMakeLists.txt.orig 2025-04-21 15:28:54 UTC +++ CMakeLists.txt -@@ -38,27 +38,7 @@ endif() +@@ -39,27 +39,7 @@ set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external) set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external) @@ -29,7 +29,7 @@ # beectl set(BEECTL_SRCS -@@ -69,21 +49,13 @@ set(BEECTL_SRCS +@@ -70,21 +50,13 @@ set(BEECTL_SRCS src/mkstemps.c # This is nasty, but I couldn't find a way to use CMAKE_TOOLCHAIN_FILE # for the external project (see comments below.) @@ -51,12 +51,13 @@ # The following would be better approach than including cJSON files in our # source list. But the build fails when cross-compiling, since -@@ -110,13 +82,13 @@ string(TOUPPER "${CMAKE_SYSTEM_NAME}" uppercase_CMAKE_ +@@ -126,14 +98,14 @@ set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFI message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFIX}/bin/beectl") -set(BEECTL_CHROME_MANIFEST_DIR "etc/opt/chrome/native-messaging-hosts") +set(BEECTL_CHROME_MANIFEST_DIR "etc/chrome/native-messaging-hosts") + set(BEECTL_CHROMIUM_MANIFEST_DIR "etc/chromium/native-messaging-hosts") if(uppercase_CMAKE_SYSTEM_NAME MATCHES LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(amd|x86_)64$") # Fedora 36 amd64 may have a separate /usr/lib64 dir different from /usr/lib. @@ -67,7 +68,7 @@ endif() # RPM package properties -@@ -238,7 +210,7 @@ elseif(uppercase_CMAKE_SYSTEM_NAME MATCHES DARWIN) +@@ -288,7 +260,7 @@ else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS) COMPONENT config) else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS) # Install host app diff --git a/editors/bee-host/files/patch-vars.sh b/editors/bee-host/files/patch-vars.sh index 12201417b955..d1cb28c9ef22 100644 --- a/editors/bee-host/files/patch-vars.sh +++ b/editors/bee-host/files/patch-vars.sh @@ -1,12 +1,14 @@ ---- vars.sh.orig 2022-04-07 09:03:56 UTC +--- vars.sh.orig 2025-05-06 17:29:25 UTC +++ vars.sh -@@ -45,8 +45,8 @@ case "$kernel" in +@@ -47,9 +47,9 @@ case "$kernel" in *) if [ $EUID == 0 ]; then # If superuser - chrome_target_manifest_dir='/etc/opt/chrome/native-messaging-hosts' +- chromium_target_manifest_dir='/etc/chromium/native-messaging-hosts' - firefox_target_manifest_dir='/usr/lib/mozilla/native-messaging-hosts' + chrome_target_manifest_dir='%%LOCALBASE%%/chrome/native-messaging-hosts' ++ chromium_target_manifest_dir='%%LOCALBASE%%/chromium/native-messaging-hosts' + firefox_target_manifest_dir='%%LOCALBASE%%/lib/mozilla/native-messaging-hosts' else # If normal user |