diff options
| author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2022-01-27 22:14:35 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2022-02-25 18:10:24 +0000 |
| commit | 337a99bc8b23f5353faab2009533cae0af699789 (patch) | |
| tree | 48f543f4e69ea164de750ac1958d21e475bb0376 /cad | |
| parent | 5ab014cb1b0bd89694a6feea062f3f48250b3b1e (diff) | |
| download | ports-337a99bc8b23f5353faab2009533cae0af699789.tar.gz ports-337a99bc8b23f5353faab2009533cae0af699789.zip | |
x11-toolkits/py-wxPython4: Update to 4.1
- Rename wxPython40 to wxPython4
- Update to 4.1 version
- Fix wxgtk31 for string
- Use wxGtk31 instead of wxgtk30
- Fix kicad* ports with wxgtk31/wxPython 4.1
Changes:
- https://www.wxpython.org/news/2020-11-21-wxpython-411-release/index.html
Reviewed by: tcberner
Approved by: yuri, bofh
Differential Revision: D34080
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/kicad-devel/Makefile | 5 | ||||
| -rw-r--r-- | cad/kicad/Makefile | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 5bb0db745f89..763cb611db17 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= kicad DISTVERSION= r${GIT_SRC_DATE} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel DIST_SUBDIR= ${PORTNAME} @@ -31,7 +31,7 @@ GL_COMMIT= ${GIT_SRC_HASH} CXXFLAGS+= --std=c++14 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include USE_GL= gl glew glu glut -USE_WX= 3.0 +USE_WX= 3.1 WX_COMPS= wx python:lib USE_GNOME= atk cairo # Required by libwx_gtk2_aui-2.8.so USE_XORG+= ice pixman x11 xext @@ -68,6 +68,7 @@ CMAKE_ARGS= -DLOCALBASE="${LOCALBASE}" \ -DKICAD_SPICE=ON \ -DKICAD_USE_OCE=OFF \ -DKICAD_USE_OCC=ON \ + -DKICAD_USE_EGL=ON \ -DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE USE_LDCONFIG= yes diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 2c67582708a9..bf7e6221b4ee 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -2,6 +2,7 @@ PORTNAME= kicad PORTVERSION= 6.0.2 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= cad MASTER_SITES= https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}/ @@ -19,7 +20,8 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libTKernel.so:cad/opencascade \ libpixman-1.so:x11/pixman \ libpng.so:graphics/png \ - libcurl.so:ftp/curl + libcurl.so:ftp/curl \ + libGLEW-wayland.so:graphics/glew-wayland CONFLICTS_INSTALL= kicad-devel # bin/_cvpcb.kiface @@ -30,7 +32,7 @@ SHEBANG_FILES= pcbnew/python/plugins/touch_slider_wizard.py USE_XORG= ice x11 xext USE_GL= gl glew glu glut -USE_WX= 3.0 +USE_WX= 3.1 WX_COMPS= python:lib wx USE_GNOME= atk cairo gdkpixbuf2 gtk30 pango CXXFLAGS+= --std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include @@ -39,6 +41,8 @@ CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \ -DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \ -DKICAD_SCRIPTING_WXPYTHON=ON \ -DKICAD_USE_OCC=ON \ + -DKICAD_USE_EGL=ON \ + -DKICAD_USE_BUNDLED_GLEW=OFF \ -DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE USE_LDCONFIG= yes |