git: 19ffa2050341 - main - devel/py-pyicu: Update to 2.11
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 05 Oct 2023 02:01:51 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=19ffa2050341f9ab2a0136b9f553b096cd30a9ec
commit 19ffa2050341f9ab2a0136b9f553b096cd30a9ec
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-10-05 01:56:33 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-10-05 02:00:21 +0000
devel/py-pyicu: Update to 2.11
- Update WWW
- Clean up Makefile
- Strip shared library
- Take maintainership
Changes: https://gitlab.pyicu.org/main/pyicu/-/blob/main/CHANGES
---
devel/py-pyicu/Makefile | 25 ++++-------
devel/py-pyicu/distinfo | 6 +--
devel/py-pyicu/files/patch-icu68 | 97 ----------------------------------------
3 files changed, 11 insertions(+), 117 deletions(-)
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 13d1842068ab..bc1afe30fda8 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -1,32 +1,23 @@
PORTNAME= pyicu
-PORTVERSION= 2.4.3
-PORTREVISION= 6
+PORTVERSION= 2.11
CATEGORIES= devel python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyICU-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Python extension wrapping IBM's ICU C++ API #'
-WWW= https://pypi.org/project/PyICU/
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Python extension wrapping the ICU C++ API
+WWW= https://gitlab.pyicu.org/main/pyicu
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libicudata.so:devel/icu
-USES= compiler:c++11-lang python
-USE_CXXSTD= c++11
-USE_PYTHON= distutils autoplist
+USES= compiler:c++11-lang pkgconfig python
+USE_PYTHON= autoplist concurrent distutils
-MAKE_ENV= PYICU_INCLUDES="${LOCALBASE}/include" \
- PYICU_CFLAGS="${CXXFLAGS:ts:}" \
- PYICU_LFLAGS="-L${LOCALBASE}/lib"
-CFLAGS+= -w -DPYICU_VER=\"${PORTVERSION}\"
-
-pre-configure:
- @if [ ! -e ${LOCALBASE}/lib/libicule.so ]; then \
- ${REINPLACE_CMD} "s/, 'icule'//" ${WRKSRC}/${PYSETUP}; \
- fi
+post-install:
+ ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
.include <bsd.port.mk>
diff --git a/devel/py-pyicu/distinfo b/devel/py-pyicu/distinfo
index 419b197d6e06..6a27b880de9d 100644
--- a/devel/py-pyicu/distinfo
+++ b/devel/py-pyicu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588020299
-SHA256 (PyICU-2.4.3.tar.gz) = c0ca7741ad0e8b20781578a876dac0357b982b7762ccc2aae116f0b18ce1ab1c
-SIZE (PyICU-2.4.3.tar.gz) = 219819
+TIMESTAMP = 1696432936
+SHA256 (PyICU-2.11.tar.gz) = 3ab531264cfe9132b3d2ac5d708da9a4649d25f6e6813730ac88cf040a08a844
+SIZE (PyICU-2.11.tar.gz) = 257899
diff --git a/devel/py-pyicu/files/patch-icu68 b/devel/py-pyicu/files/patch-icu68
deleted file mode 100644
index d49d4a776b94..000000000000
--- a/devel/py-pyicu/files/patch-icu68
+++ /dev/null
@@ -1,97 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/0101e2632c34
-Fixed by https://github.com/ovalhub/pyicu/commit/b42d6a754729
-
-measureunit.cpp:466:5: error: unknown type name 'NoUnit'
- NoUnit *object;
- ^
-measureunit.cpp:480:45: error: unexpected namespace name 'NoUnit': expected expression
-DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
- ^
-measureunit.cpp:480:1: error: use of undeclared identifier 'object'
-DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
-^
-./macros.h:199:33: note: expanded from macro 'DECLARE_TYPE'
-PyObject *wrap_##name(icuClass *object, int flags) \
- ^
-measureunit.cpp:480:1: error: expected '(' for function-style cast or type construction
-DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
-^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-./macros.h:199:45: note: expanded from macro 'DECLARE_TYPE'
-PyObject *wrap_##name(icuClass *object, int flags) \
- ~~~ ^
-measureunit.cpp:480:1: error: expected ';' after top level declarator
-./macros.h:199:75: note: expanded from macro 'DECLARE_TYPE'
-PyObject *wrap_##name(icuClass *object, int flags) \
- ^
-measureunit.cpp:956:23: error: unexpected namespace name 'NoUnit': expected expression
- return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED);
- ^
-measureunit.cpp:956:31: error: expected expression
- return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED);
- ^
-measureunit.cpp:961:25: error: unexpected namespace name 'NoUnit': expected expression
- return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED);
- ^
-measureunit.cpp:961:33: error: expected expression
- return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED);
- ^
-measureunit.cpp:966:25: error: unexpected namespace name 'NoUnit': expected expression
- return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED);
- ^
-measureunit.cpp:966:33: error: expected expression
- return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED);
- ^
-measureunit.cpp:1193:19: error: unexpected namespace name 'NoUnit': expected expression
- REGISTER_TYPE(NoUnit, m);
- ^
-
---- measureunit.cpp.orig 2019-10-03 17:11:03 UTC
-+++ measureunit.cpp
-@@ -463,7 +463,7 @@ DECLARE_TYPE(Measure, t_measure, UObject, Measure, abs
-
- class t_nounit : public _wrapper {
- public:
-- NoUnit *object;
-+ MeasureUnit *object;
- };
-
- static PyObject *t_nounit_base(PyTypeObject *type);
-@@ -477,7 +477,7 @@ static PyMethodDef t_nounit_methods[] = {
- { NULL, NULL, 0, NULL }
- };
-
--DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
-+DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, MeasureUnit,
- abstract_init, NULL);
-
- #endif
-@@ -953,17 +953,17 @@ DEFINE_RICHCMP(Measure, t_measure);
-
- static PyObject *t_nounit_base(PyTypeObject *type)
- {
-- return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED);
-+ return wrap_NoUnit((MeasureUnit *) NoUnit::base().clone(), T_OWNED);
- }
-
- static PyObject *t_nounit_percent(PyTypeObject *type)
- {
-- return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED);
-+ return wrap_NoUnit((MeasureUnit *) NoUnit::percent().clone(), T_OWNED);
- }
-
- static PyObject *t_nounit_permille(PyTypeObject *type)
- {
-- return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED);
-+ return wrap_NoUnit((MeasureUnit *) NoUnit::permille().clone(), T_OWNED);
- }
-
- #endif
-@@ -1190,7 +1190,7 @@ void _init_measureunit(PyObject *m)
- INSTALL_TYPE(MeasureUnit, m);
- INSTALL_TYPE(Measure, m);
- #if U_ICU_VERSION_HEX >= VERSION_HEX(60, 0, 0)
-- REGISTER_TYPE(NoUnit, m);
-+ INSTALL_STRUCT(NoUnit, m);
- #endif
- REGISTER_TYPE(CurrencyUnit, m);
- REGISTER_TYPE(CurrencyAmount, m);