Remove unneeded patch files
This commit is contained in:
parent
ab75887bc0
commit
0d70bcee0f
|
|
@ -1,47 +0,0 @@
|
|||
Description: Use system version of udis86
|
||||
Hyprland sources are shipped with a copy of udis86, against
|
||||
which the binaries are built. We will instead build against
|
||||
the Debian version of the library.
|
||||
Author: Alan M Varghese <alan@digistorm.in>
|
||||
Last-Update: 2024-09-22
|
||||
Forwarded: not-needed
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -26,7 +26,7 @@
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
|
||||
|
||||
# udis
|
||||
-add_subdirectory("subprojects/udis86")
|
||||
+# add_subdirectory("subprojects/udis86")
|
||||
|
||||
if(CMAKE_BUILD_TYPE)
|
||||
string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
|
||||
@@ -63,7 +63,7 @@
|
||||
message(STATUS "Configuring Hyprland in Release with CMake")
|
||||
endif()
|
||||
|
||||
-include_directories(. "src/" "subprojects/udis86/" "protocols/")
|
||||
+include_directories(. "src/" "protocols/")
|
||||
set(CMAKE_CXX_STANDARD 26)
|
||||
add_compile_options(
|
||||
-Wall
|
||||
@@ -111,7 +111,8 @@
|
||||
gio-2.0
|
||||
hyprlang>=0.3.2
|
||||
hyprcursor>=0.1.7
|
||||
- hyprutils>=0.2.1)
|
||||
+ hyprutils>=0.2.1
|
||||
+ udis86)
|
||||
|
||||
find_package(hyprwayland-scanner 0.3.10 REQUIRED)
|
||||
|
||||
@@ -256,7 +257,7 @@
|
||||
endfunction()
|
||||
|
||||
target_link_libraries(Hyprland OpenGL::EGL OpenGL::GL Threads::Threads
|
||||
- libudis86)
|
||||
+ udis86)
|
||||
|
||||
protocolnew("subprojects/hyprland-protocols/protocols"
|
||||
"hyprland-global-shortcuts-v1" true)
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
Description: Use system version of hyprland-protocols
|
||||
Hyprland sources include a copy of hyprland-protocols. We will,
|
||||
instead, use the system version of this package.
|
||||
Author: Alan M Varghese <alan@digistorm.in>
|
||||
Last-Update: 2024-09-22
|
||||
Forwarded: not-needed
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -229,6 +229,13 @@
|
||||
function(protocolnew protoPath protoName external)
|
||||
if(external)
|
||||
set(path ${CMAKE_SOURCE_DIR}/${protoPath})
|
||||
+ string(FIND ${protoPath} "/usr/share" protocol_found)
|
||||
+ if(protocol_found EQUAL 0)
|
||||
+ message(STATUS "Protocol found under /usr.")
|
||||
+ set(path ${protoPath})
|
||||
+ else()
|
||||
+ set(path ${CMAKE_SOURCE_DIR}/${protoPath})
|
||||
+ endif()
|
||||
else()
|
||||
set(path ${WAYLAND_PROTOCOLS_DIR}/${protoPath})
|
||||
endif()
|
||||
@@ -259,10 +266,10 @@
|
||||
target_link_libraries(Hyprland OpenGL::EGL OpenGL::GL Threads::Threads
|
||||
udis86)
|
||||
|
||||
-protocolnew("subprojects/hyprland-protocols/protocols"
|
||||
+protocolnew("/usr/share/hyprland-protocols/protocols"
|
||||
"hyprland-global-shortcuts-v1" true)
|
||||
protocolnew("unstable/text-input" "text-input-unstable-v1" false)
|
||||
-protocolnew("subprojects/hyprland-protocols/protocols"
|
||||
+protocolnew("/usr/share/hyprland-protocols/protocols"
|
||||
"hyprland-toplevel-export-v1" true)
|
||||
protocolnew("protocols" "wlr-screencopy-unstable-v1" true)
|
||||
protocolnew("protocols" "wlr-gamma-control-unstable-v1" true)
|
||||
@@ -274,7 +281,7 @@
|
||||
protocolnew("protocols" "wlr-output-management-unstable-v1" true)
|
||||
protocolnew("protocols" "kde-server-decoration" true)
|
||||
protocolnew("protocols" "wlr-data-control-unstable-v1" true)
|
||||
-protocolnew("subprojects/hyprland-protocols/protocols" "hyprland-focus-grab-v1"
|
||||
+protocolnew("/usr/share/hyprland-protocols/protocols" "hyprland-focus-grab-v1"
|
||||
true)
|
||||
protocolnew("protocols" "wlr-layer-shell-unstable-v1" true)
|
||||
protocolnew("protocols" "wayland-drm" true)
|
||||
Loading…
Reference in New Issue