From 1765d3375b618f4655d6a29eef96074df41b6a1059edb94236d6e7be923c54fb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 4 Jan 2025 19:03:00 +0000 Subject: [PATCH] - get rid of %dnl usage (fails on SP7 due to unkonwn macro); also after latest change I now got an autodecline that patches in sources are not mentioned in specfile; just use '#patch ...' now for not applying a patch ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=905 --- xorg-x11-server.changes | 8 ++++++++ xorg-x11-server.spec | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 8f326c3..edd8739 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jan 4 18:58:07 UTC 2025 - Stefan Dirsch + +- get rid of %dnl usage (fails on SP7 due to unkonwn macro); also + after latest change I now got an autodecline that patches in + sources are not mentioned in specfile; just use '#patch ...' + now for not applying a patch ... + ------------------------------------------------------------------- Sat Jan 4 18:37:29 UTC 2025 - Stefan Dirsch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 9d9d1f1..0345517 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -207,7 +207,7 @@ Patch10: u_xorg-wrapper-Xserver-Options-Whitelist-Filter.patch Patch11: n_xorg-wrapper-rename-Xorg.patch Patch12: n_xorg-wrapper-anybody.patch Patch100: u_01-Improved-ConfineToShape.patch -%dnl Patch101: u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch +Patch101: u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch Patch104: u_xorg-server-xdmcp.patch Patch117: xorg-x11-server-byte-order.patch @@ -216,13 +216,13 @@ Patch160: u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch Patch208: u_Panning-Set-panning-state-in-xf86RandR12ScreenSetSize.patch Patch209: u_pci-primary-Fix-up-primary-PCI-device-detection-for-the-platfrom-bus.patch -%dnl Patch210: u_os-connections-Check-for-stale-FDs.patch +Patch210: u_os-connections-Check-for-stale-FDs.patch Patch215: u_Use-better-fallbacks-to-generate-cookies-if-arc4rand.patch -%dnl Patch1162: b_cache-xkbcomp-output-for-fast-start-up.patch -%dnl Patch1211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch -%dnl Patch1222: b_sync-fix.patch +Patch1162: b_cache-xkbcomp-output-for-fast-start-up.patch +Patch1211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch +Patch1222: b_sync-fix.patch Patch1401: u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch @@ -368,21 +368,21 @@ sh %{SOURCE92} --verify . %{SOURCE91} %patch -P 12 -p1 # %patch -P 100 -p1 -%dnl %patch -P 101 -p1 +#patch -P 101 -p1 %patch -P 104 -p1 %patch -P 117 -p1 %patch -P 160 -p1 %patch -P 208 -p1 %patch -P 209 -p1 ### not applicable anymore -%dnl %patch -P 210 -p1 +#patch -P 210 -p1 %patch -P 215 -p1 ### disabled for now -%dnl %patch -P 1162 -p1 +#patch -P 1162 -p1 ### disabled for now -%dnl %patch -P 1211 -p1 +#patch -P 1211 -p1 ### patch222 might not be applicable anymore -%dnl %patch -P 1222 -p1 +#patch -P 1222 -p1 %patch -P 1401 -p1 %patch -P 1503 -p1 %patch -P 1900 -p1