summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
Diffstat (limited to 'cad')
-rw-r--r--cad/cura-engine/Makefile4
-rw-r--r--cad/freecad-devel/Makefile1
-rw-r--r--cad/fritzing/files/patch-src_commands.cpp25
-rw-r--r--cad/fritzing/files/patch-src_fapplication.cpp4
-rw-r--r--cad/fritzing/files/patch-src_items_itembase.cpp8
-rw-r--r--cad/fritzing/files/patch-src_items_paletteitembase.cpp6
-rw-r--r--cad/fritzing/files/patch-src_model_modelbase.cpp4
-rw-r--r--cad/fritzing/files/patch-src_sketch_sketchwidget.cpp19
-rw-r--r--cad/fritzing/files/patch-src_utils_textutils.cpp6
-rw-r--r--cad/openscad-devel/Makefile1
10 files changed, 56 insertions, 22 deletions
diff --git a/cad/cura-engine/Makefile b/cad/cura-engine/Makefile
index 6a06a20f0ed2..612a8cd1ea18 100644
--- a/cad/cura-engine/Makefile
+++ b/cad/cura-engine/Makefile
@@ -1,6 +1,6 @@
PORTNAME= CuraEngine
PORTVERSION= 5.7.0
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= cad
DIST_SUBDIR= Ultimaker
@@ -41,7 +41,7 @@ CMAKE_ARGS+= -DUSE_SYSTEM_LIBS:BOOL=ON \
-DStb_FOUND:BOOL=ON \
-DStb_INCLUDE_DIRS=${WRKSRC}/include/stb
LDFLAGS+= -L${LOCALBASE}/lib
-WITH_DEBUGINFO= 1 # Will segfault if Release
+#WITH_DEBUGINFO= 1 # Will segfault if Release
PLIST_FILES= bin/CuraEngine
diff --git a/cad/freecad-devel/Makefile b/cad/freecad-devel/Makefile
index 47f33f0ab247..c574aadb9074 100644
--- a/cad/freecad-devel/Makefile
+++ b/cad/freecad-devel/Makefile
@@ -1,6 +1,5 @@
PORTNAME= FreeCAD
DISTVERSION= r${GIT_SRC_DATE}
-#PORTREVISION= 1
CATEGORIES= cad
PKGNAMESUFFIX= -devel
diff --git a/cad/fritzing/files/patch-src_commands.cpp b/cad/fritzing/files/patch-src_commands.cpp
new file mode 100644
index 000000000000..78311931faf8
--- /dev/null
+++ b/cad/fritzing/files/patch-src_commands.cpp
@@ -0,0 +1,25 @@
+Fix build with Qt 6.10.1. The QString::arg() method no longer accepts
+implicit conversions. [1]
+
+[1] https://doc.qt.io/qt-6/qstring.html#arg-2
+
+--- src/commands.cpp.orig 2025-10-07 13:46:45 UTC
++++ src/commands.cpp
+@@ -509,7 +509,7 @@ QString FlipItemCommand::getParamString() const {
+ + BaseCommand::getParamString() +
+ QString(" id:%1 by:%2")
+ .arg(m_itemID)
+- .arg(m_orientation);
++ .arg(static_cast<int>(m_orientation));
+ }
+
+ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -1830,7 +1830,7 @@ QString RotateFlipLabelCommand::getParamString() const
+ }
+
+ result += QString(" id:%1 degrees:%2 orientation:%3")
+- .arg(m_itemID).arg(m_degrees).arg(m_orientation);
++ .arg(m_itemID).arg(m_degrees).arg(static_cast<int>(m_orientation));
+
+ return result;
+ }
diff --git a/cad/fritzing/files/patch-src_fapplication.cpp b/cad/fritzing/files/patch-src_fapplication.cpp
index 862bb95c5307..570939bce680 100644
--- a/cad/fritzing/files/patch-src_fapplication.cpp
+++ b/cad/fritzing/files/patch-src_fapplication.cpp
@@ -1,6 +1,6 @@
---- src/fapplication.cpp.orig 2025-04-02 10:33:24 UTC
+--- src/fapplication.cpp.orig 2025-10-07 13:46:45 UTC
+++ src/fapplication.cpp
-@@ -895,19 +895,7 @@ bool FApplication::loadReferenceModel(const QString &
+@@ -897,19 +897,7 @@ bool FApplication::loadReferenceModel(const QString &
QFileInfo info(dbPath);
bool dbExists = (info.size() > 0) && !fullLoad;
diff --git a/cad/fritzing/files/patch-src_items_itembase.cpp b/cad/fritzing/files/patch-src_items_itembase.cpp
index 3c9ce55a0bbc..69ff49c70d5f 100644
--- a/cad/fritzing/files/patch-src_items_itembase.cpp
+++ b/cad/fritzing/files/patch-src_items_itembase.cpp
@@ -1,4 +1,4 @@
---- src/items/itembase.cpp.orig 2025-04-02 10:33:24 UTC
+--- src/items/itembase.cpp.orig 2025-10-07 13:46:45 UTC
+++ src/items/itembase.cpp
@@ -55,6 +55,8 @@ along with Fritzing. If not, see <http://www.gnu.org/
#include <QClipboard>
@@ -9,11 +9,13 @@
/////////////////////////////////
static QRegularExpression NumberMatcher;
-@@ -1999,7 +2001,7 @@ void ItemBase::debugInfo2(const QString & msg) const
+@@ -2006,8 +2008,8 @@ void ItemBase::debugInfo2(const QString & msg) const
+ .arg(this->instanceTitle())
.arg(this->viewLayerID())
.arg(this->viewLayerPlacement())
- .arg(this->wireFlags())
+- .arg(this->wireFlags())
- .arg((long) dynamic_cast<const QGraphicsItem *>(this), 0, 16)
++ .arg(this->wireFlags().toInt())
+ .arg(static_cast<long>(reinterpret_cast<std::uintptr_t>(dynamic_cast<const QGraphicsItem *>(this))), 0, 16)
.arg(m_viewID)
.arg(this->zValue())
diff --git a/cad/fritzing/files/patch-src_items_paletteitembase.cpp b/cad/fritzing/files/patch-src_items_paletteitembase.cpp
index 2d19f2a299f8..0b7469b77f42 100644
--- a/cad/fritzing/files/patch-src_items_paletteitembase.cpp
+++ b/cad/fritzing/files/patch-src_items_paletteitembase.cpp
@@ -1,6 +1,6 @@
---- src/items/paletteitembase.cpp.orig 2025-04-02 10:33:24 UTC
+--- src/items/paletteitembase.cpp.orig 2025-10-07 13:46:45 UTC
+++ src/items/paletteitembase.cpp
-@@ -626,7 +626,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLa
+@@ -653,7 +653,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLa
//DebugDialog::debug(QString("path: %1").arg(path));
@@ -9,7 +9,7 @@
if (!svg.isEmpty()) return svg;
SvgFileSplitter splitter;
-@@ -657,7 +657,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLa
+@@ -684,7 +684,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLa
return "";
}
svg = splitter.elementString(xmlName);
diff --git a/cad/fritzing/files/patch-src_model_modelbase.cpp b/cad/fritzing/files/patch-src_model_modelbase.cpp
index 3424010641d4..6283f067f24f 100644
--- a/cad/fritzing/files/patch-src_model_modelbase.cpp
+++ b/cad/fritzing/files/patch-src_model_modelbase.cpp
@@ -1,6 +1,6 @@
---- src/model/modelbase.cpp.orig 2025-04-02 10:33:24 UTC
+--- src/model/modelbase.cpp.orig 2025-10-07 13:46:45 UTC
+++ src/model/modelbase.cpp
-@@ -895,7 +895,7 @@ ModelPart * ModelBase::createOldSchematicPartAux(Model
+@@ -909,7 +909,7 @@ ModelPart * ModelBase::createOldSchematicPartAux(Model
}
QDomDocument oldDoc;
QDomDocument::ParseResult parseResult = oldDoc.setContent(&newFzp);
diff --git a/cad/fritzing/files/patch-src_sketch_sketchwidget.cpp b/cad/fritzing/files/patch-src_sketch_sketchwidget.cpp
index 3df0f7e521a8..744133bd3dfb 100644
--- a/cad/fritzing/files/patch-src_sketch_sketchwidget.cpp
+++ b/cad/fritzing/files/patch-src_sketch_sketchwidget.cpp
@@ -1,14 +1,14 @@
---- src/sketch/sketchwidget.cpp.orig 2025-04-02 10:33:24 UTC
+--- src/sketch/sketchwidget.cpp.orig 2025-10-07 13:46:45 UTC
+++ src/sketch/sketchwidget.cpp
@@ -42,6 +42,7 @@ along with Fritzing. If not, see <http://www.gnu.org/
- #include <QStatusBar>
- #include <QOpenGLWidget>
+ #include <QRandomGenerator>
+ #include <QMimeData>
+#include <cstdint>
#include <limits>
#include "../items/partfactory.h"
-@@ -998,7 +999,7 @@ void SketchWidget::deleteItemForCommand(long id, bool
+@@ -1009,7 +1010,7 @@ void SketchWidget::deleteItemForCommand(long id, bool
void SketchWidget::deleteItemForCommand(long id, bool deleteModelPart, bool doEmit, bool later) {
ItemBase * pitem = findItem(id);
@@ -17,7 +17,7 @@
if (pitem) {
deleteItem(pitem, deleteModelPart, doEmit, later);
}
-@@ -1012,7 +1013,7 @@ void SketchWidget::deleteItem(ItemBase * itemBase, boo
+@@ -1023,7 +1024,7 @@ void SketchWidget::deleteItem(ItemBase * itemBase, boo
void SketchWidget::deleteItem(ItemBase * itemBase, bool deleteModelPart, bool doEmit, bool later)
{
long id = itemBase->id();
@@ -26,3 +26,12 @@
// this is a hack to try to workaround a Qt 4.7 crash in QGraphicsSceneFindItemBspTreeVisitor::visit
// when using a custom boundingRect, after deleting an item, it still appears on the visit list.
+@@ -1384,7 +1385,7 @@ long SketchWidget::createWire(ConnectorItem * from, Co
+ .arg(newID)
+ .arg(fromPos.x()).arg(fromPos.y())
+ .arg(toPos.x()).arg(toPos.y())
+- .arg(wireFlags)
++ .arg(wireFlags.toInt())
+ .arg(from->attachedToTitle()).arg(from->connectorSharedID())
+ .arg(to->attachedToTitle()).arg(to->connectorSharedID())
+ .arg(m_viewID)
diff --git a/cad/fritzing/files/patch-src_utils_textutils.cpp b/cad/fritzing/files/patch-src_utils_textutils.cpp
index af803869aa0d..99a153c3630e 100644
--- a/cad/fritzing/files/patch-src_utils_textutils.cpp
+++ b/cad/fritzing/files/patch-src_utils_textutils.cpp
@@ -1,6 +1,6 @@
---- src/utils/textutils.cpp.orig 2025-04-02 10:33:24 UTC
+--- src/utils/textutils.cpp.orig 2025-10-07 13:46:45 UTC
+++ src/utils/textutils.cpp
-@@ -77,7 +77,7 @@ QList<double> PowerPrefixValues;
+@@ -80,7 +80,7 @@ QList<double> PowerPrefixValues;
QList<QString> PowerPrefixes;
QList<double> PowerPrefixValues;
@@ -9,7 +9,7 @@
typedef QHash<QString /*brokenFont*/, QString /*replacementFont*/> FixedFontsHash;
-@@ -761,7 +761,7 @@ QString TextUtils::convertExtendedChars(const QString
+@@ -763,7 +763,7 @@ QString TextUtils::convertExtendedChars(const QString
result.append(c);
}
else {
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 7d004feb09e6..b90f1726d1fb 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,7 +1,6 @@
PORTNAME= openscad
PORTVERSION= ${GIT_SRC_DATE}
PORTREVISION= 1
-#PORTREVISION= 1
CATEGORIES= cad
PKGNAMESUFFIX= -devel
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 23:30:59 +0000