From ff7e073f8530c151d1ebedef229a333c6256fd83 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 23 May 2020 22:51:52 +1000
Subject: [PATCH] AQEMU: fix crash on start

---
 app-emulation/aqemu/aqemu-0.9.2.recipe        |   2 +-
 .../aqemu/patches/aqemu-0.9.2.patchset        | 109 +++++++++++++++---
 2 files changed, 91 insertions(+), 20 deletions(-)

diff --git a/app-emulation/aqemu/aqemu-0.9.2.recipe b/app-emulation/aqemu/aqemu-0.9.2.recipe
index 17f2607b5..7dfa6fe6f 100644
--- a/app-emulation/aqemu/aqemu-0.9.2.recipe
+++ b/app-emulation/aqemu/aqemu-0.9.2.recipe
@@ -5,7 +5,7 @@ the majority of QEMU and KVM options."
 HOMEPAGE="https://github.com/tobimensch/aqemu/"
 COPYRIGHT="2008-2017 Andrey Rijov"
 LICENSE="GNU GPL v2"
-REVISION="5"
+REVISION="6"
 SOURCE_URI="https://github.com/tobimensch/aqemu/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="e3d54de00ebdce3754f97f7e0e7cce8cebb588e8ce6bc249401cc909281b08de"
 PATCHES="aqemu-$portVersion.patchset"
diff --git a/app-emulation/aqemu/patches/aqemu-0.9.2.patchset b/app-emulation/aqemu/patches/aqemu-0.9.2.patchset
index d025a21b6..3e626e87d 100644
--- a/app-emulation/aqemu/patches/aqemu-0.9.2.patchset
+++ b/app-emulation/aqemu/patches/aqemu-0.9.2.patchset
@@ -1,4 +1,4 @@
-From 4a0e535415da4d786bb4f910416beea93dbe111a Mon Sep 17 00:00:00 2001
+From 2a1bc97e0d4b2a7dd5cb1b902960b2b2a3fb440a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 5 May 2020 18:27:33 +1000
 Subject: GCi 2019 Task - Aqemu - Add platform specific code to get memory size
@@ -110,7 +110,7 @@ index 40a3c61..ace8799 100644
 2.26.0
 
 
-From 97e54f7588b6ea1074dd7da0d87135091cfc1126 Mon Sep 17 00:00:00 2001
+From a59474bb9427410adf15d0e41348a1e40b526b0e Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 5 May 2020 19:32:10 +1000
 Subject: Add Qt to X11 scancode mapper for VNC
@@ -253,7 +253,7 @@ index 8faef72..97527b1 100644
 2.26.0
 
 
-From 2493544de2b6e7acbe143115ecd653152b1c8309 Mon Sep 17 00:00:00 2001
+From 36a868b0e5ad16da18f0bb8f4fa0f077a0bdc228 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 5 May 2020 20:49:18 +1000
 Subject: Use application dir as data dir
@@ -286,25 +286,96 @@ index ace8799..ef05043 100644
 2.26.0
 
 
-From 109b0f04f8d6d2a365c1762cd35ec7b8c412f30e Mon Sep 17 00:00:00 2001
+From 99cb71d549f8be8ae0da5c76cde581de48078da7 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 23 May 2020 13:35:04 +1000
-Subject: Disable optimizations
+Date: Sat, 23 May 2020 22:26:07 +1000
+Subject: Fix widget name conflict
 
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2dd5eb7..5f52c2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,6 +23,8 @@ IF( DEBUG )
- 	ADD_DEFINITIONS( -Wall -g )
- ENDIF( DEBUG )
- 
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O0")
-+
- # For find VNC libs
- SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
- 
+diff --git a/src/Advanced_Settings_Window.ui b/src/Advanced_Settings_Window.ui
+index c3c0faf..c06fdf2 100644
+--- a/src/Advanced_Settings_Window.ui
++++ b/src/Advanced_Settings_Window.ui
+@@ -2177,7 +2177,7 @@ with embedded display</string>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_26">
+             <item>
+-             <widget class="QWidget" name="widget_2" native="true">
++             <widget class="QWidget" name="widget_1" native="true">
+               <layout class="QVBoxLayout" name="verticalLayout_19">
+                <property name="leftMargin">
+                 <number>10</number>
+@@ -2220,7 +2220,7 @@ Supports only USB &amp;1.1 controller emulation.</string>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_25">
+             <item>
+-             <widget class="QWidget" name="widget" native="true">
++             <widget class="QWidget" name="widget_2" native="true">
+               <layout class="QVBoxLayout" name="verticalLayout_16">
+                <property name="leftMargin">
+                 <number>10</number>
+diff --git a/src/Main_Window.ui b/src/Main_Window.ui
+index 550f6e2..a642b78 100644
+--- a/src/Main_Window.ui
++++ b/src/Main_Window.ui
+@@ -226,7 +226,7 @@
+              </widget>
+             </item>
+             <item>
+-             <widget class="QWidget" name="widget" native="true">
++             <widget class="QWidget" name="widget_0" native="true">
+               <layout class="QGridLayout" name="gridLayout_12">
+                <property name="leftMargin">
+                 <number>24</number>
+@@ -2493,7 +2493,7 @@
+                     </layout>
+                    </item>
+                    <item row="1" column="0" colspan="2">
+-                    <widget class="QWidget" name="widget" native="true">
++                    <widget class="QWidget" name="widget_1" native="true">
+                      <layout class="QHBoxLayout" name="Widget_Redirection_Protocol">
+                       <property name="spacing">
+                        <number>6</number>
+@@ -2551,7 +2551,7 @@
+                     </widget>
+                    </item>
+                    <item row="2" column="0" colspan="2">
+-                    <widget class="QWidget" name="widget" native="true">
++                    <widget class="QWidget" name="widget_2" native="true">
+                      <layout class="QHBoxLayout" name="Widget_Redirection_Net">
+                       <property name="spacing">
+                        <number>6</number>
+diff --git a/src/SPICE_Settings_Widget.ui b/src/SPICE_Settings_Widget.ui
+index 3cf1a6e..bb1e339 100644
+--- a/src/SPICE_Settings_Widget.ui
++++ b/src/SPICE_Settings_Widget.ui
+@@ -95,7 +95,7 @@
+            <number>0</number>
+           </property>
+           <item>
+-           <widget class="QGroupBox" name="groupBox">
++           <widget class="QGroupBox" name="groupBox_0">
+             <property name="title">
+              <string>Network</string>
+             </property>
+@@ -209,7 +209,7 @@
+            </widget>
+           </item>
+           <item>
+-           <widget class="QGroupBox" name="groupBox">
++           <widget class="QGroupBox" name="groupBox_1">
+             <property name="title">
+              <string>Image, Video and Audio</string>
+             </property>
+@@ -387,7 +387,7 @@
+            </widget>
+           </item>
+           <item>
+-           <widget class="QGroupBox" name="groupBox">
++           <widget class="QGroupBox" name="groupBox_2">
+             <property name="title">
+              <string>Security</string>
+             </property>
 -- 
 2.26.0