diff --git a/xorg-x11-server-Xwayland.spec b/xorg-x11-server-Xwayland.spec index 775fd3a9564ec1f28ec4f6ac6c461e52fb47039b..a3215b69e73304e172ecddd2e89253ef6721120f 100644 --- a/xorg-x11-server-Xwayland.spec +++ b/xorg-x11-server-Xwayland.spec @@ -5,15 +5,16 @@ Summary: Xwayland Name: xorg-x11-server-Xwayland -Version: 23.1.0 -Release: %{anolis_release}%{dist} +Version: 23.2.4 +Release: %{anolis_release}%{?dist} URL: http://www.x.org Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz License: MIT -Requires: xorg-x11-server-common +Requires: xkeyboard-config +Requires: xkbcomp Requires: libEGL Requires: libepoxy >= 1.5.5 @@ -25,7 +26,7 @@ BuildRequires: wayland-devel BuildRequires: desktop-file-utils BuildRequires: pkgconfig(wayland-client) >= 1.21.0 -BuildRequires: pkgconfig(wayland-protocols) >= 1.28 +BuildRequires: pkgconfig(wayland-protocols) >= 1.30 BuildRequires: pkgconfig(wayland-eglstream-protocols) BuildRequires: pkgconfig(epoxy) >= 1.5.5 @@ -54,7 +55,9 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(libxcvt) BuildRequires: pkgconfig(libdecor-0) >= 0.1.1 -BuildRequires: xorg-x11-proto-devel >= 7.7-10 +BuildRequires: pkgconfig(liboeffis-1.0) >= 1.0.0 +BuildRequires: pkgconfig(libei-1.0) >= 1.0.0 +BuildRequires: xorg-x11-proto-devel >= 2023.2-1 BuildRequires: mesa-libGL-devel >= 9.2 BuildRequires: mesa-libEGL-devel @@ -63,6 +66,8 @@ BuildRequires: mesa-libgbm-devel BuildRequires: audit-libs-devel BuildRequires: libselinux-devel >= 2.0.86-1 +BuildRequires: libunwind-devel + BuildRequires: pkgconfig(xcb-aux) BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-icccm) @@ -75,6 +80,7 @@ Xwayland is an X server for running X clients under Wayland. %package devel Summary: Development package Requires: pkgconfig +Requires: %{name} = %{version}-%{release} %description devel The development package provides the developmental files which are @@ -93,10 +99,12 @@ The %{name}-doc package contains documentation files for %{name}. %build %meson \ + %{?gitdate:-Dxwayland=true -D{xorg,xnest,xvfb,udev}=false} \ -Dxwayland_eglstream=true \ -Ddefault_font_path=%{default_font_path} \ -Dbuilder_string="Build ID: %{name} %{version}-%{release}" \ -Dxkb_output_dir=%{_localstatedir}/lib/xkb \ + -Dserverconfigdir=%{_datadir}/xwayland \ -Dxcsecurity=true \ -Dglamor=true \ -Ddri3=true @@ -108,10 +116,8 @@ The %{name}-doc package contains documentation files for %{name}. # Remove unwanted files/dirs rm $RPM_BUILD_ROOT%{_mandir}/man1/Xserver.1* -rm -Rf $RPM_BUILD_ROOT%{_libdir}/xorg rm -Rf $RPM_BUILD_ROOT%{_includedir}/xorg rm -Rf $RPM_BUILD_ROOT%{_datadir}/aclocal -rm -Rf $RPM_BUILD_ROOT%{_localstatedir}/lib/xkb %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop @@ -124,6 +130,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{abidir}/Xwayland-option.list %{_mandir}/man1/Xwayland.1* %{_datadir}/applications/org.freedesktop.Xwayland.desktop +%{_datadir}/xwayland/protocol.txt %files devel %{_libdir}/pkgconfig/xwayland.pc @@ -132,5 +139,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %doc README.md %changelog +* Fri Jan 19 2024 mgb01105731 - 23.2.4-1 +- update to 23.2.4 + * Mon Mar 27 2023 yuanhui - 23.1.0-1 - Init package from upstream diff --git a/xwayland-23.1.0.tar.xz b/xwayland-23.1.0.tar.xz deleted file mode 100644 index 1ddeca963a752a2f73ac455e7e6ae0c858a4f2ba..0000000000000000000000000000000000000000 Binary files a/xwayland-23.1.0.tar.xz and /dev/null differ diff --git a/xwayland-23.2.4.tar.xz b/xwayland-23.2.4.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..06ef7ee6a570524866160e88888d2acd75103dc6 Binary files /dev/null and b/xwayland-23.2.4.tar.xz differ