pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc
Module Name: pkgsrc
Committed By: adam
Date: Wed Jan 9 19:12:14 UTC 2019
Modified Files:
pkgsrc/textproc/libxslt: Makefile Makefile.common distinfo
pkgsrc/textproc/py-libxslt: Makefile
pkgsrc/textproc/py-libxslt/files: setup.py
Added Files:
pkgsrc/textproc/libxslt/patches: patch-libexslt_date.c
Removed Files:
pkgsrc/textproc/libxslt/patches: patch-ae
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/textproc/libxslt/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/libxslt/Makefile.common
cvs rdiff -u -r1.63 -r1.64 pkgsrc/textproc/libxslt/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/textproc/libxslt/patches/patch-ae
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libxslt/patches/patch-libexslt_date.c
cvs rdiff -u -r1.51 -r1.52 pkgsrc/textproc/py-libxslt/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-libxslt/files/setup.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/textproc/libxslt/Makefile
diff -u pkgsrc/textproc/libxslt/Makefile:1.107 pkgsrc/textproc/libxslt/Makefile:1.108
--- pkgsrc/textproc/libxslt/Makefile:1.107 Wed Aug 22 09:46:46 2018
+++ pkgsrc/textproc/libxslt/Makefile Wed Jan 9 19:12:14 2019
@@ -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
Index: pkgsrc/textproc/libxslt/Makefile.common
diff -u pkgsrc/textproc/libxslt/Makefile.common:1.4 pkgsrc/textproc/libxslt/Makefile.common:1.5
--- pkgsrc/textproc/libxslt/Makefile.common:1.4 Thu Nov 23 15:48:10 2017
+++ pkgsrc/textproc/libxslt/Makefile.common Wed Jan 9 19:12:14 2019
@@ -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/
Index: pkgsrc/textproc/libxslt/distinfo
diff -u pkgsrc/textproc/libxslt/distinfo:1.63 pkgsrc/textproc/libxslt/distinfo:1.64
--- pkgsrc/textproc/libxslt/distinfo:1.63 Thu Nov 23 15:48:10 2017
+++ pkgsrc/textproc/libxslt/distinfo Wed Jan 9 19:12:14 2019
@@ -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
Index: pkgsrc/textproc/py-libxslt/Makefile
diff -u pkgsrc/textproc/py-libxslt/Makefile:1.51 pkgsrc/textproc/py-libxslt/Makefile:1.52
--- pkgsrc/textproc/py-libxslt/Makefile:1.51 Tue Jul 3 05:03:37 2018
+++ pkgsrc/textproc/py-libxslt/Makefile Wed Jan 9 19:12:14 2019
@@ -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 @@ COMMENT= Python wrapper for libxslt
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
Index: pkgsrc/textproc/py-libxslt/files/setup.py
diff -u pkgsrc/textproc/py-libxslt/files/setup.py:1.4 pkgsrc/textproc/py-libxslt/files/setup.py:1.5
--- pkgsrc/textproc/py-libxslt/files/setup.py:1.4 Tue May 16 13:51:51 2017
+++ pkgsrc/textproc/py-libxslt/files/setup.py Wed Jan 9 19:12:14 2019
@@ -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
-
-try:
- HOME = os.environ['HOME']
-except:
- HOME="C:"
+def missing(path):
+ return 1 if os.access(path, os.R_OK) == 0 else 0
+
+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"
-];
-
-xml_includes=""
-for dir in includes_dir:
- if not missing(dir + "/libxml2/libxml/tree.h"):
- xml_includes=dir + "/libxml2"
- break;
+ "@LIBXML2DIR@/include",
+ "@LIBXSLTDIR@/include"
+]
+
+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)
-
- 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()
+ "libxslt.c", "libxsl.py", "libxslt_wrap.h",
+ "generator.py"]
-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 @@ if with_xslt == 1:
modules.append('libxslt')
-extens=[]
+extens = []
if with_xslt == 1:
extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes,
- library_dirs=libdirs,
- runtime_library_dirs=libdirs,
+ library_dirs=libdirs, runtime_library_dirs=libdirs,
libraries=libs, define_macros=macros))
if missing("MANIFEST"):
-
manifest = open("MANIFEST", "w")
manifest.write("setup.py\n")
for file in xml_files:
manifest.write(file + "\n")
if with_xslt == 1:
- for file in xslt_files:
- manifest.write(file + "\n")
+ for file in xslt_files:
+ manifest.write(file + "\n")
manifest.close()
if WITHDLLS:
@@ -188,20 +156,16 @@ else:
ext_package = None
data_files = []
-setup (name = "libxslt-python",
- # On *nix, the version number is created from setup.py.in
- # On windows, it is set by configure.js
- version = os.environ['PYLIBXSLTVERSION'],
- description = descr,
- author = "Daniel Veillard",
- author_email = "veillard%redhat.com@localhost",
- url = "http://xmlsoft.org/python.html";,
- licence="MIT Licence",
- py_modules=modules,
- ext_modules=extens,
- ext_package=ext_package,
- data_files=data_files,
- )
-
-sys.exit(0)
-
+setup(name="libxslt-python",
+ # On *nix, the version number is created from setup.py.in
+ # On windows, it is set by configure.js
+ version=os.environ['PYLIBXSLTVERSION'],
+ description=descr,
+ author="Daniel Veillard",
+ author_email="veillard%redhat.com@localhost",
+ url="http://xmlsoft.org/python.html";,
+ licence="MIT Licence",
+ py_modules=modules,
+ ext_modules=extens,
+ ext_package=ext_package,
+ data_files=data_files)
Added files:
Index: pkgsrc/textproc/libxslt/patches/patch-libexslt_date.c
diff -u /dev/null pkgsrc/textproc/libxslt/patches/patch-libexslt_date.c:1.1
--- /dev/null Wed Jan 9 19:12:14 2019
+++ pkgsrc/textproc/libxslt/patches/patch-libexslt_date.c Wed Jan 9 19:12:14 2019
@@ -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
+
Home |
Main Index |
Thread Index |
Old Index