From 3f4c1194e19fe8fe463a95bebc9dc1ee1ae1c4f9 Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Wed, 28 Oct 2020 20:30:48 +0300 Subject: [PATCH] New package: simulide-0.4.13 --- srcpkgs/simulide/patches/00-glib.patch | 24 ++++ .../simulide/patches/01-use-system-simavr.bak | 133 ++++++++++++++++++ .../simulide/patches/02-use-system-gpsim.bak | 94 +++++++++++++ srcpkgs/simulide/template | 24 ++++ 4 files changed, 275 insertions(+) create mode 100644 srcpkgs/simulide/patches/00-glib.patch create mode 100644 srcpkgs/simulide/patches/01-use-system-simavr.bak create mode 100644 srcpkgs/simulide/patches/02-use-system-gpsim.bak create mode 100644 srcpkgs/simulide/template diff --git a/srcpkgs/simulide/patches/00-glib.patch b/srcpkgs/simulide/patches/00-glib.patch new file mode 100644 index 00000000000..f70ef7c02d9 --- /dev/null +++ b/srcpkgs/simulide/patches/00-glib.patch @@ -0,0 +1,24 @@ +--- SimulIDE.pro 2020-08-13 22:39:49.000000000 +0300 ++++ SimulIDE.pro 2020-10-22 03:08:27.819023767 +0300 +@@ -103,7 +103,9 @@ + ../src/gpsim/*.h \ + ../src/gpsim/devices/*.h \ + ../src/gpsim/modules/*.h \ +- ../src/gpsim/registers/*.h ++ ../src/gpsim/registers/*.h \ ++ /usr/include/glib-2.0/glib.h \ ++ /usr/lib/glib-2.0/include/glibconfig.h + + INCLUDEPATH += ../src \ + ../src/gui \ +@@ -140,7 +140,9 @@ + ../src/gpsim \ + ../src/gpsim/devices \ + ../src/gpsim/modules \ +- ../src/gpsim/registers ++ ../src/gpsim/registers \ ++ /usr/include/glib-2.0 \ ++ /usr/lib/glib-2.0/include + + TRANSLATIONS += \ + ../resources/translations/simulide.ts \ diff --git a/srcpkgs/simulide/patches/01-use-system-simavr.bak b/srcpkgs/simulide/patches/01-use-system-simavr.bak new file mode 100644 index 00000000000..452d70597f7 --- /dev/null +++ b/srcpkgs/simulide/patches/01-use-system-simavr.bak @@ -0,0 +1,133 @@ +--- src/gui/circuitwidget/components/mcu/arduino.cpp 2020-07-11 13:15:00.000000000 +0300 ++++ src/gui/circuitwidget/components/mcu/arduino.cpp 2020-10-22 04:17:34.409831811 +0300 +@@ -26,7 +26,7 @@ + + #include "hd44780.h" + +-#include "avr_twi.h" ++#include + + LibraryItem* Arduino::libraryItem() + { +--- src/gui/circuitwidget/components/mcu/avrcompbase.cpp 2020-07-04 20:30:48.000000000 +0300 ++++ src/gui/circuitwidget/components/mcu/avrcompbase.cpp 2020-10-22 04:18:15.119908217 +0300 +@@ -20,7 +20,7 @@ + #include + + #include "avrcompbase.h" +-#include "avr_twi.h" ++#include + + + AvrCompBase::AvrCompBase( QObject* parent, QString type, QString id ) +--- src/gui/circuitwidget/components/mcu/avrcomponentpin.h 2020-05-24 10:29:23.000000000 +0300 ++++ src/gui/circuitwidget/components/mcu/avrcomponentpin.h 2020-10-22 04:06:23.234074279 +0300 +@@ -25,12 +25,12 @@ + #include "mcucomponentpin.h" + + //simavr includes +-#include "sim_avr.h" +-#include "sim_irq.h" +-#include "sim_io.h" +-#include "avr_adc.h" +-#include "avr_ioport.h" +-#include "avr_timer.h" ++#include ++#include ++#include ++#include ++#include ++#include + + + class AVRComponentPin : public McuComponentPin +--- src/simulator/elements/processors/avrprocessor.cpp 2020-08-24 02:14:43.000000000 +0300 ++++ src/simulator/elements/processors/avrprocessor.cpp 2020-10-22 04:00:42.865064317 +0300 +@@ -23,12 +23,12 @@ + #include "utils.h" + + // simavr includes +-#include "sim_elf.h" +-#include "sim_hex.h" +-#include "sim_core.h" +-#include "sim_gdb.h" +-#include "avr_uart.h" +-#include "avr_eeprom.h" ++#include ++#include ++#include ++#include ++#include ++#include + + //AvrProcessor* AvrProcessor::m_pSelf = 0l; + +--- src/simulator/elements/processors/avrprocessor.h 2020-08-24 02:14:40.000000000 +0300 ++++ src/simulator/elements/processors/avrprocessor.h 2020-10-22 03:55:19.300510501 +0300 +@@ -26,7 +26,7 @@ + #include "baseprocessor.h" + + // simavr includes +-#include "sim_avr.h" ++#include + struct avr_t; + + class AvrProcessor : public BaseProcessor +--- src/simulator/elements/processors/read_elf.c 2018-03-16 11:18:04.000000000 +0300 ++++ src/simulator/elements/processors/read_elf.c 2020-10-22 03:53:11.322128504 +0300 +@@ -7,10 +7,10 @@ + #include + #include + +-#include "sim_elf.h" +-#include "sim_vcd_file.h" +-#include "avr_eeprom.h" +-#include "avr_ioport.h" ++#include ++#include ++#include ++#include + + #ifndef O_BINARY + #define O_BINARY 0 +--- SimulIDE.pro 2020-08-13 22:39:49.000000000 +0300 ++++ SimulIDE.pro 2020-10-22 03:08:27.819023767 +0300 +@@ -61,8 +61,8 @@ + ../src/simulator/elements/outputs/*.cpp \ + ../src/simulator/elements/passive/*.cpp \ + ../src/simulator/elements/processors/*.cpp \ +- ../src/simavr/sim/*.c \ +- ../src/simavr/cores/*.c \ ++# ../src/simavr/sim/*.c \ ++# ../src/simavr/cores/*.c \ + ../src/gpsim/*.cc \ + ../src/gpsim/devices/*.cc \ + ../src/gpsim/modules/*.cc \ +@@ -96,9 +96,9 @@ + ../src/simulator/elements/outputs/*.h \ + ../src/simulator/elements/passive/*.h \ + ../src/simulator/elements/processors/*.h \ +- ../src/simavr/sim/*.h \ +- ../src/simavr/sim/avr/*.h \ +- ../src/simavr/cores/*.h \ ++# ../src/simavr/sim/*.h \ ++# ../src/simavr/sim/avr/*.h \ ++# ../src/simavr/cores/*.h \ + ../resources/data/*.xml \ + ../src/gpsim/*.h \ + ../src/gpsim/devices/*.h \ +@@ -133,10 +133,10 @@ + ../src/simulator/elements/outputs \ + ../src/simulator/elements/passive \ + ../src/simulator/elements/processors \ +- ../src/simavr \ +- ../src/simavr/sim \ +- ../src/simavr/sim/avr \ +- ../src/simavr/cores \ ++# ../src/simavr \ ++# ../src/simavr/sim \ ++# ../src/simavr/sim/avr \ ++# ../src/simavr/cores \ + ../src/gpsim \ + ../src/gpsim/devices \ + ../src/gpsim/modules \ diff --git a/srcpkgs/simulide/patches/02-use-system-gpsim.bak b/srcpkgs/simulide/patches/02-use-system-gpsim.bak new file mode 100644 index 00000000000..a52dbf94f78 --- /dev/null +++ b/srcpkgs/simulide/patches/02-use-system-gpsim.bak @@ -0,0 +1,94 @@ +--- src/simulator/elements/processors/picprocessor.cpp 2020-08-24 02:14:48.000000000 +0300 ++++ src/simulator/elements/processors/picprocessor.cpp 2020-10-23 02:14:47.581299752 +0300 +@@ -25,10 +25,10 @@ + #include "utils.h" + + // GpSim includes +-#include "uart.h" +-#include "pir.h" +-#include "eeprom.h" +-#include "hexutils.h" ++#include ++#include ++#include ++#include + + PicProcessor::PicProcessor( QObject* parent ) + : BaseProcessor( parent ) +--- src/simulator/elements/processors/picprocessor.h 2020-08-24 02:13:59.000000000 +0300 ++++ src/simulator/elements/processors/picprocessor.h 2020-10-22 04:51:33.604926613 +0300 +@@ -23,7 +23,7 @@ + + #include "baseprocessor.h" + +-#include "pic-processor.h" +-#include "registers.h" +-#include "hexutils.h" ++#include ++#include ++#include + +--- src/gui/circuitwidget/components/mcu/piccomponentpin.cpp 2020-05-24 10:32:10.000000000 +0300 ++++ src/gui/circuitwidget/components/mcu/piccomponentpin.cpp 2020-10-22 04:07:33.887936322 +0300 +@@ -26,7 +26,7 @@ + + //#include "stimuli.h" + //#include "ioports.h" +-#include "pic-processor.h" ++#include + //#include "gpsim_time.h" + + PICComponentPin::PICComponentPin( McuComponent* mcu, QString id, QString type, QString label, int pos, int xpos, int ypos, int angle ) +--- SimulIDE.pro 2020-08-13 22:39:49.000000000 +0300 ++++ SimulIDE.pro 2020-10-22 03:08:27.819023767 +0300 +@@ -61,12 +61,12 @@ + ../src/simulator/elements/outputs/*.cpp \ + ../src/simulator/elements/passive/*.cpp \ + ../src/simulator/elements/processors/*.cpp \ + # ../src/simavr/sim/*.c \ + # ../src/simavr/cores/*.c \ +- ../src/gpsim/*.cc \ +- ../src/gpsim/devices/*.cc \ +- ../src/gpsim/modules/*.cc \ +- ../src/gpsim/registers/*.cc ++# ../src/gpsim/*.cc \ ++# ../src/gpsim/devices/*.cc \ ++# ../src/gpsim/modules/*.cc \ ++# ../src/gpsim/registers/*.cc + + HEADERS += ../src/*.h \ + ../src/gui/*.h \ +@@ -96,14 +96,16 @@ + ../src/simulator/elements/outputs/*.h \ + ../src/simulator/elements/passive/*.h \ + ../src/simulator/elements/processors/*.h \ + # ../src/simavr/sim/*.h \ + # ../src/simavr/sim/avr/*.h \ + # ../src/simavr/cores/*.h \ + ../resources/data/*.xml \ +- ../src/gpsim/*.h \ +- ../src/gpsim/devices/*.h \ +- ../src/gpsim/modules/*.h \ +- ../src/gpsim/registers/*.h \ ++# ../src/gpsim/*.h \ ++# ../src/gpsim/devices/*.h \ ++# ../src/gpsim/modules/*.h \ ++# ../src/gpsim/registers/*.h \ + /usr/include/glib-2.0/glib.h \ + /usr/lib/glib-2.0/include/glibconfig.h + +@@ -133,16 +133,16 @@ + ../src/simulator/elements/outputs \ + ../src/simulator/elements/passive \ + ../src/simulator/elements/processors \ +- ../src/gpsim \ +- ../src/gpsim/devices \ +- ../src/gpsim/modules \ +- ../src/gpsim/registers \ ++# ../src/gpsim \ ++# ../src/gpsim/devices \ ++# ../src/gpsim/modules \ ++# ../src/gpsim/registers \ + # ../src/simavr \ + # ../src/simavr/sim \ + # ../src/simavr/sim/avr \ diff --git a/srcpkgs/simulide/template b/srcpkgs/simulide/template new file mode 100644 index 00000000000..ee9af23d2d9 --- /dev/null +++ b/srcpkgs/simulide/template @@ -0,0 +1,24 @@ +# Template file for 'simulide' +pkgname=simulide +version=0.4.13 +revision=1 +_pkgname=SimulIDE +_rev=SR5 +wrksrc=${pkgname}_${version}-${_rev}_Sources +build_wrksrc=build_XX +build_style=qmake +hostmakedepends="qt5-qmake qt5-host-tools pkg-config" +makedepends="qt5-devel qt5-svg-devel qt5-multimedia-devel qt5-serialport-devel qt5-script-devel elfutils-devel" +short_desc="Electronic circuit simulator for PIC, AVR, Arduino" +maintainer="Artur Sinila " +license="GPL-3.0-or-later" +homepage="https://simulide.com" +distfiles="https://mailfence.com/pub/docs/santigoro/web/${_pkgname}_${version}/${_pkgname}_${version}-${_rev}_Sources.tar.gz" +checksum=b55b03e507882b8b68a25e5155dcac6020ba273be93bdf689612a0be67056d43 +nopie_files="/usr/bin/simulide" + +do_install() { + mv release/${_pkgname}_${version}-${_rev}/usr ./ + vbin usr/bin/simulide + mv usr/share ${DESTDIR}/usr/ +}