pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc libxslt: updated to 1.1.33
details: https://anonhg.NetBSD.org/pkgsrc/rev/d21016a68be7
branches: trunk
changeset: 317570:d21016a68be7
user: adam <adam%pkgsrc.org@localhost>
date: Wed Jan 09 19:12:14 2019 +0000
description:
libxslt: updated to 1.1.33
v1.1.33:
Portability:
Variables need 'extern' in static lib on Cygwin
Really declare dllexport/dllimport for Cygwin
Fix callback signatures in Python bindings
Fix transform callback signatures
Fix extension callback signatures
Fix deallocator signatures
Fix XPath callback signatures
Fix hash callback signatures
Bug Fixes:
Don't cache direct evaluation of patterns with variables
Move function result RVTs to context variable
Fix EXSLT functions returning RVTs from outer scopes
Fix handling of RVTs returned from nested EXSLT functions
Fix typos
Improvements:
Run Travis ASan tests with "sudo: required"
Cleanups:
Remove doc/libxslt-decl.txt
Docs for 1.1.32 release
diffstat:
textproc/libxslt/Makefile | 3 +-
textproc/libxslt/Makefile.common | 4 +-
textproc/libxslt/distinfo | 12 +-
textproc/libxslt/patches/patch-ae | 12 -
textproc/libxslt/patches/patch-libexslt_date.c | 12 +
textproc/py-libxslt/Makefile | 4 +-
textproc/py-libxslt/files/setup.py | 178 +++++++++---------------
7 files changed, 94 insertions(+), 131 deletions(-)
diffs (truncated from 354 to 300 lines):
diff -r 107a2009c9a8 -r d21016a68be7 textproc/libxslt/Makefile
--- a/textproc/libxslt/Makefile Wed Jan 09 19:09:02 2019 +0000
+++ b/textproc/libxslt/Makefile Wed Jan 09 19:12:14 2019 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.107 2018/08/22 09:46:46 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2019/01/09 19:12:14 adam Exp $
-PKGREVISION= 1
.include "Makefile.common"
BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
diff -r 107a2009c9a8 -r d21016a68be7 textproc/libxslt/Makefile.common
--- a/textproc/libxslt/Makefile.common Wed Jan 09 19:09:02 2019 +0000
+++ b/textproc/libxslt/Makefile.common Wed Jan 09 19:12:14 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2017/11/23 15:48:10 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2019/01/09 19:12:14 adam Exp $
#
# used by textproc/libxslt/Makefile
# used by textproc/py-libxslt/Makefile
-DISTNAME= libxslt-1.1.32
+DISTNAME= libxslt-1.1.33
CATEGORIES= textproc
MASTER_SITES= ftp://xmlsoft.org/libxslt/
MASTER_SITES+= http://xmlsoft.org/sources/
diff -r 107a2009c9a8 -r d21016a68be7 textproc/libxslt/distinfo
--- a/textproc/libxslt/distinfo Wed Jan 09 19:09:02 2019 +0000
+++ b/textproc/libxslt/distinfo Wed Jan 09 19:12:14 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.63 2017/11/23 15:48:10 wiz Exp $
+$NetBSD: distinfo,v 1.64 2019/01/09 19:12:14 adam Exp $
-SHA1 (libxslt-1.1.32.tar.gz) = c47969f16747a72f9095b6a7a56d3afdd1e6e9ac
-RMD160 (libxslt-1.1.32.tar.gz) = fc65b2730625eca4e9fda62fd9a91210b2bee368
-SHA512 (libxslt-1.1.32.tar.gz) = e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39
-Size (libxslt-1.1.32.tar.gz) = 3440715 bytes
-SHA1 (patch-ae) = 40ce3940a93b6a2dc804f62676909d3313e0ea52
+SHA1 (libxslt-1.1.33.tar.gz) = 7dcda921d9d3d3325449dae5cf84dbb102d26928
+RMD160 (libxslt-1.1.33.tar.gz) = e1c3ad9b6f7dbdf069320097e19fce0f11ce5c12
+SHA512 (libxslt-1.1.33.tar.gz) = ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
+Size (libxslt-1.1.33.tar.gz) = 3444093 bytes
+SHA1 (patch-libexslt_date.c) = 40ce3940a93b6a2dc804f62676909d3313e0ea52
diff -r 107a2009c9a8 -r d21016a68be7 textproc/libxslt/patches/patch-ae
--- a/textproc/libxslt/patches/patch-ae Wed Jan 09 19:09:02 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2012/09/15 10:26:02 adam Exp $
-
---- libexslt/date.c.orig 2012-09-12 05:58:38.000000000 +0000
-+++ libexslt/date.c
-@@ -31,6 +31,7 @@
- #if defined(HAVE_LOCALTIME_R) && defined(__GLIBC__) /* _POSIX_SOURCE required by gnu libc */
- #ifndef _AIX51 /* but on AIX we're not using gnu libc */
- #define _POSIX_SOURCE
-+#define _POSIX_C_SOURCE 199506L /* POSIX.1c */
- #endif
- #endif
-
diff -r 107a2009c9a8 -r d21016a68be7 textproc/libxslt/patches/patch-libexslt_date.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libxslt/patches/patch-libexslt_date.c Wed Jan 09 19:12:14 2019 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-libexslt_date.c,v 1.1 2019/01/09 19:12:14 adam Exp $
+
+--- libexslt/date.c.orig 2012-09-12 05:58:38.000000000 +0000
++++ libexslt/date.c
+@@ -31,6 +31,7 @@
+ #if defined(HAVE_LOCALTIME_R) && defined(__GLIBC__) /* _POSIX_SOURCE required by gnu libc */
+ #ifndef _AIX51 /* but on AIX we're not using gnu libc */
+ #define _POSIX_SOURCE
++#define _POSIX_C_SOURCE 199506L /* POSIX.1c */
+ #endif
+ #endif
+
diff -r 107a2009c9a8 -r d21016a68be7 textproc/py-libxslt/Makefile
--- a/textproc/py-libxslt/Makefile Wed Jan 09 19:09:02 2019 +0000
+++ b/textproc/py-libxslt/Makefile Wed Jan 09 19:12:14 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2018/07/03 05:03:37 adam Exp $
+# $NetBSD: Makefile,v 1.52 2019/01/09 19:12:14 adam Exp $
.include "../../textproc/libxslt/Makefile.common"
@@ -11,7 +11,7 @@
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.6.8:../../textproc/py-libxml2
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 1.1.28
+PYTHON_VERSIONS_ACCEPTED= 27
PYSETUPSUBDIR= python
NO_CONFIGURE= yes
diff -r 107a2009c9a8 -r d21016a68be7 textproc/py-libxslt/files/setup.py
--- a/textproc/py-libxslt/files/setup.py Wed Jan 09 19:09:02 2019 +0000
+++ b/textproc/py-libxslt/files/setup.py Wed Jan 09 19:12:14 2019 +0000
@@ -1,142 +1,112 @@
-#!/usr/bin/python -u
+#!/usr/bin/env python
#
-# $NetBSD: setup.py,v 1.4 2017/05/16 13:51:51 dholland Exp $
+# $NetBSD: setup.py,v 1.5 2019/01/09 19:12:14 adam Exp $
# Setup script for libxslt
#
-import sys, os
+import os
+import sys
from distutils.core import setup, Extension
# Thread-enabled libxml2
with_threads = 1
-# If this flag is set (windows only),
+# If this flag is set (windows only),
# a private copy of the dlls are included in the package.
# If this flag is not set, the libxml2 and libxslt
# dlls must be found somewhere in the PATH at runtime.
WITHDLLS = 1 and sys.platform.startswith('win')
-def missing(file):
- if os.access(file, os.R_OK) == 0:
- return 1
- return 0
+def missing(path):
+ return 1 if os.access(path, os.R_OK) == 0 else 0
-try:
- HOME = os.environ['HOME']
-except:
- HOME="C:"
+HOME = os.environ.get('HOME', 'C:')
if sys.platform.startswith('win'):
libraryPrefix = 'lib'
platformLibs = []
else:
libraryPrefix = ''
- platformLibs = ["m","z"]
+ platformLibs = ["m", "z"]
-# those are examined to find
+# those are examined to find
# - libxml2/libxml/tree.h
-# - iconv.h
+# - iconv.h
# - libxslt/xsltconfig.h
includes_dir = [
-"@LIBXML2DIR@/include",
-"@LIBXSLTDIR@/include"
-];
+ "@LIBXML2DIR@/include",
+ "@LIBXSLTDIR@/include"
+]
-xml_includes=""
-for dir in includes_dir:
- if not missing(dir + "/libxml2/libxml/tree.h"):
- xml_includes=dir + "/libxml2"
- break;
+xml_includes = ""
+for d in includes_dir:
+ if not missing(d + "/libxml2/libxml/tree.h"):
+ xml_includes = d + "/libxml2"
+ break
if xml_includes == "":
- print "failed to find headers for libxml2: update includes_dir"
- sys.exit(1)
+ sys.exit("failed to find headers for libxml2: update includes_dir")
-iconv_includes="@LIBICONVDIR@/include"
+iconv_includes = "@LIBICONVDIR@/include"
# those are added in the linker search path for libraries
libdirs = ["@LIBXML2DIR@/lib", "@PYSHLIBDIR@"]
xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
"libxml.c", "libxml.py", "libxml_wrap.h", "types.c",
- "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"]
+ "xmlgenerator.py", "README", "TODO", "drv_libxml2.py"]
xslt_files = ["libxslt-api.xml", "libxslt-python-api.xml",
- "libxslt.c", "libxsl.py", "libxslt_wrap.h",
- "generator.py"]
-
-if 0:
- try:
- try:
- import xmlgenerator
- except:
- import generator
- except:
- print "failed to find and generate stubs for libxml2, aborting ..."
- print sys.exc_type, sys.exc_value
- sys.exit(1)
+ "libxslt.c", "libxsl.py", "libxslt_wrap.h",
+ "generator.py"]
- head = open("libxml.py", "r")
- generated = open("libxml2class.py", "r")
- result = open("libxml2.py", "w")
- for line in head.readlines():
- if WITHDLLS:
- result.write(altImport(line))
- else:
- result.write(line)
- for line in generated.readlines():
- result.write(line)
- head.close()
- generated.close()
- result.close()
-
-with_xslt=0
+with_xslt = 0
if missing("libxslt-py.c") or missing("libxslt.py"):
if missing("generator.py") or missing("libxslt-python-api.xml"):
- print "libxslt stub generator not found, libxslt not built"
+ print("libxslt stub generator not found, libxslt not built")
else:
- try:
- import generator
- except:
- print "failed to generate stubs for libxslt, aborting ..."
- print sys.exc_type, sys.exc_value
- else:
- head = open("libxsl.py", "r")
- generated = open("libxsltclass.py", "r")
- result = open("libxslt.py", "w")
- for line in head.readlines():
+ try:
+ import generator
+ except:
+ print("failed to generate stubs for libxslt, aborting...")
+ print(sys.exc_type, sys.exc_value)
+ else:
+ head = open("libxsl.py", "r")
+ generated = open("libxsltclass.py", "r")
+ result = open("libxslt.py", "w")
+ for line in head.readlines():
if WITHDLLS:
result.write(altImport(line))
else:
result.write(line)
- for line in generated.readlines():
- result.write(line)
- head.close()
- generated.close()
- result.close()
- with_xslt=1
+ for line in generated.readlines():
+ result.write(line)
+ head.close()
+ generated.close()
+ result.close()
+ with_xslt = 1
else:
- with_xslt=1
+ with_xslt = 1
if with_xslt == 1:
- xslt_includes=""
- for dir in includes_dir:
- if not missing(dir + "/libxslt/xsltconfig.h"):
- xslt_includes=dir + "/libxslt"
- break;
+ xslt_includes = ""
+ for d in includes_dir:
+ if not missing(d + "/libxslt/xsltconfig.h"):
+ xslt_includes = d + "/libxslt"
+ break
if xslt_includes == "":
- print "failed to find headers for libxslt: update includes_dir"
- with_xslt = 0
+ print("failed to find headers for libxslt: update includes_dir")
+ with_xslt = 0
descr = "libxml2 package"
modules = []
c_files = []
-includes= [xml_includes, iconv_includes]
-libs = ["xml2mod"] + platformLibs
-macros = []
+includes = [xml_includes, iconv_includes]
+libs = ["xml2mod"] + platformLibs
+macros = []
if with_threads:
- macros.append(('_REENTRANT','1'))
+ macros.append(('_REENTRANT', '1'))
if with_xslt == 1:
descr = "libxslt package"
if not sys.platform.startswith('win'):
@@ -159,22 +129,20 @@
modules.append('libxslt')
-extens=[]
+extens = []
if with_xslt == 1:
Home |
Main Index |
Thread Index |
Old Index