Fix bug #382673

Package-Manager: portage-2.1.10.16/cvs/Linux x86_64

diff --git a/app-emulation/aqemu/ChangeLog b/app-emulation/aqemu/ChangeLog
index 539bb4f3f269a503eb081f8c2310ee7946656d91..0772cb5def3bd12564c31a976fd1e29c4020828a 100644 (file)
--- a/app-emulation/aqemu/ChangeLog
+++ b/app-emulation/aqemu/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2011/09/11 16:58:52 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.8 2011/09/15 18:02:23 maksbotan Exp $
+
+  15 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org>
+  files/aqemu-0.8.2_sigsev_propertis.patch:
+  Resolve #382673; thanks Kent Hagebrand for patch fix
 
   11 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> aqemu-0.8.2-r1.ebuild:
   Fix repoman leading space errors

diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
index f233e18c0e857a6be3de2130412e92c684481b0c..950054a1f6e69b01413d19b2b42a6d631fd9c051 100644 (file)
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@@ -1,7 +1,9 @@
-AUX aqemu-0.8.2_sigsev_propertis.patch 1965 RMD160 3e5c537d4df15453c3f21982ca75a06490f87c44 SHA1 8af499a6e709f843895845ed4536a5997820716a SHA256 8520dfe78e994bbe50d19fbf9cb59166a906486d18f4047ee6bc94899954d2f0
+AUX aqemu-0.8.2_sigsev_propertis.patch 960 RMD160 295570403b15cb01aae11bb194dc217ecaa44a19 SHA1 f1163e4428a3112c76e8d7c134d8c6cbab95542f SHA256 8c42d81dc603635dbf06d1571b4b55097c7ae437256562c5d15e636ce731b24c
 DIST aqemu-0.8.1.tar.bz2 963345 RMD160 5ca436fb620e6d05855b4248132262e5c18649b4 SHA1 463f6befa84afec3168d08cd598b911b8666df64 SHA256 0fab894e5f49f688122ad15065bbdf278def1425a5d43ad2d64a21caf8dec41a
 DIST aqemu-0.8.2.tar.bz2 1025129 RMD160 fde7ce7ecba5759c3c325830ef8d7ce94a930e7e SHA1 fdc4c6ec9fe3b6fd917036ebcaab3c6d52794fab SHA256 03c4a95328f78238021168ca4887f9735641f10eb4eb1eff58b08c15b748bf03
 EBUILD aqemu-0.8.1.ebuild 955 RMD160 8683b7ce703dea8baf538d2d147ae17ee52433b8 SHA1 48d0d5b437e4f0cf90df0f8f835731d0230e33ec SHA256 caeb60ac6ecb1327f4bf190885afaa9532439f2ce59fe970608f8a0221ab67cb
 EBUILD aqemu-0.8.2-r1.ebuild 1027 RMD160 3fd83b52597432aab2635222276784312e906cd7 SHA1 96f139b8b99939ef918ec9188d1884a5f47edded SHA256 69d2566d1cdfe4c953a397cebe886d73057e272398f0b8c8b87afc3d23ee3039
-MISC ChangeLog 1398 RMD160 958ad71ef09014da840e8f955cebbafd32674cfd SHA1 f3a6ad3b540e06f084e836f58c779af2d4432c57 SHA256 600eb9a348cc28a18c076d01cef5227826a12dd2fe65407e77df1eb222689b7e
+MISC ChangeLog 1550 RMD160 02bb6ab0cb2ece5ebe28815d759b09cca0f2f4a5 SHA1 da895b5e13f1b8d61a1ec41c8893114e216c6235 SHA256 f20c57fcc04ad9f1e016256cf2c493a6694613ac03a776077ecc403c38cd5a7d
+MISC Manifest.orig 1377 RMD160 dac923a4129fdf934d419f5a6ad024c63c125cb3 SHA1 4b062186b079bb4215ea82c96a394d5542bb7c35 SHA256 bc5dc3398c78064230bd52c6570bda8675d5d023bae6ed612b6f3a85c236e07a
+MISC Manifest.rej 2020 RMD160 dc754086aff40b48dc105462a8747e90512f6579 SHA1 36753d906c3042447c622b03987d89484e465fee SHA256 23474c0869323fe9efceec2a1c1da9b6b39d81b9b2904cd4d0b6bf5d97340b4d
 MISC metadata.xml 481 RMD160 84242f9fd03ff83cffef4008dc3d2fba6fa6cf40 SHA1 7037069b232f8cd261bf2e6b5705c1741e166ddb SHA256 13ded8adcfd4adde882cd251dafd457714b00da69b34e7d1eef6253214224b1f

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
index 6fa33a3c5e9b727a8c8b4c882994d7b4255b59e3..b7cc5950bd5fad52c5998ea5db9b8be1fb2da45f 100644 (file)
--- a/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
+++ b/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
@@ -1,45 +1,41 @@
-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();
+--- 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();
  }