#99861: fixed -hide feature that should really be fixed upstream

4 files changed, 85 insertions, 16 deletions

diff --git a/x11-misc/xsnap/ChangeLog b/x11-misc/xsnap/ChangeLog
index 68cf2d5b391c..7b90a3f26bf9 100644
--- a/x11-misc/xsnap/ChangeLog
+++ b/x11-misc/xsnap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xsnap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.13 2005/03/29 11:53:35 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/ChangeLog,v 1.14 2005/07/25 22:06:38 smithj Exp $
+
+*xsnap-1.4.3-r1 (25 Jul 2005)
+
+  25 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/xsnap-this-should-be-fixed-updstream.patch, -xsnap-1.4.3.ebuild,
+  +xsnap-1.4.3-r1.ebuild:
+  #99861: fixed -hide feature that should really be fixed upstream
 
   29 Mar 2005; Markus Nigbur <pyrania@gentoo.org>
   +files/xsnap-1.4-gentoo.patch, xsnap-1.4.3.ebuild:
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index 21f3f1e8c04c..73d33bc2a347 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5eefb6f4ad547654ee0fe15f4acc7d9d ChangeLog 1973
-MD5 45654243552452e2fbcaab3979f091f6 xsnap-1.4.3.ebuild 746
-MD5 6b2f8ecd3ad0e55432fa394deb816e86 metadata.xml 174
 MD5 165b6cfc968c2649ceb62d484a47ae74 xsnap-1.3.ebuild 753
+MD5 efebb331d3c9552d7052352770d48c14 ChangeLog 2221
+MD5 6b2f8ecd3ad0e55432fa394deb816e86 metadata.xml 174
+MD5 f114a3c11b8ca6056dc620bd068d45a5 xsnap-1.4.3-r1.ebuild 904
+MD5 8935756ffcda63188f1df02d678f8cb5 files/digest-xsnap-1.3 57
+MD5 2b854d6f7e3f22c97c17b407603fa796 files/digest-xsnap-1.4.3-r1 63
 MD5 bbc0ee7ce1ca06fc97a84d9769713c98 files/xsnap-1.3-gentoo.patch 406
 MD5 b181b026b729d1337836ca0c933491bd files/xsnap-1.4-gentoo.patch 251
-MD5 2b854d6f7e3f22c97c17b407603fa796 files/digest-xsnap-1.4.3 63
-MD5 8935756ffcda63188f1df02d678f8cb5 files/digest-xsnap-1.3 57
+MD5 83a81f034c00b81e8f8cc26f9d719051 files/xsnap-this-should-be-fixed-updstream.patch 1698
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCSUHBI7fK2cqeyXkRAmpTAKCjZJcL3P8wqLNhpRZVpAQMtuf75wCdH1mb
-cJk50uoRbZHfYArSanEHomQ=
-=JE4m
+iD8DBQFC5WKnl5AvwDPiUowRApTnAKCE9vwC870j30ER+83TJBUJwh5BpACfUTgH
+ntk7zUOYcQtrNC6OIbtzAUA=
+=KSaT
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xsnap/files/xsnap-this-should-be-fixed-updstream.patch b/x11-misc/xsnap/files/xsnap-this-should-be-fixed-updstream.patch
new file mode 100644
index 000000000000..7695cf958ea9
--- /dev/null
+++ b/x11-misc/xsnap/files/xsnap-this-should-be-fixed-updstream.patch
@@ -0,0 +1,55 @@
+diff -Naur xsnap-1.4.3/xsnap.c xsnap-1.4.3_patched/xsnap.c
+--- xsnap-1.4.3/xsnap.c	2004-09-30 07:59:15.000000000 +0100
++++ xsnap-1.4.3_patched/xsnap.c	2005-07-22 03:38:23.000000000 +0100
+@@ -558,7 +558,7 @@
+ 
+ 	for (i = 1; i < argc; i++)
+ 	{
+-		if (strncmp(argv[i], "-h", 2) == 0)
++		if (strcmp(argv[i], "-h") == 0)
+ 		{
+ 			usage();
+ 			continue;
+@@ -1920,27 +1920,28 @@
+ 	if (display_in_window) {
+             XMapRaised(display, snapshot);   
+ 	    XFlush (display);
+-	}
++	
+ 
+-	if (!*win_name0) 
+-            strcpy(win_name0, "xsnap");
++	    if (!*win_name0) 
++			strcpy(win_name0, "xsnap");
+ 
+-	sprintf(win_name, "%s %d x %d", 
++			sprintf(win_name, "%s %d x %d", 
+                           win_name0, width_return, height_return);
+-	XStoreName(display, snapshot, win_name);
+-
++			XStoreName(display, snapshot, win_name);
++	}
+     save_file:
+         if (save_in_file) {
+ 	    save_image_file(display, screen, window_to_snap,
+ 		 	   snap_pixmap, reg_width, reg_height, reg_depth);
+-	    if (!root_name) 
+-                strcpy(output_name, "(stdout)");
+-	    sprintf(win_name, "%s %d x %d -> %s", 
+-                            win_name0, width_return, height_return,
+-                            output_name);
+-	    XStoreName(display, snapshot, win_name);
+-	    draw_dialog(display, dialog_window, copy_gc,
+-                                 50, 96+30*i0);
++
++		if (display_in_window) {
++			if (!root_name) 
++				strcpy(output_name, "(stdout)");
++
++			sprintf(win_name, "%s %d x %d -> %s", win_name0, width_return, height_return, output_name);
++			XStoreName(display, snapshot, win_name);
++			draw_dialog(display, dialog_window, copy_gc, 50, 96+30*i0);
++		}
+ 	}
+ 
+ 	if (!display_in_window)
diff --git a/x11-misc/xsnap/xsnap-1.4.3.ebuild b/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild
index 87d684a0caa4..a076567456ad 100644
--- a/x11-misc/xsnap/xsnap-1.4.3.ebuild
+++ b/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.4.3.ebuild,v 1.2 2005/03/29 11:53:35 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xsnap/xsnap-1.4.3-r1.ebuild,v 1.1 2005/07/25 22:06:38 smithj Exp $
 
 inherit eutils
 
@@ -15,14 +15,20 @@ IUSE=""
 
 DEPEND="virtual/x11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.4-gentoo.patch
+	epatch ${FILESDIR}/${PN}-this-should-be-fixed-updstream.patch
+}
+
 src_compile() {
-	epatch ${FILESDIR}/${PN}-1.4-gentoo.patch || die "epatch failed."
-	xmkmf || die
-	make || die
+	xmkmf || die "xmkmf failed"
+	make || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	make DESTDIR=${D} install.man || die
+	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR=${D} install.man || die "make install.man failed"
 	dodoc README INSTALL AUTHORS
 }