From 997526f11746ac647562f835502b65c8ffec1683 Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Tue, 9 Dec 2025 14:17:38 -0500
Subject: [PATCH] Attempt specifying directory for patch. Removed parts of spec
 for other distros and old versions

---
 hyprland-git/hyprland-git.spec | 42 ++--------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/hyprland-git/hyprland-git.spec b/hyprland-git/hyprland-git.spec
index b65cc5e..5235e5b 100644
--- a/hyprland-git/hyprland-git.spec
+++ b/hyprland-git/hyprland-git.spec
@@ -104,26 +104,9 @@ end
 
 %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
 # modified fork.
 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:       aquamarine%{?_isa} >= 0.9.2
@@ -201,11 +184,8 @@ Requires:       pkgconfig(xkbcommon)
 
 
 %prep
-%autosetup -n %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source}
-%if 0%{?fedora} < 43
-mkdir -p subprojects/libxkbcommon
-tar -xf %{SOURCE5} -C subprojects/libxkbcommon --strip=1
-%endif
+%autosetup -n %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source} -N
+%patch 1 -d %{?bumpver:Hyprland-%{hyprland_commit}} %{!?bumpver:hyprland-source}
 
 %if 0%{?bumpver}
 tar -xf %{SOURCE2} -C subprojects/hyprland-protocols --strip=1
@@ -229,20 +209,6 @@ sed -i \
 
 %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 \
     -GNinja \
     -DCMAKE_BUILD_TYPE=Release \
@@ -253,10 +219,6 @@ export PKG_CONFIG_PATH=%{_builddir}/libxkbcommon-build/%{_libdir}/pkgconfig
 
 %install
 
-%if 0%{?rhel} == 10
-source /usr/lib/gcc-toolset/15-env.source
-%endif
-
 %cmake_install
 install -Dpm644 %{SOURCE4} -t %{buildroot}%{_rpmconfigdir}/macros.d