From 60200992fa2937cf534e4fb66e2792c4e2ae06cb Mon Sep 17 00:00:00 2001
From: Julien Cristau <julien.cristau@ens-lyon.org>
Date: Sun, 7 Jan 2007 14:09:13 +0000
Subject: [PATCH] * Add patch by Eugene Konev to fix xmore crash (closes:
 #365292). * Remove version string from subdirectory names, thus new tarball,
 and   update patches to match.

---
 debian/changelog                              |  8 +++++
 .../15_xmore_fix_segv_without_xprint.diff     | 29 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 38 insertions(+)
 create mode 100644 debian/patches/15_xmore_fix_segv_without_xprint.diff

diff --git a/debian/changelog b/debian/changelog
index 9ca98b2..6572bab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xbase-clients (1:7.1.ds1-1) unstable; urgency=low
+
+  * Add patch by Eugene Konev to fix xmore crash (closes: #365292).
+  * Remove version string from subdirectory names, thus new tarball, and
+    update patches to match.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Sun,  7 Jan 2007 15:01:47 +0100
+
 xbase-clients (1:7.1.ds-3) unstable; urgency=low
 
   [ Branden Robinson ]
diff --git a/debian/patches/15_xmore_fix_segv_without_xprint.diff b/debian/patches/15_xmore_fix_segv_without_xprint.diff
new file mode 100644
index 0000000..9fd1cd9
--- /dev/null
+++ b/debian/patches/15_xmore_fix_segv_without_xprint.diff
@@ -0,0 +1,29 @@
+This patch by Eugene Konev.
+
+diff -u a/xbase-clients/xmore/xmore.c b/xbase-clients/xmore/xmore.c
+--- a/xbase-clients/xmore/xmore.c	Sun Apr 30 13:40:29 2006 +0800
++++ b/app/xbase-clients/xmore/xmore.c	Sun Apr 30 13:40:40 2006 +0800
+@@ -150,7 +150,9 @@ static void
+ static void
+ printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
+ {
++#ifdef USE_XPRINT
+     XawPrintDialogClosePrinterConnection(printdialog, False);
++#endif
+ }
+ 
+ #ifdef USE_XPRINT
+@@ -302,7 +304,12 @@ int main( int argc, char *argv[] )
+ #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/debian/patches/series b/debian/patches/series
index ec27662..186227f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 13_xconsole_implicit_pointer_conversion.diff
 pkgconfig_naughtiness -p0
 14_SECURITY_setuid.diff
+15_xmore_fix_segv_without_xprint.diff -p2