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 audio-service-type....* gnu/services/sound.scm (ladspa-configuration): New record. (ladspa-environment): New procedure. (ladspa-service-type): New service type. (pulseaudio-environment): Remove LADSPA_PATH. * doc/guix.texi: Adjust documentation. Signed-off-by: Marius Bakke <mbakke@fastmail.com> Leo Prikler 2020-01-11services: pulseaudio-configuration: Set flat-volumes to no....* gnu/services/sound (pulseaudio-configuration) [daemon-conf]: Disable flat-volumes, which causes unpleasant experiences to users when applications inadvertently max out the system volume (e.g. as in #38172). Signed-off-by: Marius Bakke <mbakke@fastmail.com> Leo Prikler 2020-01-11services: Add pulseaudio-configuration....* gnu/services/sound (<pulseaudio-configuration>): New record. (pulseaudio-etc): New procedure. (pulseaudio-environment): Add PULSE_CONFIG and PULSE_CLIENTCONFIG. (pulseaudio-service-type): Update accordingly. Signed-off-by: Marius Bakke <mbakke@fastmail.com> Leo Prikler 2020-01-08services: Add pulseaudio service....* gnu/services/sound.scm (pulseaudio-environment): New procedure. (pulseaudio-service-type): New variable. * doc/guix.texi (Sound Services): Document it. Oleg Pykhalov 2018-06-25services: alsa-service-type: Fix the loading of 'pulse' plugin....Fixes <https://bugs.gnu.org/31591>. * gnu/services/sound.scm (<alsa-configuration>)[alsa-plugins]: New field. (alsa-config-file): Use 'pcm_type.pulse' and 'ctl_type.pulse' to specify file paths to the 'pulse' plugin. * doc/guix.texi (Sound Services): Document this. Co-authored-by: 宋文武 <iyzsong@member.fsf.org> Oleg Pykhalov 2018-05-02gnu: Add sound service....* gnu/services/sound.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add this. * doc/guix.texi (Sound Services): New chapter. Oleg Pykhalov