aboutsummaryrefslogtreecommitdiff
path: root/cad/fritzing/files
diff options
context:
space:
mode:
Diffstat (limited to 'cad/fritzing/files')
-rw-r--r--cad/fritzing/files/patch-fritzing.desktop11
-rw-r--r--cad/fritzing/files/patch-org.fritzing.Fritzing.desktop11
-rw-r--r--cad/fritzing/files/patch-phoenix.pro45
-rw-r--r--cad/fritzing/files/patch-src_connectors_connectoritem.cpp28
-rw-r--r--cad/fritzing/files/patch-src_fapplication.cpp23
-rw-r--r--cad/fritzing/files/patch-src_items_itembase.cpp20
-rw-r--r--cad/fritzing/files/patch-src_items_paletteitembase.cpp20
-rw-r--r--cad/fritzing/files/patch-src_items_resistor.cpp11
-rw-r--r--cad/fritzing/files/patch-src_model_modelbase.cpp11
-rw-r--r--cad/fritzing/files/patch-src_simulation_ngspice__simulator.cpp11
-rw-r--r--cad/fritzing/files/patch-src_sketch_sketchwidget.cpp28
-rw-r--r--cad/fritzing/files/patch-src_utils_textutils.cpp20
-rw-r--r--cad/fritzing/files/pkg-install.in15
-rw-r--r--cad/fritzing/files/pri_clipper1detect.pri4
-rw-r--r--cad/fritzing/files/pri_quazipdetect.pri7
-rw-r--r--cad/fritzing/files/pri_spicedetect.pri2
16 files changed, 204 insertions, 63 deletions
diff --git a/cad/fritzing/files/patch-fritzing.desktop b/cad/fritzing/files/patch-fritzing.desktop
deleted file mode 100644
index 3fe96b005217..000000000000
--- a/cad/fritzing/files/patch-fritzing.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- fritzing.desktop.orig 2015-03-17 13:36:55 UTC
-+++ fritzing.desktop
-@@ -2,7 +2,7 @@
- Name=Fritzing
- GenericName=Fritzing
- Comment=Electronic Design Automation software
--Exec=Fritzing
-+Exec=Fritzing -f /usr/local/share/fritzing
- Icon=fritzing
- Terminal=false
- Type=Application
diff --git a/cad/fritzing/files/patch-org.fritzing.Fritzing.desktop b/cad/fritzing/files/patch-org.fritzing.Fritzing.desktop
new file mode 100644
index 000000000000..10e4338fcd03
--- /dev/null
+++ b/cad/fritzing/files/patch-org.fritzing.Fritzing.desktop
@@ -0,0 +1,11 @@
+--- org.fritzing.Fritzing.desktop.orig 2025-04-02 10:33:24 UTC
++++ org.fritzing.Fritzing.desktop
+@@ -6,7 +6,7 @@ Comment[ru]=Создавайте схемы и вык
+ Comment=Create circuits and lay out printed circuit boards
+ Comment[fi]=Suunnittele elektronisia kytkentöjä ja piirilevyjä
+ Comment[ru]=Создавайте схемы и выкладывайте печатные платы
+-Exec=Fritzing %F
++Exec=Fritzing -f /usr/local/share/fritzing %F
+ Icon=fritzing
+ Terminal=false
+ Type=Application
diff --git a/cad/fritzing/files/patch-phoenix.pro b/cad/fritzing/files/patch-phoenix.pro
index 333e9408db20..c2792a551f1f 100644
--- a/cad/fritzing/files/patch-phoenix.pro
+++ b/cad/fritzing/files/patch-phoenix.pro
@@ -1,40 +1,11 @@
---- phoenix.pro.orig 2024-02-22 13:06:37 UTC
+--- phoenix.pro.orig 2025-10-14 05:29:12 UTC
+++ phoenix.pro
-@@ -31,7 +31,7 @@
- # QTPLUGIN += qjpeg qsqlite
+@@ -127,7 +127,7 @@ unix {
+ manpage.files += Fritzing.1
+ icon.path = $$DATADIR/pixmaps
+- icon.extra = install -D -m 0644 $$PWD/resources/images/fritzing_icon.png $(INSTALL_ROOT)$$DATADIR/pixmaps/fritzing.png
++ icon.extra = install -m 0644 $$PWD/resources/images/fritzing_icon.png $(INSTALL_ROOT)$$DATADIR/pixmaps/fritzing.png
--CONFIG += debug_and_release
-+CONFIG += release
- win32 {
- # release build using msvc 2010 needs to use Multi-threaded (/MT) for the code generation/runtime library option
- # release build using msvc 2010 needs to add msvcrt.lib;%(IgnoreSpecificDefaultLibraries) to the linker/no default libraries option
-@@ -92,7 +92,7 @@ unix {
- unix {
- !macx { # unix is defined on mac
- HARDWARE_PLATFORM = $$system(uname -m)
-- contains( HARDWARE_PLATFORM, x86_64 ) {
-+ contains( HARDWARE_PLATFORM, amd64 ) {
- DEFINES += LINUX_64
- } else {
- DEFINES += LINUX_32
-@@ -101,7 +101,7 @@ unix {
- }
-
- isEmpty(PREFIX) {
-- PREFIX = /usr
-+ PREFIX = /usr/local
- }
- BINDIR = $$PREFIX/bin
- DATADIR = $$PREFIX/share
-@@ -117,8 +117,8 @@ unix {
- manpage.path = $$DATADIR/man/man1
- manpage.files += Fritzing.1
-
-- icon.path = $$DATADIR/icons
-- icon.extra = install -D -m 0644 $$PWD/resources/images/fritzing_icon.png $(INSTALL_ROOT)$$DATADIR/icons/fritzing.png
-+ icon.path = $$DATADIR/icons/hicolor/64x64/apps
-+ icon.extra = install -m 0644 $$PWD/resources/images/fritzing_icon.png $(INSTALL_ROOT)$$DATADIR/icons/hicolor/64x64/apps/fritzing.png
-
- parts.path = $$PKGDATADIR
- parts.files += parts
+ parts.path = $$PKGDATADIR
+ parts.files += parts
diff --git a/cad/fritzing/files/patch-src_connectors_connectoritem.cpp b/cad/fritzing/files/patch-src_connectors_connectoritem.cpp
new file mode 100644
index 000000000000..d8894a8fc7d6
--- /dev/null
+++ b/cad/fritzing/files/patch-src_connectors_connectoritem.cpp
@@ -0,0 +1,28 @@
+--- src/connectors/connectoritem.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/connectors/connectoritem.cpp
+@@ -204,13 +204,15 @@ parts editor support
+ #include <QBrush>
+ #include <QPen>
+ #include <QColor>
+-#include <limits>
+ #include <QSet>
+ #include <QToolTip>
+ #include <QBitmap>
+ #include <QApplication>
+ #include <qmath.h>
+
++#include <cstdint>
++#include <limits>
++
+ #include "../sketch/infographicsview.h"
+ #include "../debugdialog.h"
+ #include "bus.h"
+@@ -490,7 +492,7 @@ ConnectorItem * ConnectorItem::removeConnection(ItemBa
+ restoreColor(visited);
+ if (itemBase) {
+ DebugDialog::debug(QString("remove from:%1 to:%2 count%3")
+- .arg((long) this, 0, 16)
++ .arg(static_cast<long>(reinterpret_cast<std::uintptr_t>(this)), 0, 16)
+ .arg(itemBase->modelPartShared()->title())
+ .arg(m_connectedTo.count()) );
+ }
diff --git a/cad/fritzing/files/patch-src_fapplication.cpp b/cad/fritzing/files/patch-src_fapplication.cpp
new file mode 100644
index 000000000000..862bb95c5307
--- /dev/null
+++ b/cad/fritzing/files/patch-src_fapplication.cpp
@@ -0,0 +1,23 @@
+--- src/fapplication.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/fapplication.cpp
+@@ -895,19 +895,7 @@ bool FApplication::loadReferenceModel(const QString &
+
+ QFileInfo info(dbPath);
+ bool dbExists = (info.size() > 0) && !fullLoad;
+-
+- QString sha;
+- if (!dbExists) {
+- // fullLoad == true means we are creating the parts database
+- // so get the sha for last commit of the parts folder and store it in the database
+- // this sha will be used to determine whether the user's parts folder can be updated from the remote repo
+- sha = PartsChecker::getSha(dir.absolutePath());
+- if (sha.isEmpty()) {
+- DebugDialog::debug(QString("1.6 SHA empty"));
+- return false;
+- }
+- referenceModel->setSha(sha);
+- }
++ referenceModel->setSha("");
+
+ // loads local parts, resource parts, and any other parts in files not in the db--these part override db parts with the same moduleID
+ QString db = databaseName;
diff --git a/cad/fritzing/files/patch-src_items_itembase.cpp b/cad/fritzing/files/patch-src_items_itembase.cpp
new file mode 100644
index 000000000000..3c9ce55a0bbc
--- /dev/null
+++ b/cad/fritzing/files/patch-src_items_itembase.cpp
@@ -0,0 +1,20 @@
+--- src/items/itembase.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/items/itembase.cpp
+@@ -55,6 +55,8 @@ along with Fritzing. If not, see <http://www.gnu.org/
+ #include <QClipboard>
+ #include <qmath.h>
+
++#include <cstdint>
++
+ /////////////////////////////////
+
+ static QRegularExpression NumberMatcher;
+@@ -1999,7 +2001,7 @@ void ItemBase::debugInfo2(const QString & msg) const
+ .arg(this->viewLayerID())
+ .arg(this->viewLayerPlacement())
+ .arg(this->wireFlags())
+- .arg((long) dynamic_cast<const QGraphicsItem *>(this), 0, 16)
++ .arg(static_cast<long>(reinterpret_cast<std::uintptr_t>(dynamic_cast<const QGraphicsItem *>(this))), 0, 16)
+ .arg(m_viewID)
+ .arg(this->zValue())
+ .arg(this->pos().x())
diff --git a/cad/fritzing/files/patch-src_items_paletteitembase.cpp b/cad/fritzing/files/patch-src_items_paletteitembase.cpp
new file mode 100644
index 000000000000..2d19f2a299f8
--- /dev/null
+++ b/cad/fritzing/files/patch-src_items_paletteitembase.cpp
@@ -0,0 +1,20 @@
+--- src/items/paletteitembase.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/items/paletteitembase.cpp
+@@ -626,7 +626,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLa
+
+ //DebugDialog::debug(QString("path: %1").arg(path));
+
+- QString svg = svgHash.value(path + xmlName + QString(QChar(m_viewLayerPlacement)), "");
++ QString svg = svgHash.value(path + xmlName + QString(QChar(static_cast<int>(m_viewLayerPlacement))), "");
+ if (!svg.isEmpty()) return svg;
+
+ SvgFileSplitter splitter;
+@@ -657,7 +657,7 @@ QString PaletteItemBase::retrieveSvg(ViewLayer::ViewLa
+ return "";
+ }
+ svg = splitter.elementString(xmlName);
+- svgHash.insert(path + xmlName + QString(QChar(m_viewLayerPlacement)), svg);
++ svgHash.insert(path + xmlName + QString(QChar(static_cast<int>(m_viewLayerPlacement))), svg);
+ return svg;
+ }
+
diff --git a/cad/fritzing/files/patch-src_items_resistor.cpp b/cad/fritzing/files/patch-src_items_resistor.cpp
new file mode 100644
index 000000000000..b7c9c8a1b67d
--- /dev/null
+++ b/cad/fritzing/files/patch-src_items_resistor.cpp
@@ -0,0 +1,11 @@
+--- src/items/resistor.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/items/resistor.cpp
+@@ -260,7 +260,7 @@ bool Resistor::collectExtraInfo(QWidget * parent, cons
+ validator->setSymbol(OhmSymbol);
+ validator->setConverter(TextUtils::convertFromPowerPrefix);
+ validator->setBounds(MIN_RESISTANCE, MAX_RESISTANCE);
+- validator->setRegularExpression(QRegularExpression(QString("((\\d{1,10})|(\\d{1,10}\\.)|(\\d{1,10}\\.\\d{1,5}))[\\x%1umkMG]{0,1}[\\x03A9]{0,1}").arg(TextUtils::MicroSymbolCode, 4, 16, QChar('0'))));
++ validator->setRegularExpression(QRegularExpression(QString("((\\d{1,10})|(\\d{1,10}\\.)|(\\d{1,10}\\.\\d{1,5}))[\\x%1umkMG]{0,1}[\\x03A9]{0,1}").arg(static_cast<int>(TextUtils::MicroSymbolCode), 4, 16, QChar('0'))));
+ focusOutComboBox->setValidator(validator);
+ connect(focusOutComboBox->validator(), SIGNAL(sendState(QValidator::State)), this, SLOT(textModified(QValidator::State)));
+ connect(focusOutComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(resistanceEntry(int)));
diff --git a/cad/fritzing/files/patch-src_model_modelbase.cpp b/cad/fritzing/files/patch-src_model_modelbase.cpp
new file mode 100644
index 000000000000..3424010641d4
--- /dev/null
+++ b/cad/fritzing/files/patch-src_model_modelbase.cpp
@@ -0,0 +1,11 @@
+--- src/model/modelbase.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/model/modelbase.cpp
+@@ -895,7 +895,7 @@ ModelPart * ModelBase::createOldSchematicPartAux(Model
+ }
+ QDomDocument oldDoc;
+ QDomDocument::ParseResult parseResult = oldDoc.setContent(&newFzp);
+- if (!parseResult.operator bool()) {
++ if (!static_cast<bool>(parseResult)) {
+ QString logMessage = QString("Parse Error: %1 at line %2, column %3 in %4")
+ .arg(parseResult.errorMessage)
+ .arg(parseResult.errorLine)
diff --git a/cad/fritzing/files/patch-src_simulation_ngspice__simulator.cpp b/cad/fritzing/files/patch-src_simulation_ngspice__simulator.cpp
new file mode 100644
index 000000000000..90ad7faef27c
--- /dev/null
+++ b/cad/fritzing/files/patch-src_simulation_ngspice__simulator.cpp
@@ -0,0 +1,11 @@
+--- src/simulation/ngspice_simulator.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/simulation/ngspice_simulator.cpp
+@@ -94,7 +94,7 @@ void NgSpiceSimulator::init()
+ DebugDialog::debug(" " + path);
+ }
+ }
+-#ifdef Q_OS_LINUX
++#ifdef Q_OS_FREEBSD
+ const QString libName = "libngspice.so";
+ #elif defined Q_OS_MACOS
+ const QString libName = "libngspice.0.dylib";
diff --git a/cad/fritzing/files/patch-src_sketch_sketchwidget.cpp b/cad/fritzing/files/patch-src_sketch_sketchwidget.cpp
new file mode 100644
index 000000000000..3df0f7e521a8
--- /dev/null
+++ b/cad/fritzing/files/patch-src_sketch_sketchwidget.cpp
@@ -0,0 +1,28 @@
+--- src/sketch/sketchwidget.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/sketch/sketchwidget.cpp
+@@ -42,6 +42,7 @@ along with Fritzing. If not, see <http://www.gnu.org/
+ #include <QStatusBar>
+ #include <QOpenGLWidget>
+
++#include <cstdint>
+ #include <limits>
+
+ #include "../items/partfactory.h"
+@@ -998,7 +999,7 @@ void SketchWidget::deleteItemForCommand(long id, bool
+
+ void SketchWidget::deleteItemForCommand(long id, bool deleteModelPart, bool doEmit, bool later) {
+ ItemBase * pitem = findItem(id);
+- // DebugDialog::debug(QString("delete item (1) %1 %2 %3 %4").arg(id).arg(doEmit).arg(m_viewID).arg((long) pitem, 0, 16) );
++ // DebugDialog::debug(QString("delete item (1) %1 %2 %3 %4").arg(id).arg(doEmit).arg(m_viewID).arg(static_cast<long>(reinterpret_cast<std::uintptr_t>(pitem)), 0, 16) );
+ if (pitem) {
+ deleteItem(pitem, deleteModelPart, doEmit, later);
+ }
+@@ -1012,7 +1013,7 @@ void SketchWidget::deleteItem(ItemBase * itemBase, boo
+ void SketchWidget::deleteItem(ItemBase * itemBase, bool deleteModelPart, bool doEmit, bool later)
+ {
+ long id = itemBase->id();
+- DebugDialog::debug(QString("delete item (2) %1 %2 %3 %4").arg(id).arg(itemBase->title()).arg(m_viewID).arg((long) itemBase, 0, 16) );
++ DebugDialog::debug(QString("delete item (2) %1 %2 %3 %4").arg(id).arg(itemBase->title()).arg(m_viewID).arg(static_cast<long>(reinterpret_cast<std::uintptr_t>(itemBase)), 0, 16) );
+
+ // 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.
diff --git a/cad/fritzing/files/patch-src_utils_textutils.cpp b/cad/fritzing/files/patch-src_utils_textutils.cpp
new file mode 100644
index 000000000000..af803869aa0d
--- /dev/null
+++ b/cad/fritzing/files/patch-src_utils_textutils.cpp
@@ -0,0 +1,20 @@
+--- src/utils/textutils.cpp.orig 2025-04-02 10:33:24 UTC
++++ src/utils/textutils.cpp
+@@ -77,7 +77,7 @@ QList<double> PowerPrefixValues;
+
+ QList<QString> PowerPrefixes;
+ QList<double> PowerPrefixValues;
+-const QString TextUtils::PowerPrefixesString = QString("pnmkMGTu\\x%1").arg(MicroSymbolCode, 4, 16, QChar('0'));
++const QString TextUtils::PowerPrefixesString = QString("pnmkMGTu\\x%1").arg(static_cast<int>(MicroSymbolCode), 4, 16, QChar('0'));
+
+ typedef QHash<QString /*brokenFont*/, QString /*replacementFont*/> FixedFontsHash;
+
+@@ -761,7 +761,7 @@ QString TextUtils::convertExtendedChars(const QString
+ result.append(c);
+ }
+ else {
+- result.append(QString("&#x%1;").arg(c.unicode(), 0, 16));
++ result.append(QString("&#x%1;").arg(static_cast<int>(c.unicode()), /*fieldWidth*/ 0, /*base*/ 16));
+ }
+ }
+
diff --git a/cad/fritzing/files/pkg-install.in b/cad/fritzing/files/pkg-install.in
deleted file mode 100644
index a84dd7733456..000000000000
--- a/cad/fritzing/files/pkg-install.in
+++ /dev/null
@@ -1,15 +0,0 @@
-echo $2 for FRITZING
-
-case $2 in
-PRE-INSTALL)
- if ! id fritzing > /dev/null 2>&1
- then
- pw adduser fritzing
- fi
-;;
-POST-INSTALL)
- echo fritzing shared files owned by fritzing user
- chown -R fritzing:fritzing %%PREFIX%%/share/fritzing
- chmod -R g+w %%PREFIX%%/share/fritzing
-;;
-esac
diff --git a/cad/fritzing/files/pri_clipper1detect.pri b/cad/fritzing/files/pri_clipper1detect.pri
new file mode 100644
index 000000000000..9ad46571e39b
--- /dev/null
+++ b/cad/fritzing/files/pri_clipper1detect.pri
@@ -0,0 +1,4 @@
+message("Using FreeBSD-provided Clipper 1 detect script.")
+
+INCLUDEPATH += "%%LOCALBASE%%/include/polyclipping"
+LIBS += "-lpolyclipping"
diff --git a/cad/fritzing/files/pri_quazipdetect.pri b/cad/fritzing/files/pri_quazipdetect.pri
new file mode 100644
index 000000000000..799e59a2a7dd
--- /dev/null
+++ b/cad/fritzing/files/pri_quazipdetect.pri
@@ -0,0 +1,7 @@
+message("Using FreeBSD-provided quazip detect script.")
+
+SOURCES += \
+ src/zlibdummy.c \
+
+INCLUDEPATH += "%%LOCALBASE%%/include/QuaZip-Qt6-1.5/"
+LIBS += "-lquazip1-qt6"
diff --git a/cad/fritzing/files/pri_spicedetect.pri b/cad/fritzing/files/pri_spicedetect.pri
new file mode 100644
index 000000000000..642c9d753b79
--- /dev/null
+++ b/cad/fritzing/files/pri_spicedetect.pri
@@ -0,0 +1,2 @@
+message("Using FreeBSD-provided ngspice detect script.")
+INCLUDEPATH += "%%LOCALBASE%%/include/ngspice"
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-28 06:48:43 +0000