diff --git a/sci-electronics/simulide/additional-files/icons.zip b/sci-electronics/simulide/additional-files/icons.zip
index 2ee9635fb..e93075634 100644
Binary files a/sci-electronics/simulide/additional-files/icons.zip and b/sci-electronics/simulide/additional-files/icons.zip differ
diff --git a/sci-electronics/simulide/patches/simulide-0.4.13.patchset b/sci-electronics/simulide/patches/simulide-0.4.14.patchset
similarity index 92%
rename from sci-electronics/simulide/patches/simulide-0.4.13.patchset
rename to sci-electronics/simulide/patches/simulide-0.4.14.patchset
index 17694b26b..3661b8dff 100644
--- a/sci-electronics/simulide/patches/simulide-0.4.13.patchset
+++ b/sci-electronics/simulide/patches/simulide-0.4.14.patchset
@@ -1,11 +1,11 @@
-From 11ebb40877ac6388889908a38d67f0c5e98a01ad Mon Sep 17 00:00:00 2001
+From fc5607a9172da9a508279fe7a35543315b10748c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Thu, 1 Oct 2020 20:08:13 +1000
+Date: Wed, 10 Feb 2021 21:54:35 +1000
Subject: Fixes for Haiku
diff --git a/SimulIDE.pro b/SimulIDE.pro
-index 5d94c2f..37050ac 100644
+index a4b382f..ead046c 100644
--- a/SimulIDE.pro
+++ b/SimulIDE.pro
@@ -25,6 +25,10 @@ TEMPLATE = app
@@ -19,7 +19,7 @@ index 5d94c2f..37050ac 100644
QT += svg
QT += xml
QT += script
-@@ -186,6 +190,11 @@ linux {
+@@ -189,6 +193,11 @@ linux {
QMAKE_LIBS += -lelf
QMAKE_LFLAGS += -no-pie
}
@@ -31,7 +31,7 @@ index 5d94c2f..37050ac 100644
macx {
OS = MacOs
INCLUDEPATH += \
-@@ -236,6 +245,17 @@ win32 | linux {
+@@ -231,6 +240,17 @@ win32 | linux {
$(COPY_DIR) ../resources/icons $$TARGET_PREFIX/share ; \
$(MOVE) ../resources/translations/*.qm $$TARGET_PREFIX/share/simulide/translations ;
}
@@ -47,132 +47,10 @@ index 5d94c2f..37050ac 100644
+ $(MOVE) ../resources/translations/*.qm $$TARGET_PREFIX/translations ;
+}
macx {
- DESTDIR = $$TARGET_PREFIX
- mkpath( $$TARGET_PREFIX/simulide.app )
-diff --git a/src/application.qrc b/src/application.qrc
-index 84a4aa9..b4ea9be 100644
---- a/src/application.qrc
-+++ b/src/application.qrc
-@@ -4,63 +4,63 @@
-
- ../src/icons/simulide.png
- ../src/icons/components/null-0.png
-- ../src/icons/mainwindow/new.png
-- ../src/icons/mainwindow/open.png
-- ../src/icons/mainwindow/save.png
-- ../src/icons/mainwindow/saveas.png
-- ../src/icons/mainwindow/help.png
-- ../src/icons/mainwindow/about.png
--
-- ../src/icons/mainwindow/new.png
-- ../src/icons/mainwindow/open.png
-- ../src/icons/mainwindow/save.png
-- ../src/icons/mainwindow/saveas.png
--
-- ../src/icons/mainwindow/cut.png
-- ../src/icons/mainwindow/copy.png
-- ../src/icons/mainwindow/paste.png
--
-- ../src/icons/mainwindow/cdup.png
-- ../src/icons/mainwindow/rotateCCW.png
-- ../src/icons/mainwindow/rotateCW.png
-- ../src/icons/mainwindow/find.png
--
-- ../src/icons/mainwindow/verify.png
-- ../src/icons/mainwindow/verify.png
--
-- ../src/icons/mainwindow/finish.png
-- ../src/icons/mainwindow/step.png
-- ../src/icons/mainwindow/stepover.png
-- ../src/icons/mainwindow/play.png
-- ../src/icons/mainwindow/runtobk.png
-- ../src/icons/mainwindow/pause.png
-- ../src/icons/mainwindow/reset.png
-- ../src/icons/mainwindow/stop.png
--
-- ../src/icons/mainwindow/poweroff.png
-- ../src/icons/mainwindow/poweron.png
-- ../src/icons/mainwindow/powerdeb.png
-- ../src/icons/mainwindow/pausesim.png
--
-- ../src/icons/mainwindow/remove.png
-- ../src/icons/mainwindow/properties.png
-- ../src/icons/mainwindow/rotateCW.png
-- ../src/icons/mainwindow/rotateCCW.png
-- ../src/icons/mainwindow/rotate180.png
-- ../src/icons/mainwindow/hflip.png
-- ../src/icons/mainwindow/vflip.png
-- ../src/icons/mainwindow/load.png
-- ../src/icons/mainwindow/reload.png
-- ../src/icons/mainwindow/terminal.png
-- ../src/icons/mainwindow/closeterminal.png
-- ../src/icons/mainwindow/saveimage.png
--
-- ../src/icons/mainwindow/rename.png
-+ ../src/icons/mainwindow/new.svg
-+ ../src/icons/mainwindow/open.svg
-+ ../src/icons/mainwindow/save.svg
-+ ../src/icons/mainwindow/saveas.svg
-+ ../src/icons/mainwindow/help.svg
-+ ../src/icons/mainwindow/about.svg
-+
-+ ../src/icons/mainwindow/new.svg
-+ ../src/icons/mainwindow/open.svg
-+ ../src/icons/mainwindow/save.svg
-+ ../src/icons/mainwindow/saveas.svg
-+
-+ ../src/icons/mainwindow/cut.svg
-+ ../src/icons/mainwindow/copy.svg
-+ ../src/icons/mainwindow/paste.svg
-+
-+ ../src/icons/mainwindow/cdup.svg
-+ ../src/icons/mainwindow/undo.svg
-+ ../src/icons/mainwindow/redo.svg
-+ ../src/icons/mainwindow/find.svg
-+
-+ ../src/icons/mainwindow/verify.svg
-+ ../src/icons/mainwindow/verify.svg
-+
-+ ../src/icons/mainwindow/finish.svg
-+ ../src/icons/mainwindow/step.svg
-+ ../src/icons/mainwindow/stepover.svg
-+ ../src/icons/mainwindow/play.svg
-+ ../src/icons/mainwindow/runtobk.svg
-+ ../src/icons/mainwindow/pause.svg
-+ ../src/icons/mainwindow/reset.svg
-+ ../src/icons/mainwindow/stop.svg
-+
-+ ../src/icons/mainwindow/poweroff.svg
-+ ../src/icons/mainwindow/poweron.svg
-+ ../src/icons/mainwindow/powerdeb.svg
-+ ../src/icons/mainwindow/pausesim.svg
-+
-+ ../src/icons/mainwindow/remove.svg
-+ ../src/icons/mainwindow/properties.svg
-+ ../src/icons/mainwindow/rotateCW.svg
-+ ../src/icons/mainwindow/rotateCCW.svg
-+ ../src/icons/mainwindow/rotate180.svg
-+ ../src/icons/mainwindow/hflip.svg
-+ ../src/icons/mainwindow/vflip.svg
-+ ../src/icons/mainwindow/load.svg
-+ ../src/icons/mainwindow/reload.svg
-+ ../src/icons/mainwindow/terminal.svg
-+ ../src/icons/mainwindow/closeterminal.svg
-+ ../src/icons/mainwindow/saveimage.svg
-+
-+ ../src/icons/mainwindow/rename.svg
- ../src/icons/mainwindow/invert.png
- ../src/icons/mainwindow/unuse.png
-
-- ../src/icons/mainwindow/breakpoint.png
-- ../src/icons/mainwindow/nobreakpoint.png
-+ ../src/icons/mainwindow/breakpoint.svg
-+ ../src/icons/mainwindow/nobreakpoint.svg
-
- ../src/icons/components/led.png
- ../src/icons/components/diode.png
+ QMAKE_CC = gcc-10
+ QMAKE_CXX = g++-10
diff --git a/src/gui/componentselector/componentselector.cpp b/src/gui/componentselector/componentselector.cpp
-index a9884ff..e50b351 100644
+index f2dd1d9..64f6066 100644
--- a/src/gui/componentselector/componentselector.cpp
+++ b/src/gui/componentselector/componentselector.cpp
@@ -141,7 +141,11 @@ void ComponentSelector::loadXml( const QString &setFile )
@@ -188,25 +66,24 @@ index a9884ff..e50b351 100644
}
QString name = element.attribute( "name" );
diff --git a/src/gui/editorwidget/codeeditor.cpp b/src/gui/editorwidget/codeeditor.cpp
-index abc43bc..a19715f 100644
+index 828cc33..b32c7ff 100644
--- a/src/gui/editorwidget/codeeditor.cpp
+++ b/src/gui/editorwidget/codeeditor.cpp
-@@ -76,8 +76,12 @@ CodeEditor::CodeEditor( QWidget* parent, OutPanelText* outPane )
- m_debugging = false;
- m_stepOver = false;
- m_driveCirc = false;
+@@ -80,8 +80,11 @@ CodeEditor::CodeEditor( QWidget* parent, OutPanelText* outPane )
+ m_properties = false;
+
+ m_help = "";
-
-+
+#ifdef Q_OS_HAIKU
+ m_font.setFamily("Noto Sans Mono");
-+#else
++#else
m_font.setFamily("Monospace");
+#endif
m_font.setFixedPitch( true );
m_font.setPixelSize( m_fontSize );
setFont( m_font );
diff --git a/src/gui/editorwidget/inodebugger.cpp b/src/gui/editorwidget/inodebugger.cpp
-index 8db2bdf..2ecf4a0 100644
+index 46700d7..1752749 100644
--- a/src/gui/editorwidget/inodebugger.cpp
+++ b/src/gui/editorwidget/inodebugger.cpp
@@ -34,8 +34,12 @@ InoDebugger::InoDebugger( QObject* parent, OutPanelText* outPane, QString filePa
@@ -260,10 +137,10 @@ index 8db2bdf..2ecf4a0 100644
}
QApplication::restoreOverrideCursor();
diff --git a/src/main.cpp b/src/main.cpp
-index 90e2a6a..7dc9776 100644
+index 523e084..fe4df10 100644
--- a/src/main.cpp
+++ b/src/main.cpp
-@@ -24,7 +24,11 @@
+@@ -25,7 +25,11 @@
QString langFile( QString locale )
{
@@ -275,7 +152,7 @@ index 90e2a6a..7dc9776 100644
QFile file( langF );
if( !file.exists() ) langF = "";
-@@ -58,7 +62,11 @@ int main(int argc, char *argv[])
+@@ -59,7 +63,11 @@ int main(int argc, char *argv[])
//QApplication::setGraphicsSystem( "raster" );//native, raster, opengl
QApplication app( argc, argv );
@@ -287,7 +164,7 @@ index 90e2a6a..7dc9776 100644
QString locale = QLocale::system().name();
if( settings.contains( "language" ) ) locale = settings.value( "language" ).toString();
-@@ -69,7 +77,11 @@ int main(int argc, char *argv[])
+@@ -70,7 +78,11 @@ int main(int argc, char *argv[])
locale = QLocale::system().name().split("_").first();
langF = langFile( locale );
}
@@ -300,7 +177,7 @@ index 90e2a6a..7dc9776 100644
QTranslator translator;
translator.load( langF );
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index bf3bfe9..9448bae 100644
+index 911fba1..3d98626 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -33,7 +33,11 @@ MainWindow* MainWindow::m_pSelf = 0l;
@@ -310,7 +187,7 @@ index bf3bfe9..9448bae 100644
+#ifdef Q_OS_HAIKU
+ , m_settings( QStandardPaths::standardLocations( QStandardPaths::AppConfigLocation).first()+"/simulide.ini", QSettings::IniFormat, this )
+#else
- , m_settings( QStandardPaths::standardLocations( QStandardPaths::DataLocation).first()+"/simulide.ini", QSettings::IniFormat, this )
+ , m_settings( QStandardPaths::standardLocations( QStandardPaths::DataLocation).first()+"/simulide.ini", QSettings::IniFormat, this )
+#endif
{
setWindowIcon( QIcon(":/simulide.png") );
@@ -346,5 +223,139 @@ index 8fcd2fe..c0315a8 100644
QDir SIMUAPI_AppPath::RWDataFolder() const
{
--
-2.28.0
+2.30.0
+
+
+From 410e9e21f148093174d749b46bc3009d01952f58 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 10 Feb 2021 21:54:53 +1000
+Subject: Add haiku svg icons
+
+
+diff --git a/src/application.qrc b/src/application.qrc
+index 87a60ce..9b20c62 100644
+--- a/src/application.qrc
++++ b/src/application.qrc
+@@ -4,64 +4,64 @@
+
+ ../src/icons/simulide.png
+ ../src/icons/components/null-0.png
+- ../src/icons/mainwindow/new.png
+- ../src/icons/mainwindow/open.png
+- ../src/icons/mainwindow/save.png
+- ../src/icons/mainwindow/saveas.png
+- ../src/icons/mainwindow/help.png
+- ../src/icons/mainwindow/about.png
+-
+- ../src/icons/mainwindow/new.png
+- ../src/icons/mainwindow/open.png
+- ../src/icons/mainwindow/save.png
+- ../src/icons/mainwindow/saveas.png
+-
+- ../src/icons/mainwindow/cut.png
+- ../src/icons/mainwindow/copy.png
+- ../src/icons/mainwindow/paste.png
+-
+- ../src/icons/mainwindow/cdup.png
+- ../src/icons/mainwindow/rotateCCW.png
+- ../src/icons/mainwindow/rotateCW.png
+- ../src/icons/mainwindow/find.png
+-
+- ../src/icons/mainwindow/verify.png
+- ../src/icons/mainwindow/verify.png
+-
+- ../src/icons/mainwindow/finish.png
+- ../src/icons/mainwindow/step.png
+- ../src/icons/mainwindow/stepover.png
+- ../src/icons/mainwindow/play.png
+- ../src/icons/mainwindow/runtobk.png
+- ../src/icons/mainwindow/pause.png
+- ../src/icons/mainwindow/reset.png
+- ../src/icons/mainwindow/stop.png
+-
+- ../src/icons/mainwindow/poweroff.png
+- ../src/icons/mainwindow/poweron.png
+- ../src/icons/mainwindow/powerdeb.png
+- ../src/icons/mainwindow/pausesim.png
+-
+- ../src/icons/mainwindow/remove.png
+- ../src/icons/mainwindow/properties.png
+- ../src/icons/mainwindow/rotateCW.png
+- ../src/icons/mainwindow/rotateCCW.png
+- ../src/icons/mainwindow/rotate180.png
+- ../src/icons/mainwindow/hflip.png
+- ../src/icons/mainwindow/vflip.png
+- ../src/icons/mainwindow/load.png
+- ../src/icons/mainwindow/lastfiles.png
+- ../src/icons/mainwindow/reload.png
+- ../src/icons/mainwindow/terminal.png
+- ../src/icons/mainwindow/closeterminal.png
+- ../src/icons/mainwindow/saveimage.png
+-
+- ../src/icons/mainwindow/rename.png
++ ../src/icons/mainwindow/new.svg
++ ../src/icons/mainwindow/open.svg
++ ../src/icons/mainwindow/save.svg
++ ../src/icons/mainwindow/saveas.svg
++ ../src/icons/mainwindow/help.svg
++ ../src/icons/mainwindow/about.svg
++
++ ../src/icons/mainwindow/new.svg
++ ../src/icons/mainwindow/open.svg
++ ../src/icons/mainwindow/save.svg
++ ../src/icons/mainwindow/saveas.svg
++
++ ../src/icons/mainwindow/cut.svg
++ ../src/icons/mainwindow/copy.svg
++ ../src/icons/mainwindow/paste.svg
++
++ ../src/icons/mainwindow/cdup.svg
++ ../src/icons/mainwindow/undo.svg
++ ../src/icons/mainwindow/redo.svg
++ ../src/icons/mainwindow/find.svg
++
++ ../src/icons/mainwindow/verify.svg
++ ../src/icons/mainwindow/verify.svg
++
++ ../src/icons/mainwindow/finish.svg
++ ../src/icons/mainwindow/step.svg
++ ../src/icons/mainwindow/stepover.svg
++ ../src/icons/mainwindow/play.svg
++ ../src/icons/mainwindow/runtobk.svg
++ ../src/icons/mainwindow/pause.svg
++ ../src/icons/mainwindow/reset.svg
++ ../src/icons/mainwindow/stop.svg
++
++ ../src/icons/mainwindow/poweroff.svg
++ ../src/icons/mainwindow/poweron.svg
++ ../src/icons/mainwindow/powerdeb.svg
++ ../src/icons/mainwindow/pausesim.svg
++
++ ../src/icons/mainwindow/remove.svg
++ ../src/icons/mainwindow/properties.svg
++ ../src/icons/mainwindow/rotateCW.svg
++ ../src/icons/mainwindow/rotateCCW.svg
++ ../src/icons/mainwindow/rotate180.svg
++ ../src/icons/mainwindow/hflip.svg
++ ../src/icons/mainwindow/vflip.svg
++ ../src/icons/mainwindow/load.svg
++ ../src/icons/mainwindow/lastfiles.svg
++ ../src/icons/mainwindow/reload.svg
++ ../src/icons/mainwindow/terminal.svg
++ ../src/icons/mainwindow/closeterminal.svg
++ ../src/icons/mainwindow/saveimage.svg
++
++ ../src/icons/mainwindow/rename.svg
+ ../src/icons/mainwindow/invert.png
+ ../src/icons/mainwindow/unuse.png
+
+- ../src/icons/mainwindow/breakpoint.png
+- ../src/icons/mainwindow/nobreakpoint.png
++ ../src/icons/mainwindow/breakpoint.svg
++ ../src/icons/mainwindow/nobreakpoint.svg
+
+ ../src/icons/components/led.png
+ ../src/icons/components/diode.png
+--
+2.30.0
diff --git a/sci-electronics/simulide/simulide-0.4.13.recipe b/sci-electronics/simulide/simulide-0.4.14.recipe
similarity index 89%
rename from sci-electronics/simulide/simulide-0.4.13.recipe
rename to sci-electronics/simulide/simulide-0.4.14.recipe
index 88888ea0d..3818df021 100644
--- a/sci-electronics/simulide/simulide-0.4.13.recipe
+++ b/sci-electronics/simulide/simulide-0.4.14.recipe
@@ -17,12 +17,12 @@ AVR asm. It is still in it's firsts stages of development, with basic functional
s, but it is possible to write, compile and basic debugging with breakpoints, watch \
registers and global variables."
HOMEPAGE="https://www.simulide.com/"
-COPYRIGHT=" 2012-2020 Santiago Gonzalez, Popov Alexey"
+COPYRIGHT=" 2012-2021 Santiago Gonzalez, Popov Alexey"
LICENSE="GNU GPL v3"
REVISION="1"
-SOURCE_URI="https://mailfence.com/pub/docs/santigoro/web/SimulIDE_0.4.13/SimulIDE_$portVersion-SR5_Sources.tar.gz"
-CHECKSUM_SHA256="b55b03e507882b8b68a25e5155dcac6020ba273be93bdf689612a0be67056d43"
-SOURCE_DIR="simulide_$portVersion-SR5_Sources"
+SOURCE_URI="https://mailfence.com/pub/docs/santigoro/web/SimulIDE_${portVersion}/SimulIDE_${portVersion}-SR4_Sources.tar.gz"
+CHECKSUM_SHA256="39879bf6566b1d4902f6ef8c7e8ceb1f998deeed02c41e1b67b443086acf9ebd"
+SOURCE_DIR="simulide_$portVersion-SR4_Sources"
PATCHES="simulide-$portVersion.patchset"
ADDITIONAL_FILES="
simulide.rdef.in
@@ -79,7 +79,7 @@ BUILD()
INSTALL()
{
mkdir -p $appsDir $settingsDir/SimulIDE
- cp -R $sourceDir/build_XX/release/SimulIDE_$portVersion-SR5 $appsDir/SimulIDE
+ cp -R $sourceDir/build_XX/executables/SimulIDE_${portVersion}-SR4 $appsDir/SimulIDE
mv $appsDir/SimulIDE/examples $settingsDir/SimulIDE
ln -s $settingsDir/SimulIDE/examples $appsDir/SimulIDE/examples