mirror of https://github.com/hyprwm/Hyprland
Nix: remove portal patch
This commit is contained in:
parent
e941836c0f
commit
8528b72b29
|
@ -5,3 +5,5 @@ foreach type : wallpaper_types
|
||||||
install_data(f'wall_@type@@size@K.png', install_dir: join_paths(get_option('datadir'), 'hyprland'), install_tag: 'runtime')
|
install_data(f'wall_@type@@size@K.png', install_dir: join_paths(get_option('datadir'), 'hyprland'), install_tag: 'runtime')
|
||||||
endforeach
|
endforeach
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
install_data('hyprland-portals.conf', install_dir: join_paths(get_option('datadir'), 'xdg-desktop-portal'), install_tag: 'runtime')
|
||||||
|
|
|
@ -100,8 +100,6 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
|
||||||
patches = [
|
patches = [
|
||||||
# make meson use the provided wlroots instead of the git submodule
|
# make meson use the provided wlroots instead of the git submodule
|
||||||
./patches/meson-build.patch
|
./patches/meson-build.patch
|
||||||
# fixes portals search path to be picked up from $XDG_DESKTOP_PORTAL_DIR
|
|
||||||
./patches/portals.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
|
|
||||||
index 1d978aed..56665389 100644
|
|
||||||
--- a/src/Compositor.cpp
|
|
||||||
+++ b/src/Compositor.cpp
|
|
||||||
@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() {
|
|
||||||
|
|
||||||
static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue;
|
|
||||||
|
|
||||||
- if (!*PSUPPRESSPORTAL) {
|
|
||||||
- if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) {
|
|
||||||
+ static auto* const PORTALDIRENV = getenv("XDG_DESKTOP_PORTAL_DIR");
|
|
||||||
+
|
|
||||||
+ static auto const PORTALDIR = PORTALDIRENV != NULL ? std::string(PORTALDIRENV) : "";
|
|
||||||
+
|
|
||||||
+ if (!*PSUPPRESSPORTAL && PORTALDIR != "") {
|
|
||||||
+ if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + portal + ".portal"); })) {
|
|
||||||
// bad portal detected
|
|
||||||
g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.",
|
|
||||||
CColor(0), 15000, ICON_ERROR);
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) {
|
|
||||||
- g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0),
|
|
||||||
- 15000, ICON_ERROR);
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue