From cdec4298f9266cc3af2121c400b28f2f4b4c654a Mon Sep 17 00:00:00 2001
From: Enrico Ros <enrico.ros@gmail.com>
Date: Mon, 13 Jun 2005 12:15:41 +0000
Subject: [PATCH] applying patch_058,061,063,073

svn path=/branches/kpdf/annotations/kdegraphics/kpdf/; revision=424916
---
 shell/shell.cpp                   | 1 -
 shell/shell.h                     | 1 -
 xpdf/splash/SplashFTFontEngine.cc | 2 ++
 xpdf/xpdf/GlobalParams.cc         | 2 ++
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index a18c2e137..6a32a5442 100644
--- a/shell/shell.cpp
+++ b/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>
diff --git a/shell/shell.h b/shell/shell.h
index e7c815089..391db6726 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -21,7 +21,6 @@
 #endif
 
 #include <kparts/mainwindow.h>
-class KPopupMenu;
 
 namespace KPDF
 {
diff --git a/xpdf/splash/SplashFTFontEngine.cc b/xpdf/splash/SplashFTFontEngine.cc
index d6c078f04..b47ba24e2 100644
--- a/xpdf/splash/SplashFTFontEngine.cc
+++ b/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
diff --git a/xpdf/xpdf/GlobalParams.cc b/xpdf/xpdf/GlobalParams.cc
index 5b120ddda..19cc8ad07 100644
--- a/xpdf/xpdf/GlobalParams.cc
+++ b/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
 };