xmbdfed/patch-4.7.diff

   1 diff -ruN xmbdfed-4.7/Makefile xmbdfed-4.7-new/Makefile
   2 --- xmbdfed-4.7/Makefile        2004-02-17 15:24:06.000000000 +0000
   3 +++ xmbdfed-4.7-new/Makefile    2006-05-04 16:16:51.000000000 +0000
   4 @@ -23,7 +23,7 @@
   5  # $Id: Makefile,v 1.13 2004/02/17 15:24:06 mleisher Exp $
   6  #
   7  CC = gcc
   8 -CFLAGS = -g -Wall
   9 +CFLAGS = -g -O2 -Wall
  10
  11  OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
  12          xmbdfedrc xmbdfed.man
  13 @@ -46,9 +46,9 @@
  14  # Uncomment these if you have the FreeType library and want to use it to
  15  # import OpenType fonts.
  16  #
  17 -#FTYPE_INCS = -I/usr/local/include
  18 -#FTYPE_LIBS = -L/usr/local/lib -lfreetype
  19 -#FTYPE_DEFS = -DHAVE_FREETYPE
  20 +FTYPE_INCS = -I/usr/include/freetype2
  21 +FTYPE_LIBS = -L/usr/lib -lfreetype
  22 +FTYPE_DEFS = -DHAVE_FREETYPE
  23
  24  #
  25  # Uncomment these if you have the hbf.h and hbf.c files in the current
  26 @@ -82,15 +82,15 @@
  27  #
  28  # Uncomment these for Solaris.
  29  #
  30 -INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
  31 -LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
  32 -       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
  33 +#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
  34 +#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
  35 +#       -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
  36
  37  #
  38  # Uncomment these for Linux.
  39  #
  40 -#INCS = -I/usr/X11/include $(FTYPE_INCS)
  41 -#LIBS = -L/usr/X11/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
  42 +INCS = -I/usr/include/X11 $(FTYPE_INCS)
  43 +LIBS = -L/usr/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
  44
  45  #
  46  # Uncomment these for HPUX.
  47 diff -ruN xmbdfed-4.7/setup.c xmbdfed-4.7-new/setup.c
  48 --- xmbdfed-4.7/setup.c 2004-02-12 15:29:17.000000000 +0000
  49 +++ xmbdfed-4.7-new/setup.c     2006-05-04 16:17:58.000000000 +0000
  50 @@ -92,7 +92,7 @@
  51      Boolean saved;
  52  } MXFEditorSetup;
  53
  54 -static unsigned long active_editor;
  55 +//static unsigned long active_editor;
  56  static MXFEditorSetup setup;
  57  static MXFEditorOtherOptions other;
  58