Updated hyprland version to 0.35.0
- Updated hyprland version in changelog - Updated expression to revert change made by hyprland to the soversion definition in subprojects/wlroots/meson.build - Updated diff in patch 001 due to change in upstream source - Removed unneeded patch 004, available upstream - Added new patch 004 to use /bin/bash as shell in Makefile. The Makefile contains a few lines that otherwise fail in dash - Updated series file Signed-off-by: Alan M Varghese (NyxTrail) <alan@digistorm.in>
This commit is contained in:
parent
88b58698b0
commit
0ab0e660f3
|
|
@ -1,4 +1,4 @@
|
||||||
hyprland (0.34.0+ds-1) UNRELEASED; urgency=low
|
hyprland (0.35.0+ds-1) UNRELEASED; urgency=low
|
||||||
|
|
||||||
* Initial release. Closes: #1040971
|
* Initial release. Closes: #1040971
|
||||||
* Modified Makefile to support DESTDIR variable so that we can "install"
|
* Modified Makefile to support DESTDIR variable so that we can "install"
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ Last-Update: 2024-02-02
|
||||||
$(MAKE) installheaders
|
$(MAKE) installheaders
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@
|
@@ -62,7 +62,7 @@
|
||||||
rm -f ${PREFIX}/bin/Hyprland
|
rm -f ${PREFIX}/bin/hyprland
|
||||||
rm -f ${PREFIX}/bin/hyprctl
|
rm -f ${PREFIX}/bin/hyprctl
|
||||||
rm -f ${PREFIX}/bin/hyprpm
|
rm -f ${PREFIX}/bin/hyprpm
|
||||||
- rm -f ${PREFIX}/lib/libwlroots.so.13032
|
- rm -f ${PREFIX}/lib/libwlroots.so.13032
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
Description: Upstream fix for hyprland.pc
|
|
||||||
This pkg-conf file is essential for hyprpm (plugin manager).
|
|
||||||
This patch fixes the prefix variable defined in this file.
|
|
||||||
Origin: https://github.com/hyprwm/Hyprland/commit/e65f52bf2d6abb001c402c8302ac7003da8cd06d
|
|
||||||
Forwarded: not-needed
|
|
||||||
Last-Update: 2024-02-03
|
|
||||||
Applied-Upstream: https://github.com/hyprwm/Hyprland/commit/e65f52bf2d6abb001c402c8302ac7003da8cd06d
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -1,22 +1,22 @@
|
|
||||||
PREFIX = /usr/local
|
|
||||||
|
|
||||||
legacyrenderer:
|
|
||||||
- cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
|
|
||||||
+ cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
|
|
||||||
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
|
|
||||||
chmod -R 777 ./build
|
|
||||||
|
|
||||||
legacyrendererdebug:
|
|
||||||
- cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
|
|
||||||
+ cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
|
|
||||||
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
|
|
||||||
chmod -R 777 ./build
|
|
||||||
|
|
||||||
release:
|
|
||||||
- cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build -G Ninja
|
|
||||||
+ cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
|
|
||||||
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
|
|
||||||
chmod -R 777 ./build
|
|
||||||
|
|
||||||
debug:
|
|
||||||
- cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -S . -B ./build -G Ninja
|
|
||||||
+ cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
|
|
||||||
cmake --build ./build --config Debug --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
|
|
||||||
chmod -R 777 ./build
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -1,4 +1,5 @@
|
||||||
|
PREFIX = /usr/local
|
||||||
|
+SHELL = /bin/bash
|
||||||
|
|
||||||
|
legacyrenderer:
|
||||||
|
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
001-move-libwlroots-to-hyprland-location.patch
|
001-move-libwlroots-to-hyprland-location.patch
|
||||||
002-disable-udis86.patch
|
002-disable-udis86.patch
|
||||||
003-use-system-hyprland-protocols.patch
|
003-use-system-hyprland-protocols.patch
|
||||||
004-fix-pkg-conf-prefix.patch
|
004-use-bash-in-makefile.patch
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ override_dh_clean:
|
||||||
rm -rf subprojects/wlroots/tmp
|
rm -rf subprojects/wlroots/tmp
|
||||||
# Hyprland made this change. Revert it or dpkg-source will complain that
|
# Hyprland made this change. Revert it or dpkg-source will complain that
|
||||||
# meson.build does not match the one in the original source tarball
|
# meson.build does not match the one in the original source tarball
|
||||||
sed -E -i -e 's/soversion = 13032/soversion = 13/g' subprojects/wlroots/meson.build
|
sed -E -i -e 's/^soversion = .*/soversion = version_minor.to_int() - 5/g' subprojects/wlroots/meson.build
|
||||||
#override_dh_auto_configure:
|
#override_dh_auto_configure:
|
||||||
# dh_auto_configure -- \
|
# dh_auto_configure -- \
|
||||||
# -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)"
|
# -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue