From cf9cb43fd08edbd7ed2ca348cc603e113ece4f72 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 18 Oct 2024 15:22:04 -0700 Subject: [PATCH] chore: Update Xwayland for F41 --- .../xorg-x11-server-Xwayland.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/spec_files/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland.spec b/spec_files/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland.spec index 0f330791..79871e25 100644 --- a/spec_files/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland.spec +++ b/spec_files/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland.spec @@ -8,7 +8,7 @@ Summary: Xwayland Name: xorg-x11-server-Xwayland -%global xwayland_version 24.1.2 +%global xwayland_version 24.1.3 Version: %{xwayland_version}.bazzite.{{{ git_dir_version }}} Release: 1%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist} @@ -16,9 +16,10 @@ URL: http://www.x.org %if 0%{?gitdate} Source0: https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{pkgname}-%{shortcommit}.tar.gz %else -Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{xwayland_version}.tar.xz +Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz %endif +# Nobara Patch0: xwayland-pointer-warp-fix.patch License: MIT @@ -54,8 +55,6 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xorg-macros) >= 1.17 -BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xres) BuildRequires: pkgconfig(xshmfence) >= 1.1 @@ -101,7 +100,7 @@ The development package provides the developmental files which are necessary for developing Wayland compositors using Xwayland. %prep -%autosetup -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{xwayland_version}} +%autosetup -S git_am -n %{pkgname}-%{?gitdate:%{commit}}%{!?gitdate:%{version}} %build %meson \ @@ -138,6 +137,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_libdir}/pkgconfig/xwayland.pc %changelog +* Wed Oct 2 2024 Olivier Fourdan - 24.1.3-1 +- xwayland 24.1.3 - (#2313799) + +* Wed Sep 4 2024 Olivier Fourdan - 24.1.2-2 +- Remove unneeded build dependencies on xorg-x11-util-macros and libXpm + * Wed Aug 7 2024 Olivier Fourdan - 24.1.2-1 - xwayland 24.1.2 - (#2303450) - Remove unneeded build dependency on wayland-eglstream-protocols