Accepting request 1288257 from X11:XOrg

- u_gcc15.patch * fixes build with gcc15 OBS-URL: https://build.opensuse.org/request/show/1288257 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liboldX?expand=0&rev=9
reintegrated previous changes:
2025-06-24 18:50:31 +00:00 · 2025-06-24 12:47:17 +00:00
3 changed files with 24 additions and 2 deletions
--- a/liboldX.changes
+++ b/liboldX.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 24 12:38:27 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- u_gcc15.patch
+  * fixes build with gcc15
+
 -------------------------------------------------------------------
 Wed Apr 26 08:00:51 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

--- a/liboldX.spec
+++ b/liboldX.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package liboldX
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,8 @@ URL:            http://cgit.freedesktop.org/xorg/lib/liboldX/
 #Git-Clone:	git://anongit.freedesktop.org/xorg/lib/liboldX
 Source:         http://xorg.freedesktop.org/releases/X11R7.0/src/lib/%{name}-X11R7.0-%{version}.tar.bz2
 Source1:        baselibs.conf
+Patch0:         u_gcc15.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #git#BuildRequires:	autoconf >= 2.57, automake, libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(x11)
@@ -56,7 +58,7 @@ This package contains the development headers for the library found
 in %lname.

 %prep
-%autosetup -n %name-X11R7.0-%version
+%autosetup -p1 -n %name-X11R7.0-%version

 %build
 %configure --disable-static
--- a/u_gcc15.patch
+++ b/u_gcc15.patch
@@ -0,0 +1,14 @@
+Index: liboldX-X11R7.0-1.0.1/include/X11/X10.h
+===================================================================
+--- liboldX-X11R7.0-1.0.1.orig/include/X11/X10.h
+++ liboldX-X11R7.0-1.0.1/include/X11/X10.h
+@@ -83,7 +83,7 @@ typedef struct {
+     int size;			/* Table size (number of buckets). */
+ } XAssocTable;
+ 
+-XAssocTable *XCreateAssocTable();
+-char *XLookUpAssoc();
+XAssocTable *XCreateAssocTable(register int size);
+char *XLookUpAssoc(register Display *dpy, register XAssocTable *table, register XID x_id);
+ 
+ #endif /* _X10_H_ */