rev 4299 - trunk/packages/kdegraphics/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-08-06 19:50:16 +0000 (Sun, 06 Aug 2006)
New Revision: 4299

Added:
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r570455.diff
Log:
And sneak in the latest branch fixes.


Added: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r570455.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r570455.diff	2006-08-06 19:49:58 UTC (rev 4298)
+++ trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r570455.diff	2006-08-06 19:50:16 UTC (rev 4299)
@@ -0,0 +1,36 @@
+#DPATCHLEVEL=0
+--- kpdf/xpdf/xpdf/GfxState.cc	(revision 567758)
++++ kpdf/xpdf/xpdf/GfxState.cc	(revision 570455)
+@@ -35,10 +35,12 @@
+ 
+ //------------------------------------------------------------------------
+ 
+-static struct {
++struct gfxBlendModeName {
+   char *name;
+   GfxBlendMode mode;
+-} gfxBlendModeNames[] = {
++};
++
++static gfxBlendModeName gfxBlendModeNames[] = {
+   { "Normal",     gfxBlendNormal },
+   { "Compatible", gfxBlendNormal },
+   { "Multiply",   gfxBlendMultiply },
+@@ -59,7 +61,7 @@
+ };
+ 
+ #define nGfxBlendModeNames \
+-          ((int)((sizeof(gfxBlendModeNames) / sizeof(char *))))
++          ((int)((sizeof(gfxBlendModeNames) / sizeof(gfxBlendModeName))))
+ 
+ //------------------------------------------------------------------------
+ 
+--- kpdf/part.rc	(revision 567758)
++++ kpdf/part.rc	(revision 570455)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="kpdf_part" version="17">
++<kpartgui name="kpdf_part" version="18">
+ <MenuBar>
+   <Menu name="file"><text>&amp;File</text>
+     <Action name="save" group="file_save"/>