devel/pyside2 and friends: update to 5.13.1

Announcement:
  https://lists.qt-project.org/pipermail/pyside/2019-September/002786.html

While here, pet portlint. Bump FreeCAD, pyside2's consumer
This commit is contained in:
Christoph Moench-Tegeder 2019-10-02 18:38:26 +00:00
parent 7fb4c27e26
commit 4e795cc7ba
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=513599
10 changed files with 51 additions and 23 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= FreeCAD
DISTVERSION= 0.18.3
PORTREVISION= 2
PORTREVISION= 3
# use these for bugfixes/snapshots
# DISTVERSION= 0.18-16093 # git rev-list --count
# DISTVERSIONSUFFIX= -g690774c0e

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pyside2-tools
DISTVERSION= 5.12.3
DISTVERSION= 5.13.1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@$
git>0:devel/git
LIB_DEPENDS= # more later
USES= cmake gl python qt:5 shebangfix tar:xz
USES= cmake gl python qt:5 shebangfix tar:xz xorg
USE_GL= gl
USE_PYTHON= flavors
USE_QT= 3d buildtools_build charts core datavis3d declarative \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1557663703
SHA256 (pyside-setup-everywhere-src-5.12.3.tar.xz) = 4f7aab7d4bbaf1b3573cc989d704e87b0de55cce656ae5e23418a88baa4c6842
SIZE (pyside-setup-everywhere-src-5.12.3.tar.xz) = 5474384
TIMESTAMP = 1570005612
SHA256 (pyside-setup-everywhere-src-5.13.1.tar.xz) = c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536
SIZE (pyside-setup-everywhere-src-5.13.1.tar.xz) = 2936204

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pyside2
DISTVERSION= 5.12.3
DISTVERSION= 5.13.1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1557616428
SHA256 (pyside-setup-everywhere-src-5.12.3.tar.xz) = 4f7aab7d4bbaf1b3573cc989d704e87b0de55cce656ae5e23418a88baa4c6842
SIZE (pyside-setup-everywhere-src-5.12.3.tar.xz) = 5474384
TIMESTAMP = 1570005501
SHA256 (pyside-setup-everywhere-src-5.13.1.tar.xz) = c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536
SIZE (pyside-setup-everywhere-src-5.13.1.tar.xz) = 2936204

View File

@ -16,6 +16,7 @@ include/PySide2/QtMultimedia/pyside2_qtmultimedia_python.h
include/PySide2/QtMultimediaWidgets/pyside2_qtmultimediawidgets_python.h
include/PySide2/QtNetwork/pyside2_qtnetwork_python.h
include/PySide2/QtOpenGL/pyside2_qtopengl_python.h
include/PySide2/QtOpenGLFunctions/pyside2_qtopenglfunctions_python.h
include/PySide2/QtPositioning/pyside2_qtpositioning_python.h
include/PySide2/QtPrintSupport/pyside2_qtprintsupport_python.h
include/PySide2/QtQml/pyside2_qtqml_python.h
@ -57,7 +58,7 @@ lib/cmake/PySide2-%%DISTVERSION%%/PySide2ConfigVersion.cmake
lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/PySide2-%%DISTVERSION%%/PySide2Targets.cmake
lib/libpyside2%%PYVERSTR%%.so
lib/libpyside2%%PYVERSTR%%.so.5.12
lib/libpyside2%%PYVERSTR%%.so.5.13
lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%%
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DAnimation.so
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DCore.so
@ -76,6 +77,7 @@ lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%%
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimediaWidgets.so
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtNetwork.so
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGL.so
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGLFunctions.so
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtPositioning.so
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtPrintSupport.so
%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQml.so
@ -116,6 +118,7 @@ lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%%
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimediaWidgets%%PYVERSTR%%.so
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtNetwork%%PYVERSTR%%.so
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGL%%PYVERSTR%%.so
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGLFunctions%%PYVERSTR%%.so
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtPositioning%%PYVERSTR%%.so
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtPrintSupport%%PYVERSTR%%.so
%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtQml%%PYVERSTR%%.so
@ -166,6 +169,7 @@ share/PySide2/typesystems/glue/qeasingcurve_glue.h
share/PySide2/typesystems/glue/qscript_value_iterator_glue.cpp
share/PySide2/typesystems/gui_common.xml
share/PySide2/typesystems/opengl_common.xml
share/PySide2/typesystems/openglfunctions_common.xml
share/PySide2/typesystems/typesystem_3danimation.xml
share/PySide2/typesystems/typesystem_3dcore.xml
share/PySide2/typesystems/typesystem_3dextras.xml
@ -193,6 +197,29 @@ share/PySide2/typesystems/typesystem_multimedia_forward_declarations.xml
share/PySide2/typesystems/typesystem_multimediawidgets.xml
share/PySide2/typesystems/typesystem_network.xml
share/PySide2/typesystems/typesystem_opengl.xml
share/PySide2/typesystems/typesystem_openglfunctions.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_0.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_0_compat.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_1.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_1_compat.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_2_compat.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_3_compat.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_4.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications1_4_compat.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications2_0.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications2_0_compat.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications2_1.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications3_0.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications3_3.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications3_3a.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications4_0.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications4_1.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications4_3.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications4_4.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications4_4_core.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications4_5.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications4_5_core.xml
share/PySide2/typesystems/typesystem_openglfunctions_modifications_va.xml
share/PySide2/typesystems/typesystem_positioning.xml
share/PySide2/typesystems/typesystem_printsupport.xml
share/PySide2/typesystems/typesystem_printsupport_common.xml

View File

@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= shiboken2
DISTVERSION= 5.12.3
PORTREVISION= 1
DISTVERSION= 5.13.1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
DISTNAME= pyside-setup-everywhere-src-${DISTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyside-setup-everywhere-src-${DISTVERSION}
MAINTAINER= cmt@FreeBSD.org
COMMENT= Python binding generator for C++ libraries
@ -21,11 +20,12 @@ LIB_DEPENDS= libclang.so:devel/llvm${LLVM_DEFAULT} \
USES= cmake gnome python qt:5 shebangfix tar:xz
USE_GNOME= libxml2
USE_LDCONFIG= yes
USE_PYTHON= flavors
USE_QT= buildtools_build core gui network qmake_build testlib \
xml xmlpatterns
SHEBANG_FILES= shiboken_tool.py
SHEBANG_FILES= shiboken_tool.py
CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
CMAKE_ARGS+= "-DCMAKE_CXX_FLAGS=-lexecinfo" \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1557663730
SHA256 (pyside-setup-everywhere-src-5.12.3.tar.xz) = 4f7aab7d4bbaf1b3573cc989d704e87b0de55cce656ae5e23418a88baa4c6842
SIZE (pyside-setup-everywhere-src-5.12.3.tar.xz) = 5474384
TIMESTAMP = 1570005636
SHA256 (pyside-setup-everywhere-src-5.13.1.tar.xz) = c57c71ddece90b29d0934cf5fac1e1634719484637b56dcbe49eb277c1c01536
SIZE (pyside-setup-everywhere-src-5.13.1.tar.xz) = 2936204

View File

@ -1,11 +1,11 @@
--- libshiboken/helper.h.orig 2018-12-17 07:28:47 UTC
--- libshiboken/helper.h.orig 2019-10-02 11:12:45 UTC
+++ libshiboken/helper.h
@@ -90,7 +90,7 @@ class AutoArrayPointer
T* data;
T *data;
};
-typedef unsigned long long ThreadId;
+typedef pthread_t ThreadId;
-using ThreadId = unsigned long long;
+using ThreadId = pthread_t;
LIBSHIBOKEN_API ThreadId currentThreadId();
LIBSHIBOKEN_API ThreadId mainThreadId();

View File

@ -31,7 +31,7 @@ lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake
lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake
lib/libshiboken2%%PYVERSTR%%.so
lib/libshiboken2%%PYVERSTR%%.so.5.12
lib/libshiboken2%%PYVERSTR%%.so.5.13
lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
%%PYTHON_SITELIBDIR%%/shiboken2/__init__.py
%%PYTHON_SITELIBDIR%%/shiboken2/_config.py
@ -43,6 +43,7 @@ lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/layout.py
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__init__.py
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/enum_sig.py
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/tool.py
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/loader.py
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/mapping.py
%%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/parser.py