CVS commit: pkgsrc/cad/qcad

["Iain Hibbert" <plunky%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   plunky
Date:           Tue Apr  7 08:18:22 UTC 2020

Modified Files:
        pkgsrc/cad/qcad: Makefile PLIST distinfo
        pkgsrc/cad/qcad/patches: patch-src_core_RS.cpp patch-src_run_main.cpp

Log Message:
update to version 3.24.3.0

ChangeLog:

3.24.3 (2020/03/17)

    Edit > Application Preferences > Graphics View:
        Behaviour:
            Configurable tolerance for double-click to select contour
        Appearance:
            Configurable default lineweight for "Default" lineweight value
    View > Property Editor:
        Allow editing of values in imperial formats "Architectural" and "Engineering"
    Bug fixes:
        FS#2030 - Cannot snap to points of mirrored blocks
        FS#2032 - Draw > Circle > Three Tangents: Cannot select third tangent
        FS#2035 - Linetype scale in viewports
        FS#2036 - Arc rendering in block context
        FS#2038 - Cannot snap arc / circle reference points inside blocks
        FS#2051 - Window selection of rotated and aligned dimensions with large extension line offset
        FS#2053 - Dots in line patterns not visible at extreme coordinates
        FS#2054 - Misc > Modify > Flatten Drawing to 2D

3.24.2 (2020/01/13)

    Bug fixes:
        FS#2027 - File > Print: Minimum line weight for printing is 0.01 drawing units

3.24.1 (2020/01/02)

    Bug fixes:
        FS#2017 - Rendering of arcs in blocks with scale factor > 1
        FS#2020 - Edit > Paste: Wrong position for block references with different drawing units


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/cad/qcad/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/cad/qcad/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/cad/qcad/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/qcad/patches/patch-src_run_main.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/qcad/Makefile
diff -u pkgsrc/cad/qcad/Makefile:1.88 pkgsrc/cad/qcad/Makefile:1.89
--- pkgsrc/cad/qcad/Makefile:1.88       Tue Mar 10 22:09:28 2020
+++ pkgsrc/cad/qcad/Makefile    Tue Apr  7 08:18:21 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2020/03/10 22:09:28 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2020/04/07 08:18:21 plunky Exp $
 #
 
-DISTNAME=              qcad-3.24.0.1
-PKGREVISION=           5
+DISTNAME=              qcad-3.24.3.0
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=         bsdtar

Index: pkgsrc/cad/qcad/PLIST
diff -u pkgsrc/cad/qcad/PLIST:1.18 pkgsrc/cad/qcad/PLIST:1.19
--- pkgsrc/cad/qcad/PLIST:1.18  Sun Dec 29 14:18:20 2019
+++ pkgsrc/cad/qcad/PLIST       Tue Apr  7 08:18:21 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2019/12/29 14:18:20 plunky Exp $
+@comment $NetBSD: PLIST,v 1.19 2020/04/07 08:18:21 plunky Exp $
 bin/qcad
 lib/libdxflib.so
 lib/libopennurbs.so
@@ -216,6 +216,7 @@ lib/qcad/patterns/imperial/lattice-04.pa
 lib/qcad/patterns/imperial/lattice-05.pat
 lib/qcad/patterns/imperial/lattice-06.pat
 lib/qcad/patterns/imperial/line.pat
+lib/qcad/patterns/imperial/looplinks.pat
 lib/qcad/patterns/imperial/maze-01.pat
 lib/qcad/patterns/imperial/maze-02.pat
 lib/qcad/patterns/imperial/mudst.pat
@@ -235,6 +236,7 @@ lib/qcad/patterns/imperial/swamp.pat
 lib/qcad/patterns/imperial/trans.pat
 lib/qcad/patterns/imperial/tri-overlap.pat
 lib/qcad/patterns/imperial/triang.pat
+lib/qcad/patterns/imperial/wire-fence.pat
 lib/qcad/patterns/imperial/zigzag.pat
 lib/qcad/patterns/metric/acad_iso02w100.pat
 lib/qcad/patterns/metric/acad_iso03w100.pat
@@ -264,12 +266,14 @@ lib/qcad/patterns/metric/ar-b816c.pat
 lib/qcad/patterns/metric/ar-b88.pat
 lib/qcad/patterns/metric/ar-brelm.pat
 lib/qcad/patterns/metric/ar-brstd.pat
+lib/qcad/patterns/metric/ar-conc-01.pat
 lib/qcad/patterns/metric/ar-conc.pat
 lib/qcad/patterns/metric/ar-hbone.pat
 lib/qcad/patterns/metric/ar-parq1.pat
 lib/qcad/patterns/metric/ar-rroof.pat
 lib/qcad/patterns/metric/ar-rshke.pat
 lib/qcad/patterns/metric/ar-sand.pat
+lib/qcad/patterns/metric/barbwire.pat
 lib/qcad/patterns/metric/blocks-01.pat
 lib/qcad/patterns/metric/blocks-02.pat
 lib/qcad/patterns/metric/box-overlap.pat
@@ -279,8 +283,13 @@ lib/qcad/patterns/metric/boxjoin-02.pat
 lib/qcad/patterns/metric/brass.pat
 lib/qcad/patterns/metric/brick.pat
 lib/qcad/patterns/metric/brstone.pat
+lib/qcad/patterns/metric/bubbles-01.pat
+lib/qcad/patterns/metric/bubbles-02.pat
+lib/qcad/patterns/metric/bubbles-03.pat
 lib/qcad/patterns/metric/celtic-01.pat
 lib/qcad/patterns/metric/celtic-02.pat
+lib/qcad/patterns/metric/celtic-03.pat
+lib/qcad/patterns/metric/celtic-04.pat
 lib/qcad/patterns/metric/circles-02.pat
 lib/qcad/patterns/metric/circles.pat
 lib/qcad/patterns/metric/clay.pat
@@ -295,7 +304,10 @@ lib/qcad/patterns/metric/explosion.pat
 lib/qcad/patterns/metric/flex.pat
 lib/qcad/patterns/metric/grass.pat
 lib/qcad/patterns/metric/grate.pat
+lib/qcad/patterns/metric/gravel-01.pat
 lib/qcad/patterns/metric/gravel.pat
+lib/qcad/patterns/metric/hatch-dots.pat
+lib/qcad/patterns/metric/hatch-sqrs.pat
 lib/qcad/patterns/metric/hex.pat
 lib/qcad/patterns/metric/hexagons.pat
 lib/qcad/patterns/metric/hexjoin-01.pat
@@ -321,7 +333,12 @@ lib/qcad/patterns/metric/lattice-03.pat
 lib/qcad/patterns/metric/lattice-04.pat
 lib/qcad/patterns/metric/lattice-05.pat
 lib/qcad/patterns/metric/lattice-06.pat
+lib/qcad/patterns/metric/lattice-07.pat
+lib/qcad/patterns/metric/leaf-01.pat
+lib/qcad/patterns/metric/leaf-02.pat
+lib/qcad/patterns/metric/leaf-03.pat
 lib/qcad/patterns/metric/line.pat
+lib/qcad/patterns/metric/looplinks.pat
 lib/qcad/patterns/metric/maze-01.pat
 lib/qcad/patterns/metric/maze-02.pat
 lib/qcad/patterns/metric/mudst.pat
@@ -330,6 +347,7 @@ lib/qcad/patterns/metric/net3.pat
 lib/qcad/patterns/metric/plast.pat
 lib/qcad/patterns/metric/plasti.pat
 lib/qcad/patterns/metric/qcad-logo.pat
+lib/qcad/patterns/metric/redback.pat
 lib/qcad/patterns/metric/sacncr.pat
 lib/qcad/patterns/metric/scaffold.pat
 lib/qcad/patterns/metric/square.pat
@@ -341,6 +359,11 @@ lib/qcad/patterns/metric/swamp.pat
 lib/qcad/patterns/metric/trans.pat
 lib/qcad/patterns/metric/tri-overlap.pat
 lib/qcad/patterns/metric/triang.pat
+lib/qcad/patterns/metric/weatherboard.pat
+lib/qcad/patterns/metric/weaving.pat
+lib/qcad/patterns/metric/wire-fence.pat
+lib/qcad/patterns/metric/xmastree-01.pat
+lib/qcad/patterns/metric/xmastree-02.pat
 lib/qcad/patterns/metric/zigzag.pat
 lib/qcad/plugins/designer/libqcadcustomwidgets.so
 lib/qcad/plugins/libqcaddxf.so
@@ -2681,7 +2704,9 @@ lib/qcad/scripts/Draw/Hatch/HatchFromSel
 lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest05.js
 lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest06.js
 lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest07.js
+lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/HatchFromSelectionTest08.js
 lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/contour.dxf
+lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_block_line.dxf
 lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_block_lines.dxf
 lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_block_polyline.dxf
 lib/qcad/scripts/Draw/Hatch/HatchFromSelection/Tests/data/hatch_blocks.dxf
@@ -6078,6 +6103,7 @@ lib/qcad/scripts/Misc/Examples/MathExamp
 lib/qcad/scripts/Misc/Examples/MathExamples/ExMathSpiral/ExMathSpiral.pro
 lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/CurtainRope.svg
 lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.js
+lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.pro
 lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainter.svg
 lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.svg
 lib/qcad/scripts/Misc/Examples/MathExamples/FlexPainter/FlexPainterDialog.ui
@@ -7465,6 +7491,9 @@ lib/qcad/scripts/Modify/Stretch/Tests/St
 lib/qcad/scripts/Modify/Stretch/Tests/StretchTest03.js
 lib/qcad/scripts/Modify/Stretch/Tests/StretchTest05.js
 lib/qcad/scripts/Modify/Stretch/Tests/StretchTest06.js
+lib/qcad/scripts/Modify/Stretch/Tests/StretchTest07.js
+lib/qcad/scripts/Modify/Stretch/Tests/StretchTest08.js
+lib/qcad/scripts/Modify/Stretch/Tests/StretchTest09.js
 lib/qcad/scripts/Modify/Stretch/Tests/data/entities0.dxf
 lib/qcad/scripts/Modify/Stretch/Tests/data/entities1.dxf
 lib/qcad/scripts/Modify/Stretch/Tests/data/entities2.dxf
@@ -7474,6 +7503,9 @@ lib/qcad/scripts/Modify/Stretch/Tests/re
 lib/qcad/scripts/Modify/Stretch/Tests/required/StretchTest03_000.dxf
 lib/qcad/scripts/Modify/Stretch/Tests/required/StretchTest05_000.dxf
 lib/qcad/scripts/Modify/Stretch/Tests/required/StretchTest06_000.dxf
+lib/qcad/scripts/Modify/Stretch/Tests/required/StretchTest07_000.dxf
+lib/qcad/scripts/Modify/Stretch/Tests/required/StretchTest08_000.dxf
+lib/qcad/scripts/Modify/Stretch/Tests/required/StretchTest09_000.dxf
 lib/qcad/scripts/Modify/Stretch/doc/Stretch.png
 lib/qcad/scripts/Modify/Stretch/doc/StretchFigure.dxf
 lib/qcad/scripts/Modify/Stretch/doc/StretchFigure.png
@@ -10033,24 +10065,7 @@ lib/qcad/scripts/simple_view.js
 lib/qcad/scripts/splashscreen.png
 lib/qcad/scripts/splashscreen%2x.png@localhost
 lib/qcad/scripts/sprintf.js
-lib/qcad/themes/Dark/checkbox_checked.png
-lib/qcad/themes/Dark/checkbox_checked_disabled.png
-lib/qcad/themes/Dark/checkbox_checked_focus.png
-lib/qcad/themes/Dark/checkbox_unchecked.png
-lib/qcad/themes/Dark/checkbox_unchecked_disabled.png
-lib/qcad/themes/Dark/checkbox_unchecked_focus.png
-lib/qcad/themes/Dark/close-hover.png
-lib/qcad/themes/Dark/close.png
-lib/qcad/themes/Dark/radio_checked.png
-lib/qcad/themes/Dark/radio_checked_disabled.png
-lib/qcad/themes/Dark/radio_checked_focus.png
-lib/qcad/themes/Dark/radio_unchecked.png
-lib/qcad/themes/Dark/radio_unchecked_disabled.png
-lib/qcad/themes/Dark/radio_unchecked_focus.png
 lib/qcad/themes/Dark/stylesheet.css
-lib/qcad/themes/Dark/stylesheet_linux.css
-lib/qcad/themes/Dark/triangle_down.png
-lib/qcad/themes/Dark/triangle_right.png
 lib/qcad/ts/assistant_ar.qm
 lib/qcad/ts/assistant_bg.qm
 lib/qcad/ts/assistant_cs.qm
@@ -10569,6 +10584,9 @@ share/qcad/libraries/default/Hydraulics/
 share/qcad/libraries/default/Hydraulics/_META/meta.rdf
 share/qcad/libraries/default/Hydraulics/cylinder.dxf
 share/qcad/libraries/default/Hydraulics/cylinder.rdf
+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

Index: pkgsrc/cad/qcad/distinfo
diff -u pkgsrc/cad/qcad/distinfo:1.35 pkgsrc/cad/qcad/distinfo:1.36
--- pkgsrc/cad/qcad/distinfo:1.35       Sun Dec 29 14:18:20 2019
+++ pkgsrc/cad/qcad/distinfo    Tue Apr  7 08:18:21 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2019/12/29 14:18:20 plunky Exp $
+$NetBSD: distinfo,v 1.36 2020/04/07 08:18:21 plunky Exp $
 
-SHA1 (qcad-3.24.0.1.tar.gz) = 39cf137348dfa28ddfa565b6d894da539a17fd44
-RMD160 (qcad-3.24.0.1.tar.gz) = e5a6c008443546f1f35939ba0c439df2b619e8fa
-SHA512 (qcad-3.24.0.1.tar.gz) = 1c4c03a0fdfb768285dca75469309bfd2cb65ddb6990f39b4990f1596f4ce3efbfa38f18d81b16290bcb5003ac55e8d25a8e0a2356f4a9ab74fdd8a452c7ed93
-Size (qcad-3.24.0.1.tar.gz) = 33773334 bytes
+SHA1 (qcad-3.24.3.0.tar.gz) = b9752603764bd1f578d741ee462fb0cac04ab03a
+RMD160 (qcad-3.24.3.0.tar.gz) = 2169bf5780ce4a879b3ce4d55caaa3e4339b0170
+SHA512 (qcad-3.24.3.0.tar.gz) = 27b66abb1e8d04b60e140204a2c92d576998b894e117197b9f89d3c870f61e1f54e276f829e2f878443da4019e47afd5a2df124b8667671c523d5a717f684716
+Size (qcad-3.24.3.0.tar.gz) = 33874174 bytes
 SHA1 (patch-qcad.pro) = b8dafdf3105ff3580815bb82a6a84b71f4d0b172
 SHA1 (patch-scripts_Help_ShowReadme_ShowReadme.js) = 96412237a7c4422f02dc5d2ab3634457b376a2d2
 SHA1 (patch-scripts_Widgets_LibraryBrowser_LibraryBrowser.js) = 65f988e553259eb93217ea12e9cb429fe52f05be
@@ -17,7 +17,7 @@ SHA1 (patch-src_3rdparty_opennurbs_openn
 SHA1 (patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro) = 7120c49027d4a50c23b1e9e60c44a1e0a239d6ac
 SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = d3af7c7c8da0d3bc297fb8cd19d0c91125bfcdfe
 SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = 22e2e937f6a19277608bad11676b156e87cf1826
-SHA1 (patch-src_core_RS.cpp) = 7864f7a99904401ad9eae01dfd1304f062a52d6a
+SHA1 (patch-src_core_RS.cpp) = d3148a29b1a127b09d3bd3d0cc195e26b86b6280
 SHA1 (patch-src_core_RSettings.cpp) = 3fc5cea42fae1b9ace651f68f38dad62dfe0e88a
 SHA1 (patch-src_core_core.pro) = 3b2c68139457f08205896b94e44ebf6c09eb6bfe
 SHA1 (patch-src_customwidgets_customwidgets.pro) = 8bac25b8f02092464591019be961470a45c810cc
@@ -26,7 +26,7 @@ SHA1 (patch-src_grid_grid.pro) = 65f5f47
 SHA1 (patch-src_gui_gui.pro) = 938fdcb8715ec78550ebff80400ab66be551584d
 SHA1 (patch-src_io_dxf_dxf.pro) = d386b09c217fcebd7fae68807950aa7b80c3a6c8
 SHA1 (patch-src_operations_operations.pro) = d10b38594f29ae07febdb52339049646926c2252
-SHA1 (patch-src_run_main.cpp) = 4f3cae015852ab4b4550c897d82e9f30ac14d3d1
+SHA1 (patch-src_run_main.cpp) = 614912a3d812235999c00f81cd35f6d992783c6e
 SHA1 (patch-src_run_run.pri) = fca4570872f9fc7b25beac8dfd0c4802b81d3972
 SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 8105fd89a8b52962f9e0c1ff80cf154ceb09145e
 SHA1 (patch-src_snap_snap.pro) = 9464576805a1d2baa81c91f759e59a8cc3989b6a

Index: pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp
diff -u pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp:1.2 pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp:1.3
--- pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp:1.2   Thu Sep  5 13:39:10 2019
+++ pkgsrc/cad/qcad/patches/patch-src_core_RS.cpp       Tue Apr  7 08:18:22 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_core_RS.cpp,v 1.2 2019/09/05 13:39:10 nia Exp $
+$NetBSD: patch-src_core_RS.cpp,v 1.3 2020/04/07 08:18:22 plunky Exp $
 
 fix hardcoded paths
 
---- src/core/RS.cpp.orig       2019-07-18 15:47:56.000000000 +0000
+--- src/core/RS.cpp.orig       2020-03-17 10:40:38.000000000 +0000
 +++ src/core/RS.cpp
-@@ -139,48 +139,9 @@ bool RS::compare(const QPair<QVariant, R
+@@ -139,44 +139,10 @@
  QStringList RS::getDirectoryList(const QString& subDirectory) {
      QStringList dirList;
  
@@ -46,13 +46,10 @@ fix hardcoded paths
 -    }
 -#endif
 -    */
--
--    // TODO: add a path to users home to be used to extend pattern, etc.
--    //QString appDirName = QSettings.applicationName();
--    //dirList.append(RSettings::getHomeLocation() + "/." + appDirName + "/" + subDirectory);
++    //QString appDirName = QSettings.applicationName();
 +    dirList.append("@PREFIX@/lib/qcad/" + subDirectory);
 +    dirList.append("@PREFIX@/share/qcad/" + subDirectory);
 +    dirList.append(QDir::homePath() + "/.qcad/" + subDirectory);
  
-     QStringList ret;
-     for (int i=0; i<dirList.size(); i++) {
+     // add a path to users home (config dir) to be used to extend pattern, linetypes, etc.
+     dirList.append(RSettings::getPath() + "/" + subDirectory);

Index: pkgsrc/cad/qcad/patches/patch-src_run_main.cpp
diff -u pkgsrc/cad/qcad/patches/patch-src_run_main.cpp:1.1 pkgsrc/cad/qcad/patches/patch-src_run_main.cpp:1.2
--- pkgsrc/cad/qcad/patches/patch-src_run_main.cpp:1.1  Sun Dec 29 14:18:20 2019
+++ pkgsrc/cad/qcad/patches/patch-src_run_main.cpp      Tue Apr  7 08:18:22 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_run_main.cpp,v 1.1 2019/12/29 14:18:20 plunky Exp $
+$NetBSD: patch-src_run_main.cpp,v 1.2 2020/04/07 08:18:22 plunky Exp $
 
 don't overwrite the plugins directory: remove the applicationDir and add the pluginPaths
 
---- src/run/main.cpp.orig      2019-12-22 19:09:21.954519285 +0000
+--- src/run/main.cpp.orig      2020-03-17 10:40:38.000000000 +0000
 +++ src/run/main.cpp
-@@ -237,7 +237,11 @@ int main(int argc, char *argv[]) {
+@@ -237,7 +237,11 @@
          qWarning() << "No plugin paths found";
          return -1;
      }
@@ -15,5 +15,5 @@ don't overwrite the plugins directory: r
 +    foreach (const QString &path, pluginPaths)
 +      app->addLibraryPath(path);
  
-     RMath::init();
-     RFontList::init();
+     RSettings::setApplicationNameOverride("QCAD3");
+