1
0

Accepting request 1146918 from home:jtorres:branches:X11:XOrg

- Provide again xorg-x11-server-source
  * xwayland sources are not meant for a generic server.
  * https://github.com/TigerVNC/tigervnc/issues/1728

OBS-URL: https://build.opensuse.org/request/show/1146918
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=878
This commit is contained in:
Stefan Dirsch 2024-02-15 18:36:36 +00:00 committed by Git OBS Bridge
parent 31a9dd9b98
commit 041c8cf369
2 changed files with 27 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 15 17:08:16 UTC 2024 - Joan Torres <joan.torres@suse.com>
- Provide again xorg-x11-server-source
* xwayland sources are not meant for a generic server.
* https://github.com/TigerVNC/tigervnc/issues/1728
-------------------------------------------------------------------
Thu Feb 15 10:46:29 UTC 2024 - Joan Torres <joan.torres@suse.com>

View File

@ -336,6 +336,13 @@ Obsoletes: xorg-x11-server-sdk < 7.6_%{version}
%description sdk
This package contains the X.Org Server SDK.
%package source
Summary: Source code of X.Org server
Group: Development/Sources
%description source
This package contains patched sources of X.Org Server.
%prep
%setup -q -n xorg-server-%{version} -a3
# Early verification if the ABI Defines are correct. Let's not waste build cycles if the Provides are wrong at the end.
@ -400,6 +407,10 @@ sh %{SOURCE92} --verify . %{SOURCE91}
export SUSE_ZNOW=0
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
test -e source-file-list || \
find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \
source-file-list
autoreconf -fi
%if 0%{?pci_ids_dir:1}
export PCI_TXT_IDS_DIR=%{pci_ids_dir}
@ -503,6 +514,11 @@ mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so
%endif
mkdir -p %{buildroot}/usr/src/xserver
xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < source-file-list
# unneeded python2 script; simply remove it (boo#1179591)
rm -f %{buildroot}/usr/src/xserver/config/fdi2iclass.py
%post
%tmpfiles_create xkb.conf
%{fillup_only -an displaymanager}
@ -618,4 +634,8 @@ fi
%{_datadir}/aclocal/*.m4
/usr/lib/rpm/macros.d/macros.xorg-server
%files source
%defattr(-,root,root)
/usr/src/xserver
%changelog