1 --- fontforge-20060822/fontforge/Makefile.dynamic.in.orig 2006-08-07 04:09:46.000000000 +0200
2 +++ fontforge-20060822/fontforge/Makefile.dynamic.in 2006-09-16 15:19:44.300186750 +0200
12 CFLAGS = @CFLAGS@ $(_CFLAGS)
14 #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles
15 -LIBS = -rpath $(libdir) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
16 - $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm
17 +LIBS = -rpath $(libdir) $(STATIC_LIBS) $(X_LIBS) ../libgdraw.la ../libgunicode.la \
18 + $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ -lm
19 DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm
21 all: fontforge sfddiff
23 fontforge: main.o $(fontforge_LIBOBJECTS)
24 - $(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LIBS)
25 + $(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LDFLAGS) $(LIBS)
28 echo "#!$(bindir)/fontforge" >sfddiff
29 --- fontforge-20060822/gdraw/Makefile.dynamic.in.orig 2006-08-22 08:14:00.000000000 +0200
30 +++ fontforge-20060822/gdraw/Makefile.dynamic.in 2006-09-16 15:12:29.164992500 +0200
33 ../libgdraw.la: $(libgdraw_OBJECTS)
34 $(LIBTOOL) --mode=link $(CC) $(CFLAGS) @LDFLAGS@ -o ../libgdraw.la $(libgdraw_OBJECTS) \
35 - $(STATIC_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) \
36 + $(STATIC_LIBS) ../libgunicode.la $(X_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) -lm \
37 -rpath $(libdir) -version-info $(GD_VERSION):$(GD_REVISION):$(GD_AGE)
40 --- fontforge-20060822/configure.in.orig 2006-09-16 14:04:37.782547000 +0200
41 +++ fontforge-20060822/configure.in 2006-09-16 15:17:21.123238750 +0200
46 -LDFLAGS="$LDFLAGS -L/usr/local/lib"
52 dnl AC_CHECK_HEADER("X11/extensions/XI.h", : ,AC_DEFINE(_NO_XINPUT),)
53 dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS
55 - AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 )
56 - AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
57 + AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_EXTRA_LIBS -lX11 )
58 + AC_CHECK_LIB(X11, XkbQueryExtension, [:] ,AC_DEFINE(_NO_XKB), $X_LIBS $X_EXTRA_LIBS -lm )
62 --- fontforge-20060822/Makefile.dynamic.in.orig 2006-07-14 22:20:20.000000000 +0200
63 +++ fontforge-20060822/Makefile.dynamic.in 2006-09-16 15:52:43.479877750 +0200
65 # You may need to be root to do the install
67 #-rm $(libdir)/libgdraw.so* $(libdir)/libgunicode.so.*
68 - $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la $(libdir)/libgdraw.la
69 $(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
70 + $(LIBTOOL) --mode=install $(INSTALL) -c libgdraw.la $(libdir)/libgdraw.la
71 #cp .libs/*.so.*.* $(libdir)
72 $(LIBTOOL) --mode=finish $(libdir)
73 mkdir -p $(libdir)/pkgconfig