Attempt specifying directory for patch. Removed parts of spec for other
Some checks failed
Build hyprland-git / Build and push image (push) Failing after 2m40s

distros and old versions
This commit is contained in:
2025-12-09 14:17:38 -05:00
parent 063ce6d247
commit 997526f117

View File

@@ -104,26 +104,9 @@ end
%printbdeps %printbdeps
%if 0%{?rhel} == 10
BuildRequires: gcc-toolset-15
BuildRequires: gcc-toolset-15-gcc-c++
BuildRequires: gcc-toolset-15-annobin-plugin-gcc
%endif
%if 0%{?fedora} < 43
BuildRequires: byacc flex bison
BuildRequires: xorg-x11-proto-devel libX11-devel
BuildRequires: xkeyboard-config-devel
BuildRequires: pkgconfig(xcb-xkb)
BuildRequires: libxml2-devel
%endif
# udis86 is packaged in Fedora, but the copy bundled here is actually a # udis86 is packaged in Fedora, but the copy bundled here is actually a
# modified fork. # modified fork.
Provides: bundled(udis86) = 1.7.2^1.%{udis86_shortcommit} Provides: bundled(udis86) = 1.7.2^1.%{udis86_shortcommit}
%if 0%{?fedora} < 43
Provides: bundled(libxkbcommon) = %{libxkbcommon_version}
%endif
Requires: xorg-x11-server-Xwayland%{?_isa} Requires: xorg-x11-server-Xwayland%{?_isa}
Requires: aquamarine%{?_isa} >= 0.9.2 Requires: aquamarine%{?_isa} >= 0.9.2
@@ -201,11 +184,8 @@ Requires: pkgconfig(xkbcommon)
%prep %prep
%autosetup -n %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source} %autosetup -n %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source} -N
%if 0%{?fedora} < 43 %patch 1 -d %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source}
mkdir -p subprojects/libxkbcommon
tar -xf %{SOURCE5} -C subprojects/libxkbcommon --strip=1
%endif
%if 0%{?bumpver} %if 0%{?bumpver}
tar -xf %{SOURCE2} -C subprojects/hyprland-protocols --strip=1 tar -xf %{SOURCE2} -C subprojects/hyprland-protocols --strip=1
@@ -229,20 +209,6 @@ sed -i \
%build %build
%if 0%{?rhel} == 10
source /usr/lib/gcc-toolset/15-env.source
%endif
%if 0%{?fedora} < 43
pushd subprojects/libxkbcommon > /dev/null
%meson -Denable-tools=false -Ddefault_library=static
%meson_build
DESTDIR=%{_builddir}/libxkbcommon-build meson install -C %{_vpath_builddir} --no-rebuild
popd > /dev/null
export PKG_CONFIG_PATH=%{_builddir}/libxkbcommon-build/%{_libdir}/pkgconfig
%global optflags %{optflags} -I%{_builddir}/libxkbcommon-build/%{_includedir} -L%{_builddir}/libxkbcommon-build/%{_libdir}
%endif
%cmake \ %cmake \
-GNinja \ -GNinja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
@@ -253,10 +219,6 @@ export PKG_CONFIG_PATH=%{_builddir}/libxkbcommon-build/%{_libdir}/pkgconfig
%install %install
%if 0%{?rhel} == 10
source /usr/lib/gcc-toolset/15-env.source
%endif
%cmake_install %cmake_install
install -Dpm644 %{SOURCE4} -t %{buildroot}%{_rpmconfigdir}/macros.d install -Dpm644 %{SOURCE4} -t %{buildroot}%{_rpmconfigdir}/macros.d