On Sat Mar 21, 2020 at 10:30:12AM +0100, Rafael Sadowski wrote:
> This is a result of debugging qt5-cups. Starts fine and feels usable on
> amd64. Any consumers around?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/cad/qcad/Makefile,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 Makefile
> --- Makefile 7 Mar 2020 17:35:00 -0000 1.36
> +++ Makefile 21 Mar 2020 09:22:40 -0000
> @@ -4,10 +4,9 @@ COMMENT = Qt-based 2D CAD system
>
> GH_ACCOUNT = qcad
> GH_PROJECT = qcad
> -GH_TAGNAME = v3.23.0.0
> -REVISION = 1
> +GH_TAGNAME = v3.24.3.0
>
> -SO_VERSION = 0.0
> +SO_VERSION = 1.0
> QCAD_LIBS = qcadcore \
> qcadecmaapi \
> qcadentity \
> @@ -22,6 +21,17 @@ QCAD_LIBS = qcadcore \
> .for _lib in ${QCAD_LIBS}
> SHARED_LIBS += ${_lib} ${SO_VERSION}
> .endfor
> +
> +SHARED_LIBS += qtscript_core 0.0 # 1.0
> +SHARED_LIBS += qtscript_gui 0.0 # 1.0
> +SHARED_LIBS += qtscript_network 0.0 # 1.0
> +SHARED_LIBS += qtscript_opengl 0.0 # 1.0
> +SHARED_LIBS += qtscript_printsupport 0.0 # 1.0
> +SHARED_LIBS += qtscript_sql 0.0 # 1.0
> +SHARED_LIBS += qtscript_uitools 0.0 # 1.0
> +SHARED_LIBS += qtscript_widgets 0.0 # 1.0
> +SHARED_LIBS += qtscript_xml 0.0 # 1.0
> +SHARED_LIBS += qtscript_xmlpatterns 0.0 # 1.0
>
New diff without plugins in SHARED_LIBS, hint by jca@, thanks.
OK?
diff --git cad/qcad/Makefile cad/qcad/Makefile
index f54b1c1453f..a0bd814c5e4 100644
--- cad/qcad/Makefile
+++ cad/qcad/Makefile
@@ -4,10 +4,9 @@ COMMENT = Qt-based 2D CAD system
GH_ACCOUNT = qcad
GH_PROJECT = qcad
-GH_TAGNAME = v3.23.0.0
-REVISION = 1
+GH_TAGNAME = v3.24.3.0
-SO_VERSION = 0.0
+SO_VERSION = 1.0
QCAD_LIBS = qcadcore \
qcadecmaapi \
qcadentity \
diff --git cad/qcad/distinfo cad/qcad/distinfo
index 57f16e458b1..4c984aa3cb1 100644
--- cad/qcad/distinfo
+++ cad/qcad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qcad-3.23.0.0.tar.gz) = QuNmoKEpMPMYIc+23TKPiKceG4z8tzSlGtDqqLjqJws=
-SIZE (qcad-3.23.0.0.tar.gz) = 33296984
+SHA256 (qcad-3.24.3.0.tar.gz) = A1JZf9QfaKQ8+qrFsWufK9Dn2x12mGPJMXDeZMgEv3c=
+SIZE (qcad-3.24.3.0.tar.gz) = 33874174
diff --git cad/qcad/patches/patch-scripts_Help_About_About_js
cad/qcad/patches/patch-scripts_Help_About_About_js
index d7b4cd5cf3f..b819f7a828e 100644
--- cad/qcad/patches/patch-scripts_Help_About_About_js
+++ cad/qcad/patches/patch-scripts_Help_About_About_js
@@ -3,9 +3,9 @@ $OpenBSD: patch-scripts_Help_About_About_js,v 1.1 2019/08/14
06:56:50 feinerer E
Index: scripts/Help/About/About.js
--- scripts/Help/About/About.js.orig
+++ scripts/Help/About/About.js
-@@ -451,6 +451,9 @@ About.prototype.initAboutSystem = function(textEdit) {
- if (RS.getSystemId()==="linux") {
- text += "Linux";
+@@ -467,6 +467,9 @@ About.prototype.initAboutSystem = function(textEdit) {
+ if (RS.getSystemId()==="solaris") {
+ text += "Solaris";
}
+ if (RS.getSystemId()==="openbsd") {
+ text += "OpenBSD";
diff --git cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js
cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js
index 9adba7abac4..17bac6daa13 100644
--- cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js
+++ cad/qcad/patches/patch-scripts_Widgets_CommandLine_CommandLine_js
@@ -3,9 +3,9 @@ $OpenBSD: patch-scripts_Widgets_CommandLine_CommandLine_js,v
1.1 2019/08/14 06:5
Index: scripts/Widgets/CommandLine/CommandLine.js
--- scripts/Widgets/CommandLine/CommandLine.js.orig
+++ scripts/Widgets/CommandLine/CommandLine.js
-@@ -478,6 +478,9 @@ CommandLine.init = function(basePath) {
- case "linux":
- system = "Linux";
+@@ -490,6 +490,9 @@ CommandLine.init = function(basePath) {
+ case "solaris":
+ system = "Solaris";
break;
+ case "openbsd":
+ system = "OpenBSD";
diff --git cad/qcad/patches/patch-src_core_RSPlatform_cpp
cad/qcad/patches/patch-src_core_RSPlatform_cpp
deleted file mode 100644
index 6e6da74b111..00000000000
--- cad/qcad/patches/patch-src_core_RSPlatform_cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_core_RSPlatform_cpp,v 1.1 2019/08/14 06:56:50 feinerer Exp
$
-
-Index: src/core/RSPlatform.cpp
---- src/core/RSPlatform.cpp.orig
-+++ src/core/RSPlatform.cpp
-@@ -43,7 +43,7 @@
- QString RS::getHostId() {
- return QString("%1_%2")
- .arg(getSystemId())
--#if defined(Q_OS_LINUX)
-+#if defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD)
- .arg(getenv("HOSTNAME"));
- #elif defined(Q_OS_MAC)
- // environment variable HOSTNAME not exported on OS X by default:
-@@ -56,7 +56,7 @@ QString RS::getHostId() {
- }
-
- /**
-- * \return Unique system ID ("linux", "osx", "win").
-+ * \return Unique system ID ("linux", "osx", "win", "openbsd").
- */
- QString RS::getSystemId() {
- #if defined(Q_OS_LINUX)
-@@ -65,6 +65,8 @@ QString RS::getSystemId() {
- return "osx";
- #elif defined(Q_OS_WIN)
- return "win";
-+#elif defined(Q_OS_OPENBSD)
-+ return "openbsd";
- #else
- return "unknown";
- #endif
diff --git cad/qcad/patches/patch-src_core_RSettings_cpp
cad/qcad/patches/patch-src_core_RSettings_cpp
index 88a35689406..4a66c57c13e 100644
--- cad/qcad/patches/patch-src_core_RSettings_cpp
+++ cad/qcad/patches/patch-src_core_RSettings_cpp
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_core_RSettings_cpp,v 1.1 2019/08/14
06:56:50 feinerer Exp $
Index: src/core/RSettings.cpp
--- src/core/RSettings.cpp.orig
+++ src/core/RSettings.cpp
-@@ -362,9 +362,13 @@ QString RSettings::getApplicationPath() {
+@@ -363,9 +363,13 @@ QString RSettings::getApplicationPath() {
}
#endif
diff --git cad/qcad/pkg/PLIST cad/qcad/pkg/PLIST
index 8ca9d5892f9..78047e900e5 100644
--- cad/qcad/pkg/PLIST
+++ cad/qcad/pkg/PLIST
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.7 2019/08/14 06:56:51 feinerer Exp $
@bin bin/qcad
-lib/libdxflib.a
-lib/libopennurbs.a
+@static-lib lib/libdxflib.a
+@static-lib lib/libopennurbs.a
@lib lib/libqcadcore.so.${LIBqcadcore_VERSION}
@lib lib/libqcadecmaapi.so.${LIBqcadecmaapi_VERSION}
@lib lib/libqcadentity.so.${LIBqcadentity_VERSION}
@@ -12,7 +12,7 @@ lib/libopennurbs.a
@lib lib/libqcadspatialindex.so.${LIBqcadspatialindex_VERSION}
@lib lib/libqcadstemmer.so.${LIBqcadstemmer_VERSION}
@lib lib/libspatialindexnavel.so.${LIBspatialindexnavel_VERSION}
-lib/libstemmer.a
+@static-lib lib/libstemmer.a
@man man/man1/qcad.1
share/applications/qcad.desktop
share/examples/qcad/
@@ -109,6 +109,9 @@ share/qcad/libraries/default/Hydraulics/cylinder.dxf
share/qcad/libraries/default/Hydraulics/cylinder.rdf
share/qcad/libraries/default/Mechanics/
share/qcad/libraries/default/Mechanics/Gears/
+share/qcad/libraries/default/Mechanics/Gears/CrankWheel.js
+share/qcad/libraries/default/Mechanics/Gears/CrankWheel.ui
+share/qcad/libraries/default/Mechanics/Gears/CrankWheel_LICENSE.txt
share/qcad/libraries/default/Mechanics/Gears/InvoluteSpur.js
share/qcad/libraries/default/Mechanics/Gears/InvoluteSpur.rdf
share/qcad/libraries/default/Mechanics/Gears/InvoluteSpur.ui
@@ -240,6 +243,8 @@
share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Din6771-1_quer_A4.dxf
share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Din6771_quer_A3.dxf
share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Din7200_quer_A3.dxf
share/qcad/libraries/templates/metric/dl3dl/Vorlage_Qcad_Plankopf
gross_quer_A3.dxf
+share/qcad/libraries/templates/metric/dl3dl/Vorlage_elt_2.dxf
+share/qcad/libraries/templates/metric/dl3dl/Vorlage_elt_3.dxf
share/qcad/libraries/templates/metric/dl3dl/_META/
share/qcad/libraries/templates/metric/dl3dl/_META/meta.rdf
share/qcad/libraries/templates/metric/dl3dl/nur Plankopf.dxf
@@ -306,10 +311,19 @@ share/qcad/patterns/imperial/ar-parq1.pat
share/qcad/patterns/imperial/ar-rroof.pat
share/qcad/patterns/imperial/ar-rshke.pat
share/qcad/patterns/imperial/ar-sand.pat
+share/qcad/patterns/imperial/blocks-01.pat
+share/qcad/patterns/imperial/blocks-02.pat
+share/qcad/patterns/imperial/box-overlap.pat
share/qcad/patterns/imperial/box.pat
+share/qcad/patterns/imperial/boxjoin-01.pat
+share/qcad/patterns/imperial/boxjoin-02.pat
share/qcad/patterns/imperial/brass.pat
share/qcad/patterns/imperial/brick.pat
share/qcad/patterns/imperial/brstone.pat
+share/qcad/patterns/imperial/celtic-01.pat
+share/qcad/patterns/imperial/celtic-02.pat
+share/qcad/patterns/imperial/circles-02.pat
+share/qcad/patterns/imperial/circles.pat
share/qcad/patterns/imperial/clay.pat
share/qcad/patterns/imperial/cork.pat
share/qcad/patterns/imperial/cross.pat
@@ -318,27 +332,47 @@ share/qcad/patterns/imperial/dolmit.pat
share/qcad/patterns/imperial/dots.pat
share/qcad/patterns/imperial/earth.pat
share/qcad/patterns/imperial/escher.pat
+share/qcad/patterns/imperial/explosion.pat
share/qcad/patterns/imperial/flex.pat
share/qcad/patterns/imperial/grass.pat
share/qcad/patterns/imperial/grate.pat
share/qcad/patterns/imperial/gravel.pat
share/qcad/patterns/imperial/hex.pat
+share/qcad/patterns/imperial/hexagons.pat
+share/qcad/patterns/imperial/hexjoin-01.pat
+share/qcad/patterns/imperial/hexjoin-02.pat
+share/qcad/patterns/imperial/holly.pat
share/qcad/patterns/imperial/honey.pat
share/qcad/patterns/imperial/hound.pat
share/qcad/patterns/imperial/insul.pat
+share/qcad/patterns/imperial/lattice-01.pat
+share/qcad/patterns/imperial/lattice-02.pat
+share/qcad/patterns/imperial/lattice-03.pat
+share/qcad/patterns/imperial/lattice-04.pat
+share/qcad/patterns/imperial/lattice-05.pat
+share/qcad/patterns/imperial/lattice-06.pat
share/qcad/patterns/imperial/line.pat
+share/qcad/patterns/imperial/looplinks.pat
+share/qcad/patterns/imperial/maze-01.pat
+share/qcad/patterns/imperial/maze-02.pat
share/qcad/patterns/imperial/mudst.pat
share/qcad/patterns/imperial/net.pat
share/qcad/patterns/imperial/net3.pat
share/qcad/patterns/imperial/plast.pat
share/qcad/patterns/imperial/plasti.pat
+share/qcad/patterns/imperial/qcad-logo.pat
share/qcad/patterns/imperial/sacncr.pat
+share/qcad/patterns/imperial/scaffold.pat
share/qcad/patterns/imperial/square.pat
+share/qcad/patterns/imperial/squiggle-01.pat
+share/qcad/patterns/imperial/squiggle-02.pat
share/qcad/patterns/imperial/stars.pat
share/qcad/patterns/imperial/steel.pat
share/qcad/patterns/imperial/swamp.pat
share/qcad/patterns/imperial/trans.pat
+share/qcad/patterns/imperial/tri-overlap.pat
share/qcad/patterns/imperial/triang.pat
+share/qcad/patterns/imperial/wire-fence.pat
share/qcad/patterns/imperial/zigzag.pat
share/qcad/patterns/metric/
share/qcad/patterns/metric/acad_iso02w100.pat
@@ -369,16 +403,32 @@ share/qcad/patterns/metric/ar-b816c.pat
share/qcad/patterns/metric/ar-b88.pat
share/qcad/patterns/metric/ar-brelm.pat
share/qcad/patterns/metric/ar-brstd.pat
+share/qcad/patterns/metric/ar-conc-01.pat
share/qcad/patterns/metric/ar-conc.pat
share/qcad/patterns/metric/ar-hbone.pat
share/qcad/patterns/metric/ar-parq1.pat
share/qcad/patterns/metric/ar-rroof.pat
share/qcad/patterns/metric/ar-rshke.pat
share/qcad/patterns/metric/ar-sand.pat
+share/qcad/patterns/metric/barbwire.pat
+share/qcad/patterns/metric/blocks-01.pat
+share/qcad/patterns/metric/blocks-02.pat
+share/qcad/patterns/metric/box-overlap.pat
share/qcad/patterns/metric/box.pat
+share/qcad/patterns/metric/boxjoin-01.pat
+share/qcad/patterns/metric/boxjoin-02.pat
share/qcad/patterns/metric/brass.pat
share/qcad/patterns/metric/brick.pat
share/qcad/patterns/metric/brstone.pat
+share/qcad/patterns/metric/bubbles-01.pat
+share/qcad/patterns/metric/bubbles-02.pat
+share/qcad/patterns/metric/bubbles-03.pat
+share/qcad/patterns/metric/celtic-01.pat
+share/qcad/patterns/metric/celtic-02.pat
+share/qcad/patterns/metric/celtic-03.pat
+share/qcad/patterns/metric/celtic-04.pat
+share/qcad/patterns/metric/circles-02.pat
+share/qcad/patterns/metric/circles.pat
share/qcad/patterns/metric/clay.pat
share/qcad/patterns/metric/cork.pat
share/qcad/patterns/metric/cross.pat
@@ -387,11 +437,19 @@ share/qcad/patterns/metric/dolmit.pat
share/qcad/patterns/metric/dots.pat
share/qcad/patterns/metric/earth.pat
share/qcad/patterns/metric/escher.pat
+share/qcad/patterns/metric/explosion.pat
share/qcad/patterns/metric/flex.pat
share/qcad/patterns/metric/grass.pat
share/qcad/patterns/metric/grate.pat
+share/qcad/patterns/metric/gravel-01.pat
share/qcad/patterns/metric/gravel.pat
+share/qcad/patterns/metric/hatch-dots.pat
+share/qcad/patterns/metric/hatch-sqrs.pat
share/qcad/patterns/metric/hex.pat
+share/qcad/patterns/metric/hexagons.pat
+share/qcad/patterns/metric/hexjoin-01.pat
+share/qcad/patterns/metric/hexjoin-02.pat
+share/qcad/patterns/metric/holly.pat
share/qcad/patterns/metric/honey.pat
share/qcad/patterns/metric/hound.pat
share/qcad/patterns/metric/insul.pat
@@ -406,52 +464,76 @@ share/qcad/patterns/metric/jis_rc_30.pat
share/qcad/patterns/metric/jis_stn_1e.pat
share/qcad/patterns/metric/jis_stn_2.5.pat
share/qcad/patterns/metric/jis_wood.pat
+share/qcad/patterns/metric/lattice-01.pat
+share/qcad/patterns/metric/lattice-02.pat
+share/qcad/patterns/metric/lattice-03.pat
+share/qcad/patterns/metric/lattice-04.pat
+share/qcad/patterns/metric/lattice-05.pat
+share/qcad/patterns/metric/lattice-06.pat
+share/qcad/patterns/metric/lattice-07.pat
+share/qcad/patterns/metric/leaf-01.pat
+share/qcad/patterns/metric/leaf-02.pat
+share/qcad/patterns/metric/leaf-03.pat
share/qcad/patterns/metric/line.pat
+share/qcad/patterns/metric/looplinks.pat
+share/qcad/patterns/metric/maze-01.pat
+share/qcad/patterns/metric/maze-02.pat
share/qcad/patterns/metric/mudst.pat
share/qcad/patterns/metric/net.pat
share/qcad/patterns/metric/net3.pat
share/qcad/patterns/metric/plast.pat
share/qcad/patterns/metric/plasti.pat
+share/qcad/patterns/metric/qcad-logo.pat
+share/qcad/patterns/metric/redback.pat
share/qcad/patterns/metric/sacncr.pat
+share/qcad/patterns/metric/scaffold.pat
share/qcad/patterns/metric/square.pat
+share/qcad/patterns/metric/squiggle-01.pat
+share/qcad/patterns/metric/squiggle-02.pat
share/qcad/patterns/metric/stars.pat
share/qcad/patterns/metric/steel.pat
share/qcad/patterns/metric/swamp.pat
share/qcad/patterns/metric/trans.pat
+share/qcad/patterns/metric/tri-overlap.pat
share/qcad/patterns/metric/triang.pat
+share/qcad/patterns/metric/weatherboard.pat
+share/qcad/patterns/metric/weaving.pat
+share/qcad/patterns/metric/wire-fence.pat
+share/qcad/patterns/metric/xmastree-01.pat
+share/qcad/patterns/metric/xmastree-02.pat
share/qcad/patterns/metric/zigzag.pat
share/qcad/plugins/
share/qcad/plugins/codecs/
share/qcad/plugins/codecs/readme.txt
share/qcad/plugins/designer/
-share/qcad/plugins/designer/libqcadcustomwidgets.so
+@so share/qcad/plugins/designer/libqcadcustomwidgets.so
share/qcad/plugins/designer/readme.txt
share/qcad/plugins/imageformats/
-share/qcad/plugins/imageformats/libqgif.so
-share/qcad/plugins/imageformats/libqico.so
-share/qcad/plugins/imageformats/libqjpeg.so
-share/qcad/plugins/imageformats/libqsvg.so
-share/qcad/plugins/imageformats/libqtga.so
-share/qcad/plugins/imageformats/libqtiff.so
+@so share/qcad/plugins/imageformats/libqgif.so
+@so share/qcad/plugins/imageformats/libqico.so
+@so share/qcad/plugins/imageformats/libqjpeg.so
+@so share/qcad/plugins/imageformats/libqsvg.so
+@so share/qcad/plugins/imageformats/libqtga.so
+@so share/qcad/plugins/imageformats/libqtiff.so
share/qcad/plugins/imageformats/readme.txt
-share/qcad/plugins/libqcaddxf.so
-share/qcad/plugins/libqcadscripts.so
+@so share/qcad/plugins/libqcaddxf.so
+@so share/qcad/plugins/libqcadscripts.so
share/qcad/plugins/printsupport/
-share/qcad/plugins/printsupport/libcupsprintersupport.so
+@so share/qcad/plugins/printsupport/libcupsprintersupport.so
share/qcad/plugins/printsupport/readme.txt
share/qcad/plugins/script/
-share/qcad/plugins/script/libqtscript_core.so.1.0
-share/qcad/plugins/script/libqtscript_gui.so.1.0
-share/qcad/plugins/script/libqtscript_network.so.1.0
-share/qcad/plugins/script/libqtscript_opengl.so.1.0
-share/qcad/plugins/script/libqtscript_printsupport.so.1.0
-share/qcad/plugins/script/libqtscript_sql.so.1.0
-share/qcad/plugins/script/libqtscript_uitools.so.1.0
-share/qcad/plugins/script/libqtscript_widgets.so.1.0
-share/qcad/plugins/script/libqtscript_xml.so.1.0
-share/qcad/plugins/script/libqtscript_xmlpatterns.so.1.0
+@lib share/qcad/plugins/script/libqtscript_core.so.1.0
+@lib share/qcad/plugins/script/libqtscript_gui.so.1.0
+@lib share/qcad/plugins/script/libqtscript_network.so.1.0
+@lib share/qcad/plugins/script/libqtscript_opengl.so.1.0
+@lib share/qcad/plugins/script/libqtscript_printsupport.so.1.0
+@lib share/qcad/plugins/script/libqtscript_sql.so.1.0
+@lib share/qcad/plugins/script/libqtscript_uitools.so.1.0
+@lib share/qcad/plugins/script/libqtscript_widgets.so.1.0
+@lib share/qcad/plugins/script/libqtscript_xml.so.1.0
+@lib share/qcad/plugins/script/libqtscript_xmlpatterns.so.1.0
share/qcad/plugins/sqldrivers/
-share/qcad/plugins/sqldrivers/libqsqlite.so
+@so share/qcad/plugins/sqldrivers/libqsqlite.so
share/qcad/plugins/sqldrivers/readme.txt
share/qcad/qcadshp.cxf
share/qcad/qt/
@@ -1706,11 +1788,13 @@ share/qcad/scripts/Draw/Circle/Circle2TP/Tests/
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest00.js
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest01.js
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest02.js
+share/qcad/scripts/Draw/Circle/Circle2TP/Tests/Circle2TPTest03.js
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/actual/
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest00_000.dxf
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest01_000.dxf
share/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest02_000.dxf
+share/qcad/scripts/Draw/Circle/Circle2TP/Tests/required/Circle2TPTest03_000.dxf
share/qcad/scripts/Draw/Circle/Circle2TP/doc/
share/qcad/scripts/Draw/Circle/Circle2TP/doc/Circle2TP.png
share/qcad/scripts/Draw/Circle/Circle2TP/doc/Circle2TP_de.html
@@ -3034,9 +3118,11 @@
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest04.
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest05.js
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest06.js
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest07.js
+share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest08.js
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/actual/
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/contour.dxf
+share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_block_line.dxf
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_block_lines.dxf
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_block_polyline.dxf
share/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_blocks.dxf
@@ -5609,6 +5695,7 @@ share/qcad/scripts/Help/About/doc/About_desc_ru.html
share/qcad/scripts/Help/About/doc/About_desc_sl.html
share/qcad/scripts/Help/About/doc/About_ja.html
share/qcad/scripts/Help/About/doc/About_nl.html
+share/qcad/scripts/Help/About/doc/About_pt.html
share/qcad/scripts/Help/About/doc/About_ru.html
share/qcad/scripts/Help/About/doc/About_sl.html
share/qcad/scripts/Help/BrowseUserManual/
@@ -5650,6 +5737,7 @@ share/qcad/scripts/Help/FAQ/doc/FAQ_desc_ru.html
share/qcad/scripts/Help/FAQ/doc/FAQ_desc_sl.html
share/qcad/scripts/Help/FAQ/doc/FAQ_ja.html
share/qcad/scripts/Help/FAQ/doc/FAQ_nl.html
+share/qcad/scripts/Help/FAQ/doc/FAQ_pt.html
share/qcad/scripts/Help/FAQ/doc/FAQ_ru.html
share/qcad/scripts/Help/FAQ/doc/FAQ_sl.html
share/qcad/scripts/Help/Forum/
@@ -5669,6 +5757,7 @@ share/qcad/scripts/Help/Forum/doc/Forum_desc_ru.html
share/qcad/scripts/Help/Forum/doc/Forum_desc_sl.html
share/qcad/scripts/Help/Forum/doc/Forum_ja.html
share/qcad/scripts/Help/Forum/doc/Forum_nl.html
+share/qcad/scripts/Help/Forum/doc/Forum_pt.html
share/qcad/scripts/Help/Forum/doc/Forum_ru.html
share/qcad/scripts/Help/Forum/doc/Forum_sl.html
share/qcad/scripts/Help/Help.js
@@ -5689,6 +5778,7 @@
share/qcad/scripts/Help/ReportBug/doc/ReportBug_desc_ru.html
share/qcad/scripts/Help/ReportBug/doc/ReportBug_desc_sl.html
share/qcad/scripts/Help/ReportBug/doc/ReportBug_ja.html
share/qcad/scripts/Help/ReportBug/doc/ReportBug_nl.html
+share/qcad/scripts/Help/ReportBug/doc/ReportBug_pt.html
share/qcad/scripts/Help/ReportBug/doc/ReportBug_ru.html
share/qcad/scripts/Help/ReportBug/doc/ReportBug_sl.html
share/qcad/scripts/Help/ReportTranslationError/
@@ -5698,6 +5788,7 @@ share/qcad/scripts/Help/ReportTranslationError/doc/
share/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_de.html
share/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_ja.html
share/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_nl.html
+share/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_pt.html
share/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_ru.html
share/qcad/scripts/Help/ReportTranslationError/doc/ReportTranslationError_sl.html
share/qcad/scripts/Help/ShowReadme/
@@ -5708,6 +5799,7 @@ share/qcad/scripts/Help/ShowReadme/doc/
share/qcad/scripts/Help/ShowReadme/doc/ShowReadme_de.html
share/qcad/scripts/Help/ShowReadme/doc/ShowReadme_ja.html
share/qcad/scripts/Help/ShowReadme/doc/ShowReadme_nl.html
+share/qcad/scripts/Help/ShowReadme/doc/ShowReadme_pt.html
share/qcad/scripts/Help/ShowReadme/doc/ShowReadme_ru.html
share/qcad/scripts/Help/ShowReadme/doc/ShowReadme_sl.html
share/qcad/scripts/Help/Website/
@@ -5727,6 +5819,7 @@ share/qcad/scripts/Help/Website/doc/Website_desc_ru.html
share/qcad/scripts/Help/Website/doc/Website_desc_sl.html
share/qcad/scripts/Help/Website/doc/Website_ja.html
share/qcad/scripts/Help/Website/doc/Website_nl.html
+share/qcad/scripts/Help/Website/doc/Website_pt.html
share/qcad/scripts/Help/Website/doc/Website_ru.html
share/qcad/scripts/Help/Website/doc/Website_sl.html
share/qcad/scripts/Help/dir/
@@ -5734,6 +5827,7 @@ share/qcad/scripts/Help/doc/
share/qcad/scripts/Help/doc/Help_de.html
share/qcad/scripts/Help/doc/Help_ja.html
share/qcad/scripts/Help/doc/Help_nl.html
+share/qcad/scripts/Help/doc/Help_pt.html
share/qcad/scripts/Help/doc/Help_ru.html
share/qcad/scripts/Help/doc/Help_sl.html
share/qcad/scripts/ImportExport/
@@ -6635,6 +6729,50 @@
share/qcad/scripts/Misc/Examples/MathExamples/ExMandelbrot/
share/qcad/scripts/Misc/Examples/MathExamples/ExMandelbrot/ExMandelbrot.js
share/qcad/scripts/Misc/Examples/MathExamples/ExMathSpiral/
share/qcad/scripts/Misc/Examples/MathExamples/ExMathSpiral/ExMathSpiral.js
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/CurtainRope.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.js
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.ui
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterTemplates/
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterTemplates/PainterConstruct_Rope.dxf
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterTemplates/PainterTestEntities.dxf
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/1OrthoPointGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/1OrthoPointGlobalFlex.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/2OrthoPointsGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/2OrthoPointsGlobalFlex.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/3PhaseWaveGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/AllPainterDataTypes.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/CurtainRopeProto.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/CurtainRopeProtoKnot.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/GreekMeander15.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/GreekMeander15Flexing.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/OrthogonalBar.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/OrthogonalMark.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RailwayTrackConcrete.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RailwayTrackLineArt.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RulerInch.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/RulerMetric.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SawtoothWave.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SawtoothWaveGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SinusoidWave.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SinusoidWaveGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqaureWave.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqaureWaveFlexing.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqaureWaveGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqauredShape.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SqauredShapeFlexing.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SteppedWave.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/SteppedWaveGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/TelephoneCoilMedio.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/TriangleWave.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/Icons/TriangleWaveGlobal.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOff.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOffSq.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOn.svg
+share/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/PreserveLookOnSq.svg
share/qcad/scripts/Misc/Examples/MathExamples/MathExamples.js
share/qcad/scripts/Misc/Examples/MathExamples/dir/
share/qcad/scripts/Misc/Examples/ModifyExamples/
@@ -8000,11 +8138,13 @@ share/qcad/scripts/Modify/Scale/Tests/ScaleTest05.js
share/qcad/scripts/Modify/Scale/Tests/ScaleTest06.js
share/qcad/scripts/Modify/Scale/Tests/ScaleTest07.js
share/qcad/scripts/Modify/Scale/Tests/ScaleTest08.js
+share/qcad/scripts/Modify/Scale/Tests/ScaleTest09.js
share/qcad/scripts/Modify/Scale/Tests/actual/
share/qcad/scripts/Modify/Scale/Tests/data/
share/qcad/scripts/Modify/Scale/Tests/data/arcs.dxf
share/qcad/scripts/Modify/Scale/Tests/data/circles.dxf
share/qcad/scripts/Modify/Scale/Tests/data/ellipses_ellipse_arcs.dxf
+share/qcad/scripts/Modify/Scale/Tests/data/entities.dxf
share/qcad/scripts/Modify/Scale/Tests/data/lines.dxf
share/qcad/scripts/Modify/Scale/Tests/data/mtext.dxf
share/qcad/scripts/Modify/Scale/Tests/data/points.dxf
@@ -8021,6 +8161,7 @@
share/qcad/scripts/Modify/Scale/Tests/required/ScaleTest05_000.dxf
share/qcad/scripts/Modify/Scale/Tests/required/ScaleTest06_000.dxf
share/qcad/scripts/Modify/Scale/Tests/required/ScaleTest07_000.dxf
share/qcad/scripts/Modify/Scale/Tests/required/ScaleTest08_000.dxf
+share/qcad/scripts/Modify/Scale/Tests/required/ScaleTest09_000.dxf
share/qcad/scripts/Modify/Scale/doc/
share/qcad/scripts/Modify/Scale/doc/ByMouse.png
share/qcad/scripts/Modify/Scale/doc/ByMouseSq.png
@@ -8074,6 +8215,9 @@ share/qcad/scripts/Modify/Stretch/Tests/StretchTest02.js
share/qcad/scripts/Modify/Stretch/Tests/StretchTest03.js
share/qcad/scripts/Modify/Stretch/Tests/StretchTest05.js
share/qcad/scripts/Modify/Stretch/Tests/StretchTest06.js
+share/qcad/scripts/Modify/Stretch/Tests/StretchTest07.js
+share/qcad/scripts/Modify/Stretch/Tests/StretchTest08.js
+share/qcad/scripts/Modify/Stretch/Tests/StretchTest09.js
share/qcad/scripts/Modify/Stretch/Tests/actual/
share/qcad/scripts/Modify/Stretch/Tests/data/
share/qcad/scripts/Modify/Stretch/Tests/data/entities0.dxf
@@ -8086,6 +8230,9 @@
share/qcad/scripts/Modify/Stretch/Tests/required/StretchTest02_000.dxf
share/qcad/scripts/Modify/Stretch/Tests/required/StretchTest03_000.dxf
share/qcad/scripts/Modify/Stretch/Tests/required/StretchTest05_000.dxf
share/qcad/scripts/Modify/Stretch/Tests/required/StretchTest06_000.dxf
+share/qcad/scripts/Modify/Stretch/Tests/required/StretchTest07_000.dxf
+share/qcad/scripts/Modify/Stretch/Tests/required/StretchTest08_000.dxf
+share/qcad/scripts/Modify/Stretch/Tests/required/StretchTest09_000.dxf
share/qcad/scripts/Modify/Stretch/doc/
share/qcad/scripts/Modify/Stretch/doc/Stretch.png
share/qcad/scripts/Modify/Stretch/doc/StretchFigure.dxf
@@ -10540,6 +10687,9 @@
share/qcad/scripts/Widgets/LibraryBrowser/doc/ShowOptionsDown.png
share/qcad/scripts/Widgets/LibraryBrowser/doc/ShowOptionsUp.png
share/qcad/scripts/Widgets/LibraryBrowser/doc/Sync.png
share/qcad/scripts/Widgets/LibraryBrowser/doc/Tag.png
+share/qcad/scripts/Widgets/MenuBar/
+share/qcad/scripts/Widgets/MenuBar/MenuBar.js
+share/qcad/scripts/Widgets/MenuBar/PreferencesPage.ui
share/qcad/scripts/Widgets/MouseDisplay/
share/qcad/scripts/Widgets/MouseDisplay/Mouse-inverse.svg
share/qcad/scripts/Widgets/MouseDisplay/Mouse.svg
@@ -10759,24 +10909,7 @@ share/qcad/scripts/splashscr...@2x.png
share/qcad/scripts/sprintf.js
share/qcad/themes/
share/qcad/themes/Dark/
-share/qcad/themes/Dark/checkbox_checked.png
-share/qcad/themes/Dark/checkbox_checked_disabled.png
-share/qcad/themes/Dark/checkbox_checked_focus.png
-share/qcad/themes/Dark/checkbox_unchecked.png
-share/qcad/themes/Dark/checkbox_unchecked_disabled.png
-share/qcad/themes/Dark/checkbox_unchecked_focus.png
-share/qcad/themes/Dark/close-hover.png
-share/qcad/themes/Dark/close.png
-share/qcad/themes/Dark/radio_checked.png
-share/qcad/themes/Dark/radio_checked_disabled.png
-share/qcad/themes/Dark/radio_checked_focus.png
-share/qcad/themes/Dark/radio_unchecked.png
-share/qcad/themes/Dark/radio_unchecked_disabled.png
-share/qcad/themes/Dark/radio_unchecked_focus.png
share/qcad/themes/Dark/stylesheet.css
-share/qcad/themes/Dark/stylesheet_linux.css
-share/qcad/themes/Dark/triangle_down.png
-share/qcad/themes/Dark/triangle_right.png
share/qcad/ts/
share/qcad/ts/assistant_ar.qm
share/qcad/ts/assistant_bg.qm
diff --git x11/qt5/Makefile.version x11/qt5/Makefile.version
index aa4980b34d2..2838c2a0719 100644
--- x11/qt5/Makefile.version
+++ x11/qt5/Makefile.version
@@ -3,7 +3,7 @@
QT5_VERSION = 5.13.2
QT5_DIST_VERSION = 5.13.2
-QT5_WEBKIT_VERSION = 5.212.0
+QT5_WEBKIT_VERSION = 5.212.0alpha4v0
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
diff --git x11/qt5/qtwebkit/Makefile x11/qt5/qtwebkit/Makefile
index d10c4ce5c91..c861d31d9cc 100644
--- x11/qt5/qtwebkit/Makefile
+++ x11/qt5/qtwebkit/Makefile
@@ -9,15 +9,14 @@ CATEGORIES = www
DPB_PROPERTIES = parallel
VERSION = ${QT5_WEBKIT_VERSION}
-DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
-PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
-REVISION = 1
+DISTNAME = qtwebkit-${VERSION:C/alpha4v0/-alpha4/}
+PKGNAME = qtwebkit-${VERSION}
-SHARED_LIBS += Qt5WebKit 3.0 # 5.9
-SHARED_LIBS += Qt5WebKitWidgets 3.0 # 5.9
+SHARED_LIBS += Qt5WebKit 3.1 # 5.9
+SHARED_LIBS += Qt5WebKitWidgets 3.1 # 5.9
SHARED_LIBS += JavaScriptCore 0.0 # 5.212.9
-SHARED_LIBS += WebCore 0.0 # 5.212.9
-SHARED_LIBS += WebKit2 0.0 # 5.212.9
+SHARED_LIBS += WebCore 1.0 # 5.212.9
+SHARED_LIBS += WebKit2 0.1 # 5.212.9
SHARED_LIBS += WTF 0.0 # 5.212.9
# Mostly LGPLv2.1 or LGPLv3 for code; FDLv1.3 for documentation.
@@ -47,6 +46,7 @@ CONFIGURE_STYLE = cmake
# Remove default "first" target and build all
ALL_TARGET =
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP = No
MODRUBY_RUNDEP = No
@@ -97,6 +97,8 @@ CONFIGURE_ARGS +=
-DCMAKE_INSTALL_PREFIX="${WRKINST}${TRUEPREFIX}" \
-DKDE_INSTALL_LIBDIR=${WRKINST}${MODQT_LIBDIR} \
-DKDE_INSTALL_QMLDIR=${WRKINST}${MODQT_LIBDIR}/qml
+CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN}
+
.include <bsd.port.arch.mk>
# sync with Source/JavaScriptCore/assembler/MacroAssembler.h
diff --git x11/qt5/qtwebkit/distinfo x11/qt5/qtwebkit/distinfo
index 28c86f25aa3..3a40e645f77 100644
--- x11/qt5/qtwebkit/distinfo
+++ x11/qt5/qtwebkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtwebkit-5.212.0-alpha3.tar.xz) =
NX7uWCRFV0Ry5BDr7OYy0G+g7JQ1j8Q0XypxOSLfXhc=
-SIZE (qt/qtwebkit-5.212.0-alpha3.tar.xz) = 12457896
+SHA256 (qt/qtwebkit-5.212.0-alpha4.tar.xz) =
nKEm2pJzZk3SOjzNDJvrzre7U0vd10PbMcr2pabUqeY=
+SIZE (qt/qtwebkit-5.212.0-alpha4.tar.xz) = 12528508
diff --git x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
index b56405cb210..142ad53b843 100644
--- x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
+++ x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_JavaScriptCore_CMakeLists_txt,v 1.1
2020/02/19 16:08:53 r
Index: Source/JavaScriptCore/CMakeLists.txt
--- Source/JavaScriptCore/CMakeLists.txt.orig
+++ Source/JavaScriptCore/CMakeLists.txt
-@@ -1286,6 +1286,7 @@ elseif (WTF_CPU_S390)
+@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390)
elseif (WTF_CPU_S390X)
elseif (WTF_CPU_MIPS)
elseif (WTF_CPU_SH4)
diff --git x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp
x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp
deleted file mode 100644
index 0815dc900b9..00000000000
--- x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-Source_WebCore_dom_Document_cpp,v 1.2 2020/02/19 16:08:53
rsadowski Exp $
-
-Fix build with icu4c >=65
-
-Index: Source/WebCore/dom/Document.cpp
---- Source/WebCore/dom/Document.cpp.orig
-+++ Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character
- unsigned i = 0;
-
- UChar32 c;
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (!isValidNameStart(c))
- return false;
-
- while (i < length) {
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (!isValidNamePart(c))
- return false;
- }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif
-
- for (unsigned i = 0; i < length;) {
- UChar32 c;
-- U16_NEXT(qualifiedName, i, length, c)
-+ U16_NEXT(qualifiedName, i, length, c);
- if (c == ':') {
- if (sawColon) {
- ec = NAMESPACE_ERR;
diff --git
x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
index 2436eb7e306..f31b5712f8a 100644
---
x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
+++
x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
@@ -3,7 +3,7 @@ $OpenBSD:
patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp,v 1.1 2020/
Index: Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
--- Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp.orig
+++ Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
-@@ -964,6 +964,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
+@@ -965,6 +965,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
if (view->needsLayout())
view->layout();
view->adjustViewSize();
diff --git x11/qt5/qtwebkit/pkg/PLIST x11/qt5/qtwebkit/pkg/PLIST
index ec588fd5335..009cfb19463 100644
--- x11/qt5/qtwebkit/pkg/PLIST
+++ x11/qt5/qtwebkit/pkg/PLIST
@@ -2,36 +2,36 @@
@conflict qt5-<5.6
@pkgpath x11/qt5/qtwebkit,-main
include/X11/qt5/QtWebKit/
-include/X11/qt5/QtWebKit/${VERSION}/
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qhttpheader_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquicknetworkreply_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquicknetworkrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickurlschemedelegate_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebpage_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebpage_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebview_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebview_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qtwebsecurityorigin_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebchannelwebkittransport_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdatabase_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdownloaditem_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdownloaditem_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebelement_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebhistory_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebiconimageprovider_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebkittest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebloadrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationhistory_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationhistory_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpermissionrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebplugindatabase_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpreferences_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpreferences_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebscriptworld_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebsecurityorigin_p.h
+include/X11/qt5/QtWebKit/5.212.0/
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebiconimageprovider_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebkittest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebloadrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpermissionrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h
include/X11/qt5/QtWebKit/QWebDatabase
include/X11/qt5/QtWebKit/QWebElement
include/X11/qt5/QtWebKit/QWebElementCollection
@@ -66,13 +66,13 @@ include/X11/qt5/QtWebKit/qwebpluginfactory.h
include/X11/qt5/QtWebKit/qwebsecurityorigin.h
include/X11/qt5/QtWebKit/qwebsettings.h
include/X11/qt5/QtWebKitWidgets/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebframe_p.h
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebinspector_p.h
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebpage_p.h
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebviewaccessible_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebframe_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebinspector_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebpage_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebviewaccessible_p.h
include/X11/qt5/QtWebKitWidgets/QGraphicsWebView
include/X11/qt5/QtWebKitWidgets/QWebFrame
include/X11/qt5/QtWebKitWidgets/QWebHitTestResult
