Fixed bug #92262 (cursor disappearing).

(Portage version: 2.1-r1)

4 files changed, 91 insertions, 6 deletions

diff --git a/sys-block/partimage/ChangeLog b/sys-block/partimage/ChangeLog
index 23c1b6284134..22bc3c7ee38d 100644
--- a/sys-block/partimage/ChangeLog
+++ b/sys-block/partimage/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-block/partimage
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.24 2006/10/14 16:01:37 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/ChangeLog,v 1.25 2006/10/14 17:07:41 xmerlin Exp $
+
+  14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/partimage-0.6.4-gui.diff, partimage-0.6.4-r3.ebuild,
+  partimage-0.6.4-r4.ebuild:
+  Fixed bug #92262 (cursor disappearing).
+
+  14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
+  partimage-0.6.4-r3.ebuild, partimage-0.6.4-r4.ebuild:
+  Fixed bug #131998.
 
   14 Oct 2006; Christian Zoffoli <xmerlin@gentoo.org>
   +files/partimage-0.6.4-dont-discard-error-message-in-batch-mode.patch,
diff --git a/sys-block/partimage/files/partimage-0.6.4-gui.diff b/sys-block/partimage/files/partimage-0.6.4-gui.diff
new file mode 100644
index 000000000000..cad13bc0b14d
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.4-gui.diff
@@ -0,0 +1,75 @@
+diff -uNr partimage-0.6.4.orig/src/server/partimaged-gui_newt.cpp partimage-0.6.4/src/server/partimaged-gui_newt.cpp
+--- partimage-0.6.4.orig/src/server/partimaged-gui_newt.cpp	2004-02-04 01:57:36.000000000 +0100
++++ partimage-0.6.4/src/server/partimaged-gui_newt.cpp	2006-10-14 19:59:17.000000000 +0200
+@@ -188,9 +188,10 @@
+ // =============================================================================
+ void CPartimagedInterfaceNewt::Status(char * msg)
+ {
+-/*
++  char szBuf[1024];
+   newtPopHelpLine();
+-  newtPushHelpLine(msg);
++  snprintf(szBuf, sizeof(szBuf),
++    "%s [Press * to exit]", msg);
++  newtPushHelpLine(szBuf);
+   newtRefresh();
+-*/
+ }
+diff -uNr partimage-0.6.4.orig/src/server/partimaged-main.cpp partimage-0.6.4/src/server/partimaged-main.cpp
+--- partimage-0.6.4.orig/src/server/partimaged-main.cpp	2006-10-14 19:55:07.000000000 +0200
++++ partimage-0.6.4/src/server/partimaged-main.cpp	2006-10-14 20:02:25.000000000 +0200
+@@ -98,6 +98,11 @@
+   else if (signo == SIGINT)
+     {
+       g_bSigInt = true;
++      delete g_Server;
++      delete g_Window;
++      g_Server = NULL;
++      g_Window = NULL;
++      exit(0);
+     }
+   else if (signo == SIGSEGV)
+     {
+@@ -235,7 +240,7 @@
+ 	  case 'd':
+ 	    if (chdir(optarg) != 0)
+ 	    {
+-		    printf("%s: %s\n", optarg, strerror(errno));
++		    printf("Directory %s: %s\n", optarg, strerror(errno));
+ 		    exit(-1);
+ 	    }
+ 	    break;
+@@ -313,9 +318,9 @@
+ #endif    
+ 
+   // register signals
+-//  signal(SIGTERM, catch_sigint);
+-//  signal(SIGINT, catch_sigint);
+-//  signal(SIGSEGV, catch_sigint); // segmentation fault
++  signal(SIGTERM, catch_sigint);
++  signal(SIGINT, catch_sigint);
++  signal(SIGSEGV, catch_sigint); // segmentation fault
+ //  signal(SIGHUP, catch_sigint);
+ //  signal(SIGQUIT, catch_sigint);
+ //  signal(SIGCHLD, catch_sigint);
+diff -uNr partimage-0.6.4.orig/src/server/partimaged.cpp partimage-0.6.4/src/server/partimaged.cpp
+--- partimage-0.6.4.orig/src/server/partimaged.cpp	2004-02-04 01:57:36.000000000 +0100
++++ partimage-0.6.4/src/server/partimaged.cpp	2006-10-14 19:59:17.000000000 +0200
+@@ -74,7 +74,7 @@
+ 
+   while (!bQuit)
+     {
+-      g_Window->Status(i18n("Waitting ..."));
++      g_Window->Status(i18n("waiting ..."));
+ 
+       n = Server->RecvMsg(nClient, mess);
+       if (n != MESSAGE_LEN)
+@@ -115,7 +115,7 @@
+           break;
+ 
+         case MSG_WRITE:
+-          g_Window->Status(i18n("writting ..."));
++          g_Window->Status(i18n("writing ..."));
+           if (m_size > BUFFER_LEN)
+             {
+               delete g_Window;
diff --git a/sys-block/partimage/partimage-0.6.4-r3.ebuild b/sys-block/partimage/partimage-0.6.4-r3.ebuild
index af46775f41b5..70e17f1f4cfa 100644
--- a/sys-block/partimage/partimage-0.6.4-r3.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.18 2006/10/05 03:02:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r3.ebuild,v 1.19 2006/10/14 17:07:41 xmerlin Exp $
 
 WANT_AUTOMAKE="1.8"
 
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-LP64-fixes.patch || die
 	epatch ${FILESDIR}/${P}-save_all_and_rest_all_actions.patch || die
 	epatch ${FILESDIR}/${P}-datadir-path.patch || die
+	epatch ${FILESDIR}/${P}-gui.diff || die
 }
 
 src_compile() {
@@ -142,7 +143,6 @@ pkg_postinst() {
 		einfo "emerge  --config =${PF}"
 		# force a permmissions fixup
 		partimagesslperms
-		return 0
 	fi
-	chown partimag:0 /etc/partimaged/partimagedusers
+	chown partimag:0 /etc/partimaged/partimagedusers || die
 }
diff --git a/sys-block/partimage/partimage-0.6.4-r4.ebuild b/sys-block/partimage/partimage-0.6.4-r4.ebuild
index 81ad5430a8a5..ea31d4cc762a 100644
--- a/sys-block/partimage/partimage-0.6.4-r4.ebuild
+++ b/sys-block/partimage/partimage-0.6.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.12 2006/10/14 16:01:37 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.4-r4.ebuild,v 1.13 2006/10/14 17:07:41 xmerlin Exp $
 
 WANT_AUTOMAKE="1.8"
 
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-dont-discard-error-message-in-batch-mode.patch || die
 	epatch ${FILESDIR}/${P}-save_file_and_rest_file_actions.patch || die
 	epatch ${FILESDIR}/${P}-varargs.patch || die
+	epatch ${FILESDIR}/${P}-gui.diff || die
 }
 
 src_compile() {
@@ -169,6 +170,6 @@ pkg_postinst() {
 		einfo "emerge  --config =${PF}"
 		# force a permmissions fixup
 		partimagesslperms
-		return 0
 	fi
+	chown partimag:0 /etc/partimaged/partimagedusers || die
 }