Date: Thu, 28 Nov 2019 15:58:42 +0000 From: Pietro Cerutti <gahr@FreeBSD.org> To: python@FreeBSD.org, fluffy@FreeBSD.org Subject: [fluffy@FreeBSD.org: Re: svn commit: r518575 - in head/lang/tcl87: . files] Message-ID: <20191128155842.mzcevoc6s3puxd73@ptrcrt.ch>
index | next in thread | raw e-mail
[-- Attachment #1 --] Forwarding to python@. Tcl 8.7 is still in alpha stage - things are supposed to break again until the final release. Up to you to decide how much effort do you want to put in (in this case it's minimal, as Dima has already provided a patch). Thanks, ----- Forwarded message from Dima Panov <fluffy@FreeBSD.org> ----- Date: Fri, 29 Nov 2019 01:18:07 +1000 From: Dima Panov <fluffy@FreeBSD.org> To: Pietro Cerutti <gahr@FreeBSD.org> Subject: Re: svn commit: r518575 - in head/lang/tcl87: . files [-- Type: text/plain; charset=utf-8, Encoding: quoted-printable, Size: 0.8K --] Thanks! BTW, tcl87 update is also broke py27-tkinter (x11-toolkits/py-tkinter) Fix is attached -- Dima Panov (fluffy@FreeBSD.org) (X11, KDE, Office)@FreeBSD team Facebook: http://www.facebook.com/fluffy.khv twitter: fluffy_khv | skype: dima.panov | telegram: @dima_panov IRC: fluffy@EFNet, fluffykhv@FreeNode > On Friday, Nov 29, 2019 at 1:07 AM, Pietro Cerutti <gahr@FreeBSD.org (mailto:gahr@FreeBSD.org)> wrote: > On Nov 28 2019, 13:14 UTC, Dima Panov <fluffy@FreeBSD.org> wrote: > [-- Type: text/plain; charset=utf-8, Encoding: quoted-printable, Size: 36K --] > > Moin! > > > > You missed to place tzdata/Asia/Qostanay under %%TZDATA%% macros :( > > Ouch - thanks, fixed in r518584. > > -- > Pietro Cerutti [-- Alternative Type #1: text/html; charset=utf-8, Encoding: quoted-printable, Size: 1.9K --] ----- End forwarded message ----- -- Pietro Cerutti [-- Attachment #2 --] Index: py-tkinter/Makefile =================================================================== --- py-tkinter/Makefile (revision 518584) +++ py-tkinter/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= tkinter PORTVERSION= ${PYTHON_PORTVERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits python MASTER_SITES= PYTHON/ftp/python/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,8 +16,9 @@ PORTSCOUT= ignore:1 -USES= python tar:xz tk +USES= python tar:xz tk xorg USE_PYTHON= distutils autoplist allflavors +USE_XORG= x11 DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo @@ -27,6 +28,10 @@ .include <bsd.port.pre.mk> +.if (${_TCLTK_WANTED_VERSIONS} > 86 && ${PYTHON_REL} < 3000) +EXTRA_PATCHES= ${FILESDIR}/extrapatch-py27__tkinter.c +.endif + post-extract: .if ${PYTHON_REL} < 3000 @${SED} -e "s|%%TK_VER%%|${TK_VER}|" ${FILESDIR}/setup.py > ${WRKSRC}/setup.py Index: py-tkinter/files/extrapatch-py27__tkinter.c =================================================================== --- py-tkinter/files/extrapatch-py27__tkinter.c (nonexistent) +++ py-tkinter/files/extrapatch-py27__tkinter.c (working copy) @@ -0,0 +1,29 @@ +--- _tkinter.c.orig 2019-10-19 20:38:44.000000000 +0200 ++++ _tkinter.c 2019-11-28 16:08:37.232941000 +0100 +@@ -92,7 +92,7 @@ + Tcl_Unichar. This is also ok as long as Python uses UCS-4, + as well. + */ +-#if TCL_UTF_MAX != 3 && !(defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==6) ++#if TCL_UTF_MAX != 4 && !(defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==6) + #error "unsupported Tcl configuration" + #endif + +@@ -1164,7 +1164,7 @@ + Py_ssize_t size = PyUnicode_GET_SIZE(value); + /* This #ifdef assumes that Tcl uses UCS-2. + See TCL_UTF_MAX test above. */ +-#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX == 3 ++#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX == 4 + Tcl_UniChar *outbuf = NULL; + Py_ssize_t i; + size_t allocsize; +@@ -1377,7 +1377,7 @@ + + if (value->typePtr == app->StringType) { + #ifdef Py_USING_UNICODE +-#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==3 ++#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==4 + PyObject *result; + int size; + Tcl_UniChar *input; Property changes on: py-tkinter/files/extrapatch-py27__tkinter.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of propertyhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191128155842.mzcevoc6s3puxd73>