rpms/kdegraphics/devel kdegraphics-3.5.4-kde#113635.patch, NONE, 1.1 kdegraphics.spec, 1.91, 1.92

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv745

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-3.5.4-kde#113635.patch 
Log Message:
fix #113635, kpdf crash


kdegraphics-3.5.4-kde#113635.patch:
 generator_pdf.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdegraphics-3.5.4-kde#113635.patch ---
Index: kpdf/core/generator_pdf/generator_pdf.cpp
===================================================================
--- kpdf/core/generator_pdf/generator_pdf.cpp	(Revision 581595)
+++ kpdf/core/generator_pdf/generator_pdf.cpp	(Revision 581596)
@@ -832,7 +832,8 @@
         viewport.pageNumber = pdfdoc->findPage( ref.num, ref.gen ) - 1;
     }
 
-    if (viewport.pageNumber == -1) return;
+    if (viewport.pageNumber < 0) return;
+    if (viewport.pageNumber >= pdfdoc->getNumPages()) return;
 
     // get destination position
     // TODO add other attributes to the viewport (taken from link)


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- kdegraphics.spec	10 Aug 2006 13:19:15 -0000	1.91
+++ kdegraphics.spec	7 Sep 2006 15:55:31 -0000	1.92
@@ -16,7 +16,7 @@
 %define no_scanner_archs s390 s390x
 
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -32,6 +32,9 @@
 Patch3: kdegraphics-3.5.1-warning.patch
 Patch4: kdegraphics-3.5.2-kpdf-xft.patch
 
+# upstream patches
+Patch100: kdegraphics-3.5.4-kde#113635.patch
+
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -90,6 +93,9 @@
 %patch3 -p1 -b .gcc-warning
 %patch4 -p1 -b .kpdf-xft
 
+# upstream patches
+%patch100 -p0 -b .kde#113635
+
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
@@ -194,6 +200,10 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Sep 07 2006 Than Ngo <than at redhat.com> 7:3.5.4-2
+- apply upstream patches
+   fix #113635, kpdf crash
+
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
 - rebuild