Preliminary hacks.

diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
new file mode 100644 (file)
index 0000000..736025f
--- /dev/null
+++ b/pdf/xpdf/ChangeLog
@@ -0,0 +1,16 @@
+1999-05-27  Michael Meeks  <michael@imaginator.com>
+
+       * GOutputDev.cc (GOutputFont): Hacks.
+       (GOutputFont): Renamed.
+       (getFont): killed redundant 'display'
+       getGdkFont not getXFont.
+       (GOutputDev): NB. colormap -> gtk_widget_get_default_colormap ()
+       which returns GdkColormap *, killed colormap & depth1 in prototype.
+       Removed redundant assigns.
+       NB. Miguel says 'miguel> michael: a GdkPixmap is a GdkWindow'
+       
+       * GOutputDev.h: Comments 'G'd and GOutputDev updated.
+       XPoint -> GdkPoint
+
+       * Makefile.in (CXXFLAGS): Add GOOSRCDIR.
+

diff --git a/pdf/xpdf/Makefile.in b/pdf/xpdf/Makefile.in
index e5311d5fe035cf27befcc3aa1b5c3d619aca2ada..cf062fe0cc4402043401ab62c95c9ec3278db4f2 100644 (file)
--- a/pdf/xpdf/Makefile.in
+++ b/pdf/xpdf/Makefile.in
@@ -15,7 +15,7 @@ LTKSRCDIR = $(srcdir)/../ltk
 LTKLIBDIR = ../ltk
 
 #CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @Xpm_CFLAGS@
-CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ `gnome-config --cflags gnomeui` -I$(srcdir) @X_CFLAGS@
+CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) `gnome-config --cflags gnomeui` -I$(srcdir) @X_CFLAGS@
 XLIBS = @Xpm_LIBS@ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@
 
 OTHERLIBS = @LIBS@