From nobody Wed Feb 21 15:37:58 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tg0lq3xYqz59n9r; Wed, 21 Feb 2024 15:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg0lq0Yd7z4jLL; Wed, 21 Feb 2024 15:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gu+Cr8P8bEgBsBfFT1fe4WnArb5epIIRDrXxIwO0y5c=; b=aGgTI7Y0HSSuaRj4aLnl8eDI0FcRIiG3zL0gp3LjUwTCcxYqwK277rsPl4zwUWtXPlGhz5 gNaksHX42LQRW2MefduQOdgIrjYOzAsJWuPMR2zvU5gltDa9dqQHxJ5IvUxLbhN9IgEwj4 GoXjBEgcndp5oMMlvpnwKedStGHZDiZ7UGRH+qGW+PEKIx19Sp6KCM4liLcyYRlDWG0wt5 MW27XfBBV83gQn5kkARWkz9phawD4HlT4SKhHigy6V5+HrtZxiLxFUIPWlV1CfQ+SB/kO2 dnUkcjiKocXa6K56Rc7QEgRrOt4qvUB58upcFWaUoi8vW5ZBUFoXBTDJfxAZvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gu+Cr8P8bEgBsBfFT1fe4WnArb5epIIRDrXxIwO0y5c=; b=uLtZiOCklXWqbz8CBrj/TBk4vhFamS5hJt1CfI8/A1IdrXK6JYeBTOVW9vIJIMpNrKq9/X uGSdekxhX8K9bRZVj+rQbBLRUMPqz6065bOeOWKqKGfKWsrHF+P755tVpCGLlg/JAlur4u cM6eSJK4dN+3epKz0Zry7On6XHwj7Rc2ceXzEmW1ktDWUMukTm/kpdpqtuL7wpm7QbzlJ4 qKnOhOUe2OHyIhv8BEF4tm9Cg0njP/4SC0rJOB77Ne+3fiPWlOij9wdT8y5t86kn+KgEXL z+YTPAiQSL42N8rKU6ry8n1VJw16qiM6PgfNnOLloyvaYxObXWM6NckKGpuLJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708529879; a=rsa-sha256; cv=none; b=ikgYNQ+sDeQN0RUdD51qsRYm2UFdPAvHHCXFW/oyEVwLSObGCQ2ePTXAk2p+fwmHT8PqHg Xo1cT3yX5aDwT7DO0dTTvp+E93Prcsk++QuGbbMDna5hIUMyrj+TkH2h+PnUpnB+O1ZW7M 6DqeYc7krKjBnfs5bfJfRXVZGs8k7o3DRMzoL0X/YxWYOL1fyOflv9nzYyjxbmSGz2m6a+ SnHPX1WV9e3qFNZ5bRYAU+FzzbsqhPiWvS/NmactGcdqYNeRuFQpx+wD5OJmRSM7BzQZqz A0dPw78x8gUylUTfDiAg/bOiAAWWIxHwTDWyIEhddc1+Ti2PJYB7r/t/ShtE6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tg0lp6lMSz17qT; Wed, 21 Feb 2024 15:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFbw4W088334; Wed, 21 Feb 2024 15:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFbws9088331; Wed, 21 Feb 2024 15:37:58 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:37:58 GMT Message-Id: <202402211537.41LFbws9088331@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1da51be7f3d1 - main - x11-toolkits/py-fltk: Update to 1.3.9 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da51be7f3d19581ec22b6db7421713a3c8bef01 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1da51be7f3d19581ec22b6db7421713a3c8bef01 commit 1da51be7f3d19581ec22b6db7421713a3c8bef01 Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 15:02:03 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-02-21 15:11:11 +0000 x11-toolkits/py-fltk: Update to 1.3.9 - Fix build with swig 4.2.0 Changes: https://sourceforge.net/p/pyfltk/code/HEAD/tree/trunk/pyfltk/ReleaseNotes.txt --- x11-toolkits/py-fltk/Makefile | 15 ++++---- x11-toolkits/py-fltk/distinfo | 6 +-- x11-toolkits/py-fltk/files/patch-setup.py | 11 +----- x11-toolkits/py-fltk/files/patch-swig420 | 62 +++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 20 deletions(-) diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile index 3e69ed3084eb..0c5b51e0c4be 100644 --- a/x11-toolkits/py-fltk/Makefile +++ b/x11-toolkits/py-fltk/Makefile @@ -1,5 +1,5 @@ PORTNAME= fltk -PORTVERSION= 1.3.8 +PORTVERSION= 1.3.9 CATEGORIES= x11-toolkits python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/pyFltk-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,20 +15,21 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libfltk.so:x11-toolkits/fltk -CFLAGS+= -DFL_LIBRARY USES= python shebangfix xorg USE_PYTHON= autoplist distutils -PYDISTUTILS_CONFIGUREARGS= swig -SHEBANG_FILES= fltk/test/tree.py \ - fltk/test/tree_demo.py \ - fltk/test/fltk_threads.py USE_XORG= x11 +CFLAGS+= -DFL_LIBRARY +PYDISTUTILS_CONFIGUREARGS= swig + DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} PORTDOCS= * PORTEXAMPLES= * -WRKSRC= ${WRKDIR}/pyFltk-${PORTVERSION} + +SHEBANG_FILES= fltk/test/tree.py \ + fltk/test/tree_demo.py \ + fltk/test/fltk_threads.py OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/x11-toolkits/py-fltk/distinfo b/x11-toolkits/py-fltk/distinfo index 4bdf9133a0e5..4060e3f0e876 100644 --- a/x11-toolkits/py-fltk/distinfo +++ b/x11-toolkits/py-fltk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661553643 -SHA256 (pyFltk-1.3.8.tar.gz) = f7c5012810022dce011f3ed9f3f004c56e08090823739bfe670881fce9611f80 -SIZE (pyFltk-1.3.8.tar.gz) = 587221 +TIMESTAMP = 1708450750 +SHA256 (pyFltk-1.3.9.tar.gz) = fe72b123706d9d08817e0127324109ef83cb4db6b81889218d3f0fb9744edd54 +SIZE (pyFltk-1.3.9.tar.gz) = 587472 diff --git a/x11-toolkits/py-fltk/files/patch-setup.py b/x11-toolkits/py-fltk/files/patch-setup.py index ef29b4f616d3..158363d0d0e3 100644 --- a/x11-toolkits/py-fltk/files/patch-setup.py +++ b/x11-toolkits/py-fltk/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2022-08-26 05:16:56 UTC +--- setup.py.orig 2024-01-07 22:04:09 UTC +++ setup.py @@ -80,7 +80,7 @@ elif sys.platform.startswith('linux') or sys.platform compile_arg_list.append('-Werror=format-security') @@ -9,12 +9,3 @@ print(f"Building for: {sys.platform}") def_list = [('UNIX', '1')] lib_dir_list = [fltk_lib_dir,'/usr/X11R6/lib','/usr/lib'] -@@ -297,7 +297,7 @@ class PySwigCommand(distutils.cmd.Command): - - def run(self): - """Run command.""" -- command = ['swig', '-w302', '-w312', '-w325', '-w362', '-w389', '-w401', '-w473', '-w509', '-I./swig', '-DFL_EXPORT', '-DPYTHON', '-DPYTHON3', '-py3', '-c++', '-python', '-shadow', '-fastdispatch', '-outdir', 'fltk', '-o', 'fltk/fltk_wrap.cpp', './swig/fltk.i'] -+ command = ['swig', '-w302', '-w312', '-w325', '-w362', '-w389', '-w401', '-w473', '-w509', '-I./swig', '-DPYTHON', '-DPYTHON3', '-c++', '-python', '-shadow', '-fastdispatch', '-outdir', 'fltk', '-o', 'fltk/fltk_wrap.cpp', './swig/fltk.i'] - pos = command.index('-I./swig')+1 - command[pos:pos] = self.include - self.announce( diff --git a/x11-toolkits/py-fltk/files/patch-swig420 b/x11-toolkits/py-fltk/files/patch-swig420 new file mode 100644 index 000000000000..e4d706006ad8 --- /dev/null +++ b/x11-toolkits/py-fltk/files/patch-swig420 @@ -0,0 +1,62 @@ +--- swig/Fl_File_Browser.i.orig 2024-01-07 22:03:35 UTC ++++ swig/Fl_File_Browser.i +@@ -44,7 +44,7 @@ CHANGE_OWNERSHIP(Fl_File_Browser) + + int load_new(PyObject* dObj, PyObject* sObj) { + //char *directory=PyString_AsString(dObj); +- char *directory=SWIG_Python_str_AsChar(dObj); ++ char *directory=PyString_AsString(dObj); + int sort=PyInt_AsLong(sObj); + int result = -1; + +--- swig/Fl_Menu_.i.orig 2024-01-07 22:03:35 UTC ++++ swig/Fl_Menu_.i +@@ -75,7 +75,7 @@ DEFINE_CALLBACK(Fl_Menu_) + int add(PyObject *lObj, PyObject *sObj, PyObject *cObj, PyObject* uObj=0, PyObject* fObj=0) { + + //char *pyLabel=PyString_AsString(lObj); +- char* pyLabel = SWIG_Python_str_AsChar(lObj); ++ char* pyLabel = PyString_AsString(lObj); + + int shortcut=PyInt_AsLong(sObj); + PyObject *callback=cObj; +--- swig/Fl_Pixmap.i.orig 2024-01-07 22:03:35 UTC ++++ swig/Fl_Pixmap.i +@@ -31,7 +31,7 @@ The Fl_Pixmap class supports caching and drawing of co + %#endif + { + //$1[i] = PyString_AsString(PyList_GetItem($input,i)); +- $1[i] = SWIG_Python_str_AsChar(PyList_GetItem($input,i)); ++ $1[i] = PyString_AsString(PyList_GetItem($input,i)); + } + else { + PyErr_SetString(PyExc_TypeError,"list must contain strings"); +--- swig/WindowShowTypemap.i.orig 2024-01-07 22:03:35 UTC ++++ swig/WindowShowTypemap.i +@@ -13,7 +13,7 @@ + if (PyString_Check(o)) + %#endif + //$1[i] = PyString_AsString(PyList_GetItem($input,i)); +- $1[i] = SWIG_Python_str_AsChar(PyList_GetItem($input,i)); ++ $1[i] = PyString_AsString(PyList_GetItem($input,i)); + else { + PyErr_SetString(PyExc_TypeError,"list must contain strings"); + free($1); +@@ -52,7 +52,7 @@ void show(PyObject *count = 0, PyObject *data = 0) + %#else + if (PyString_Check(o)) + %#endif +- tmp[i] = SWIG_Python_str_AsChar(PyList_GetItem(count,i)); ++ tmp[i] = PyString_AsString(PyList_GetItem(count,i)); + //tmp[i] = PyString_AsString(PyList_GetItem(count,i)); + else { + PyErr_SetString(PyExc_TypeError,"list must contain strings"); +@@ -77,7 +77,7 @@ void show(PyObject *count = 0, PyObject *data = 0) + %#else + if (PyString_Check(o)) + %#endif +- tmp[i] = SWIG_Python_str_AsChar(PyList_GetItem(data,i)); ++ tmp[i] = PyString_AsString(PyList_GetItem(data,i)); + //tmp[i] = PyString_AsString(PyList_GetItem(data,i)); + else { + PyErr_SetString(PyExc_TypeError,"list must contain strings");