Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Oct 2018 19:26:44 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482978 - in head/textproc: libxml2/files py-libxml2
Message-ID:  <201810251926.w9PJQihk097445@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Thu Oct 25 19:26:44 2018
New Revision: 482978
URL: https://svnweb.freebsd.org/changeset/ports/482978

Log:
  Remove usage of _PyVerify_fd().
  
  This function appears to be removed in python 3.5.0. Instead of adding a
  version check like the submitter proposed. Grab the upstream patch instead
  that just removes the function usage.
  
  PR:		224902
  Submitted by:	Michael Zhilin <mizhka@gmail.com>
  Obtained from:	libxml2 upstream

Added:
  head/textproc/libxml2/files/patch-python_types.c   (contents, props changed)
Modified:
  head/textproc/py-libxml2/Makefile

Added: head/textproc/libxml2/files/patch-python_types.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/libxml2/files/patch-python_types.c	Thu Oct 25 19:26:44 2018	(r482978)
@@ -0,0 +1,30 @@
+From d910e99c322a0895955038c700471e9b1fd91fa6 Mon Sep 17 00:00:00 2001
+From: Patrick Welche <prlw1@cam.ac.uk>
+Date: Mon, 6 Nov 2017 16:20:25 +0000
+Subject: [PATCH] python: remove single use of _PyVerify_fd
+
+_PyVerify_fd disappeared from python with:
+
+  https://hg.python.org/cpython/rev/e88e2049b793
+
+https://bugzilla.gnome.org/show_bug.cgi?id=776815
+---
+ python/types.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/python/types.c b/python/types.c
+index f2376776..124af565 100644
+--- python/types.c
++++ python/types.c
+@@ -31,8 +31,6 @@ libxml_PyFileGet(PyObject *f) {
+     const char *mode;
+ 
+     fd = PyObject_AsFileDescriptor(f);
+-    if (!_PyVerify_fd(fd))
+-        return(NULL);
+     /*
+      * Get the flags on the fd to understand how it was opened
+      */
+-- 
+2.18.1
+

Modified: head/textproc/py-libxml2/Makefile
==============================================================================
--- head/textproc/py-libxml2/Makefile	Thu Oct 25 18:48:23 2018	(r482977)
+++ head/textproc/py-libxml2/Makefile	Thu Oct 25 19:26:44 2018	(r482978)
@@ -1,7 +1,7 @@
 # Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810251926.w9PJQihk097445>