svn commit: r396121 - in head: archivers/py-lz4 archivers/py-lz4/files x11/xpra x11/xpra/files
Jung-uk Kim
jkim at FreeBSD.org
Fri Sep 4 17:24:10 UTC 2015
Author: jkim
Date: Fri Sep 4 17:24:08 2015
New Revision: 396121
URL: https://svnweb.freebsd.org/changeset/ports/396121
Log:
- Add an upstream patch for archivers/py-lz4 to export its version number.
- Remove a local hack for x11/xpra to properly detect LZ4 version.
Added:
head/archivers/py-lz4/files/patch-src_python-lz4.c (contents, props changed)
Deleted:
head/x11/xpra/files/patch-xpra_net_compression.py
Modified:
head/archivers/py-lz4/Makefile
head/archivers/py-lz4/files/patch-setup.py
head/x11/xpra/Makefile
Modified: head/archivers/py-lz4/Makefile
==============================================================================
--- head/archivers/py-lz4/Makefile Fri Sep 4 17:18:21 2015 (r396120)
+++ head/archivers/py-lz4/Makefile Fri Sep 4 17:24:08 2015 (r396121)
@@ -2,6 +2,7 @@
PORTNAME= lz4
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= archivers python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Modified: head/archivers/py-lz4/files/patch-setup.py
==============================================================================
--- head/archivers/py-lz4/files/patch-setup.py Fri Sep 4 17:18:21 2015 (r396120)
+++ head/archivers/py-lz4/files/patch-setup.py Fri Sep 4 17:24:08 2015 (r396121)
@@ -1,6 +1,23 @@
--- setup.py.orig 2014-07-07 13:03:03 UTC
+++ setup.py
-@@ -29,7 +29,7 @@ setup(
+@@ -4,10 +4,11 @@
+ from setuptools import setup, find_packages, Extension
+
+ VERSION = (0, 7, 0)
++VERSION_STR = ".".join([str(x) for x in VERSION])
+
+ setup(
+ name='lz4',
+- version=".".join([str(x) for x in VERSION]),
++ version=VERSION_STR,
+ description="LZ4 Bindings for Python",
+ long_description=open('README.rst', 'r').read(),
+ author='Steeve Morin',
+@@ -26,10 +27,11 @@ setup(
+ "-Wall",
+ "-W",
+ "-Wundef",
++ "-DVERSION=\"%s\"" % VERSION_STR,
"-DLZ4_VERSION=\"r119\"",
])
],
Added: head/archivers/py-lz4/files/patch-src_python-lz4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/archivers/py-lz4/files/patch-src_python-lz4.c Fri Sep 4 17:24:08 2015 (r396121)
@@ -0,0 +1,13 @@
+--- src/python-lz4.c.orig 2014-07-07 13:03:03 UTC
++++ src/python-lz4.c
+@@ -202,6 +202,10 @@ void initlz4(void)
+ INITERROR;
+ }
+
++ PyModule_AddStringConstant(module, "VERSION", VERSION);
++ PyModule_AddStringConstant(module, "__version__", VERSION);
++ PyModule_AddStringConstant(module, "LZ4_VERSION", LZ4_VERSION);
++
+ #if PY_MAJOR_VERSION >= 3
+ return module;
+ #endif
Modified: head/x11/xpra/Makefile
==============================================================================
--- head/x11/xpra/Makefile Fri Sep 4 17:18:21 2015 (r396120)
+++ head/x11/xpra/Makefile Fri Sep 4 17:24:08 2015 (r396121)
@@ -3,6 +3,7 @@
PORTNAME= xpra
PORTVERSION= 0.15.5
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/
@@ -13,7 +14,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \
${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/lz4.so:${PORTSDIR}/archivers/py-lz4 \
+RUN_DEPENDS= py${PYTHON_SUFFIX}-lz4>=0.7.0_1:${PORTSDIR}/archivers/py-lz4 \
pulseaudio:${PORTSDIR}/audio/pulseaudio \
${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \
${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
More information about the svn-ports-head
mailing list