* 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.
This commit is contained in:
Julien Cristau 2007-01-07 14:09:13 +00:00
parent 7a67f85eb9
commit 60200992fa
3 changed files with 38 additions and 0 deletions

8
debian/changelog vendored
View File

@ -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 ]

View File

@ -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);

View File

@ -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