Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171450391891840"
MIME-Version: 1.0
Date: Tue, 30 Apr 2024 19:05:18 +0000
From: "Aleksey Cheusov" <cheusov@netbsd.org>
Subject: CVS commit: pkgsrc/lang/python311
To: pkgsrc-changes@NetBSD.org
Reply-To: cheusov@netbsd.org
Message-Id: <20240430190518.4441CFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171450391891840
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	cheusov
Date:		Tue Apr 30 19:05:18 UTC 2024

Modified Files:
	pkgsrc/lang/python311: distinfo
	pkgsrc/lang/python311/patches: patch-Modules_readline.c

Log Message:
Fix build failure on NetBSD where native libedit does not have VFunction type


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/python311/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/python311/patches/patch-Modules_readline.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171450391891840
Content-Disposition: inline
Content-Length: 2600
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/python311/distinfo
diff -u pkgsrc/lang/python311/distinfo:1.17 pkgsrc/lang/python311/distinfo:1.18
--- pkgsrc/lang/python311/distinfo:1.17	Tue Apr 30 17:07:17 2024
+++ pkgsrc/lang/python311/distinfo	Tue Apr 30 19:05:17 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2024/04/30 17:07:17 cheusov Exp $
+$NetBSD: distinfo,v 1.18 2024/04/30 19:05:17 cheusov Exp $
 
 BLAKE2s (Python-3.11.9.tar.xz) = 82562f4c5e5a6feb3d9ec5186c7402da21b83a65c761cbb1e4f6b840892c1b89
 SHA512 (Python-3.11.9.tar.xz) = 2b0a1d936b4ef8376f9655797aece8ffdff75031ad7bfa840f330cac2aed189aecc80c163edc12ea772851d7a011f3fc1960470a73d9d4290cf3ab8ad6ed7e6a
@@ -9,6 +9,6 @@ SHA1 (patch-Lib_distutils_unixccompiler.
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 593c4e93c5653ab400f0a98b91db92630c0a7390
 SHA1 (patch-Lib_sysconfig.py) = bc6d91bf8f7121456b26ea7f080f588c96f2596f
 SHA1 (patch-Makefile.pre.in) = fdb5794d112f422a1f28aa9f8b179dc05520f9e1
-SHA1 (patch-Modules_readline.c) = 7c144fd63573356f8c2fe7770a3c96b762e4ef82
+SHA1 (patch-Modules_readline.c) = 232f6ac43b5a0e87c915f13117bae91ef069a6c1
 SHA1 (patch-configure) = a6d9a00ff160581245bc30d1b0d2ec0e9da8fb0b
 SHA1 (patch-setup.py) = 874b114febf51181509593a272ad5cdd4acaf3b4

Index: pkgsrc/lang/python311/patches/patch-Modules_readline.c
diff -u pkgsrc/lang/python311/patches/patch-Modules_readline.c:1.1 pkgsrc/lang/python311/patches/patch-Modules_readline.c:1.2
--- pkgsrc/lang/python311/patches/patch-Modules_readline.c:1.1	Tue Apr 30 16:55:22 2024
+++ pkgsrc/lang/python311/patches/patch-Modules_readline.c	Tue Apr 30 19:05:18 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-Modules_readline.c,v 1.1 2024/04/30 16:55:22 cheusov Exp $
+$NetBSD: patch-Modules_readline.c,v 1.2 2024/04/30 19:05:18 cheusov Exp $
 
 pkgsrc buildlink framework installs libedit headers to readline/ subdirectory.
 
---- Modules/readline.c.orig	2024-04-30 14:54:41.228944748 +0000
+VFunction type is not available on NetBSD`s native libedit.
+
+--- Modules/readline.c.orig	2024-04-02 08:25:04.000000000 +0000
 +++ Modules/readline.c
 @@ -29,7 +29,7 @@
  #endif
@@ -13,3 +15,12 @@ pkgsrc buildlink framework installs libe
  #else
  /* GNU readline definitions */
  #  undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
+@@ -443,7 +443,7 @@ readline_set_completion_display_matches_
+ #if defined(HAVE_RL_COMPDISP_FUNC_T)
+         (rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
+ #else
+-        (VFunction *)on_completion_display_matches_hook : 0;
++        on_completion_display_matches_hook : 0;
+ #endif
+ #endif
+     return result;


--_----------=_171450391891840--