applying patch_058,061,063,073

svn path=/branches/kpdf/annotations/kdegraphics/kpdf/; revision=424916

shell/shell.cpp

@@ -30,7 +30,6 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
 #include <kparts/componentfactory.h>
 #include <kio/netaccess.h>
 #include <kmainwindowiface.h>

shell/shell.h

@@ -21,7 +21,6 @@
 #endif
 
 #include <kparts/mainwindow.h>
-class KPopupMenu;
 
 namespace KPDF
 {

xpdf/splash/SplashFTFontEngine.cc

@@ -31,9 +31,11 @@ extern "C" int unlink(char *filename);
 
 //------------------------------------------------------------------------
 
+#if 0
 static void FT_fileWrite(void *stream, const char *data, int len) {
   fwrite(data, 1, len, (FILE *)stream);
 }
+#endif
 
 //------------------------------------------------------------------------
 // SplashFTFontEngine

xpdf/xpdf/GlobalParams.cc

@@ -23,6 +23,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 // -- ---------------------------------------------------------- --
+#include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 #include <X11/Xft/XftCompat.h>
 #include <stdio.h>
@@ -99,6 +100,7 @@ static const char *displayFontDirs[] = {
   "/usr/share/fonts/default/Type1",
   "/usr/share/fonts/type1/gsfonts",
   "/usr/share/fonts/default/ghostscript/",
+  "/usr/share/fonts/Type1",
   NULL
 };