From 44248dd2afd8108ff9c3b7cfb458a88aff75fa9f Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Wed, 3 Jul 2024 18:21:26 -0500 Subject: [PATCH] simulavr: Update to 1.1.0 Closes: https://trac.macports.org/ticket/60811 --- emulators/simulavr/Portfile | 96 +++++++------- emulators/simulavr/files/doc.patch | 24 ++++ emulators/simulavr/files/include.patch | 23 ++++ emulators/simulavr/files/no-git.patch | 12 ++ emulators/simulavr/files/no-python.patch | 20 +++ emulators/simulavr/files/patch-at90can-elpm | 27 ---- emulators/simulavr/files/patch-at90can-ivs | 120 ------------------ emulators/simulavr/files/patch-msleep | 39 ------ .../simulavr/files/patch-src_Makefile.in | 19 --- .../simulavr/files/patch-src_systemclock.cpp | 11 -- 10 files changed, 127 insertions(+), 264 deletions(-) create mode 100644 emulators/simulavr/files/doc.patch create mode 100644 emulators/simulavr/files/include.patch create mode 100644 emulators/simulavr/files/no-git.patch create mode 100644 emulators/simulavr/files/no-python.patch delete mode 100644 emulators/simulavr/files/patch-at90can-elpm delete mode 100644 emulators/simulavr/files/patch-at90can-ivs delete mode 100644 emulators/simulavr/files/patch-msleep delete mode 100644 emulators/simulavr/files/patch-src_Makefile.in delete mode 100644 emulators/simulavr/files/patch-src_systemclock.cpp diff --git a/emulators/simulavr/Portfile b/emulators/simulavr/Portfile index efdd8a4332e2d..9050da916caf4 100644 --- a/emulators/simulavr/Portfile +++ b/emulators/simulavr/Portfile @@ -1,72 +1,72 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 PortSystem 1.0 +PortGroup cmake 1.1 name simulavr -version 1.0.0 -revision 2 +version 1.1.0 +revision 0 +checksums rmd160 6654189a7da966ff31ae859fef4eb753329c17e5 \ + sha256 8d46a9cf05eb651c3258f720dfc3b967567cdb1a0279f55365e4203eabff9c27 \ + size 1109235 + categories emulators devel maintainers nomaintainer +license GPL-2+ MIT + description Simulator for Atmel AVR microcontrollers long_description The SimulAVR program is a simulator for the Atmel AVR family \ of microcontrollers. (ATtiny and ATmega) SimulAVR can be used \ either standalone or as a remote target for avr-gdb. + homepage https://www.nongnu.org/simulavr/ -platforms darwin master_sites https://savannah.nongnu.org/download/simulavr/ +# No distfile on normal download server: +# https://savannah.nongnu.org/bugs/?65923 +master_sites http://git.savannah.nongnu.org/cgit/simulavr.git/snapshot/ +distname ${name}-release-${version} -checksums rmd160 0e9eb32f398943449b564e919765348c32f4c600 \ - sha256 39d93faa3eeae2bee15f682dd6a48fb4d4366addd12a2abebb04c99f87809be7 +depends_build-append \ + bin:gzip:gzip \ + port:help2man \ + bin:makeinfo:texinfo -depends_build bin:makeinfo:texinfo -depends_lib port:avr-binutils \ - port:swig-python \ - port:swig-tcl +depends_lib port:avr-gcc -patchfiles patch-src_systemclock.cpp \ - patch-msleep \ - patch-src_Makefile.in \ - patch-at90can-ivs \ - patch-at90can-elpm +patchfiles doc.patch \ + include.patch \ + no-git.patch \ + no-python.patch post-patch { - # Hack the swig macro into detecting a modern version of swig - reinplace "s|required=1.3.18|required=3.0.8|g" ${worksrcpath}/configure + # https://savannah.nongnu.org/bugs/index.php?65943 + reinplace "s/0\.0\.0/${version}/g" ${worksrcpath}/cmake/get_git_version.sh + # https://savannah.nongnu.org/bugs/index.php?65947 + delete ${worksrcpath}/include/elfio/VERSION +} - # Apply changes from https://savannah.nongnu.org/bugs/?35737 to fix building - # against the later avr-libc releases - set regexps { - "s/SIG_INTERRUPT0/INT0_vect/" - "s/SIG_INTERRUPT1/INT1_vect/" - "s/SIG_INTERRUPT2/INT2_vect/" - "s/SIG_OUTPUT_COMPARE2/TIMER2_COMP_vect/" - "s/SIG_OUTPUT_COMPARE2A/TIMER2_COMPA_vect/" - "s/SIG_OUTPUT_COMPARE3B/TIMER3_COMPB_vect/" - "s/SIG_UART0_RECV/USART0_RX_vect/" - "s/SIG_UART0_DATA/USART0_UDRE_vect/" - "s/__attribute__((progmem))/PROGMEM/" - "s/__attribute__ ((progmem))/PROGMEM/" - } +compiler.cxx_standard 2011 - fs-traverse fpath ${worksrcpath} { - set ext [file extension "${fpath}"] - if {[file isfile "${fpath}"] && ($ext == ".c" || $ext == ".h" || $ext == ".cpp")} { - foreach r $regexps { - reinplace -locale C $r $fpath - } - } - } +configure.args -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON \ + -DDOT=DOT-NOTFOUND \ + -DDOXYGEN=DOXYGEN-NOTFOUND \ + -DDPKG=DPKG-NOTFOUND \ + -DFAKEROOT=FAKEROOT-NOTFOUND \ + -DVALGRIND=VALGRIND-NOTFOUND - reinplace "s|^static char unshifted|static const char unshifted|" ${worksrcpath}/examples/atmel_key/scancodes.h - reinplace {s|prog_char shifted\[\]\[2\]|static const char shifted\[\]\[2\] PROGMEM|g} ${worksrcpath}/examples/atmel_key/scancodes.h -} +# https://savannah.nongnu.org/bugs/index.php?58231 +build.target-append doc + +# https://savannah.nongnu.org/bugs/index.php?65948 +build.env DYLD_LIBRARY_PATH=${build.dir}/libsim +test.env DYLD_LIBRARY_PATH=${build.dir}/libsim -# avr-binutils' libbfd.a can't find gettext and zlib (#41106) -configure.ldflags-append -lintl -lz -configure.args --with-bfd="${prefix}/avr/host" \ - --with-libiberty="${prefix}/avr/host" -#configure.args --mandir=${prefix}/share/man +# Tests require python, but allowing python to be found can cause unwanted +# documentation to be built. +# https://savannah.nongnu.org/bugs/index.php?65945 +test.run no +test.target check livecheck.type regex -livecheck.url [lindex ${master_sites} 0] -livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix} +livecheck.url https://git.savannah.nongnu.org/cgit/simulavr.git/refs/ +livecheck.regex release-(\[0-9.\]+)[quotemeta ${extract.suffix}] diff --git a/emulators/simulavr/files/doc.patch b/emulators/simulavr/files/doc.patch new file mode 100644 index 0000000000000..3eb1de49a9258 --- /dev/null +++ b/emulators/simulavr/files/doc.patch @@ -0,0 +1,24 @@ +Fix documentation install directory. +https://savannah.nongnu.org/bugs/index.php?65952 +--- app/CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600 ++++ app/CMakeLists.txt 2024-07-03 17:58:45.000000000 -0500 +@@ -21,6 +21,6 @@ + ${docDir}/README.gdb + ${docDir}/SUPPORT + ${docDir}/TODO) +-install(FILES ${docSrcs} DESTINATION "share/doc/common") ++install(FILES ${docSrcs} DESTINATION "share/doc/simulavr") + + # EOF +\ No newline at end of file +--- doc/CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600 ++++ doc/CMakeLists.txt 2024-07-03 17:58:17.000000000 -0500 +@@ -63,7 +63,7 @@ + add_custom_target(doc-changelog DEPENDS ${DOC_CHANGELOG}) + add_dependencies(progdoc doc-changelog) + +- install(FILES ${DOC_CHANGELOG} DESTINATION "share/doc/common") ++ install(FILES ${DOC_CHANGELOG} DESTINATION "share/doc/simulavr") + endif() + + add_custom_target(doc COMMENT "create simulavr documentation" DEPENDS progdoc) diff --git a/emulators/simulavr/files/include.patch b/emulators/simulavr/files/include.patch new file mode 100644 index 0000000000000..8a6612949c792 --- /dev/null +++ b/emulators/simulavr/files/include.patch @@ -0,0 +1,23 @@ +Install headers into subdirectory. +https://savannah.nongnu.org/bugs/?65950 +--- libsim/CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600 ++++ libsim/CMakeLists.txt 2024-07-03 18:05:54.000000000 -0500 +@@ -42,12 +42,12 @@ + file(GLOB files_elfio "${CMAKE_SOURCE_DIR}/include/elfio/elfio/*.hpp") + + install(TARGETS sim DESTINATION "lib") +-install(FILES ${files_common} DESTINATION "include") +-install(FILES ${files_hwtimer} DESTINATION "include/hwtimer") +-install(FILES ${files_gdb} DESTINATION "include/gdb") +-install(FILES ${files_ui} DESTINATION "include/ui") +-install(FILES ${files_cmd} DESTINATION "include/cmd") +-install(FILES ${files_elfio} DESTINATION "include/elfio/elfio") ++install(FILES ${files_common} DESTINATION "include/simulavr") ++install(FILES ${files_hwtimer} DESTINATION "include/simulavr/hwtimer") ++install(FILES ${files_gdb} DESTINATION "include/simulavr/gdb") ++install(FILES ${files_ui} DESTINATION "include/simulavr/ui") ++install(FILES ${files_cmd} DESTINATION "include/simulavr/cmd") ++install(FILES ${files_elfio} DESTINATION "include/simulavr/elfio/elfio") + + if(BUILD_VERILOG) + diff --git a/emulators/simulavr/files/no-git.patch b/emulators/simulavr/files/no-git.patch new file mode 100644 index 0000000000000..8b3409d6738a9 --- /dev/null +++ b/emulators/simulavr/files/no-git.patch @@ -0,0 +1,12 @@ +Do not try to get version information from git. It will not work because we are +using a tarball not a git clone. +https://savannah.nongnu.org/bugs/index.php?65943 +--- cmake/get_git_version.sh.orig 2019-12-20 07:13:39.000000000 -0600 ++++ cmake/get_git_version.sh 2024-07-03 12:28:33.000000000 -0500 +@@ -1,5 +1,5 @@ + #!/bin/sh +-if which git > /dev/null 2> /dev/null; then ++if false; then + H=$(git log --pretty=format:'%h' -n 1) + D=$(git diff --quiet --exit-code || echo "+") + T=$(git describe --abbrev=0) diff --git a/emulators/simulavr/files/no-python.patch b/emulators/simulavr/files/no-python.patch new file mode 100644 index 0000000000000..2c837c16fbc74 --- /dev/null +++ b/emulators/simulavr/files/no-python.patch @@ -0,0 +1,20 @@ +Don't fail if python isn't found. +https://savannah.nongnu.org/bugs/index.php?65945 +--- CMakeLists.txt.orig 2019-12-20 07:13:39.000000000 -0600 ++++ CMakeLists.txt 2024-07-03 16:19:04.000000000 -0500 +@@ -26,11 +26,15 @@ + # find tools + # find python executable, for Python3 you need a virtual env, which links python to python3 executable! + find_package(PythonInterp 3.5) ++if(PythonInterp_FOUND) + execute_process(COMMAND ${PYTHON_EXECUTABLE} + -c "import sys; print('%s.%s' % (sys.version_info.major, sys.version_info.minor))" + OUTPUT_VARIABLE PYTHON_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX MATCH "[0-9]" PYTHON_MAJOR_VERSION ${PYTHON_VERSION}) ++else() ++ set(PYTHON_MAJOR_VERSION 0) ++endif() + + # SWIG + if(BUILD_TCL OR BUILD_PYTHON) diff --git a/emulators/simulavr/files/patch-at90can-elpm b/emulators/simulavr/files/patch-at90can-elpm deleted file mode 100644 index 54e32a3c1d96d..0000000000000 --- a/emulators/simulavr/files/patch-at90can-elpm +++ /dev/null @@ -1,27 +0,0 @@ -From e3d323e664884003673a00559c14d8e799699b52 Mon Sep 17 00:00:00 2001 -From: Petr Hluzin -Date: Sat, 06 Oct 2012 12:45:34 +0000 -Subject: AT90CAN128 has ELPM instruction. - -According to AT90CAN32/64/128 datasheet rev.H all three devices in the -family have the ELPM instruction. - -Reported by and patch provided by Uwe Bonnes, thanks. -http://savannah.nongnu.org/patch/?7850 ---- -(limited to 'src/at90canbase.cpp') - -diff --git a/src/at90canbase.cpp b/src/at90canbase.cpp -index cbfef1a..da5b694 100644 ---- src/at90canbase.cpp -+++ src/at90canbase.cpp -@@ -92,6 +92,7 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - &portf.GetPin(6), - &portf.GetPin(7)) - { -+ flagELPMInstructions = true; - flagJMPInstructions = (flash_bytes > 8U * 1024U) ? true : false; - irqSystem = new HWIrqSystem(this, (flash_bytes > 8U * 1024U) ? 4 : 2, 37); - --- -cgit v0.9.0.2 diff --git a/emulators/simulavr/files/patch-at90can-ivs b/emulators/simulavr/files/patch-at90can-ivs deleted file mode 100644 index 7d25eca1e65cd..0000000000000 --- a/emulators/simulavr/files/patch-at90can-ivs +++ /dev/null @@ -1,120 +0,0 @@ -From 6ef1c1455becac93f445c3100520ab498ecf240c Mon Sep 17 00:00:00 2001 -From: Petr Hluzin -Date: Sat, 11 Aug 2012 18:33:23 +0000 -Subject: Fixed interrupt vectors for at90can* devices. - -Original code had bogus numbers for interrupt vector values and wrote -past end of an array. -Reported by Ytai Ben-tsvi. -http://lists.gnu.org/archive/html/simulavr-devel/2012-07/msg00003.html ---- -(limited to 'src/at90canbase.cpp') - -diff --git src/at90canbase.cpp b/src/at90canbase.cpp -index 727e893..cbfef1a 100644 ---- src/at90canbase.cpp -+++ src/at90canbase.cpp -@@ -93,9 +93,9 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - &portf.GetPin(7)) - { - flagJMPInstructions = (flash_bytes > 8U * 1024U) ? true : false; -- irqSystem = new HWIrqSystem(this, (flash_bytes > 8U * 1024U) ? 4 : 2, 26); -+ irqSystem = new HWIrqSystem(this, (flash_bytes > 8U * 1024U) ? 4 : 2, 37); - -- eeprom = new HWEeprom(this, irqSystem, ee_bytes, 23, HWEeprom::DEVMODE_EXTENDED); -+ eeprom = new HWEeprom(this, irqSystem, ee_bytes, 26, HWEeprom::DEVMODE_EXTENDED); - stack = new HWStackSram(this, 16); - - RegisterPin("AREF", &aref); -@@ -116,8 +116,8 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - extirq01->registerIrq(8, 7, new ExternalIRQSingle(eicrb_reg, 6, 2, GetPin("E7"))); - - timerIrq0 = new TimerIRQRegister(this, irqSystem, 0); -- timerIrq0->registerLine(0, new IRQLine("TOV0", 16)); -- timerIrq0->registerLine(1, new IRQLine("OCF0A", 15)); -+ timerIrq0->registerLine(0, new IRQLine("TOV0", 17)); // TIMER0 OVF -+ timerIrq0->registerLine(1, new IRQLine("OCF0A", 16)); // TIMER0 COMP - - timer0 = new HWTimer8_1C(this, - new PrescalerMultiplexerExt(&prescaler013, PinAtPort(&portd, 7)), -@@ -127,11 +127,11 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - new PinAtPort(&portb, 7)); - - timerIrq1 = new TimerIRQRegister(this, irqSystem, 1); -- timerIrq1->registerLine(0, new IRQLine("TOV1", 14)); -- timerIrq1->registerLine(1, new IRQLine("OCF1A", 13)); -- timerIrq1->registerLine(2, new IRQLine("OCF1B", 12)); -- timerIrq1->registerLine(3, new IRQLine("OCF1C", 11)); -- timerIrq1->registerLine(5, new IRQLine("ICF1", 10)); -+ timerIrq1->registerLine(0, new IRQLine("TOV1", 15)); // TIMER1 OVF -+ timerIrq1->registerLine(1, new IRQLine("OCF1A", 12)); // TIMER1 COMPA -+ timerIrq1->registerLine(2, new IRQLine("OCF1B", 13)); // TIMER1 COMPB -+ timerIrq1->registerLine(3, new IRQLine("OCF1C", 14)); // TIMER1 COMPC -+ timerIrq1->registerLine(5, new IRQLine("ICF1", 11)); // TIMER1 CAPT - - inputCapture1 = new ICaptureSource(PinAtPort(&portd, 4)); - timer1 = new HWTimer16_3C(this, -@@ -148,8 +148,8 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - inputCapture1); - - timerIrq2 = new TimerIRQRegister(this, irqSystem, 2); -- timerIrq2->registerLine(0, new IRQLine("TOV2", 9)); -- timerIrq2->registerLine(1, new IRQLine("OCF2A", 7)); -+ timerIrq2->registerLine(0, new IRQLine("TOV2", 10)); // TIMER2 OVF -+ timerIrq2->registerLine(1, new IRQLine("OCF2A", 9)); // TIMER2 COMP - - timer2 = new HWTimer8_1C(this, - new PrescalerMultiplexer(&prescaler2), -@@ -159,11 +159,11 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - new PinAtPort(&portb, 4)); - - timerIrq3 = new TimerIRQRegister(this, irqSystem, 3); -- timerIrq3->registerLine(0, new IRQLine("TOV3", 30)); -- timerIrq3->registerLine(1, new IRQLine("OCF3A", 27)); -- timerIrq3->registerLine(2, new IRQLine("OCF3B", 28)); -- timerIrq3->registerLine(3, new IRQLine("OCF3C", 29)); -- timerIrq3->registerLine(5, new IRQLine("ICF3", 26)); -+ timerIrq3->registerLine(0, new IRQLine("TOV3", 31)); // TIMER3 OVF -+ timerIrq3->registerLine(1, new IRQLine("OCF3A", 28)); // TIMER3 COMPA -+ timerIrq3->registerLine(2, new IRQLine("OCF3B", 29)); // TIMER3 COMPB -+ timerIrq3->registerLine(3, new IRQLine("OCF3C", 30)); // TIMER3 COMPC -+ timerIrq3->registerLine(5, new IRQLine("ICF3", 27)); // TIMER3 CAPT - - inputCapture3 = new ICaptureSource(PinAtPort(&porte, 7)); - timer3 = new HWTimer16_3C(this, -@@ -195,16 +195,16 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - - wado = new HWWado(this); - -- acomp = new HWAcomp(this, irqSystem, PinAtPort(&porte, 2), PinAtPort(&porte, 3), 23); -+ acomp = new HWAcomp(this, irqSystem, PinAtPort(&porte, 2), PinAtPort(&porte, 3), 24); - - usart0 = new HWUsart(this, - irqSystem, - PinAtPort(&porte,1), // TXD - PinAtPort(&porte,0), // RXD - PinAtPort(&porte,2), // XCK -- 20, // RX complete vector -- 21, // UDRE vector -- 22, // TX complete vector -+ 21, // RX complete vector -+ 22, // UDRE vector -+ 23, // TX complete vector - 0); - - usart1 = new HWUsart(this, -@@ -212,9 +212,9 @@ AvrDevice_at90canbase::AvrDevice_at90canbase(unsigned ram_bytes, - PinAtPort(&portd,3), // TXD - PinAtPort(&portd,2), // RXD - PinAtPort(&portd,5), // XCK -- 31, // RX complete vector -- 32, // UDRE vector -- 33, // TX complete vector -+ 32, // RX complete vector -+ 33, // UDRE vector -+ 34, // TX complete vector - 1); - - --- -cgit v0.9.0.2 diff --git a/emulators/simulavr/files/patch-msleep b/emulators/simulavr/files/patch-msleep deleted file mode 100644 index 53c5dee815eb0..0000000000000 --- a/emulators/simulavr/files/patch-msleep +++ /dev/null @@ -1,39 +0,0 @@ ---- examples/atmel_key/StdDefs.c 2012-10-14 01:14:44.000000000 -0400 -+++ examples/atmel_key/StdDefs.c 2012-10-14 01:51:12.000000000 -0400 -@@ -54,16 +54,6 @@ - sbi(TESTPIN_PORT, TESTPIN_BIT); - } - --// Delay in 1/10's of a millisecond --void msleep(INT16U ms) -- { /* This loop does not work with optimization != 0. Therefore we use -- avr-libc _delay routines K. Schwichtenberg -- INT16S i,j; -- for (i = 1; i < ms; i++) -- for (j = 1; j < ONETENTH_MS; j++); / * to give 1/10 ms*/ -- _delay_ms(ms); // Changed K. Schwichtenberg -- } -- - //------------------------------------------------------------ - // void putBCD(INT16S X, CHARU length, CHARU TrailingSpace) - // ---- examples/atmel_key/main.c 2012-10-14 01:14:44.000000000 -0400 -+++ examples/atmel_key/main.c 2012-10-14 01:51:53.000000000 -0400 -@@ -5,6 +5,8 @@ - // PS-1 Keyboard interface test program - - #include -+#include -+ - #include - //include - #include -@@ -31,7 +33,7 @@ - { - key=getchar(); - putchar(key); -- msleep(10); -+ _delay_ms(10); - } - return 1; - } diff --git a/emulators/simulavr/files/patch-src_Makefile.in b/emulators/simulavr/files/patch-src_Makefile.in deleted file mode 100644 index 5660e0d7a9874..0000000000000 --- a/emulators/simulavr/files/patch-src_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- src/Makefile.in 2012-10-25 22:47:51.000000000 -0400 -+++ src/Makefile.in 2012-10-25 22:46:05.000000000 -0400 -@@ -420,11 +421,14 @@ - specialmem.cpp string2.cpp systemclock.cpp traceval.cpp ui/ui.cpp - - nodist_libsim_la_SOURCES = $(FAB_CPP) --libsim_la_LDFLAGS = -version-info 0:0:0 -rpath ${prefix}/lib -+libsim_la_LDFLAGS = -version-info 0:0:0 -rpath ${prefix}/lib \ -+ -L$(AVR_LIBBFD_LIBPATH) -lbfd -L$(AVR_LIBIBERTY_LIBPATH) -liberty \ -+ -lz -lintl -ltcl - nodist_libsimulavr_la_SOURCES = $(TCL_WRAP_SRC) - libsimulavr_la_LDFLAGS = -version-info 0:0:0 -rpath ${prefix}/lib - libsimulavr_la_LIBADD = $(libsim_la_OBJECTS) -lz \ -- -L$(AVR_LIBBFD_LIBPATH) -lbfd -L$(AVR_LIBIBERTY_LIBPATH) -liberty -+ -L$(AVR_LIBBFD_LIBPATH) -lbfd -L$(AVR_LIBIBERTY_LIBPATH) -liberty \ -+ -lz -lintl -ltcl - - pkginclude_HEADERS = \ - adcpin.h application.h at4433.h at8515.h atmega128.h atmega16_32.h attiny2313.h \ diff --git a/emulators/simulavr/files/patch-src_systemclock.cpp b/emulators/simulavr/files/patch-src_systemclock.cpp deleted file mode 100644 index cb411a8013999..0000000000000 --- a/emulators/simulavr/files/patch-src_systemclock.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/systemclock.cpp.orig 2012-10-13 23:07:50.000000000 -0400 -+++ src/systemclock.cpp 2012-10-13 23:07:56.000000000 -0400 -@@ -67,7 +67,7 @@ - template - void MinHeap::Insert(Key k, Value v) - { -- resize(this->size()+1); -+ this->resize(this->size()+1); - for(unsigned i = this->size();;) { - unsigned parent = i/2; - if(parent == 0 || (*this)[parent-1].first < k) {