From 9967bdc451d76e53a69873ace05fe84d5aa0e43f Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sat, 21 Nov 2020 19:13:44 -0600 Subject: [PATCH] aqemu: update to 0.9.4 --- srcpkgs/aqemu/patches/memory-leak.patch | 68 ------------------------- srcpkgs/aqemu/patches/stdexcept.patch | 27 +++++++--- srcpkgs/aqemu/template | 8 +-- 3 files changed, 25 insertions(+), 78 deletions(-) delete mode 100644 srcpkgs/aqemu/patches/memory-leak.patch diff --git a/srcpkgs/aqemu/patches/memory-leak.patch b/srcpkgs/aqemu/patches/memory-leak.patch deleted file mode 100644 index d2369e18687..00000000000 --- a/srcpkgs/aqemu/patches/memory-leak.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c031cf9ba4023b2026e5680ddcd0daeca5e6b842 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tobias=20Gl=C3=A4=C3=9Fer?= -Date: Tue, 14 Jun 2016 20:25:24 +0200 -Subject: [PATCH] Small memory leak fixes. - ---- - src/HDD_Image_Info.cpp | 5 +++++ - src/HDD_Image_Info.h | 1 + - src/Properties_Window.cpp | 5 +++++ - src/Properties_Window.h | 1 + - 4 files changed, 12 insertions(+) - -diff --git src/HDD_Image_Info.cpp src/HDD_Image_Info.cpp -index 4cd34b4..9d29c88 100644 ---- src/HDD_Image_Info.cpp -+++ src/HDD_Image_Info.cpp -@@ -32,6 +32,11 @@ HDD_Image_Info::HDD_Image_Info( QObject *parent ) - QEMU_IMG_Proc = new QProcess( this ); - } - -+HDD_Image_Info::~HDD_Image_Info() -+{ -+ delete QEMU_IMG_Proc; -+} -+ - VM::Disk_Info HDD_Image_Info::Get_Disk_Info() const - { - return Info; -diff --git src/HDD_Image_Info.h src/HDD_Image_Info.h -index 2cfec47..9339464 100644 ---- src/HDD_Image_Info.h -+++ src/HDD_Image_Info.h -@@ -32,6 +32,7 @@ class HDD_Image_Info : public QObject - - public: - HDD_Image_Info( QObject *parent = 0 ); -+ ~HDD_Image_Info(); - VM::Disk_Info Get_Disk_Info() const; - - public slots: -diff --git src/Properties_Window.cpp src/Properties_Window.cpp -index 918251f..48d9619 100644 ---- src/Properties_Window.cpp -+++ src/Properties_Window.cpp -@@ -47,6 +47,11 @@ Properties_Window::Properties_Window( QWidget *parent ) - this, SLOT(on_Button_Update_Info_clicked()) ); - } - -+Properties_Window::~Properties_Window() -+{ -+ delete HDD_Info; -+} -+ - const VM_Storage_Device &Properties_Window::Get_Floppy() - { - PW_Storage.Set_Enabled( true ); -diff --git src/Properties_Window.h src/Properties_Window.h -index 75ecbc1..bb9f692 100644 ---- src/Properties_Window.h -+++ src/Properties_Window.h -@@ -33,6 +33,7 @@ class Properties_Window: public QDialog - - public: - Properties_Window( QWidget *parent = 0 ); -+ ~Properties_Window(); - - const VM_Storage_Device &Get_Floppy(); - const VM_Storage_Device &Get_CD_ROM(); diff --git a/srcpkgs/aqemu/patches/stdexcept.patch b/srcpkgs/aqemu/patches/stdexcept.patch index 8b2b015e239..70c87ccd073 100644 --- a/srcpkgs/aqemu/patches/stdexcept.patch +++ b/srcpkgs/aqemu/patches/stdexcept.patch @@ -1,10 +1,25 @@ ---- src/docopt/docopt_value.h 2016-05-31 14:34:02.000000000 +0200 -+++ src/docopt/docopt_value.h 2020-09-24 20:10:27.152286526 +0200 -@@ -13,6 +13,7 @@ - #include - #include // std::hash +From fe1fd5c856a79d9f0704ad2b973caf786272dbd4 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Sat, 21 Nov 2020 19:08:35 -0600 +Subject: [PATCH] stdexcept + +--- + src/docopt/docopt_value.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/docopt/docopt_value.h src/docopt/docopt_value.h +index ddb8a8e..99aa545 100644 +--- src/docopt/docopt_value.h ++++ src/docopt/docopt_value.h +@@ -13,7 +13,7 @@ #include + #include + #include +- +#include - namespace docopt { + /// A generic type to hold the various types that can be produced by docopt. +-- +2.29.2 + diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template index a3dcfe64e57..eea61aa562b 100644 --- a/srcpkgs/aqemu/template +++ b/srcpkgs/aqemu/template @@ -1,7 +1,7 @@ # Template file for 'aqemu' pkgname=aqemu -version=0.9.2 -revision=2 +version=0.9.4 +revision=1 build_style=cmake configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1" makedepends="qt5-devel qemu desktop-file-utils" @@ -10,8 +10,8 @@ short_desc="GUI to QEMU and KVM emulators, written in Qt4" maintainer="Orphaned " license="GPL-2.0-only" homepage="http://aqemu.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/aqemu/${version}/aqemu-$version.tar.gz" -checksum=e3d54de00ebdce3754f97f7e0e7cce8cebb588e8ce6bc249401cc909281b08de +distfiles="https://github.com/TBK/aqemu/archive/v${version}.tar.gz" +checksum=576ae78de936518a1de057355ffc192b59e42be934f0111122b2c5fcafe318a7 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel"