Modify udis86 dependency to refer system installed version
This commit is contained in:
parent
3057c518bc
commit
e2779e7813
|
|
@ -1,6 +1,8 @@
|
||||||
--- a/Makefile
|
Index: hyprland-0.34.0/Makefile
|
||||||
+++ b/Makefile
|
===================================================================
|
||||||
@@ -52,8 +52,8 @@
|
--- hyprland-0.34.0.orig/Makefile
|
||||||
|
+++ hyprland-0.34.0/Makefile
|
||||||
|
@@ -52,8 +52,8 @@ install:
|
||||||
mkdir -p ${DESTDIR}${PREFIX}/share/man/man1
|
mkdir -p ${DESTDIR}${PREFIX}/share/man/man1
|
||||||
install -m644 ./docs/*.1 ${DESTDIR}${PREFIX}/share/man/man1
|
install -m644 ./docs/*.1 ${DESTDIR}${PREFIX}/share/man/man1
|
||||||
|
|
||||||
|
|
@ -11,7 +13,7 @@
|
||||||
|
|
||||||
$(MAKE) installheaders
|
$(MAKE) installheaders
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@
|
@@ -62,7 +62,7 @@ uninstall:
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/Hyprland
|
rm -f ${DESTDIR}${PREFIX}/bin/Hyprland
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/hyprctl
|
rm -f ${DESTDIR}${PREFIX}/bin/hyprctl
|
||||||
rm -f ${DESTDIR}${PREFIX}/bin/hyprpm
|
rm -f ${DESTDIR}${PREFIX}/bin/hyprpm
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -26,9 +26,6 @@
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
-# udis
|
||||||
|
-add_subdirectory("subprojects/udis86")
|
||||||
|
-
|
||||||
|
# wlroots
|
||||||
|
message(STATUS "Setting up wlroots")
|
||||||
|
|
||||||
|
@@ -88,7 +85,6 @@
|
||||||
|
"src/"
|
||||||
|
"subprojects/wlroots/include/"
|
||||||
|
"subprojects/wlroots/build/include/"
|
||||||
|
- "subprojects/udis86/"
|
||||||
|
"protocols/")
|
||||||
|
set(CMAKE_CXX_STANDARD 23)
|
||||||
|
add_compile_definitions(WLR_USE_UNSTABLE)
|
||||||
|
@@ -101,7 +97,7 @@
|
||||||
|
find_package(Threads REQUIRED)
|
||||||
|
find_package(PkgConfig REQUIRED)
|
||||||
|
find_package(OpenGL REQUIRED)
|
||||||
|
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1) # we do not check for wlroots, as we provide it ourselves
|
||||||
|
+pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 udis86) # we do not check for wlroots, as we provide it ourselves
|
||||||
|
|
||||||
|
file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
|
||||||
|
|
||||||
|
@@ -225,7 +221,7 @@
|
||||||
|
OpenGL::EGL
|
||||||
|
OpenGL::GL
|
||||||
|
Threads::Threads
|
||||||
|
- libudis86
|
||||||
|
+ udis86
|
||||||
|
)
|
||||||
|
|
||||||
|
protocol("protocols/idle.xml" "idle" true)
|
||||||
|
|
@ -1,2 +1,3 @@
|
||||||
000-destdir.patch
|
000-destdir.patch
|
||||||
001-move-libwlroots-to-hyprland-location.patch
|
001-move-libwlroots-to-hyprland-location.patch
|
||||||
|
002-disable-udis86.patch
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue