From patchwork Tue Jun 6 09:01:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 13740 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B5F5E27BBEA; Tue, 6 Jun 2023 17:35:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE90C27BBE2 for ; Tue, 6 Jun 2023 17:34:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6ZdG-0007PP-E5; Tue, 06 Jun 2023 12:34:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ZdC-0007O5-HJ for guix-patches@gnu.org; Tue, 06 Jun 2023 12:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6ZdC-0003v2-8w for guix-patches@gnu.org; Tue, 06 Jun 2023 12:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6ZdB-0006Fy-Qx for guix-patches@gnu.org; Tue, 06 Jun 2023 12:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63930] [PATCH] gnu: openjdk: Re-add "openjdk-15-xcursor-no-dynamic.patch". Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Jun 2023 16:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63930 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63930@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168606923224031 (code B ref -1); Tue, 06 Jun 2023 16:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2023 16:33:52 +0000 Received: from localhost ([127.0.0.1]:52883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Zd2-0006FX-7X for submit@debbugs.gnu.org; Tue, 06 Jun 2023 12:33:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:56446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6Zd0-0006FM-NG for submit@debbugs.gnu.org; Tue, 06 Jun 2023 12:33:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Zd0-0007KV-GY for guix-patches@gnu.org; Tue, 06 Jun 2023 12:33:50 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6Zcp-0003jR-JY for guix-patches@gnu.org; Tue, 06 Jun 2023 12:33:50 -0400 Received: from localhost.localdomain (unknown [88.122.103.45]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 3989F11200CA; Tue, 6 Jun 2023 18:33:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=scratchpost.org; s=kas202303142049; t=1686069210; bh=yGX33gacSKnfRy1HSGMfRTKQqSGZIZjOja0fo/b7+U8=; h=From:To:Cc:Subject:Date:From; b=WLMmF+/QwSxK1Wgnki9JYvaV+8ZAnu8qXzgzDpqPUytOeIA0jFohg+nHAzPY3LaJF wEQ5f2ImwhbjI8eVDYCmPWWGewGLYH0a7Fy6paUepG2ZS/Cdpv38nwm3oQqAl/AiDQ VLR5I685XMv019zSb81GvO47rAazZaf6IBjwxMMcX1oIIInpGJX8TtlsrnBGiuuffL IM4jKPVaAkpo5vLd2HpzrCaGIUQPZIw7NLNCpc9kWOZq0GswvUONkhiu+C46OXYb9M EP53PT/wCnykC8fmijmfzpJ/KaFw76BJkQOwb8/py2+cSgVkpiz1mbUYUoF/ht5U9m Qohxst1M0aTWg== From: Danny Milosavljevic Date: Tue, 6 Jun 2023 11:01:19 +0200 Message-Id: <20230606090119.21931-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spamd-Bar: ++++++ Received-SPF: none client-ip=85.13.145.193; envelope-from=dannym@scratchpost.org; helo=dd30410.kasserver.com X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_06_12=1.543, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/java.scm (openjdk16)[source](patches): Re-add xcursor patch. (openjdk17)[source](patches): Re-add xcursor patch. --- gnu/packages/java.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 067284017c..dedae4e0fc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1493,7 +1493,8 @@ (define-public openjdk16 "0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz" (source (origin (inherit (package-source base)) - (patches (search-patches "openjdk-10-setsignalhandler.patch")))))) + (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch" + "openjdk-10-setsignalhandler.patch")))))) (define-public openjdk17 (make-openjdk @@ -1501,7 +1502,7 @@ (define-public openjdk17 "1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs" (source (origin (inherit (package-source base)) - (patches '()))) + (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) (arguments (substitute-keyword-arguments (package-arguments openjdk16) ((#:phases phases)