From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uHhKApsJRmLRmQAAgWs5BA (envelope-from ) for ; Thu, 31 Mar 2022 22:05:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0OmcOpoJRmKyDAEAauVa8A (envelope-from ) for ; Thu, 31 Mar 2022 22:05:46 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 663A41B86F for ; Thu, 31 Mar 2022 22:05:46 +0200 (CEST) Received: from localhost ([::1]:53016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na13A-0002DX-Sl for larch@yhetil.org; Thu, 31 Mar 2022 16:05:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na11W-0000O4-Lh for bug-guix@gnu.org; Thu, 31 Mar 2022 16:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na11W-00072U-Bb for bug-guix@gnu.org; Thu, 31 Mar 2022 16:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na11W-0008Pk-2E for bug-guix@gnu.org; Thu, 31 Mar 2022 16:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#54654: [PATCH v2] gnu: openjdk15: Make big cursors work. Resent-From: dannym@scratchpost.org Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 31 Mar 2022 20:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54654 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 54654@debbugs.gnu.org Received: via spool by 54654-submit@debbugs.gnu.org id=B54654.164875701132305 (code B ref 54654); Thu, 31 Mar 2022 20:04:02 +0000 Received: (at 54654) by debbugs.gnu.org; 31 Mar 2022 20:03:31 +0000 Received: from localhost ([127.0.0.1]:39919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na111-0008Oz-B0 for submit@debbugs.gnu.org; Thu, 31 Mar 2022 16:03:31 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]:56782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na10z-0008Ok-1c for 54654@debbugs.gnu.org; Thu, 31 Mar 2022 16:03:29 -0400 Received: from dayas.lan (84-115-234-55.cable.dynamic.surfer.at [84.115.234.55]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 53E6911201BF; Thu, 31 Mar 2022 22:03:26 +0200 (CEST) From: dannym@scratchpost.org Date: Thu, 31 Mar 2022 22:03:23 +0200 Message-Id: <20220331200323.10098-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220331153156.0ae2b4ce@scratchpost.org> References: <20220331153156.0ae2b4ce@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648757146; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=/0EOBGWiph1YZD/Z5oEewXwak7BDaQpzKXRbLHS+2yA=; b=Uj9qAIKEGfyp8lsFaoNll95tTS5Zp2ePcaDXuo6XvJjNnJV9dMAXq2xlAimdNxdK/r3crm s9aeuG4LtsX2qSoUBX8p33VgKI/XfT3t08YRNCa5qN4QGheKNxW5pObitz3e3SO5kf0XQI 0sNjMHDn8v8rmliYhnd3WloVOOn1XZ+UEf5UCyVnK8I6ko43gvGXT26Esc7a6d3gRrMt/w ykUxQLQAwjkfxp2Gf8QtGmGpi/sv0qn6lyB4MzG5ZxyCULITksRy5Dl3/dZYSfQno6ht2B sIQFOyP7vJxycihIAJGhyTFW1enBhM/Rc2zJWhJ5UMD1BAlludDDe59ZoX5alA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648757146; a=rsa-sha256; cv=none; b=qmHXb51osi/NXvMtFE3vzmltZpzy2Yzq7uU9CuqHpNDsczH5H8aoGJOSRXp1ze0FcrZ17z 7JsPfJrjqGyHwHfsIG35X5yQRkMjVGAW1s+Tnj8gRm7qDE3Jfo2hQ33QbjEuyVug1Ecfvx vuZ4J7VIwyBA9+0eEAkvdls/agjh+3Rb5M2CIC7sA/BoQTTR86HVRsPwWxz42BY2XH9LKe fuKVMJL+gaqXz7bksSnhkBTbUaxCutaIo6kscuWpALCV7v3WaXUwaxGVqQY2xmjn9TkNhN EJeL82y8F6zwu2PTbwXrzxg5Lqfa9b1b7UBwBFA5Z561W029mu1KgvpEYo/I/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.57 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 663A41B86F X-Spam-Score: -2.57 X-Migadu-Scanner: scn0.migadu.com X-TUID: eiqxCXzL9coU From: Danny Milosavljevic * gnu/packages/patches/openjdk-15-xcursor-no-dynamic.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/java.scm (openjdk15)[source]: Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 7 +- .../openjdk-15-xcursor-no-dynamic.patch | 72 +++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openjdk-15-xcursor-no-dynamic.patch diff --git a/gnu/local.mk b/gnu/local.mk index a704161abc..ac8992885e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1564,6 +1564,7 @@ dist_patch_DATA = \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ + %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b27892841e..b0908cc15a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2185,7 +2185,12 @@ (define-public openjdk15 (file-name (git-file-name name version)) (sha256 (base32 - "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i")))) + "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i")) + (patches + (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) + (inputs + (cons `("libxcursor" ,libxcursor) ; for our patch to work + (package-inputs openjdk14))) (native-inputs `(("autoconf" ,autoconf) ("openjdk14:jdk" ,openjdk14 "jdk") diff --git a/gnu/packages/patches/openjdk-15-xcursor-no-dynamic.patch b/gnu/packages/patches/openjdk-15-xcursor-no-dynamic.patch new file mode 100644 index 0000000000..9325dd3da6 --- /dev/null +++ b/gnu/packages/patches/openjdk-15-xcursor-no-dynamic.patch @@ -0,0 +1,72 @@ +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 + -- 2.34.0