From c8f0330b4dfec35ca9a9d7943582580359c6705a Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sat, 28 Dec 2019 16:03:36 +0100 Subject: Rename motif patchset from 2.3.6 to 2.3.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No change in file content. Signed-off-by: Ulrich Müller --- patchsets/motif/2.3.6/01_all_solaris.patch | 17 -------------- patchsets/motif/2.3.6/02_all_sanitise-paths.patch | 27 ----------------------- patchsets/motif/2.3.6/03_all_solaris-11.patch | 13 ----------- patchsets/motif/2.3.6/04_all_parallel-make.patch | 15 ------------- patchsets/motif/2.3.6/05_all_install-dirs.patch | 18 --------------- patchsets/motif/2.3.6/06_all_cflags.patch | 14 ------------ patchsets/motif/2.3.8/01_all_solaris.patch | 17 ++++++++++++++ patchsets/motif/2.3.8/02_all_sanitise-paths.patch | 27 +++++++++++++++++++++++ patchsets/motif/2.3.8/03_all_solaris-11.patch | 13 +++++++++++ patchsets/motif/2.3.8/04_all_parallel-make.patch | 15 +++++++++++++ patchsets/motif/2.3.8/05_all_install-dirs.patch | 18 +++++++++++++++ patchsets/motif/2.3.8/06_all_cflags.patch | 14 ++++++++++++ 12 files changed, 104 insertions(+), 104 deletions(-) delete mode 100644 patchsets/motif/2.3.6/01_all_solaris.patch delete mode 100644 patchsets/motif/2.3.6/02_all_sanitise-paths.patch delete mode 100644 patchsets/motif/2.3.6/03_all_solaris-11.patch delete mode 100644 patchsets/motif/2.3.6/04_all_parallel-make.patch delete mode 100644 patchsets/motif/2.3.6/05_all_install-dirs.patch delete mode 100644 patchsets/motif/2.3.6/06_all_cflags.patch create mode 100644 patchsets/motif/2.3.8/01_all_solaris.patch create mode 100644 patchsets/motif/2.3.8/02_all_sanitise-paths.patch create mode 100644 patchsets/motif/2.3.8/03_all_solaris-11.patch create mode 100644 patchsets/motif/2.3.8/04_all_parallel-make.patch create mode 100644 patchsets/motif/2.3.8/05_all_install-dirs.patch create mode 100644 patchsets/motif/2.3.8/06_all_cflags.patch diff --git a/patchsets/motif/2.3.6/01_all_solaris.patch b/patchsets/motif/2.3.6/01_all_solaris.patch deleted file mode 100644 index e1e6e62..0000000 --- a/patchsets/motif/2.3.6/01_all_solaris.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugs.motifzone.net/showattachment.cgi?attach_id=259 -http://bugs.motifzone.net/long_list.cgi?buglist=1479 - -Extend the patch to include guard for sun to solve the exact same -compilation issue on Solaris. - ---- motif-2.3.4-orig/clients/uil/UilDefI.h -+++ motif-2.3.4/clients/uil/UilDefI.h -@@ -270,7 +270,7 @@ - #include "UilIODef.h" - #include "UilDiagDef.h" - #include "UilSarDef.h" --#if defined(linux) || defined(__APPLE__) -+#if defined(linux) || defined(__APPLE__) || defined(sun) - #define YYSTYPE yystype - #endif - #include "UilLexPars.h" diff --git a/patchsets/motif/2.3.6/02_all_sanitise-paths.patch b/patchsets/motif/2.3.6/02_all_sanitise-paths.patch deleted file mode 100644 index 750e368..0000000 --- a/patchsets/motif/2.3.6/02_all_sanitise-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -* don't do automagic guessing of paths - ---- motif-2.3.4-orig/configure.ac -+++ motif-2.3.4/configure.ac -@@ -183,21 +183,8 @@ - - case "$host_os" in - freebsd*) CFLAGS="$CFLAGS -DCSRG_BASED -DXNO_MTSAFE_API -DXNO_MTSAFE_PWDAPI"; -- LDFLAGS="$LDFLAGS -L/usr/local/lib";; -+ ;; - cygwin*) CFLAGS="$CFLAGS -DXNO_MTSAFE_DIRENTDAPI";; -- solaris* | sunos*) X_LIBS="$X_LIBS -L/usr/X/lib" && -- if test x$enable_motif22_compatibility = x -- then -- enable_motif22_compatibility="no" -- fi; -- if test x$enable_utf8 = x -- then -- enable_utf8="no" -- fi; -- if test x$enable_xft = x -- then -- enable_xft="no" -- fi;; - esac - - if test x$enable_motif22_compatibility = x diff --git a/patchsets/motif/2.3.6/03_all_solaris-11.patch b/patchsets/motif/2.3.6/03_all_solaris-11.patch deleted file mode 100644 index 4a6b236..0000000 --- a/patchsets/motif/2.3.6/03_all_solaris-11.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/465426 - ---- motif-2.3.4-orig/lib/Xm/Xmos_r.h -+++ motif-2.3.4/lib/Xm/Xmos_r.h -@@ -602,7 +602,7 @@ - # endif - } _Xreaddirparams; - --# if defined(AIXV3) || defined(AIXV4) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) -+# if defined(AIXV3) || defined(AIXV4) || defined(HAVE_READDIR_R_3) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) - /* AIX defines the draft POSIX symbol, but uses the final API. */ - /* POSIX final API, returns (int)0 on success. */ - # if defined(__osf__) diff --git a/patchsets/motif/2.3.6/04_all_parallel-make.patch b/patchsets/motif/2.3.6/04_all_parallel-make.patch deleted file mode 100644 index c8733e9..0000000 --- a/patchsets/motif/2.3.6/04_all_parallel-make.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.motifzone.net/show_bug.cgi?id=1592 - ---- motif-2.3.4-orig/lib/Xm/Makefile.am -+++ motif-2.3.4/lib/Xm/Makefile.am -@@ -283,7 +283,9 @@ - $(top_builddir)/config/util/makestrs: - ( cd $(top_builddir)/config/util && $(MAKE) $(AM_MAKEFLAGS) makestrs ) - --$(STRING_FILES): Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs -+XmStrDefs.h XmStrDefs22.h XmStrDefs23.h XmStrDefsI.h: XmStrDefs.c -+ -+XmStrDefs.c: Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs - test -f $(XMSTRING_LIST) || $(LN_S) $(srcdir)/$(XMSTRING_LIST) $(XMSTRING_LIST) - test -f XmStrDefs.ht || $(LN_S) $(srcdir)/XmStrDefs.ht XmStrDefs.ht - test -f XmStrDefs22.ht || $(LN_S) $(srcdir)/XmStrDefs22.ht XmStrDefs22.ht diff --git a/patchsets/motif/2.3.6/05_all_install-dirs.patch b/patchsets/motif/2.3.6/05_all_install-dirs.patch deleted file mode 100644 index 8b525aa..0000000 --- a/patchsets/motif/2.3.6/05_all_install-dirs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- motif-2.3.4-orig/configure.ac -+++ motif-2.3.4/configure.ac -@@ -179,13 +179,13 @@ - LIBDIR="${libdir}/X11" - AC_SUBST(LIBDIR) - --MWMRCDIR="${libdir}/X11" -+MWMRCDIR="${sysconfdir}/X11/mwm" - AC_SUBST(MWMRCDIR) - - INCDIR="${includedir}/X11" - AC_SUBST(INCDIR) - --XMBINDDIR_FALLBACK="${libdir}/X11/bindings" -+XMBINDDIR_FALLBACK="${datadir}/X11/bindings" - AC_SUBST(XMBINDDIR_FALLBACK) - - RM="rm -f" diff --git a/patchsets/motif/2.3.6/06_all_cflags.patch b/patchsets/motif/2.3.6/06_all_cflags.patch deleted file mode 100644 index 681783d..0000000 --- a/patchsets/motif/2.3.6/06_all_cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/604242 -Do not add -g to the user's CFLAGS. - ---- motif-2.3.6-orig/configure.ac -+++ motif-2.3.6/configure.ac -@@ -158,7 +158,7 @@ - - if test x$GCC = xyes - then -- CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment" -+ CFLAGS="$CFLAGS -Wall -fno-strict-aliasing -Wno-unused -Wno-comment" - if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then - CFLAGS="$CFLAGS -fno-tree-ter" - fi diff --git a/patchsets/motif/2.3.8/01_all_solaris.patch b/patchsets/motif/2.3.8/01_all_solaris.patch new file mode 100644 index 0000000..e1e6e62 --- /dev/null +++ b/patchsets/motif/2.3.8/01_all_solaris.patch @@ -0,0 +1,17 @@ +http://bugs.motifzone.net/showattachment.cgi?attach_id=259 +http://bugs.motifzone.net/long_list.cgi?buglist=1479 + +Extend the patch to include guard for sun to solve the exact same +compilation issue on Solaris. + +--- motif-2.3.4-orig/clients/uil/UilDefI.h ++++ motif-2.3.4/clients/uil/UilDefI.h +@@ -270,7 +270,7 @@ + #include "UilIODef.h" + #include "UilDiagDef.h" + #include "UilSarDef.h" +-#if defined(linux) || defined(__APPLE__) ++#if defined(linux) || defined(__APPLE__) || defined(sun) + #define YYSTYPE yystype + #endif + #include "UilLexPars.h" diff --git a/patchsets/motif/2.3.8/02_all_sanitise-paths.patch b/patchsets/motif/2.3.8/02_all_sanitise-paths.patch new file mode 100644 index 0000000..750e368 --- /dev/null +++ b/patchsets/motif/2.3.8/02_all_sanitise-paths.patch @@ -0,0 +1,27 @@ +* don't do automagic guessing of paths + +--- motif-2.3.4-orig/configure.ac ++++ motif-2.3.4/configure.ac +@@ -183,21 +183,8 @@ + + case "$host_os" in + freebsd*) CFLAGS="$CFLAGS -DCSRG_BASED -DXNO_MTSAFE_API -DXNO_MTSAFE_PWDAPI"; +- LDFLAGS="$LDFLAGS -L/usr/local/lib";; ++ ;; + cygwin*) CFLAGS="$CFLAGS -DXNO_MTSAFE_DIRENTDAPI";; +- solaris* | sunos*) X_LIBS="$X_LIBS -L/usr/X/lib" && +- if test x$enable_motif22_compatibility = x +- then +- enable_motif22_compatibility="no" +- fi; +- if test x$enable_utf8 = x +- then +- enable_utf8="no" +- fi; +- if test x$enable_xft = x +- then +- enable_xft="no" +- fi;; + esac + + if test x$enable_motif22_compatibility = x diff --git a/patchsets/motif/2.3.8/03_all_solaris-11.patch b/patchsets/motif/2.3.8/03_all_solaris-11.patch new file mode 100644 index 0000000..4a6b236 --- /dev/null +++ b/patchsets/motif/2.3.8/03_all_solaris-11.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/465426 + +--- motif-2.3.4-orig/lib/Xm/Xmos_r.h ++++ motif-2.3.4/lib/Xm/Xmos_r.h +@@ -602,7 +602,7 @@ + # endif + } _Xreaddirparams; + +-# if defined(AIXV3) || defined(AIXV4) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) ++# if defined(AIXV3) || defined(AIXV4) || defined(HAVE_READDIR_R_3) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) + /* AIX defines the draft POSIX symbol, but uses the final API. */ + /* POSIX final API, returns (int)0 on success. */ + # if defined(__osf__) diff --git a/patchsets/motif/2.3.8/04_all_parallel-make.patch b/patchsets/motif/2.3.8/04_all_parallel-make.patch new file mode 100644 index 0000000..c8733e9 --- /dev/null +++ b/patchsets/motif/2.3.8/04_all_parallel-make.patch @@ -0,0 +1,15 @@ +http://bugs.motifzone.net/show_bug.cgi?id=1592 + +--- motif-2.3.4-orig/lib/Xm/Makefile.am ++++ motif-2.3.4/lib/Xm/Makefile.am +@@ -283,7 +283,9 @@ + $(top_builddir)/config/util/makestrs: + ( cd $(top_builddir)/config/util && $(MAKE) $(AM_MAKEFLAGS) makestrs ) + +-$(STRING_FILES): Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs ++XmStrDefs.h XmStrDefs22.h XmStrDefs23.h XmStrDefsI.h: XmStrDefs.c ++ ++XmStrDefs.c: Makefile $(XMSTRING_LIST) XmStrDefs.ht XmStrDefsI.ht XmStrDefs.ct $(top_builddir)/config/util/makestrs + test -f $(XMSTRING_LIST) || $(LN_S) $(srcdir)/$(XMSTRING_LIST) $(XMSTRING_LIST) + test -f XmStrDefs.ht || $(LN_S) $(srcdir)/XmStrDefs.ht XmStrDefs.ht + test -f XmStrDefs22.ht || $(LN_S) $(srcdir)/XmStrDefs22.ht XmStrDefs22.ht diff --git a/patchsets/motif/2.3.8/05_all_install-dirs.patch b/patchsets/motif/2.3.8/05_all_install-dirs.patch new file mode 100644 index 0000000..8b525aa --- /dev/null +++ b/patchsets/motif/2.3.8/05_all_install-dirs.patch @@ -0,0 +1,18 @@ +--- motif-2.3.4-orig/configure.ac ++++ motif-2.3.4/configure.ac +@@ -179,13 +179,13 @@ + LIBDIR="${libdir}/X11" + AC_SUBST(LIBDIR) + +-MWMRCDIR="${libdir}/X11" ++MWMRCDIR="${sysconfdir}/X11/mwm" + AC_SUBST(MWMRCDIR) + + INCDIR="${includedir}/X11" + AC_SUBST(INCDIR) + +-XMBINDDIR_FALLBACK="${libdir}/X11/bindings" ++XMBINDDIR_FALLBACK="${datadir}/X11/bindings" + AC_SUBST(XMBINDDIR_FALLBACK) + + RM="rm -f" diff --git a/patchsets/motif/2.3.8/06_all_cflags.patch b/patchsets/motif/2.3.8/06_all_cflags.patch new file mode 100644 index 0000000..681783d --- /dev/null +++ b/patchsets/motif/2.3.8/06_all_cflags.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/604242 +Do not add -g to the user's CFLAGS. + +--- motif-2.3.6-orig/configure.ac ++++ motif-2.3.6/configure.ac +@@ -158,7 +158,7 @@ + + if test x$GCC = xyes + then +- CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment" ++ CFLAGS="$CFLAGS -Wall -fno-strict-aliasing -Wno-unused -Wno-comment" + if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then + CFLAGS="$CFLAGS -fno-tree-ter" + fi -- cgit v1.2.3-65-gdbad