2025-06-20 15:47:27 -04:00
|
|
|
diff --git a/overlays/meson.build b/overlays/meson.build
|
|
|
|
|
index 12ecb97..a6e39ff 100644
|
2025-06-20 16:17:32 -04:00
|
|
|
--- a/meson.build
|
|
|
|
|
+++ b/meson.build
|
2025-06-20 15:47:27 -04:00
|
|
|
@@ -218,7 +218,7 @@ if is_64bit_system
|
2025-06-20 15:44:46 -04:00
|
|
|
xcb_64bit_dep = dependency('xcb')
|
|
|
|
|
endif
|
2025-06-20 15:47:27 -04:00
|
|
|
if with_bitbridge
|
2025-06-20 15:44:46 -04:00
|
|
|
- xcb_32bit_dep = winegcc.find_library('xcb')
|
|
|
|
|
+ xcb_32bit_dep = winegcc.find_library('xcb', dirs: ['@libxcb32@/lib'])
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# These are all headers-only libraries, and thus won't require separate 32-bit
|
|
|
|
|
diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
|
|
|
|
|
index 654b6c83..78ba2fe7 100644
|
|
|
|
|
--- a/src/common/notifications.cpp
|
|
|
|
|
+++ b/src/common/notifications.cpp
|
|
|
|
|
@@ -29,8 +29,8 @@
|
|
|
|
|
#include "process.h"
|
|
|
|
|
#include "utils.h"
|
|
|
|
|
|
|
|
|
|
-constexpr char libdbus_library_name[] = "libdbus-1.so.3";
|
|
|
|
|
-constexpr char libdbus_library_fallback_name[] = "libdbus-1.so";
|
|
|
|
|
+constexpr char libdbus_library_name[] = "@libdbus@/lib/libdbus-1.so.3";
|
|
|
|
|
+constexpr char libdbus_library_fallback_name[] = "@libdbus@/lib/libdbus-1.so";
|
|
|
|
|
|
|
|
|
|
std::atomic<void*> libdbus_handle = nullptr;
|
|
|
|
|
std::mutex libdbus_mutex;
|
|
|
|
|
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
|
|
|
|
index 441345c6..f3e51cff 100644
|
|
|
|
|
--- a/src/plugin/utils.cpp
|
|
|
|
|
+++ b/src/plugin/utils.cpp
|
|
|
|
|
@@ -103,7 +103,7 @@ std::string PluginInfo::wine_version() const {
|
|
|
|
|
// The '*.exe' scripts generated by winegcc allow you to override the binary
|
|
|
|
|
// used to run Wine, so will will handle this in the same way for our Wine
|
|
|
|
|
// version detection. We'll be using `execvpe`
|
|
|
|
|
- std::string wine_path = "wine";
|
|
|
|
|
+ std::string wine_path = "@wine@/bin/wine";
|
|
|
|
|
// NOLINTNEXTLINE(concurrency-mt-unsafe)
|
|
|
|
|
if (const char* wineloader_path = getenv("WINELOADER");
|
|
|
|
|
wineloader_path && access(wineloader_path, X_OK) == 0) {
|
