From: Danny Milosavljevic Date: Thu, 31 Mar 2022 17:02:00 +0200 Subject: Make openjdk use libxcursor directly Fixes . This patch makes openjdk use libxcursor directly. Without it, libx11 would try to dlopen("libXcursor.so.1") and fail. diff -ru orig/22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/make/modules/java.desktop/lib/Awt2dLibraries.gmk 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/make/modules/java.desktop/lib/Awt2dLibraries.gmk --- orig/22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/make/modules/java.desktop/lib/Awt2dLibraries.gmk 2022-03-31 15:34:08.773419480 +0200 +++ 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/make/modules/java.desktop/lib/Awt2dLibraries.gmk 2022-03-31 21:36:27.854273411 +0200 @@ -217,7 +217,7 @@ endif endif - LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm + LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXcursor -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm ifeq ($(call isTargetOs, linux), true) LIBAWT_XAWT_LIBS += -lpthread diff -ru orig/22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c --- orig/22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c 2022-03-31 15:34:11.917502206 +0200 +++ 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c 2022-03-31 21:38:16.417253535 +0200 @@ -40,10 +40,12 @@ #include #include #include +#include #include #include #include #include +#include #if defined(AIX) #undef X_HAVE_UTF8_STRING @@ -972,10 +974,21 @@ } +static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ +static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */ + JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XCreateFontCursor (JNIEnv *env, jclass clazz, jlong display, jint shape) { AWT_CHECK_HAVE_LOCK_RETURN(0); - return XCreateFontCursor((Display *) jlong_to_ptr(display), (int) shape); + Display * dpy = (Display *) jlong_to_ptr(display); + if (dpy->cursor_font == None) { + dpy->cursor_font = XLoadFont(dpy, "cursor"); + if (dpy->cursor_font == None) return None; + } + Cursor result = XcursorTryShapeCursor(dpy, dpy->cursor_font, dpy->cursor_font, (int) shape, (int) shape + 1, &foreground, &background); + if (!result) + result = XCreateFontCursor(dpy, (int) shape); + return result; } /* diff -ru orig/22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/test/jdk/java/awt/JAWT/Makefile.unix 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/test/jdk/java/awt/JAWT/Makefile.unix --- orig/22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/test/jdk/java/awt/JAWT/Makefile.unix 2022-03-31 15:34:10.553466316 +0200 +++ 22kjr9lzrml0h5m55viq7zlfkqr9p7ny-openjdk-15.0.3-checkout/test/jdk/java/awt/JAWT/Makefile.unix 2022-03-31 21:36:27.854273411 +0200 @@ -31,7 +31,7 @@ J_INC = $(TESTJAVA)/include INCLUDES = -I$(J_INC) -I$(J_INC)/$(SYST) -I. -LIBS = -L$(TESTJAVA)/lib -ljawt -lX11 +LIBS = -L$(TESTJAVA)/lib -ljawt -lX11 -lXcursor all: $(CLASSES) libmylib.so gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm Efraim Flashner 2022-12-24gnu: libtirpc-hurd: Fix cross-compilation....Fixes a regression introduced in 517618b2401c2ab5861e63df60ae49918b94f727, whereby the "wrong" 'krb5-config' script would be picked. * gnu/packages/onc-rpc.scm (libtirpc/hurd)[arguments]: Turn #:configure-flags into a gexp to refer to the right "mit-krb5". Ludovic Courtès 2022-12-05gnu: libtirpc: fix cross-compilation....* gnu/packages/onc-rpc.scm (libtirpc)[native-inputs]: add mit-krb5. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Z572 2022-08-12gnu: libtirpc: Incorporate grafted changes....* gnu/packages/onc-rpc.scm (libtirpc)[replacement]: Remove. (source)[patches]: New field. (libtirpc/fixed): Remove variable. Marius Bakke 2022-08-07gnu: libtirpc: Fix CVE-2021-46828....* gnu/packages/onc-rpc.scm (libtirpc)[replacement]: New field. (libtirpc/fixed): New variable. (libtirpc-hurd)[source]: Add patch. * gnu/packages/patches/libtirpc-CVE-2021-46828.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Efraim Flashner