diff options
| author | tommat | 2007-11-27 16:00:48 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 25822eb8c85eab3664747d435ab3930d6578267b (patch) | |
| tree | 26d9060fe3ef6326493baf6469817b68869e41f4 | |
| parent | 4d9fe7ff05032db0530b7bc5a90b6107d14e81d4 (diff) | |
| download | motif-25822eb8c85eab3664747d435ab3930d6578267b.zip motif-25822eb8c85eab3664747d435ab3930d6578267b.tar.gz | |
- 2.3.0
Changed files:
openmotif-bison.patch -> 1.2
openmotif-freetype.patch -> 1.1
| -rw-r--r-- | openmotif-bison.patch | 22 | ||||
| -rw-r--r-- | openmotif-freetype.patch | 16 |
2 files changed, 16 insertions, 22 deletions
diff --git a/openmotif-bison.patch b/openmotif-bison.patch index 5c7b590..3cbb417 100644 --- a/openmotif-bison.patch +++ b/openmotif-bison.patch @@ -1,17 +1,3 @@ ---- openMotif-2.2.3/configure.in.orig 2004-03-03 10:21:33.000000000 +0000 -+++ openMotif-2.2.3/configure.in 2004-07-24 23:57:51.015614270 +0000 -@@ -32,9 +32,9 @@ - AM_PROG_LIBTOOL - AC_EXEEXT - --dnl AC_PROG_YACC -+AC_PROG_YACC - dnl Do this the old fashioned way. 'bison -y' doesn't cut it --AC_CHECK_PROGS(YACC, byacc, yacc) -+dnl AC_CHECK_PROGS(YACC, byacc, yacc) - - AM_PROG_LEX - AC_PROG_INSTALL --- openMotif-2.2.3/tools/wml/Uil.y.orig 2003-08-15 17:48:15.000000000 +0000 +++ openMotif-2.2.3/tools/wml/Uil.y 2004-07-24 23:53:59.386710858 +0000 @@ -59,6 +59,9 @@ @@ -24,14 +10,6 @@ #include "UilDefI.h" #include "UilCompGl.h" -@@ -1051,7 +1054,6 @@ - sar_private_error( &$$ ); - } - } -- ; - | value { $$ = $1; - if ($$.b_type != sym_k_error_value) - { --- openMotif-2.2.3/tools/wml/wmldbcreate.c.orig 2003-10-08 21:07:48.000000000 +0000 +++ openMotif-2.2.3/tools/wml/wmldbcreate.c 2004-07-24 23:55:39.212881510 +0000 @@ -45,7 +45,9 @@ diff --git a/openmotif-freetype.patch b/openmotif-freetype.patch new file mode 100644 index 0000000..eee109c --- /dev/null +++ b/openmotif-freetype.patch @@ -0,0 +1,16 @@ +--- openmotif-2.3.0/ac_find_xft.m4.orig 2007-11-27 15:01:28.000000000 +0100 ++++ openmotif-2.3.0/ac_find_xft.m4 2007-11-27 15:03:36.000000000 +0100 +@@ -75,7 +75,12 @@ + LIBS="$LIBS $freetype_lib" + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" +-AC_CHECK_HEADERS(freetype/freetype.h) ++AC_CHECK_HEADERS(ft2build.h \ ++ freetype/freetype.h \ ++ freetype/ftglyph.h \ ++ freetype/tttables.h \ ++ freetype/ftnames.h \ ++ ) + + LT_HAVE_FREETYPE="no" + case "$ac_cv_header_freetype_freetype_h" in |