rpms/xpdf/devel xpdf-3.01-resize.patch, NONE, 1.1 xpdf.spec, 1.58, 1.59

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9272

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.01-resize.patch 
Log Message:
apply upstream patch to fix resize/redraw bug #166569



xpdf-3.01-resize.patch:
 XPDFCore.cc |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE xpdf-3.01-resize.patch ---
--- xpdf-3.01/xpdf/XPDFCore.cc.resize	2005-10-06 23:40:10.000000000 +0200
+++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-06 23:40:10.000000000 +0200
@@ -979,6 +979,9 @@
   XPDFCore *core = (XPDFCore *)ptr;
   XEvent event;
   Widget top;
+  Window rootWin;
+  int x1, y1;
+  Guint w1, h1, bw1, depth1;
   Arg args[2];
   int n;
   Dimension w, h;
@@ -986,15 +989,20 @@
 
   // find the top-most widget which has an associated window, and look
   // for a pending ConfigureNotify in the event queue -- if there is
-  // one, that means we're still resizing, and we want to skip the
-  // current event
+  // one, and it specifies a different width or height, that means
+  // we're still resizing, and we want to skip the current event
   for (top = core->parentWidget;
        XtParent(top) && XtWindow(XtParent(top));
        top = XtParent(top)) ;
   if (XCheckTypedWindowEvent(core->display, XtWindow(top),
 			     ConfigureNotify, &event)) {
     XPutBackEvent(core->display, &event);
-    return;
+    XGetGeometry(core->display, event.xconfigure.window,
+		 &rootWin, &x1, &y1, &w1, &h1, &bw1, &depth1);
+    if ((Guint)event.xconfigure.width != w1 ||
+	(Guint)event.xconfigure.height != h1) {
+      return;
+    }
   }
 
   n = 0;


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xpdf.spec	18 Aug 2005 09:35:21 -0000	1.58
+++ xpdf.spec	7 Oct 2005 09:28:42 -0000	1.59
@@ -7,7 +7,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 1
+Release: 2
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -32,6 +32,7 @@
 Patch10: xpdf-3.00-gcc4.patch
 Patch11: xpdf-3.01-crash.patch
 Patch12: xpdf-3.00-64bit.patch
+Patch13: xpdf-3.01-resize.patch
 
 Requires: urw-fonts
 Requires: htmlview
@@ -115,7 +116,8 @@
 %patch10 -p1 -b .gcc4
 %patch11 -p1 -b .crash
 %patch12 -p1 -b .alloc
-
+%patch13 -p1 -b .resize
+%
 %build
 find -name "*orig" | xargs rm -f
 
@@ -214,6 +216,9 @@
 %lang(ko) %{_datadir}/xpdf/korean
 
 %changelog
+* Fri Oct 07 2005 Than Ngo <than at redhat.com> 3.01-2 
+- apply upstream patch to fix resize/redraw bug #166569
+
 * Thu Aug 18 2005 Than Ngo <than at redhat.com> 3.01-1
 - update to 3.01