From 31a9dd9b98aa91b12d7d7e7e324b426f49722300cc532dbe9ba50c4bd0b5e0ff Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 15 Feb 2024 11:54:17 +0000 Subject: [PATCH 1/3] Accepting request 1146793 from home:jtorres:branches:X11:XOrg - Stop providing xorg-x11-server-source from xorg-x11-server * Now the sources are provided by xwayland because it is more updated. * Fixes bsc#1219892. OBS-URL: https://build.opensuse.org/request/show/1146793 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=877 --- xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 22 +--------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 61e0c5a..6276149 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 15 10:46:29 UTC 2024 - Joan Torres + +- Stop providing xorg-x11-server-source from xorg-x11-server + * Now the sources are provided by xwayland because it is more updated. + * Fixes bsc#1219892. + ------------------------------------------------------------------- Mon Feb 12 09:58:50 UTC 2024 - Stefan Dirsch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e84a07c..4073ce0 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -146,7 +146,7 @@ Requires: libpixman-1-0 >= 0.24 Requires: Mesa %if 0%{?suse_version} >= 1315 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives %endif Provides: xorg-x11-server-glx Obsoletes: xorg-x11-server-glx @@ -336,13 +336,6 @@ 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. @@ -407,10 +400,6 @@ 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} @@ -514,11 +503,6 @@ 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} @@ -634,8 +618,4 @@ fi %{_datadir}/aclocal/*.m4 /usr/lib/rpm/macros.d/macros.xorg-server -%files source -%defattr(-,root,root) -/usr/src/xserver - %changelog From 041c8cf3698b32380d22cbae152e53fbc30452ab5276898ccd1715aa4426add5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 15 Feb 2024 18:36:36 +0000 Subject: [PATCH 2/3] 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 --- xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 6276149..e3d35d6 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 15 17:08:16 UTC 2024 - Joan Torres + +- 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 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 4073ce0..0e85ec6 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 From acf968d51682f94b2c062fee6662f7da74295e6acf041f365aef087065d42c73 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 20 Feb 2024 20:40:13 +0000 Subject: [PATCH 3/3] - fix permissions of files in xorg-x11-server-source for tigervnc build later (needed since latest autoconf) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=879 --- xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index e3d35d6..8c363b4 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 20 20:36:19 UTC 2024 - Stefan Dirsch + +- fix permissions of files in xorg-x11-server-source for tigervnc + build later (needed since latest autoconf) + ------------------------------------------------------------------- Thu Feb 15 17:08:16 UTC 2024 - Joan Torres diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 0e85ec6..a4e7b8e 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -146,7 +146,7 @@ Requires: libpixman-1-0 >= 0.24 Requires: Mesa %if 0%{?suse_version} >= 1315 Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives %endif Provides: xorg-x11-server-glx Obsoletes: xorg-x11-server-glx @@ -518,6 +518,10 @@ 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 +# fix permissions for tigervnc build later (needed since latest autoconf) +chmod 0755 %{buildroot}/usr/src/xserver/config.guess +chmod 0755 %{buildroot}/usr/src/xserver/config.sub +chmod 0755 %{buildroot}/usr/src/xserver/install-sh %post %tmpfiles_create xkb.conf