rpms/kdegraphics/devel kdegraphics-3.4.2-kpdf-110199.patch, NONE, 1.1 kdegraphics.spec, 1.53, 1.54

[fedora-cvs-commits redhat com]

Author: than

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

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-3.4.2-kpdf-110199.patch 
Log Message:
backport CVS patch to fix rendering problem in kpdf


kdegraphics-3.4.2-kpdf-110199.patch:
 Makefile.am |    2 +-
 Stream.cc   |    3 +--
 Stream.h    |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE kdegraphics-3.4.2-kpdf-110199.patch ---
--- kdegraphics-3.4.2/kpdf/xpdf/xpdf/Makefile.am.orig	2005-08-31 11:55:18.000000000 +0200
+++ kdegraphics-3.4.2/kpdf/xpdf/xpdf/Makefile.am	2005-08-31 11:55:35.000000000 +0200
@@ -4,7 +4,7 @@
 libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
 libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
      Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
-     FontEncodingTables.cc FlateStream.cc Function.cc Gfx.cc \
+     FontEncodingTables.cc Function.cc Gfx.cc \
      GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \
      JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc \
      OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PSTokenizer.cc \
--- kdegraphics-3.4.2/kpdf/xpdf/xpdf/Stream.cc.orig	2005-08-31 11:55:46.000000000 +0200
+++ kdegraphics-3.4.2/kpdf/xpdf/xpdf/Stream.cc	2005-08-31 12:34:40.000000000 +0200
@@ -33,7 +33,6 @@
 #include "JPXStream.h"
 #include "Stream-CCITT.h"
 #include "DCTStream.h"
-#include "FlateStream.h"
 
 #ifdef __DJGPP__
 static GBool setDJSYSFLAGS = gFalse;
@@ -3179,6 +3178,7 @@
 GBool DCTStream::isBinary(GBool /*last*/) {
   return str->isBinary(gTrue);
 }
+#endif 
 
 //------------------------------------------------------------------------
 // FlateStream
@@ -3710,7 +3710,6 @@
   codeSize -= bits;
   return c;
 }
-#endif
 
 //------------------------------------------------------------------------
 // EOFStream
--- kdegraphics-3.4.2/kpdf/xpdf/xpdf/Stream.h.orig	2005-08-31 12:30:43.000000000 +0200
+++ kdegraphics-3.4.2/kpdf/xpdf/xpdf/Stream.h	2005-08-31 12:33:54.000000000 +0200
@@ -637,6 +637,7 @@
   int readMarker();
   int read16();
 };
+#endif 
 
 //------------------------------------------------------------------------
 // FlateStream
@@ -712,7 +713,6 @@
   int getHuffmanCodeWord(FlateHuffmanTab *tab);
   int getCodeWord(int bits);
 };
-#endif
 
 //------------------------------------------------------------------------
 // EOFStream


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdegraphics.spec	11 Aug 2005 10:07:18 -0000	1.53
+++ kdegraphics.spec	31 Aug 2005 10:45:24 -0000	1.54
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.4.2
-Release: 1
+Release: 2
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -26,6 +26,9 @@
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 
+# upstream patches
+Patch100: kdegraphics-3.4.2-kpdf-110199.patch
+
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -259,6 +262,7 @@
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
+%patch100 -p1 -b .kpdf-110199
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -356,6 +360,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Aug 31 2005 Than Ngo <than redhat com> 7:3.4.2-2
+- backport CVS patch to fix rendering problem in kpdf
+
 * Thu Aug 11 2005 Than Ngo <than redhat com> 7:3.4.2-1
 - update to 3.4.2