[packages/xorg-lib-libXmu] - updated to 1.3.0 + upstream fix
qboosh
qboosh at pld-linux.org
Wed Jan 28 21:40:36 CET 2026
commit dc18081dfaaff982e29c04c0de8b1f27d29b3879
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jan 28 21:40:44 2026 +0100
- updated to 1.3.0 + upstream fix
libXmu-32bit.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
xorg-lib-libXmu.spec | 20 +++++++++---------
2 files changed, 68 insertions(+), 9 deletions(-)
---
diff --git a/xorg-lib-libXmu.spec b/xorg-lib-libXmu.spec
index ead154a..df49343 100644
--- a/xorg-lib-libXmu.spec
+++ b/xorg-lib-libXmu.spec
@@ -1,12 +1,13 @@
Summary: X Miscellaneous Utilities library
Summary(pl.UTF-8): Biblioteka różnych funkcji użytkowych X
Name: xorg-lib-libXmu
-Version: 1.2.1
+Version: 1.3.0
Release: 1
License: MIT
Group: X11/Libraries
Source0: https://xorg.freedesktop.org/releases/individual/lib/libXmu-%{version}.tar.xz
-# Source0-md5: 85edefb7deaad4590a03fccba517669f
+# Source0-md5: 532a37254137e9e1827b8eec95e79adf
+Patch0: libXmu-32bit.patch
URL: https://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.70
BuildRequires: automake
@@ -73,10 +74,11 @@ Pakiet zawiera statyczną bibliotekę libXmu.
%prep
%setup -q -n libXmu-%{version}
+%patch -P0 -p1
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
@@ -101,16 +103,16 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc COPYING ChangeLog README.md
-%attr(755,root,root) %{_libdir}/libXmu.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libXmu.so.6
-%attr(755,root,root) %{_libdir}/libXmuu.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libXmuu.so.1
+%{_libdir}/libXmu.so.*.*.*
+%ghost %{_libdir}/libXmu.so.6
+%{_libdir}/libXmuu.so.*.*.*
+%ghost %{_libdir}/libXmuu.so.1
%files devel
%defattr(644,root,root,755)
%doc doc/{Xmu.html,xlogo.svg}
-%attr(755,root,root) %{_libdir}/libXmu.so
-%attr(755,root,root) %{_libdir}/libXmuu.so
+%{_libdir}/libXmu.so
+%{_libdir}/libXmuu.so
%{_libdir}/libXmu.la
%{_libdir}/libXmuu.la
%dir %{_includedir}/X11/Xmu
diff --git a/libXmu-32bit.patch b/libXmu-32bit.patch
new file mode 100644
index 0000000..f804184
--- /dev/null
+++ b/libXmu-32bit.patch
@@ -0,0 +1,57 @@
+From 3d207f8600adbc8fad6f5a5daaa66bf3961d9bdd Mon Sep 17 00:00:00 2001
+From: Tim Hentenaar <tim at hentenaar.com>
+Date: Mon, 26 Jan 2026 12:01:07 -0500
+Subject: [PATCH] Fix compilation on 32-bit targets
+
+Fixes #3
+
+Thanks to @jengelh
+
+Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxmu/-/merge_requests/20>
+---
+ include/X11/Xmu/EditresP.h | 8 ++------
+ src/EditresCom.c | 2 +-
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/include/X11/Xmu/EditresP.h b/include/X11/Xmu/EditresP.h
+index 1591e0f..3530345 100644
+--- a/include/X11/Xmu/EditresP.h
++++ b/include/X11/Xmu/EditresP.h
+@@ -265,6 +265,7 @@ in this Software without prior written authorization from The Open Group.
+
+ ************************************************************/
+
++#include <stdint.h>
+ #include <X11/Intrinsic.h>
+ #include <X11/Xfuncproto.h>
+ #include <X11/Xmd.h>
+@@ -291,12 +292,7 @@ in this Software without prior written authorization from The Open Group.
+ #define EDITRES_COMM_ATOM "EditresComm"
+ #define EDITRES_CLIENT_VALUE "EditresClientVal"
+ #define EDITRES_PROTOCOL_ATOM "EditresProtocol"
+-
+-#ifdef LONG64
+-#define ID2WIDGET(X) ((Widget)(void *)((X)))
+-#else
+-#define ID2WIDGET(X) ((Widget)(void *)((X) & 0xffffffff))
+-#endif
++#define ID2WIDGET(X) ((Widget)(void *)(uintptr_t)((X)))
+
+ typedef enum {
+ SendWidgetTree = 0,
+diff --git a/src/EditresCom.c b/src/EditresCom.c
+index 07b7bfd..b085acf 100644
+--- a/src/EditresCom.c
++++ b/src/EditresCom.c
+@@ -1631,7 +1631,7 @@ InsertWidget(ProtocolStream *stream, Widget w)
+ * make sure that they are inserted in the list from parent -> child
+ */
+ for (i--, temp = w; temp != NULL; temp = XtParent(temp), i--)
+- widget_list[i] = (CARD64)temp;
++ widget_list[i] = (CARD64)(uintptr_t)temp;
+
+ _XEditResPut16(stream, num_widgets); /* insert number of widgets */
+ for (i = 0; i < num_widgets; i++) /* insert Widgets themselves */
+--
+GitLab
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libXmu.git/commitdiff/dc18081dfaaff982e29c04c0de8b1f27d29b3879
More information about the pld-cvs-commit
mailing list