[packages/motif] - rediffed

[hawk]

commit e0281281ca8d8d2adee701c72d04312ef48ef37f
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Fri Dec 8 22:49:56 2023 +0100

    - rediffed

 motif-bison.patch    | 13 +++++++------
 motif-freetype.patch |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/motif-bison.patch b/motif-bison.patch
index 1044fb8..4188dd5 100644
--- a/motif-bison.patch
+++ b/motif-bison.patch
@@ -1,7 +1,8 @@
---- openMotif-2.3.0/configure.ac.orig	2004-03-03 10:21:33.000000000 +0000
-+++ openMotif-2.3.0/configure.ac	2004-07-24 23:57:51.015614270 +0000
-@@ -32,9 +32,9 @@
- AM_PROG_LIBTOOL
+diff -urNp -x '*.orig' motif-2.3.8.org/configure.ac motif-2.3.8/configure.ac
+--- motif-2.3.8.org/configure.ac	2023-12-08 22:45:00.669224607 +0100
++++ motif-2.3.8/configure.ac	2023-12-08 22:45:00.874227241 +0100
+@@ -40,9 +40,9 @@ AM_PROG_LIBTOOL
+ 
  AC_EXEEXT
  
 -dnl AC_PROG_YACC
@@ -10,5 +11,5 @@
 -AC_CHECK_PROGS(YACC, byacc, yacc)
 +dnl AC_CHECK_PROGS(YACC, byacc, yacc)
  
- AM_PROG_LEX
- AC_PROG_INSTALL
+ dnl AC_PROG_SPLINT
+ AC_CHECK_PROGS(SPLINT, splint)
diff --git a/motif-freetype.patch b/motif-freetype.patch
index eee109c..940082b 100644
--- a/motif-freetype.patch
+++ b/motif-freetype.patch
@@ -1,6 +1,7 @@
---- 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 @@
+diff -urNp -x '*.orig' motif-2.3.8.org/ac_find_xft.m4 motif-2.3.8/ac_find_xft.m4
+--- motif-2.3.8.org/ac_find_xft.m4	2017-03-28 00:24:31.000000000 +0200
++++ motif-2.3.8/ac_find_xft.m4	2023-12-08 22:45:43.438774053 +0100
+@@ -75,7 +75,12 @@ saved_LIBS="$LIBS"
  LIBS="$LIBS $freetype_lib"
  saved_CPPFLAGS="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
@@ -12,5 +13,5 @@
 +		    freetype/ftnames.h \
 +		    )
  
- LT_HAVE_FREETYPE="no"
+ FINDXFT_HAVE_FREETYPE="no"
  case "$ac_cv_header_freetype_freetype_h" in
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/motif.git/commitdiff/e0281281ca8d8d2adee701c72d04312ef48ef37f