diff options
author | Maxim Koltsov <maksbotan@gentoo.org> | 2011-09-11 16:55:20 +0000 |
---|---|---|
committer | Maxim Koltsov <maksbotan@gentoo.org> | 2011-09-11 16:55:20 +0000 |
commit | e3e4d27cc79c5dd7763ea37d8952a480eec62b3d (patch) | |
tree | da4710e0d08d1f66c19b63cce5d0600529caab2b /app-emulation/aqemu | |
parent | [app-emulation/xen-tools] Sync live ebuild with 4.1.1, drop acm since its dep... (diff) | |
download | gentoo-2-e3e4d27cc79c5dd7763ea37d8952a480eec62b3d.tar.gz gentoo-2-e3e4d27cc79c5dd7763ea37d8952a480eec62b3d.tar.bz2 gentoo-2-e3e4d27cc79c5dd7763ea37d8952a480eec62b3d.zip |
Add aqemu-0.8.2-r1, drop 0.8.2
(Portage version: 2.1.10.15/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/aqemu')
-rw-r--r-- | app-emulation/aqemu/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/aqemu/aqemu-0.8.2-r1.ebuild (renamed from app-emulation/aqemu/aqemu-0.8.2.ebuild) | 31 | ||||
-rw-r--r-- | app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch | 45 |
3 files changed, 69 insertions, 16 deletions
diff --git a/app-emulation/aqemu/ChangeLog b/app-emulation/aqemu/ChangeLog index ec9131592400..168d8401dac4 100644 --- a/app-emulation/aqemu/ChangeLog +++ b/app-emulation/aqemu/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/aqemu # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.5 2011/09/04 17:36:42 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.6 2011/09/11 16:55:20 maksbotan Exp $ + +*aqemu-0.8.2-r1 (11 Sep 2011) + + 11 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> -aqemu-0.8.2.ebuild, + +aqemu-0.8.2-r1.ebuild, +files/aqemu-0.8.2_sigsev_propertis.patch: + Add aqemu-0.8.2-r1 with patch from upstream git, drop aqemu-0.8.2. Thanks to + Andreis Vinogradovs <spamslepnoga@inbox.ru> 04 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> aqemu-0.8.1.ebuild: x86 stable wrt bug #380471 diff --git a/app-emulation/aqemu/aqemu-0.8.2.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild index f453299d7d0c..1517e4352ac9 100644 --- a/app-emulation/aqemu/aqemu-0.8.2.ebuild +++ b/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/aqemu-0.8.2.ebuild,v 1.1 2011/07/29 12:06:37 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild,v 1.1 2011/09/11 16:55:20 maksbotan Exp $ -EAPI="2" +EAPI=4 inherit cmake-utils @@ -17,21 +17,22 @@ IUSE="kvm vnc" DEPEND="${RDEPEND}" RDEPEND="kvm? ( app-emulation/qemu-kvm ) - !kvm? ( >=app-emulation/qemu-0.9.0 ) - vnc? ( net-libs/libvncserver ) - x11-libs/qt-gui:4 - x11-libs/qt-test:4 - x11-libs/qt-xmlpatterns:4" + !kvm? ( >=app-emulation/qemu-0.9.0 ) + vnc? ( net-libs/libvncserver ) + x11-libs/qt-gui:4 + x11-libs/qt-test:4 + x11-libs/qt-xmlpatterns:4" DOCS="AUTHORS CHANGELOG README TODO" +PATCHES=("${FILESDIR}"/aqemu-0.8.2_sigsev_propertis.patch) src_configure() { - local mycmakeargs=" -DCMAKE_VERBOSE_MAKEFILE=OFF" - if use vnc; then - mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=OFF " - else - mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=ON " - fi - - cmake-utils_src_configure + local mycmakeargs=" -DMAN_PAGE_COMPRESSOR="" " + if use vnc; then + mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=OFF " + else + mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=ON " + fi + + cmake-utils_src_configure } 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 new file mode 100644 index 000000000000..6fa33a3c5e9b --- /dev/null +++ b/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch @@ -0,0 +1,45 @@ +X-Git-Url: http://aqemu.git.sourceforge.net/git/gitweb.cgi?p=aqemu%2Faqemu;a=blobdiff_plain;f=Device_Manager_Widget.cpp;h=671930a152de6bf98b9218df7cb9cb1ca29e570d;hp=7288bafc6887841b94dd846a9df523205aa72a22;hb=18 + +diff --git a/Device_Manager_Widget.cpp b/Device_Manager_Widget.cpp +index 7288baf..671930a 100644 +--- a/Device_Manager_Widget.cpp ++++ b/Device_Manager_Widget.cpp +@@ -981,9 +981,10 @@ void Device_Manager_Widget::on_actionDelete_triggered() + { + 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 @@ void Device_Manager_Widget::on_actionDelete_triggered() + "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(); + } + |