hydros/HyprlandRPM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[hyprland] Update to commit d486a5f and use prebuilt hyprland-protocols
Some checks failed
Build hyprland-git / Build and push image (push) Failing after 3m37s
Details

Browse Source
This commit is contained in:
Eriq Taing
2026-06-19 21:19:58 -04:00
parent af7fc4d719
commit 6f563afd64
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hyprland-git/hyprland-git.spec
View File

@@ -1,14 +1,8 @@
%global hyprland_commit e5c721f29ae035881aef1620b2d714da97067883 %global hyprland_commit d486a5fe69c9800e75aed76ae4beb3183ac8886d
%global hyprland_shortcommit %(c=%{hyprland_commit}; echo ${c:0:7}) %global hyprland_shortcommit %(c=%{hyprland_commit}; echo ${c:0:7})
%global bumpver 1 %global bumpver 1
%global commits_count 7475 %global commits_count 7486
%global commit_date Sun Jun 14 06:40:09 2026 %global commit_date Fri Jun 19 05:04:51 2026
%global protocols_commit 3a5c2bda1c1a4e55cc1330c782547695a93f05b2
%global protocols_shortcommit %(c=%{protocols_commit}; echo ${c:0:7})
%global udis86_commit 5336633af70f3917760a6d441ff02d93477b0c86
%global udis86_shortcommit %(c=%{udis86_commit}; echo ${c:0:7})
%global libxkbcommon_version 1.11.0 %global libxkbcommon_version 1.11.0
@@ -28,7 +22,6 @@ License: BSD-3-Clause AND BSD-2-Clause AND HPND-sell-variant AND LGPL-2.1
URL: https://github.com/hyprwm/Hyprland URL: https://github.com/hyprwm/Hyprland
%if 0%{?bumpver} %if 0%{?bumpver}
Source0: %{url}/archive/%{hyprland_commit}/%{name}-%{hyprland_shortcommit}.tar.gz Source0: %{url}/archive/%{hyprland_commit}/%{name}-%{hyprland_shortcommit}.tar.gz
Source2: https://github.com/hyprwm/hyprland-protocols/archive/%{protocols_commit}/protocols-%{protocols_shortcommit}.tar.gz
Source3: https://github.com/canihavesomecoffee/udis86/archive/%{udis86_commit}/udis86-%{udis86_shortcommit}.tar.gz Source3: https://github.com/canihavesomecoffee/udis86/archive/%{udis86_commit}/udis86-%{udis86_shortcommit}.tar.gz
%else %else
Source0: %{url}/releases/download/v%{version}/source-v%{version}.tar.gz Source0: %{url}/releases/download/v%{version}/source-v%{version}.tar.gz
@@ -92,6 +85,8 @@ hyprdeps = {
"pkgconfig(xwayland)", "pkgconfig(xwayland)",
"pkgconfig(hyprwire)", "pkgconfig(hyprwire)",
"pkgconfig(lua) >= 5.5", "pkgconfig(lua) >= 5.5",
"pkgconfig(readline)",
"pkgconfig(hyprland-protocols)",
} }
} }
%if 0%{?fedora} > 42 %if 0%{?fedora} > 42
@@ -190,7 +185,6 @@ Requires: pkgconfig(xkbcommon)
%autosetup -n %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source} -N %autosetup -n %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source} -N
%if 0%{?bumpver} %if 0%{?bumpver}
tar -xf %{SOURCE2} -C subprojects/hyprland-protocols --strip=1
tar -xf %{SOURCE3} -C subprojects/udis86 --strip=1 tar -xf %{SOURCE3} -C subprojects/udis86 --strip=1
sed -e '/GIT_COMMIT_HASH/s/unknown/%{hyprland_commit}/' \ sed -e '/GIT_COMMIT_HASH/s/unknown/%{hyprland_commit}/' \
-e '/GIT_BRANCH/s/unknown/main/' \ -e '/GIT_BRANCH/s/unknown/main/' \
@@ -201,7 +195,6 @@ sed -e '/GIT_COMMIT_HASH/s/unknown/%{hyprland_commit}/' \
-i CMakeLists.txt -i CMakeLists.txt
%endif %endif
cp -p subprojects/hyprland-protocols/LICENSE LICENSE-hyprland-protocols
cp -p subprojects/udis86/LICENSE LICENSE-udis86 cp -p subprojects/udis86/LICENSE LICENSE-udis86
sed -i \ sed -i \
@@ -227,7 +220,7 @@ install -Dpm644 %{SOURCE4} -t %{buildroot}%{_rpmconfigdir}/macros.d
%files %files
%license LICENSE LICENSE-udis86 LICENSE-hyprland-protocols %license LICENSE LICENSE-udis86
%{_bindir}/[Hh]yprland %{_bindir}/[Hh]yprland
%{_bindir}/hyprctl %{_bindir}/hyprctl
%{_bindir}/start-hyprland %{_bindir}/start-hyprland