public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/
@ 2016-07-27 20:23 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-07-27 20:23 UTC (permalink / raw
  To: gentoo-commits

commit:     c85e4fe0bd7ef6a882eec0b698c09d74f83186e1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 20:22:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 20:23:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85e4fe0

app-emulation/aqemu: add patch to ensure the correct rcc binary is called

Gentoo-bug: 589332

Package-Manager: portage-2.3.0

 app-emulation/aqemu/aqemu-0.9.2.ebuild               |  1 +
 app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2.ebuild
index cbe0aa5..bdf8926 100644
--- a/app-emulation/aqemu/aqemu-0.9.2.ebuild
+++ b/app-emulation/aqemu/aqemu-0.9.2.ebuild
@@ -25,6 +25,7 @@ RDEPEND="app-emulation/qemu
 	dev-qt/qtprintsupport:5"
 
 DOCS="AUTHORS CHANGELOG README TODO"
+PATCHES=( "${FILESDIR}/${PN}-0.9.2-qtbindir.patch" )
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch b/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch
new file mode 100644
index 0000000..5c55480
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.9.2-qtbindir.patch
@@ -0,0 +1,15 @@
+Ensure the Qt 5 version of rcc is used instead of whatever is in $PATH.
+
+Gentoo-bug: 589332
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -285,7 +285,7 @@
+ 		
+ 		SET( _out ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.rcc )
+ 		
+-		ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND rcc ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} )
++		ADD_CUSTOM_COMMAND( OUTPUT ${_out} COMMAND ${Qt5Core_RCC_EXECUTABLE} ARGS ${_in} -binary -o ${_out} DEPENDS ${_in} )
+ 		
+ 		SET( ${_sources} ${${_sources}} ${_out} )
+ 	ENDFOREACH( curFile )


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/
@ 2017-02-12 16:07 Johannes Huber
  0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2017-02-12 16:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e8c66d943e29a4f51c744dc26e3b55ef6aa54df0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 16:01:47 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 16:07:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c66d94

app-emulation/aqemu: Remove 0.8.2 (r3)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-emulation/aqemu/Manifest                       |  1 -
 app-emulation/aqemu/aqemu-0.8.2-r3.ebuild          | 41 ----------------------
 .../aqemu/files/aqemu-0.8.2_desktop_file.patch     | 33 -----------------
 .../aqemu/files/aqemu-0.8.2_format-security.patch  | 38 --------------------
 .../aqemu/files/aqemu-0.8.2_qt48_build.patch       | 27 --------------
 .../aqemu/files/aqemu-0.8.2_sigsev_propertis.patch | 41 ----------------------
 6 files changed, 181 deletions(-)

diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
index 09013e24e8..49e74a8a05 100644
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@@ -1,2 +1 @@
-DIST aqemu-0.8.2.tar.bz2 1025129 SHA256 03c4a95328f78238021168ca4887f9735641f10eb4eb1eff58b08c15b748bf03 SHA512 45f27f82ca307ffc50ea26a57631b47236fd04915274bb00a0720e65859e183d56c3243e0e31d71e5280d0941a9c80c1457b09d393e5c4d4deeb1fea4159459d WHIRLPOOL c5a058883df1424d5d1b2b028fca7fd6aae8b72281060a305a428e63ad5bfb1d062c56c18878b6a279a79953a88c760553a701b5c3346113836eb56ab4a30aa2
 DIST v0.9.2.tar.gz 1373465 SHA256 e3d54de00ebdce3754f97f7e0e7cce8cebb588e8ce6bc249401cc909281b08de SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba WHIRLPOOL ddefe4c3265b10940c3d65a5f6182ecfce627bcc45486d7a2b8701a6152b8a144242ea55018437f71773f7b8bb70b763095b5db6f933fdacd7b16b1f22112b87

diff --git a/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild
deleted file mode 100644
index c37c3a905f..0000000000
--- a/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit  cmake-utils
-
-DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt4"
-HOMEPAGE="https://sourceforge.net/projects/aqemu"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vnc"
-
-DEPEND="${RDEPEND}"
-RDEPEND="app-emulation/qemu
-	vnc? ( net-libs/libvncserver )
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	dev-qt/qtxmlpatterns:4"
-
-DOCS="AUTHORS CHANGELOG README TODO"
-
-PATCHES=(
-	"${FILESDIR}"/aqemu-0.8.2_sigsev_propertis.patch
-	"${FILESDIR}"/aqemu-0.8.2_qt48_build.patch
-	"${FILESDIR}"/aqemu-0.8.2_desktop_file.patch
-	"${FILESDIR}"/aqemu-0.8.2_format-security.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		"-DMAN_PAGE_COMPRESSOR="
-		"-DWITHOUT_EMBEDDED_DISPLAY=$(use vnc && echo "OFF" || echo "ON")"
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch b/app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch
deleted file mode 100644
index 4cf20ea578..0000000000
--- a/app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2a0f32e8cb46c8a1c0a33ed151737e5abb5679ed Mon Sep 17 00:00:00 2001
-From: Andrey Rijov <rdron@users.sourceforge.net>
-Date: Mon, 31 Oct 2011 19:38:17 +0400
-Subject: [PATCH] Updated aqemu.desktop file (See bug: 3430317)
-
----
- menu_data/aqemu.desktop |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
---- a/menu_data/aqemu.desktop
-+++ b/menu_data/aqemu.desktop
-@@ -1,14 +1,15 @@
- [Desktop Entry]
- Encoding=UTF-8
--Name=AQEMU
- Exec=aqemu
- Terminal=false
- Type=Application
--Icon=aqemu_48x48.png
-+Icon=aqemu_48x48
- StartupNotify=true
- Categories=System;Emulator;
- 
--Name[ru]=AQEMU
-+Name=AQEMU
-+Comment=Virtual machine manager
- Name[en]=AQEMU
--Comment[ru]=Управление виртуальными машинами
- Comment[en]=Virtual machine manager
-+Name[ru]=AQEMU
-+Comment[ru]=Управление виртуальными машинами
--- 
-1.7.4.1

diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch b/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch
deleted file mode 100644
index d6ce93969b..0000000000
--- a/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- aqemu-0.8.2-orig/Utils.cpp
-+++ aqemu-0.8.2-format-security/Utils.cpp
-@@ -66,9 +66,9 @@ void AQDebug( const QString &sender, con
- 		std::cout << QString( "\nAQEMU Debug [%1] >>>\nSender: %2\nMessage: %3" )
- 							  .arg(Messages_Index).arg(sender).arg(mes).toStdString();
- 	#else
--		qDebug( qPrintable(QString(
-+		qDebug() << qPrintable(QString(
- 			"\n\33[32mAQEMU Debug\33[0m [%1] >>>\n\33[32mSender:\33[0m %2\n\33[32mMessage:\33[0m %3")
--			.arg(Messages_Index).arg(sender).arg(mes)) );
-+			.arg(Messages_Index).arg(sender).arg(mes));
- 	#endif
- 	}
- 	
-@@ -87,9 +87,9 @@ void AQWarning( const QString &sender, c
- 		std::cout << QString( "\nAQEMU Warning [%1] >>>\nSender: %2\nMessage: %3" )
- 							  .arg(Messages_Index).arg(sender).arg(mes).toStdString();
- 	#else
--		qDebug( qPrintable(QString(
-+		qDebug() << qPrintable(QString(
- 			"\n\33[34mAQEMU Warning\33[0m [%1] >>>\n\33[34mSender:\33[0m %2\n\33[34mMessage:\33[0m %3")
--			.arg(Messages_Index).arg(sender).arg(mes)) );
-+			.arg(Messages_Index).arg(sender).arg(mes));
- 	#endif
- 	}
- 	
-@@ -108,9 +108,9 @@ void AQError( const QString &sender, con
- 		std::cout << QString( "\nAQEMU Error [%1] >>>\nSender: %2\nMessage: %3" )
- 							  .arg(Messages_Index).arg(sender).arg(mes).toStdString();
- 	#else
--		qDebug( qPrintable(QString(
-+		qDebug() << qPrintable(QString(
- 			"\n\33[31mAQEMU Error\33[0m [%1] >>>\n\33[31mSender:\33[0m %2\n\33[31mMessage:\33[0m %3")
--			.arg(Messages_Index).arg(sender).arg(mes)) );
-+			.arg(Messages_Index).arg(sender).arg(mes));
- 	#endif
- 	}
- 	

diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch b/app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch
deleted file mode 100644
index afd1f0c853..0000000000
--- a/app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9b21d88a4f4a681f9e80c11e83e81c976e0fc91e Mon Sep 17 00:00:00 2001
-From: Andrey Rijov <rdron@users.sourceforge.net>
-Date: Sat, 29 Oct 2011 10:20:32 +0400
-Subject: [PATCH 1/1] Fix build error on Qt 4.8
-
----
- Embedded_Display/vncview.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Embedded_Display/vncview.cpp b/Embedded_Display/vncview.cpp
-index 9e105c9..0be5944 100644
---- a/Embedded_Display/vncview.cpp
-+++ b/Embedded_Display/vncview.cpp
-@@ -27,8 +27,8 @@
-     #include <QMessageBox>
-     #include <QInputDialog>
-     #define KMessageBox QMessageBox
--    #define error(parent, message, caption) \
--        critical(parent, caption, message)
-+/*    #define error(parent, message, caption) \
-+        critical(parent, caption, message)*/
- #else
-     #include "settings.h"
-     #include <KActionCollection>
--- 
-1.7.4.1
-

diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch b/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
deleted file mode 100644
index b7cc5950bd..0000000000
--- a/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/Device_Manager_Widget.cpp	2011-09-13 21:45:58.883389571 +0200
-+++ b/Device_Manager_Widget.cpp	2011-09-13 21:55:01.401866022 +0200
-@@ -981,9 +981,10 @@
- 		{
- 			if( ui.Devices_List->currentItem()->data(512).toString() == "device" + QString::number(fx) )
- 			{
--				finded = true;
--				
- 				Storage_Devices.removeAt( fx );
-+				ui.Devices_List->takeItem( ui.Devices_List->currentRow() );
-+				finded = true;
-+				break;
- 			}
- 		}
- 		
-@@ -993,10 +994,24 @@
- 					 "Incorrect Device!" );
- 			return;
- 		}
-+		else
-+		{
-+			// Rename items
-+			for( int ix = 0, count = 0; ix < ui.Devices_List->count(); ++ix )
-+			{
-+				if( ui.Devices_List->item(ix)->data(512).toString().contains("device") )
-+				{
-+					ui.Devices_List->item(ix)->setData( 512, QString("device%1").arg(count) );
-+					++count;
-+				}
-+			}
-+
-+			emit Device_Changet();
-+			return;
-+		}
- 	}
- 	
- 	ui.Devices_List->takeItem( ui.Devices_List->currentRow() );
--	
- 	emit Device_Changet();
- }
- 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/
@ 2021-07-19 10:49 Stephan Hartmann
  0 siblings, 0 replies; 5+ messages in thread
From: Stephan Hartmann @ 2021-07-19 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0d8f2a7f189c900b1de10e074c455adb025caeae
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 10:49:01 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 10:49:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8f2a7f

app-emulation/aqemu: add patch for missing include

Closes: https://bugs.gentoo.org/802816
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 app-emulation/aqemu/aqemu-0.9.2.ebuild              |  5 ++++-
 app-emulation/aqemu/files/aqemu-0.9.2-include.patch | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2.ebuild
index 86008228bc2..852e66678fc 100644
--- a/app-emulation/aqemu/aqemu-0.9.2.ebuild
+++ b/app-emulation/aqemu/aqemu-0.9.2.ebuild
@@ -26,7 +26,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 #DOCS=( AUTHORS CHANGELOG README TODO )
-PATCHES=( "${FILESDIR}/${PN}-0.9.2-qtbindir.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.2-qtbindir.patch"
+	"${FILESDIR}/${PN}-0.9.2-include.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-include.patch b/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
new file mode 100644
index 00000000000..98a14068a7c
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.9.2-include.patch
@@ -0,0 +1,10 @@
+--- a/src/docopt/docopt_value.h
++++ b/src/docopt/docopt_value.h
+@@ -13,6 +13,7 @@
+ #include <vector>
+ #include <functional> // std::hash
+ #include <iosfwd>
++#include <stdexcept>
+ 
+ namespace docopt {
+ 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/
@ 2021-07-19 13:52 Stephan Hartmann
  0 siblings, 0 replies; 5+ messages in thread
From: Stephan Hartmann @ 2021-07-19 13:52 UTC (permalink / raw
  To: gentoo-commits

commit:     fda506b12d14e8758d699e60e81e709e1b004463
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 13:52:12 2021 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 13:52:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda506b1

app-emulation/aqemu: fix docs installation

Closes: https://bugs.gentoo.org/802912
Closes: https://bugs.gentoo.org/802909
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 .../aqemu/{aqemu-0.9.2.ebuild => aqemu-0.9.2-r1.ebuild}   |  5 +++--
 app-emulation/aqemu/files/aqemu-0.9.2-docs.patch          | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r1.ebuild
similarity index 88%
rename from app-emulation/aqemu/aqemu-0.9.2.ebuild
rename to app-emulation/aqemu/aqemu-0.9.2-r1.ebuild
index 852e66678fc..d7880171c93 100644
--- a/app-emulation/aqemu/aqemu-0.9.2.ebuild
+++ b/app-emulation/aqemu/aqemu-0.9.2-r1.ebuild
@@ -25,15 +25,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-#DOCS=( AUTHORS CHANGELOG README TODO )
+DOCS=( AUTHORS CHANGELOG README TODO )
 PATCHES=(
 	"${FILESDIR}/${PN}-0.9.2-qtbindir.patch"
 	"${FILESDIR}/${PN}-0.9.2-include.patch"
+	"${FILESDIR}/${PN}-0.9.2-docs.patch"
 )
 
 src_configure() {
 	local mycmakeargs=(
-		-DMAN_PAGE_COMPRESSOR=""
+		-DMAN_PAGE_COMPRESSOR=OFF
 		-DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON)
 	)
 

diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch b/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
new file mode 100644
index 00000000000..e3fab7fbf20
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.9.2-docs.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -273,9 +273,9 @@ MACRO( create_docs _sources )
+ 	ENDFOREACH( curFile )
+ ENDMACRO( create_docs )
+ 
+-CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
+-ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
+-INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
++#CREATE_DOCS( docs_bz2 AUTHORS CHANGELOG README TODO )
++#ADD_CUSTOM_TARGET( docs ALL DEPENDS ${docs_bz2} )
++#INSTALL( FILES ${docs_bz2} DESTINATION share/doc/aqemu )
+ 
+ # Build RCC files (GUI icons)
+ MACRO( pack_icons _sources )


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/
@ 2021-12-23  0:32 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-12-23  0:32 UTC (permalink / raw
  To: gentoo-commits

commit:     a8fe0f469f72fede9769365e1553f2706f9fb3eb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 23 00:18:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 23 00:19:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8fe0f46

app-emulation/aqemu: fix crash on startup

Closes: https://bugs.gentoo.org/738020
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/aqemu/aqemu-0.9.2-r2.ebuild          |  43 ++++++++
 .../aqemu/files/aqemu-0.9.2-crash-fix.patch        | 116 +++++++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..30c5865b473a
--- /dev/null
+++ b/app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt5"
+HOMEPAGE="https://sourceforge.net/projects/aqemu"
+SRC_URI="https://github.com/tobimensch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vnc"
+
+RDEPEND="
+	app-emulation/qemu
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	vnc? ( net-libs/libvncserver )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS CHANGELOG README TODO )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.2-qtbindir.patch"
+	"${FILESDIR}/${PN}-0.9.2-include.patch"
+	"${FILESDIR}/${PN}-0.9.2-docs.patch"
+	"${FILESDIR}/${PN}-0.9.2-crash-fix.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMAN_PAGE_COMPRESSOR=OFF
+		-DWITHOUT_EMBEDDED_DISPLAY=$(usex vnc OFF ON)
+	)
+
+	cmake_src_configure
+}

diff --git a/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
new file mode 100644
index 000000000000..ef4c1a146461
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.9.2-crash-fix.patch
@@ -0,0 +1,116 @@
+https://github.com/tobimensch/aqemu/pull/116
+https://bugs.gentoo.org/738020
+
+From dc19121a923c71eed248cd6310b9b06ec0af6abe Mon Sep 17 00:00:00 2001
+From: Moskaliou Nikita <44800696+nikitamos@users.noreply.github.com>
+Date: Sun, 5 Dec 2021 19:36:44 +0300
+Subject: [PATCH] Change widgets names
+
+Several widgets in the src/Main_Window.ui file had the same name ("widget"), for several users AQEMU crashed with SEGFAULT. So, the names were changed and now everything works fine
+--- 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="general_Machine_Sets" native="true">
+               <layout class="QGridLayout" name="gridLayout_12">
+                <property name="leftMargin">
+                 <number>24</number>
+@@ -275,9 +275,6 @@
+                    <property name="maxCount">
+                     <number>64</number>
+                    </property>
+-                   <property name="sizeAdjustPolicy">
+-                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+-                   </property>
+                   </widget>
+                  </item>
+                  <item row="3" column="1">
+@@ -294,9 +291,6 @@
+                    <property name="maxCount">
+                     <number>16</number>
+                    </property>
+-                   <property name="sizeAdjustPolicy">
+-                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+-                   </property>
+                    <item>
+                     <property name="text">
+                      <string>1</string>
+@@ -395,9 +389,6 @@
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+-                   <property name="sizeAdjustPolicy">
+-                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+-                   </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="2">
+@@ -526,9 +517,6 @@
+                    <property name="maxCount">
+                     <number>8</number>
+                    </property>
+-                   <property name="sizeAdjustPolicy">
+-                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+-                   </property>
+                    <item>
+                     <property name="text">
+                      <string>Floppy</string>
+@@ -586,9 +574,6 @@
+                    <property name="maxCount">
+                     <number>8</number>
+                    </property>
+-                   <property name="sizeAdjustPolicy">
+-                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+-                   </property>
+                   </widget>
+                  </item>
+                  <item row="3" column="0">
+@@ -618,9 +603,6 @@
+                    <property name="maxCount">
+                     <number>128</number>
+                    </property>
+-                   <property name="sizeAdjustPolicy">
+-                    <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+-                   </property>
+                    <item>
+                     <property name="text">
+                      <string>en-us (default)</string>
+@@ -1333,7 +1315,7 @@
+              </widget>
+             </item>
+            </layout>
+-           <zorder>widget</zorder>
++           <zorder>general_Machine_Sets</zorder>
+            <zorder>GB_Options</zorder>
+            <zorder>GB_Audio</zorder>
+            <zorder>GB_Memory</zorder>
+@@ -2457,7 +2439,7 @@
+                     </layout>
+                    </item>
+                    <item row="1" column="0" colspan="2">
+-                    <widget class="QWidget" name="widget" native="true">
++                    <widget class="QWidget" name="protocol_Sets" native="true">
+                      <layout class="QHBoxLayout" name="Widget_Redirection_Protocol">
+                       <property name="spacing">
+                        <number>6</number>
+@@ -2515,7 +2497,7 @@
+                     </widget>
+                    </item>
+                    <item row="2" column="0" colspan="2">
+-                    <widget class="QWidget" name="widget" native="true">
++                    <widget class="QWidget" name="ip_Sets" native="true">
+                      <layout class="QHBoxLayout" name="Widget_Redirection_Net">
+                       <property name="spacing">
+                        <number>6</number>
+@@ -3018,7 +3000,7 @@
+      <x>0</x>
+      <y>0</y>
+      <width>982</width>
+-     <height>32</height>
++     <height>22</height>
+     </rect>
+    </property>
+    <widget class="QMenu" name="menuVM">


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-12-23  0:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-19 13:52 [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/ Stephan Hartmann
  -- strict thread matches above, loose matches on Subject: below --
2021-12-23  0:32 Sam James
2021-07-19 10:49 Stephan Hartmann
2017-02-12 16:07 Johannes Huber
2016-07-27 20:23 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox