Insert missing ifdef's for building without xprint, segmentation faults without it.

Package-Manager: portage-2.1.4

5 files changed, 71 insertions, 5 deletions

diff --git a/x11-apps/xmore/ChangeLog b/x11-apps/xmore/ChangeLog
index a5aefd155379..e289013c4c00 100644
--- a/x11-apps/xmore/ChangeLog
+++ b/x11-apps/xmore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xmore
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.15 2008/01/21 15:09:09 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.16 2008/01/21 15:22:26 drac Exp $
+
+*xmore-1.0.1-r1 (21 Jan 2008)
+
+  21 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xmore-1.0.1-ifdef-xprint.patch, +xmore-1.0.1-r1.ebuild:
+  Insert missing ifdef's for building without xprint, segmentation faults
+  without it. Debian bug report #365292.
 
   21 Jan 2008; Samuli Suominen <drac@gentoo.org> xmore-1.0.1.ebuild:
   Keyword ~amd64.
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index ad5e78554e0f..506c5893479a 100644
--- a/x11-apps/xmore/Manifest
+++ b/x11-apps/xmore/Manifest
@@ -1,12 +1,20 @@
+AUX xmore-1.0.1-ifdef-xprint.patch 879 RMD160 df9c62aa6f42d131d4038b2615b431b074acb5d2 SHA1 de7cf22e6a529698f765f0f29551ad58835ebed8 SHA256 b1d9cd58ce7afdb4a266fb79e28c3ceec53fbb7ba8bbb62837e9afc14e8c19ef
+MD5 44e529e5cd40128e263f6571f4f3bf3d files/xmore-1.0.1-ifdef-xprint.patch 879
+RMD160 df9c62aa6f42d131d4038b2615b431b074acb5d2 files/xmore-1.0.1-ifdef-xprint.patch 879
+SHA256 b1d9cd58ce7afdb4a266fb79e28c3ceec53fbb7ba8bbb62837e9afc14e8c19ef files/xmore-1.0.1-ifdef-xprint.patch 879
 DIST xmore-1.0.1.tar.bz2 92060 RMD160 98c437125fb5c7cb384bb78b536ef69d4ca363f2 SHA1 abd0b926fc11c9d8c886f91b0b6a4834512cb0ba SHA256 653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527
+EBUILD xmore-1.0.1-r1.ebuild 643 RMD160 75c7c703da30c444af5b4b2cdba281d48cc75ea1 SHA1 6a27d52a6fffcfdca3edb5873ef141292c3157e4 SHA256 5bf86ec2931d1de2b81e212ebee6678573188d72aa215b82e5da030eda923704
+MD5 b8d203f5734d478ba9ca0e801709f907 xmore-1.0.1-r1.ebuild 643
+RMD160 75c7c703da30c444af5b4b2cdba281d48cc75ea1 xmore-1.0.1-r1.ebuild 643
+SHA256 5bf86ec2931d1de2b81e212ebee6678573188d72aa215b82e5da030eda923704 xmore-1.0.1-r1.ebuild 643
 EBUILD xmore-1.0.1.ebuild 591 RMD160 b37e180df38a6a324864f4307e4ee7cbe4cfb889 SHA1 3515909ce41c3c7f79674e3a0c71090ac84233a5 SHA256 3c5e0701a7b5ba3b70526c81f7064c66758aeb3c584f118a6fdcb42187691d32
 MD5 686dc718342dc12beda2834d08104e2e xmore-1.0.1.ebuild 591
 RMD160 b37e180df38a6a324864f4307e4ee7cbe4cfb889 xmore-1.0.1.ebuild 591
 SHA256 3c5e0701a7b5ba3b70526c81f7064c66758aeb3c584f118a6fdcb42187691d32 xmore-1.0.1.ebuild 591
-MISC ChangeLog 1874 RMD160 524552d675986def528e16db21829e3756cd665d SHA1 64efe61ee3f4267ea2c57fcc597c8dceb9fa178c SHA256 260278a695c106f1e03617bb79bec5c75e78b3d1e7f9d141f094edfbf05abf57
-MD5 69664bc33e03e9401d27a528dc76173a ChangeLog 1874
-RMD160 524552d675986def528e16db21829e3756cd665d ChangeLog 1874
-SHA256 260278a695c106f1e03617bb79bec5c75e78b3d1e7f9d141f094edfbf05abf57 ChangeLog 1874
+MISC ChangeLog 2135 RMD160 b0ca1f23f3484221e5a2ed5d3df46b16d503bcc8 SHA1 2d3e4da53e168392b24f49c9a856b4c7caf3216c SHA256 9a7c524a6e883676d6d2f0feaf32f2583c40dd71fd7474388c2af5b1f9eb9763
+MD5 76e1017993e90b50471b4e227ffd4799 ChangeLog 2135
+RMD160 b0ca1f23f3484221e5a2ed5d3df46b16d503bcc8 ChangeLog 2135
+SHA256 9a7c524a6e883676d6d2f0feaf32f2583c40dd71fd7474388c2af5b1f9eb9763 ChangeLog 2135
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -14,3 +22,6 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 65767d17303cd885d9fa6e000005d511 files/digest-xmore-1.0.1 235
 RMD160 d0cdfb0f240c9dc62dcf9ebfcd764f416970cbea files/digest-xmore-1.0.1 235
 SHA256 e38b9c150186589a93eaf14c2b05b74e154eb12b06e4105fbf496ebe554bca70 files/digest-xmore-1.0.1 235
+MD5 65767d17303cd885d9fa6e000005d511 files/digest-xmore-1.0.1-r1 235
+RMD160 d0cdfb0f240c9dc62dcf9ebfcd764f416970cbea files/digest-xmore-1.0.1-r1 235
+SHA256 e38b9c150186589a93eaf14c2b05b74e154eb12b06e4105fbf496ebe554bca70 files/digest-xmore-1.0.1-r1 235
diff --git a/x11-apps/xmore/files/digest-xmore-1.0.1-r1 b/x11-apps/xmore/files/digest-xmore-1.0.1-r1
new file mode 100644
index 000000000000..e5f5fffec8cb
--- /dev/null
+++ b/x11-apps/xmore/files/digest-xmore-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 d36e918dce779a9d207b7a266f4e87c8 xmore-1.0.1.tar.bz2 92060
+RMD160 98c437125fb5c7cb384bb78b536ef69d4ca363f2 xmore-1.0.1.tar.bz2 92060
+SHA256 653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527 xmore-1.0.1.tar.bz2 92060
diff --git a/x11-apps/xmore/files/xmore-1.0.1-ifdef-xprint.patch b/x11-apps/xmore/files/xmore-1.0.1-ifdef-xprint.patch
new file mode 100644
index 000000000000..af48f7f3005c
--- /dev/null
+++ b/x11-apps/xmore/files/xmore-1.0.1-ifdef-xprint.patch
@@ -0,0 +1,27 @@
+diff -ur xmore-1.0.1.orig/xmore.c xmore-1.0.1/xmore.c
+--- xmore-1.0.1.orig/xmore.c	2005-07-06 01:51:11.000000000 +0300
++++ xmore-1.0.1/xmore.c	2008-01-21 17:16:06.000000000 +0200
+@@ -150,7 +150,9 @@
+ static void
+ printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
+ {
++#ifdef USE_XPRINT
+     XawPrintDialogClosePrinterConnection(printdialog, False);
++#endif
+ }
+ 
+ #ifdef USE_XPRINT
+@@ -302,7 +304,12 @@
+ #endif
+   
+   n = 0;
+-  XtSetArg(args[n], XtNfromHoriz,       printbutton);            n++;
++#ifdef USE_XPRINT
++  XtSetArg(args[n], XtNfromHoriz,       printbutton);
++#else
++  XtSetArg(args[n], XtNfromHoriz,       NULL);
++#endif
++  n++;
+   XtSetArg(args[n], XtNfromVert,        text);                   n++;
+   XtSetArg(args[n], XtNlabel,           "Quit");      n++;
+   quitbutton = XtCreateManagedWidget("quit", commandWidgetClass, form, args, n);
diff --git a/x11-apps/xmore/xmore-1.0.1-r1.ebuild b/x11-apps/xmore/xmore-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..58fad89a60bb
--- /dev/null
+++ b/x11-apps/xmore/xmore-1.0.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/xmore-1.0.1-r1.ebuild,v 1.1 2008/01/21 15:22:26 drac Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="plain text display program for the X Window System"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+# Broken without xprint
+IUSE="xprint"
+RDEPEND="xprint? ( x11-libs/libXprintUtil )"
+#x11-libs/libXprintUtil"
+DEPEND="${RDEPEND}"
+PATCHES="${FILESDIR}/${P}-ifdef-xprint.patch"
+CONFIGURE_OPTIONS="$(use_enable xprint)"