pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/cad/qcad
Module Name: pkgsrc
Committed By: plunky
Date: Sun Mar 16 14:56:13 UTC 2025
Modified Files:
pkgsrc/cad/qcad: Makefile PLIST distinfo
pkgsrc/cad/qcad/patches:
patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp
patch-src_3rdparty_opennurbs_opennurbs__zlib.h
patch-src_core_RSettings.cpp
Added Files:
pkgsrc/cad/qcad/patches: patch-src_3rdparty_CMakeLists.txt
patch-src_3rdparty_opennurbs_CMakeLists.txt
patch-src_CMakeLists.txt
Removed Files:
pkgsrc/cad/qcad/patches: patch-qcad.pro patch-shared.pri
patch-shared__app.pri patch-src_3rdparty_3rdparty.pro
patch-src_3rdparty_dxflib_dxflib.pro
patch-src_3rdparty_legacy_spatialindexnavel_spatialindexnavel.pro
patch-src_3rdparty_opennurbs_opennurbs.pro
patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro
patch-src_core_core.pro patch-src_customwidgets_customwidgets.pro
patch-src_entity_entity.pro patch-src_grid_grid.pro
patch-src_gui_gui.pro patch-src_io_dxf_dxf.pro
patch-src_operations_operations.pro patch-src_run_run.pri
patch-src_scripting_ecmaapi_ecmaapi.pro
patch-src_scripts_scripts.pro patch-src_snap_snap.pro
patch-src_spatialindex_spatialindex.pro
patch-src_stemmer_stemmer.pro
Log Message:
Update QCAD to v3.32.2.0
Many improvements since the previous pkgsrc version, the complete
changelog is at https://qcad.org/en/changelog
For this update, I have switched to the CMake build, which does not
require such invasive patching
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/cad/qcad/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/cad/qcad/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/cad/qcad/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/cad/qcad/patches/patch-qcad.pro \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_3rdparty.pro \
pkgsrc/cad/qcad/patches/patch-src_run_run.pri
cvs rdiff -u -r1.2 -r0 pkgsrc/cad/qcad/patches/patch-shared.pri \
pkgsrc/cad/qcad/patches/patch-src_customwidgets_customwidgets.pro \
pkgsrc/cad/qcad/patches/patch-src_entity_entity.pro \
pkgsrc/cad/qcad/patches/patch-src_gui_gui.pro \
pkgsrc/cad/qcad/patches/patch-src_operations_operations.pro \
pkgsrc/cad/qcad/patches/patch-src_snap_snap.pro
cvs rdiff -u -r1.6 -r0 pkgsrc/cad/qcad/patches/patch-shared__app.pri
cvs rdiff -u -r0 -r1.1 \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_CMakeLists.txt \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_CMakeLists.txt \
pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt
cvs rdiff -u -r1.3 -r0 \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro \
pkgsrc/cad/qcad/patches/patch-src_core_core.pro \
pkgsrc/cad/qcad/patches/patch-src_io_dxf_dxf.pro \
pkgsrc/cad/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro \
pkgsrc/cad/qcad/patches/patch-src_spatialindex_spatialindex.pro
cvs rdiff -u -r1.1 -r0 \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_legacy_spatialindexnavel_spatialindexnavel.pro \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs.pro \
pkgsrc/cad/qcad/patches/patch-src_grid_grid.pro \
pkgsrc/cad/qcad/patches/patch-src_scripts_scripts.pro
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp \
pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.h
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp
cvs rdiff -u -r1.5 -r0 pkgsrc/cad/qcad/patches/patch-src_stemmer_stemmer.pro
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.126 pkgsrc/cad/qcad/Makefile:1.127
--- pkgsrc/cad/qcad/Makefile:1.126 Wed Feb 12 06:44:32 2025
+++ pkgsrc/cad/qcad/Makefile Sun Mar 16 14:56:11 2025
@@ -1,28 +1,27 @@
-# $NetBSD: Makefile,v 1.126 2025/02/12 06:44:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.127 2025/03/16 14:56:11 plunky Exp $
-DISTNAME= qcad-3.28.2.2
-PKGREVISION= 7
+DISTNAME= qcad-3.32.2.0
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=qcad/}
EXTRACT_USING= bsdtar
GITHUB_TAG= v${PKGVERSION_NOREV}
+GITHUB_SUBMODULES= qcad qtjsapi ${GITHUB_TAG} src/qtjsapi \
+ qcad qcadjsapi ${GITHUB_TAG} src/qcadjsapi
+
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.qcad.org/
+HOMEPAGE= https://www.qcad.org/
COMMENT= 2D CAD system
LICENSE= gnu-gpl-v3
-DEPENDS+= bash-[0-9]*:../../shells/bash
-
-USE_TOOLS+= chmod find make pax
+USE_TOOLS+= cmake find pax
USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
SUBST_MESSAGE.paths= Attending to hard-coded paths.
-SUBST_FILES.paths+= shared.pri src/core/RS.cpp src/core/RSettings.cpp
SUBST_FILES.paths+= scripts/Help/ShowReadme/ShowReadme.js
+SUBST_FILES.paths+= src/core/RS.cpp src/core/RSettings.cpp
SUBST_VARS.paths= PREFIX
SUBST_CLASSES+= icon
@@ -31,22 +30,21 @@ SUBST_MESSAGE.icon= Fix icon name.
SUBST_FILES.icon= qcad.desktop
SUBST_SED.icon= -e s,qcad_icon,qcad,g
-AUTO_MKDIRS= yes
+# qcad source includes libzlib, transform this to libz to use builtin
+BUILDLINK_TRANSFORM+= l:zlib:z
-# ensure we don't build debug libs
-BUILD_TARGET= release
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
-#
-# The QCad build system normally links direct to a release dir but this
-# causes a lot of problems with libtool dependencies. We patch it so that
-# the libs are linked from the source dirs and add an install target to
-# allow pkgsrc to use DESTDIR
-#
-do-configure:
- cd ${WRKSRC} && ${QTDIR}/bin/qmake -r -after DESTDIR=
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/applications \
+ share/icons/hicolor/scalable/apps \
+ share/icons/hicolor/512x512/apps \
+ share/icons/hicolor/256x256/apps \
+ share/icons/hicolor/64x64/apps \
+ lib/qcad/plugins/
do-install:
- cd ${WRKSRC} && make INSTALL_ROOT=${DESTDIR} install
+ ${INSTALL_PROGRAM} ${WRKSRC}/release/qcad \
+ ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/qcad.desktop \
${DESTDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/support/logo/logo_512.svg \
@@ -59,12 +57,17 @@ do-install:
${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps/qcad.png
${INSTALL_DATA} ${WRKSRC}/support/doc/api/qcad_icon.png \
${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps/qcad.png
- ${INSTALL_LIB} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-*/qtbindings/qtscript_*/libqtscript_*.so* \
- ${DESTDIR}${PREFIX}/lib/qcad/plugins/script
${INSTALL_MAN} ${WRKSRC}/qcad.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- ${FIND} ${WRKSRC}/scripts -name \*.orig -delete
- ${FIND} ${WRKSRC} -name \*.gitignore -delete
+ ${INSTALL_LIB} ${WRKSRC}/${CMAKE_BUILD_DIR}/src/qcad/plugins/libqcadjsapi.so \
+ ${DESTDIR}${PREFIX}/lib/${PKGBASE}/plugins
+ ${INSTALL_LIB} ${WRKSRC}/${CMAKE_BUILD_DIR}/src/qtjsapi/out/libqtjsapi.so \
+ ${DESTDIR}${PREFIX}/lib
+ cd ${WRKSRC}/${CMAKE_BUILD_DIR}/release && ${PAX} -rwpm \
+ lib*.so ${DESTDIR}${PREFIX}/lib
+ cd ${WRKSRC}/${CMAKE_BUILD_DIR} && ${PAX} -rwpm plugins \
+ ${DESTDIR}${PREFIX}/lib/${PKGBASE}
+ ${FIND} ${WRKSRC}/scripts \( -name \*.orig -or -name .gitignore \) -delete
cd ${WRKSRC} && ${PAX} -rwpm \
fonts linetypes patterns scripts themes ts \
${DESTDIR}${PREFIX}/lib/${PKGBASE}
@@ -72,13 +75,16 @@ do-install:
readme.txt examples libraries \
${DESTDIR}${PREFIX}/share/${PKGBASE}
+.include "../../devel/cmake/build.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../devel/libexecinfo/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/qt6-qt5compat/buildlink3.mk"
+.include "../../devel/qt6-qttools/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.include "../../lang/qt6-qtdeclarative/buildlink3.mk"
.include "../../textproc/libstemmer/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtscript/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/cad/qcad/PLIST
diff -u pkgsrc/cad/qcad/PLIST:1.25 pkgsrc/cad/qcad/PLIST:1.26
--- pkgsrc/cad/qcad/PLIST:1.25 Thu Jan 4 21:50:29 2024
+++ pkgsrc/cad/qcad/PLIST Sun Mar 16 14:56:11 2025
@@ -1,17 +1,15 @@
-@comment $NetBSD: PLIST,v 1.25 2024/01/04 21:50:29 plunky Exp $
+@comment $NetBSD: PLIST,v 1.26 2025/03/16 14:56:11 plunky Exp $
bin/qcad
-lib/libdxflib.so
lib/libopennurbs.so
lib/libqcadcore.so
-lib/libqcadecmaapi.so
lib/libqcadentity.so
lib/libqcadgrid.so
lib/libqcadgui.so
lib/libqcadoperations.so
-lib/libqcadscripts.so
lib/libqcadsnap.so
lib/libqcadspatialindex.so
lib/libqcadstemmer.so
+lib/libqtjsapi.so
lib/libspatialindexnavel.so
lib/qcad/fonts/CourierCad.cxf
lib/qcad/fonts/Cursive.cxf
@@ -387,46 +385,8 @@ lib/qcad/patterns/metric/xmastree-02.pat
lib/qcad/patterns/metric/zigzag.pat
lib/qcad/plugins/designer/libqcadcustomwidgets.so
lib/qcad/plugins/libqcaddxf.so
-lib/qcad/plugins/script/libqtscript_core.so
-lib/qcad/plugins/script/libqtscript_core.so.1
-lib/qcad/plugins/script/libqtscript_core.so.1.0
-lib/qcad/plugins/script/libqtscript_core.so.1.0.0
-lib/qcad/plugins/script/libqtscript_gui.so
-lib/qcad/plugins/script/libqtscript_gui.so.1
-lib/qcad/plugins/script/libqtscript_gui.so.1.0
-lib/qcad/plugins/script/libqtscript_gui.so.1.0.0
-lib/qcad/plugins/script/libqtscript_network.so
-lib/qcad/plugins/script/libqtscript_network.so.1
-lib/qcad/plugins/script/libqtscript_network.so.1.0
-lib/qcad/plugins/script/libqtscript_network.so.1.0.0
-lib/qcad/plugins/script/libqtscript_opengl.so
-lib/qcad/plugins/script/libqtscript_opengl.so.1
-lib/qcad/plugins/script/libqtscript_opengl.so.1.0
-lib/qcad/plugins/script/libqtscript_opengl.so.1.0.0
-lib/qcad/plugins/script/libqtscript_printsupport.so
-lib/qcad/plugins/script/libqtscript_printsupport.so.1
-lib/qcad/plugins/script/libqtscript_printsupport.so.1.0
-lib/qcad/plugins/script/libqtscript_printsupport.so.1.0.0
-lib/qcad/plugins/script/libqtscript_sql.so
-lib/qcad/plugins/script/libqtscript_sql.so.1
-lib/qcad/plugins/script/libqtscript_sql.so.1.0
-lib/qcad/plugins/script/libqtscript_sql.so.1.0.0
-lib/qcad/plugins/script/libqtscript_uitools.so
-lib/qcad/plugins/script/libqtscript_uitools.so.1
-lib/qcad/plugins/script/libqtscript_uitools.so.1.0
-lib/qcad/plugins/script/libqtscript_uitools.so.1.0.0
-lib/qcad/plugins/script/libqtscript_widgets.so
-lib/qcad/plugins/script/libqtscript_widgets.so.1
-lib/qcad/plugins/script/libqtscript_widgets.so.1.0
-lib/qcad/plugins/script/libqtscript_widgets.so.1.0.0
-lib/qcad/plugins/script/libqtscript_xml.so
-lib/qcad/plugins/script/libqtscript_xml.so.1
-lib/qcad/plugins/script/libqtscript_xml.so.1.0
-lib/qcad/plugins/script/libqtscript_xml.so.1.0.0
-lib/qcad/plugins/script/libqtscript_xmlpatterns.so
-lib/qcad/plugins/script/libqtscript_xmlpatterns.so.1
-lib/qcad/plugins/script/libqtscript_xmlpatterns.so.1.0
-lib/qcad/plugins/script/libqtscript_xmlpatterns.so.1.0.0
+lib/qcad/plugins/libqcadjsapi.so
+lib/qcad/plugins/libqcadscripts.so
lib/qcad/scripts/AddOn.js
lib/qcad/scripts/Apollonius.js
lib/qcad/scripts/Block/AddBlock/AddBlock-inverse.svg
@@ -1445,7 +1405,16 @@ lib/qcad/scripts/Draw/Arc/ArcTPR/ArcTPR.
lib/qcad/scripts/Draw/Arc/ArcTPR/ArcTPR.ui
lib/qcad/scripts/Draw/Arc/ArcTPR/ArcTPRInit.js
lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/ArcTPRTest00.js
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/ArcTPRTest01.js
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/ArcTPRTest02.js
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/ArcTPRTest03.js
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/ArcTPRTest04.js
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/data/four_solutions.dxf
lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/required/ArcTPRTest00_000.dxf
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/required/ArcTPRTest01_000.dxf
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/required/ArcTPRTest02_000.dxf
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/required/ArcTPRTest03_000.dxf
+lib/qcad/scripts/Draw/Arc/ArcTPR/Tests/required/ArcTPRTest04_000.dxf
lib/qcad/scripts/Draw/Arc/ArcTPR/doc/ArcTPR.png
lib/qcad/scripts/Draw/Arc/ArcTPR/doc/ArcTPR_bg.html
lib/qcad/scripts/Draw/Arc/ArcTPR/doc/ArcTPR_da.html
@@ -1849,10 +1818,12 @@ lib/qcad/scripts/Draw/Circle/Circle3T/Te
lib/qcad/scripts/Draw/Circle/Circle3T/Tests/Circle3TTest01.js
lib/qcad/scripts/Draw/Circle/Circle3T/Tests/Circle3TTest02.js
lib/qcad/scripts/Draw/Circle/Circle3T/Tests/Circle3TTest03.js
+lib/qcad/scripts/Draw/Circle/Circle3T/Tests/Circle3TTest04.js
lib/qcad/scripts/Draw/Circle/Circle3T/Tests/required/Circle3TTest00_000.dxf
lib/qcad/scripts/Draw/Circle/Circle3T/Tests/required/Circle3TTest01_000.dxf
lib/qcad/scripts/Draw/Circle/Circle3T/Tests/required/Circle3TTest02_000.dxf
lib/qcad/scripts/Draw/Circle/Circle3T/Tests/required/Circle3TTest03_000.dxf
+lib/qcad/scripts/Draw/Circle/Circle3T/Tests/required/Circle3TTest04_000.dxf
lib/qcad/scripts/Draw/Circle/Circle3T/doc/Circle3T.png
lib/qcad/scripts/Draw/Circle/Circle3T/doc/Circle3T_bg.html
lib/qcad/scripts/Draw/Circle/Circle3T/doc/Circle3T_da.html
@@ -2951,55 +2922,6 @@ lib/qcad/scripts/Draw/Ellipse/EllipseDD/
lib/qcad/scripts/Draw/Ellipse/EllipseDD/doc/EllipseDD_ru.html
lib/qcad/scripts/Draw/Ellipse/EllipseDD/doc/EllipseDD_sl.html
lib/qcad/scripts/Draw/Ellipse/EllipseDD/doc/EllipseDD_sv.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/EllipseInscribedQuad-inverse.svg
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/EllipseInscribedQuad.js
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/EllipseInscribedQuad.pro
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/EllipseInscribedQuad.svg
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/EllipseInscribedQuadInit.js
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/Tests/EllipseInscribedQuadTest00.js
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/Tests/required/EllipseInscribedQuadTest00_000.dxf
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad.png
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_bg.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_da.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_de.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_bg.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_da.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_de.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_en.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_es.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_fr.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_it.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_ja.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_nl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_pl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_pt.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_ru.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_sl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_desc_sv.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_en.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_es.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_fr.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_it.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_ja.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_nl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_pl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_bg.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_da.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_de.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_en.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_es.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_fr.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_it.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_ja.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_nl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_pl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_pt.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_ru.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_proc_sv.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_pt.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_ru.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_sl.html
-lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/doc/EllipseInscribedQuad_sv.html
lib/qcad/scripts/Draw/Ellipse/EllipseOffset/EllipseOffset-inverse.svg
lib/qcad/scripts/Draw/Ellipse/EllipseOffset/EllipseOffset.js
lib/qcad/scripts/Draw/Ellipse/EllipseOffset/EllipseOffset.pro
@@ -4411,8 +4333,40 @@ lib/qcad/scripts/Draw/Shape/ShapeRectang
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/ShapeRectanglePPInit.js
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest00.js
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest01.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest02.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest03.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest04.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest05.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest06.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest07.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest08.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest09.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest10.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest11.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest12.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest13.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest14.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest15.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest16.js
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/ShapeRectanglePPTest17.js
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest00_000.dxf
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest01_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest02_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest03_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest04_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest05_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest06_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest07_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest08_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest09_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest10_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest11_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest12_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest13_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest14_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest15_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest16_000.dxf
+lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/Tests/required/ShapeRectanglePPTest17_000.dxf
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/doc/ShapeRectanglePP.png
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/doc/ShapeRectanglePP_bg.html
lib/qcad/scripts/Draw/Shape/ShapeRectanglePP/doc/ShapeRectanglePP_da.html
@@ -7182,6 +7136,9 @@ lib/qcad/scripts/Misc/Examples/ExMinimal
lib/qcad/scripts/Misc/Examples/ExMinimal2/ExMinimal2.ui
lib/qcad/scripts/Misc/Examples/Examples.js
lib/qcad/scripts/Misc/Examples/Examples.pro
+lib/qcad/scripts/Misc/Examples/IOExamples/ExCsvExport/ExCsvExport.js
+lib/qcad/scripts/Misc/Examples/IOExamples/ExCsvExport/ExCsvExport.pro
+lib/qcad/scripts/Misc/Examples/IOExamples/ExCsvExport/ExCsvExportInit.js
lib/qcad/scripts/Misc/Examples/IOExamples/ExDumpPolyline/ExDumpPolyline.js
lib/qcad/scripts/Misc/Examples/IOExamples/ExDumpPolyline/ExDumpPolyline.pro
lib/qcad/scripts/Misc/Examples/IOExamples/ExDumpPolyline/points.txt
@@ -7556,6 +7513,8 @@ lib/qcad/scripts/Misc/MiscInformation/In
lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoCentroidsListener/InfoCentroidsListener.js
lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoCentroidsListener/InfoCentroidsListener.pro
lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoCentroidsListener/InfoCentroidsListener.svg
+lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoCentroidsListener/InfoCentroidsListenerActive.svg
+lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoCentroidsListener/InfoCentroidsListenerInactive.svg
lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoCentroidsListener/InfoCentroidsListenerInit.js
lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoSumCentroidsWeighted/InfoSumCentroidsWeighted-inverse.svg
lib/qcad/scripts/Misc/MiscInformation/InfoCentroids/InfoSumCentroidsWeighted/InfoSumCentroidsWeighted.js
@@ -7586,9 +7545,12 @@ lib/qcad/scripts/Misc/MiscSelect/MiscSel
lib/qcad/scripts/Misc/MiscSelect/MiscSelect.pro
lib/qcad/scripts/Misc/MiscSelect/SelectByColor/SelectByColor.js
lib/qcad/scripts/Misc/MiscSelect/SelectByColor/SelectByColor.pro
+lib/qcad/scripts/Misc/MiscSelect/SelectByColor/SelectByColor.svg
lib/qcad/scripts/Misc/MiscSelect/SelectByColor/SelectByColorInit.js
+lib/qcad/scripts/Misc/MiscSelect/SelectByHandle/SelectByHandle-inverse.svg
lib/qcad/scripts/Misc/MiscSelect/SelectByHandle/SelectByHandle.js
lib/qcad/scripts/Misc/MiscSelect/SelectByHandle/SelectByHandle.pro
+lib/qcad/scripts/Misc/MiscSelect/SelectByHandle/SelectByHandle.svg
lib/qcad/scripts/Misc/MiscSelect/SelectByHandle/SelectByHandleDialog.ui
lib/qcad/scripts/Misc/MiscSelect/SelectByHandle/SelectByHandleInit.js
lib/qcad/scripts/Misc/MiscSelect/dir/dir.pro
@@ -7630,14 +7592,13 @@ lib/qcad/scripts/Misc/Tutorials/Tutorial
lib/qcad/scripts/Misc/Tutorials/Tutorials.pro
lib/qcad/scripts/Misc/Tutorials/dir/dir.pro
lib/qcad/scripts/Misc/dir/dir.pro
-lib/qcad/scripts/Misc/doc/Examples_de.html
-lib/qcad/scripts/Misc/doc/Examples_en.html
-lib/qcad/scripts/Misc/doc/Examples_ja.html
lib/qcad/scripts/Misc/doc/Misc.png
lib/qcad/scripts/Misc/doc/Misc_da.html
lib/qcad/scripts/Misc/doc/Misc_de.html
lib/qcad/scripts/Misc/doc/Misc_en.html
+lib/qcad/scripts/Misc/doc/Misc_es.html
lib/qcad/scripts/Misc/doc/Misc_ja.html
+lib/qcad/scripts/Misc/doc/Misc_pl.html
lib/qcad/scripts/Misc/doc/Misc_ru.html
lib/qcad/scripts/Misc/doc/Misc_sl.html
lib/qcad/scripts/Misc/translations.pri
@@ -9041,6 +9002,7 @@ lib/qcad/scripts/Modify/Translate/doc/Tr
lib/qcad/scripts/Modify/Translate/doc/Translate_ru.html
lib/qcad/scripts/Modify/Translate/doc/Translate_sl.html
lib/qcad/scripts/Modify/Translate/doc/Translate_sv.html
+lib/qcad/scripts/Modify/TranslateRotate/PreferencesPage.ui
lib/qcad/scripts/Modify/TranslateRotate/Tests/TranslateRotateTest00.js
lib/qcad/scripts/Modify/TranslateRotate/Tests/TranslateRotateTest01.js
lib/qcad/scripts/Modify/TranslateRotate/Tests/TranslateRotateTest02.js
@@ -9056,6 +9018,7 @@ lib/qcad/scripts/Modify/TranslateRotate/
lib/qcad/scripts/Modify/TranslateRotate/TranslateRotateDialog.svg
lib/qcad/scripts/Modify/TranslateRotate/TranslateRotateDialog.ui
lib/qcad/scripts/Modify/TranslateRotate/TranslateRotateInit.js
+lib/qcad/scripts/Modify/TranslateRotate/TranslateRotateNoDialog.ui
lib/qcad/scripts/Modify/TranslateRotate/doc/TranslateRotate.png
lib/qcad/scripts/Modify/TranslateRotate/doc/TranslateRotateDialog.png
lib/qcad/scripts/Modify/TranslateRotate/doc/TranslateRotateFigure.dxf
@@ -10867,6 +10830,10 @@ lib/qcad/scripts/Tools/MergeDrawings/Mer
lib/qcad/scripts/Tools/Tools.pro
lib/qcad/scripts/Tools/arguments.js
lib/qcad/scripts/Tools/dir/dir.pro
+lib/qcad/scripts/Tutorial/GenerateTutorial/doc/GenerateTutorial_da.html
+lib/qcad/scripts/Tutorial/GenerateTutorial/doc/GenerateTutorial_es.html
+lib/qcad/scripts/Tutorial/GenerateTutorial/doc/GenerateTutorial_ja.html
+lib/qcad/scripts/Tutorial/GenerateTutorial/doc/GenerateTutorial_pl.html
lib/qcad/scripts/View/AntialiasingMode/AntialiasingMode-inverse.svg
lib/qcad/scripts/View/AntialiasingMode/AntialiasingMode.js
lib/qcad/scripts/View/AntialiasingMode/AntialiasingMode.pro
@@ -11096,23 +11063,6 @@ lib/qcad/scripts/View/LinetypeMode/doc/L
lib/qcad/scripts/View/LinetypeMode/doc/LinetypeMode_ru.html
lib/qcad/scripts/View/LinetypeMode/doc/LinetypeMode_sl.html
lib/qcad/scripts/View/LinetypeMode/doc/LinetypeMode_sv.html
-lib/qcad/scripts/View/OptionsToolBarFocus/OptionsToolBarFocus.js
-lib/qcad/scripts/View/OptionsToolBarFocus/OptionsToolBarFocus.pro
-lib/qcad/scripts/View/OptionsToolBarFocus/OptionsToolBarFocusInit.js
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_bg.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_da.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_de.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_en.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_es.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_fr.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_it.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_ja.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_nl.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_pl.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_pt.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_ru.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_sl.html
-lib/qcad/scripts/View/OptionsToolBarFocus/doc/OptionsToolBarFocus_sv.html
lib/qcad/scripts/View/ShowToolDialog/ShowToolDialog.js
lib/qcad/scripts/View/ShowToolDialog/ShowToolDialog.pro
lib/qcad/scripts/View/ToggleGrid/ToggleGrid-inverse.svg
@@ -11635,6 +11585,7 @@ lib/qcad/scripts/Widgets/LayerList/layer
lib/qcad/scripts/Widgets/LayerList/layerstatus_11.svg
lib/qcad/scripts/Widgets/MenuBar/MenuBar.js
lib/qcad/scripts/Widgets/MenuBar/MenuBar.pro
+lib/qcad/scripts/Widgets/MenuBar/MenuBarInit.js
lib/qcad/scripts/Widgets/MenuBar/PreferencesPage.ui
lib/qcad/scripts/Widgets/MouseDisplay/Mouse-inverse.svg
lib/qcad/scripts/Widgets/MouseDisplay/Mouse.svg
@@ -11858,6 +11809,7 @@ lib/qcad/scripts/lib/sprintf2/sprintf2.j
lib/qcad/scripts/library.js
lib/qcad/scripts/map.js
lib/qcad/scripts/mimetype.png
+lib/qcad/scripts/org.qcad.QCAD.png
lib/qcad/scripts/qcad_icon.png
lib/qcad/scripts/qcad_icon.svg
lib/qcad/scripts/scripts.dox
@@ -12011,13 +11963,17 @@ lib/qcad/ts/assistant_de.qm
lib/qcad/ts/assistant_en.qm
lib/qcad/ts/assistant_es.qm
lib/qcad/ts/assistant_fr.qm
+lib/qcad/ts/assistant_hr.qm
lib/qcad/ts/assistant_hu.qm
lib/qcad/ts/assistant_ja.qm
lib/qcad/ts/assistant_ko.qm
+lib/qcad/ts/assistant_nl.qm
lib/qcad/ts/assistant_pl.qm
+lib/qcad/ts/assistant_pt_BR.qm
lib/qcad/ts/assistant_ru.qm
lib/qcad/ts/assistant_sk.qm
lib/qcad/ts/assistant_sl.qm
+lib/qcad/ts/assistant_tr.qm
lib/qcad/ts/assistant_uk.qm
lib/qcad/ts/assistant_zh_CN.qm
lib/qcad/ts/assistant_zh_TW.qm
@@ -12029,13 +11985,16 @@ lib/qcad/ts/designer_de.qm
lib/qcad/ts/designer_en.qm
lib/qcad/ts/designer_es.qm
lib/qcad/ts/designer_fr.qm
+lib/qcad/ts/designer_hr.qm
lib/qcad/ts/designer_hu.qm
lib/qcad/ts/designer_ja.qm
lib/qcad/ts/designer_ko.qm
+lib/qcad/ts/designer_nl.qm
lib/qcad/ts/designer_pl.qm
lib/qcad/ts/designer_ru.qm
lib/qcad/ts/designer_sk.qm
lib/qcad/ts/designer_sl.qm
+lib/qcad/ts/designer_tr.qm
lib/qcad/ts/designer_uk.qm
lib/qcad/ts/designer_zh_CN.qm
lib/qcad/ts/designer_zh_TW.qm
@@ -12047,13 +12006,18 @@ lib/qcad/ts/linguist_de.qm
lib/qcad/ts/linguist_en.qm
lib/qcad/ts/linguist_es.qm
lib/qcad/ts/linguist_fr.qm
+lib/qcad/ts/linguist_hr.qm
lib/qcad/ts/linguist_hu.qm
+lib/qcad/ts/linguist_it.qm
lib/qcad/ts/linguist_ja.qm
lib/qcad/ts/linguist_ko.qm
+lib/qcad/ts/linguist_nl.qm
lib/qcad/ts/linguist_pl.qm
lib/qcad/ts/linguist_ru.qm
lib/qcad/ts/linguist_sk.qm
lib/qcad/ts/linguist_sl.qm
+lib/qcad/ts/linguist_sv.qm
+lib/qcad/ts/linguist_tr.qm
lib/qcad/ts/linguist_uk.qm
lib/qcad/ts/linguist_zh_CN.qm
lib/qcad/ts/linguist_zh_TW.qm
@@ -12276,10 +12240,12 @@ lib/qcad/ts/qt_es.qm
lib/qcad/ts/qt_fa.qm
lib/qcad/ts/qt_fi.qm
lib/qcad/ts/qt_fr.qm
+lib/qcad/ts/qt_gd.qm
lib/qcad/ts/qt_gl.qm
lib/qcad/ts/qt_he.qm
lib/qcad/ts/qt_help_ar.qm
lib/qcad/ts/qt_help_bg.qm
+lib/qcad/ts/qt_help_ca.qm
lib/qcad/ts/qt_help_cs.qm
lib/qcad/ts/qt_help_da.qm
lib/qcad/ts/qt_help_de.qm
@@ -12287,28 +12253,40 @@ lib/qcad/ts/qt_help_en.qm
lib/qcad/ts/qt_help_es.qm
lib/qcad/ts/qt_help_fr.qm
lib/qcad/ts/qt_help_gl.qm
+lib/qcad/ts/qt_help_hr.qm
lib/qcad/ts/qt_help_hu.qm
lib/qcad/ts/qt_help_it.qm
lib/qcad/ts/qt_help_ja.qm
lib/qcad/ts/qt_help_ko.qm
+lib/qcad/ts/qt_help_nl.qm
+lib/qcad/ts/qt_help_nn.qm
lib/qcad/ts/qt_help_pl.qm
+lib/qcad/ts/qt_help_pt_BR.qm
lib/qcad/ts/qt_help_ru.qm
lib/qcad/ts/qt_help_sk.qm
lib/qcad/ts/qt_help_sl.qm
+lib/qcad/ts/qt_help_tr.qm
lib/qcad/ts/qt_help_uk.qm
lib/qcad/ts/qt_help_zh_CN.qm
lib/qcad/ts/qt_help_zh_TW.qm
+lib/qcad/ts/qt_hr.qm
lib/qcad/ts/qt_hu.qm
lib/qcad/ts/qt_it.qm
lib/qcad/ts/qt_ja.qm
lib/qcad/ts/qt_ko.qm
lib/qcad/ts/qt_lt.qm
+lib/qcad/ts/qt_lv.qm
+lib/qcad/ts/qt_nl.qm
+lib/qcad/ts/qt_nn.qm
lib/qcad/ts/qt_pl.qm
lib/qcad/ts/qt_pt.qm
+lib/qcad/ts/qt_pt_BR.qm
+lib/qcad/ts/qt_pt_PT.qm
lib/qcad/ts/qt_ru.qm
lib/qcad/ts/qt_sk.qm
lib/qcad/ts/qt_sl.qm
lib/qcad/ts/qt_sv.qm
+lib/qcad/ts/qt_tr.qm
lib/qcad/ts/qt_uk.qm
lib/qcad/ts/qt_zh_CN.qm
lib/qcad/ts/qt_zh_TW.qm
@@ -12320,10 +12298,12 @@ lib/qcad/ts/qtbase_da.qm
lib/qcad/ts/qtbase_de.qm
lib/qcad/ts/qtbase_en.qm
lib/qcad/ts/qtbase_es.qm
+lib/qcad/ts/qtbase_fa.qm
lib/qcad/ts/qtbase_fi.qm
lib/qcad/ts/qtbase_fr.qm
lib/qcad/ts/qtbase_gd.qm
lib/qcad/ts/qtbase_he.qm
+lib/qcad/ts/qtbase_hr.qm
lib/qcad/ts/qtbase_hu.qm
lib/qcad/ts/qtbase_it.qm
lib/qcad/ts/qtbase_ja.qm
@@ -12331,14 +12311,18 @@ lib/qcad/ts/qtbase_ko.qm
lib/qcad/ts/qtbase_lv.qm
lib/qcad/ts/qtbase_nl.qm
lib/qcad/ts/qtbase_nl.ts
+lib/qcad/ts/qtbase_nn.qm
lib/qcad/ts/qtbase_pl.qm
lib/qcad/ts/qtbase_pt.qm
lib/qcad/ts/qtbase_pt.ts
+lib/qcad/ts/qtbase_pt_BR.qm
lib/qcad/ts/qtbase_ru.qm
lib/qcad/ts/qtbase_sk.qm
+lib/qcad/ts/qtbase_tr.qm
lib/qcad/ts/qtbase_uk.qm
lib/qcad/ts/qtbase_zh_CN.qm
lib/qcad/ts/qtbase_zh_CN.ts
+lib/qcad/ts/qtbase_zh_TW.qm
lib/qcad/ts/qtconfig_hu.qm
lib/qcad/ts/qtconfig_ja.qm
lib/qcad/ts/qtconfig_ko.qm
@@ -12820,7 +12804,6 @@ share/qcad/readme.txt
@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseRR/Tests/actual
@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseOffsetThrough/Tests/actual
@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseOffset/Tests/actual
-@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseInscribedQuad/Tests/actual
@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseDD/Tests/actual
@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseCPP/Tests/actual
@pkgdir lib/qcad/scripts/Draw/Ellipse/EllipseArcCPPA/Tests/actual
@@ -12862,3 +12845,4 @@ share/qcad/readme.txt
@pkgdir lib/qcad/scripts/Block/EditBlock/Tests/actual
@pkgdir lib/qcad/scripts/Block/CreateBlock/Tests/actual
@pkgdir lib/qcad/scripts/Block/AddBlock/Tests/actual
+@pkgdir lib/plugins
Index: pkgsrc/cad/qcad/distinfo
diff -u pkgsrc/cad/qcad/distinfo:1.45 pkgsrc/cad/qcad/distinfo:1.46
--- pkgsrc/cad/qcad/distinfo:1.45 Thu Jan 4 21:50:29 2024
+++ pkgsrc/cad/qcad/distinfo Sun Mar 16 14:56:12 2025
@@ -1,32 +1,20 @@
-$NetBSD: distinfo,v 1.45 2024/01/04 21:50:29 plunky Exp $
+$NetBSD: distinfo,v 1.46 2025/03/16 14:56:12 plunky Exp $
-BLAKE2s (qcad-3.28.2.2.tar.gz) = 110caae967b322832f9aaaef6396130642ba2aac51f071e94968f69ed4404901
-SHA512 (qcad-3.28.2.2.tar.gz) = 2e4b677d73ae5ae3d639d3f92d4800862df0551ab3e4b0c79c4a946db84fd5124f17376cbcd76ea3a5688e29c2f50573843d6e9bbd5fe916d5945e999e1ed64e
-Size (qcad-3.28.2.2.tar.gz) = 42292122 bytes
-SHA1 (patch-qcad.pro) = b8dafdf3105ff3580815bb82a6a84b71f4d0b172
+BLAKE2s (qcad-3.32.2.0.tar.gz) = 3e150349b061c13c5d6f27bcc2db515f53a52bd6314066bb95660465b76e5121
+SHA512 (qcad-3.32.2.0.tar.gz) = b13bfad1f2aa714949f82baa4ba80f264f1353e768264cb74225e24eab876fe763e0b4551ece6497ca251946e0aee1349d28478738c855a6b00a7178308a041d
+Size (qcad-3.32.2.0.tar.gz) = 43092869 bytes
+BLAKE2s (qcad-qcadjsapi-v3.32.2.0.tar.gz) = b74a6ba6c3bd9cad94af6dd7ee46968a44adeec430f808a7e5c0f2338da3cace
+SHA512 (qcad-qcadjsapi-v3.32.2.0.tar.gz) = 0a4e496938d56cef6c22869bd0b792dd04d5a9ed15c99f4c6307f688202a31b3762518063fda3bc79b1079322dd7a4c5b5c7c74bd6a3d4eb0f5c6ed06dff446c
+Size (qcad-qcadjsapi-v3.32.2.0.tar.gz) = 3471956 bytes
+BLAKE2s (qcad-qtjsapi-v3.32.2.0.tar.gz) = 9ed9cc79e86e069fb89936daca01fff50678247a04f5f08cc9298a90c1b7060b
+SHA512 (qcad-qtjsapi-v3.32.2.0.tar.gz) = d78fb2b03378e04a973af5ec77b41ee60091e25e0fadf8ec98b018326af337803f75902c60a561cdf91813beb8453b04c58191e308f807228623ecf018aefe10
+Size (qcad-qtjsapi-v3.32.2.0.tar.gz) = 3167711 bytes
SHA1 (patch-scripts_Help_ShowReadme_ShowReadme.js) = 96412237a7c4422f02dc5d2ab3634457b376a2d2
-SHA1 (patch-shared.pri) = f0b3ca615636c7fc2edc1af3b25b7aef2d9393ac
-SHA1 (patch-shared__app.pri) = bd3d4b1800a6589bb4bfa35e4ab56c82ccb7fe17
-SHA1 (patch-src_3rdparty_3rdparty.pro) = 462cab6afdf87cfc4361585da713798d183e547b
-SHA1 (patch-src_3rdparty_dxflib_dxflib.pro) = 7229800bfa5f04a475111f68cf26581e6ea41e83
-SHA1 (patch-src_3rdparty_legacy_spatialindexnavel_spatialindexnavel.pro) = a271bef49285ae76b08c46fa7ce7938b22ce9c0a
-SHA1 (patch-src_3rdparty_opennurbs_opennurbs.pro) = d96e1ce129d32703fc474aea71afdae1d4b537ed
-SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp) = 26385c45b2132909470aba79181c242c785614a7
-SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.h) = 333fe1510cc5ea2457eefd7d07ccaf034ee5d22f
-SHA1 (patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro) = 7120c49027d4a50c23b1e9e60c44a1e0a239d6ac
+SHA1 (patch-src_3rdparty_CMakeLists.txt) = 789a1d14b9c74374a7333bddc931ea6ffa2fac56
+SHA1 (patch-src_3rdparty_opennurbs_CMakeLists.txt) = 0e5a5b4547840c38a3b18fdfbf2c716c1e30be50
+SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp) = 5691a80688cfe135a1d47ce340768c6db6c60c66
+SHA1 (patch-src_3rdparty_opennurbs_opennurbs__zlib.h) = e83185090c36a7d502d11852b0469e26be523d51
+SHA1 (patch-src_CMakeLists.txt) = 37e003e48e51d43abfa4509ecbe2003a703aadc2
SHA1 (patch-src_core_RS.cpp) = a8814a6f475bde9c7ff03c3066e13daff2313ac5
-SHA1 (patch-src_core_RSettings.cpp) = 3fc5cea42fae1b9ace651f68f38dad62dfe0e88a
-SHA1 (patch-src_core_core.pro) = 3b2c68139457f08205896b94e44ebf6c09eb6bfe
-SHA1 (patch-src_customwidgets_customwidgets.pro) = 8bac25b8f02092464591019be961470a45c810cc
-SHA1 (patch-src_entity_entity.pro) = 5452a432726c598036be0a816ee040c68313519e
-SHA1 (patch-src_grid_grid.pro) = 65f5f47cce612b31181a0ac3e153214d29f08767
-SHA1 (patch-src_gui_gui.pro) = 938fdcb8715ec78550ebff80400ab66be551584d
-SHA1 (patch-src_io_dxf_dxf.pro) = 3ac31fda7170202334d0fead5b010e88b780f8aa
-SHA1 (patch-src_operations_operations.pro) = d10b38594f29ae07febdb52339049646926c2252
+SHA1 (patch-src_core_RSettings.cpp) = d59135a840520f88abb5ed37ae6bd511f0578c92
SHA1 (patch-src_run_main.cpp) = 2414fdbd6434c5a7d12647f9f964775b01fcee6a
-SHA1 (patch-src_run_run.pri) = fca4570872f9fc7b25beac8dfd0c4802b81d3972
-SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 8105fd89a8b52962f9e0c1ff80cf154ceb09145e
-SHA1 (patch-src_scripts_scripts.pro) = 7019dd69451b2594890c14f9ebf688a15cf81ee4
-SHA1 (patch-src_snap_snap.pro) = 9464576805a1d2baa81c91f759e59a8cc3989b6a
-SHA1 (patch-src_spatialindex_spatialindex.pro) = 2dfbdcbefec8893253e7fab312c6355afb41b449
-SHA1 (patch-src_stemmer_stemmer.pro) = 801530913fa0fbc4f5de4e9890940b7113fd6177
Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp
diff -u pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp:1.1 pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp:1.2
--- pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp:1.1 Mon Dec 18 21:21:44 2017
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp Sun Mar 16 14:56:12 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp,v 1.1 2017/12/18 21:21:44 plunky Exp $
+$NetBSD: patch-src_3rdparty_opennurbs_opennurbs__zlib.cpp,v 1.2 2025/03/16 14:56:12 plunky Exp $
-don't provide own zlib
+don't provide zlib, use pkgsrc version
--- src/3rdparty/opennurbs/opennurbs_zlib.cpp.orig 2017-12-18 11:43:25.553607369 +0000
+++ src/3rdparty/opennurbs/opennurbs_zlib.cpp
Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.h
diff -u pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.h:1.1 pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.h:1.2
--- pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.h:1.1 Mon Dec 18 21:21:44 2017
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs__zlib.h Sun Mar 16 14:56:12 2025
@@ -1,24 +1,23 @@
-$NetBSD: patch-src_3rdparty_opennurbs_opennurbs__zlib.h,v 1.1 2017/12/18 21:21:44 plunky Exp $
+$NetBSD: patch-src_3rdparty_opennurbs_opennurbs__zlib.h,v 1.2 2025/03/16 14:56:12 plunky Exp $
-don't provide own zlib
+don't provide zlib, use pkgsrc version
---- src/3rdparty/opennurbs/opennurbs_zlib.h.orig 2017-12-18 11:43:25.553865013 +0000
+--- src/3rdparty/opennurbs/opennurbs_zlib.h.orig 2025-02-20 12:25:22.000000000 +0000
+++ src/3rdparty/opennurbs/opennurbs_zlib.h
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,6 @@
#if !defined(Z_PREFIX)
/* decorates zlib functions with a "z_" prefix to prevent symbol collision. */
-#define Z_PREFIX
-+//#define Z_PREFIX
#endif
#if !defined(MY_ZCALLOC)
-@@ -38,7 +38,7 @@
- //#define MY_ZCALLOC
+@@ -39,7 +38,7 @@
#endif
+ extern "C" {
-#include "./zlib/zlib.h"
+#include <zlib.h>
+ }
ON_BEGIN_EXTERNC
- voidpf zcalloc (voidpf, unsigned, unsigned);
Index: pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp
diff -u pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp:1.2 pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp:1.3
--- pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp:1.2 Thu Sep 5 13:39:10 2019
+++ pkgsrc/cad/qcad/patches/patch-src_core_RSettings.cpp Sun Mar 16 14:56:12 2025
@@ -1,34 +1,22 @@
-$NetBSD: patch-src_core_RSettings.cpp,v 1.2 2019/09/05 13:39:10 nia Exp $
+$NetBSD: patch-src_core_RSettings.cpp,v 1.3 2025/03/16 14:56:12 plunky Exp $
fix hardcoded paths
---- src/core/RSettings.cpp.orig 2019-07-18 15:47:56.000000000 +0000
+--- src/core/RSettings.cpp.orig 2025-02-20 12:25:22.000000000 +0000
+++ src/core/RSettings.cpp
-@@ -345,27 +345,7 @@ bool RSettings::isDeployed() {
+@@ -376,6 +376,7 @@ bool RSettings::isDeployed() {
* \return Path where all application resources are stored ('scripts', 'patterns', 'ts', 'doc', 'linetypes', ...)
*/
QString RSettings::getApplicationPath() {
-- QDir ret(QApplication::applicationDirPath());
--
--#ifdef Q_OS_MAC
-- if (ret.dirName() == "MacOS") {
-- ret.cdUp();
-- // deployed (scripts inside app bundle):
-- if (ret.cd("Resources/scripts")) {
-- ret.cdUp();
-- }
-- // development (scripts outside add bundle):
-- else {
-- ret.cdUp();
-- ret.cdUp();
-- }
-- }
--#endif
--
-- if (ret.dirName() == "debug" || ret.dirName() == "release") {
-- ret.cdUp();
-- }
--
++#if 0
+ QDir ret(QApplication::applicationDirPath());
+
+ #ifdef Q_OS_MAC
+@@ -397,6 +398,8 @@ QString RSettings::getApplicationPath()
+ ret.cdUp();
+ }
+
++#endif
+ QDir ret("@PREFIX@/lib/qcad");
return ret.path();
}
Added files:
Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_3rdparty_CMakeLists.txt:1.1
--- /dev/null Sun Mar 16 14:56:13 2025
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_CMakeLists.txt Sun Mar 16 14:56:12 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_3rdparty_CMakeLists.txt,v 1.1 2025/03/16 14:56:12 plunky Exp $
+
+don't provide libstemmer, use pkgsrc version
+
+--- src/3rdparty/CMakeLists.txt.orig 2025-03-11 20:29:01.577633096 +0000
++++ src/3rdparty/CMakeLists.txt
+@@ -6,7 +6,6 @@ include(../../CMakeInclude.txt)
+ add_subdirectory(dxflib)
+ add_subdirectory(opennurbs)
+ add_subdirectory(spatialindexnavel)
+-add_subdirectory(stemmer)
+
+ IF(NOT BUILD_QT6)
+ add_subdirectory(qt-labs-qtscriptgenerator-5.5.0)
Index: pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_CMakeLists.txt:1.1
--- /dev/null Sun Mar 16 14:56:13 2025
+++ pkgsrc/cad/qcad/patches/patch-src_3rdparty_opennurbs_CMakeLists.txt Sun Mar 16 14:56:12 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_3rdparty_opennurbs_CMakeLists.txt,v 1.1 2025/03/16 14:56:12 plunky Exp $
+
+don't provide zlib, use pkgsrc version
+
+--- src/3rdparty/opennurbs/CMakeLists.txt.orig 2025-03-09 09:31:31.081861147 +0000
++++ src/3rdparty/opennurbs/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ cmake_minimum_required(VERSION 3.16)
+ project(opennurbs VERSION 1.0 LANGUAGES CXX C)
+
+-add_subdirectory(zlib)
+ add_subdirectory(opennurbs)
Index: pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null Sun Mar 16 14:56:13 2025
+++ pkgsrc/cad/qcad/patches/patch-src_CMakeLists.txt Sun Mar 16 14:56:12 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2025/03/16 14:56:12 plunky Exp $
+
+turn off debug output
+
+include qtjsapi (library) and qcadjsapi (plugin) in build
+
+--- src/CMakeLists.txt.orig 2025-02-20 12:25:22.000000000 +0000
++++ src/CMakeLists.txt
+@@ -3,6 +3,8 @@ project(src VERSION 1.0 LANGUAGES CXX)
+
+ include(../CMakeInclude.txt)
+
++add_compile_definitions(QT_DEBUG_NO_OUTPUT)
++
+ add_subdirectory(3rdparty)
+ add_subdirectory(core)
+ add_subdirectory(spatialindex)
+@@ -16,6 +18,8 @@ add_subdirectory(stemmer)
+ add_subdirectory(customwidgets)
+ add_subdirectory(run)
+ add_subdirectory(scripts)
++add_subdirectory(qtjsapi)
++add_subdirectory(qcadjsapi)
+ if(NOT BUILD_QT6)
+ message("Qt 5")
+ add_subdirectory(scripting)
Home |
Main Index |
Thread Index |
Old Index