summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'patchsets')
-rw-r--r--patchsets/motif/2.3.4/01_all_solaris.patch17
-rw-r--r--patchsets/motif/2.3.4/02_all_sanitise-paths.patch27
-rw-r--r--patchsets/motif/2.3.4/03_all_solaris-11.patch13
-rw-r--r--patchsets/motif/2.3.4/04_all_parallel-make.patch15
-rw-r--r--patchsets/motif/2.3.4/05_all_install-dirs.patch18
-rw-r--r--patchsets/motif/2.3.4/06_all_fc-config.patch25
-rw-r--r--patchsets/motif/2.3.4/07_all_automake-1.13.patch18
7 files changed, 0 insertions, 133 deletions
diff --git a/patchsets/motif/2.3.4/01_all_solaris.patch b/patchsets/motif/2.3.4/01_all_solaris.patch
deleted file mode 100644
index e1e6e62..0000000
--- a/patchsets/motif/2.3.4/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.4/02_all_sanitise-paths.patch b/patchsets/motif/2.3.4/02_all_sanitise-paths.patch
deleted file mode 100644
index 750e368..0000000
--- a/patchsets/motif/2.3.4/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.4/03_all_solaris-11.patch b/patchsets/motif/2.3.4/03_all_solaris-11.patch
deleted file mode 100644
index 4a6b236..0000000
--- a/patchsets/motif/2.3.4/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.4/04_all_parallel-make.patch b/patchsets/motif/2.3.4/04_all_parallel-make.patch
deleted file mode 100644
index c8733e9..0000000
--- a/patchsets/motif/2.3.4/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.4/05_all_install-dirs.patch b/patchsets/motif/2.3.4/05_all_install-dirs.patch
deleted file mode 100644
index 8b525aa..0000000
--- a/patchsets/motif/2.3.4/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.4/06_all_fc-config.patch b/patchsets/motif/2.3.4/06_all_fc-config.patch
deleted file mode 100644
index 6de2505..0000000
--- a/patchsets/motif/2.3.4/06_all_fc-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-AC_FIND_XFT looks for the fontconfig-config program which does not
-exist any more. Fall back to "pkg-config fontconfig".
-https://bugs.gentoo.org/462232
-http://bugs.motifzone.net/show_bug.cgi?id=1593
-
---- motif-2.3.4-orig/ac_find_xft.m4
-+++ motif-2.3.4/ac_find_xft.m4
-@@ -189,7 +189,7 @@
- yes)
- case "$fc_config" in
- no)
-- FONTCONFIG_CFLAGS=""
-+ FONTCONFIG_CFLAGS="`pkg-config fontconfig --cflags`"
- ;;
- *)
- FONTCONFIG_CFLAGS="`$fc_config --cflags`"
-@@ -208,7 +208,7 @@
- yes)
- case "$fc_config" in
- no)
-- fontconfig_lib=""
-+ FONTCONFIG_LIBS="`pkg-config fontconfig --libs`"
- ;;
- *)
- FONTCONFIG_LIBS="`$fc_config --libs`"
diff --git a/patchsets/motif/2.3.4/07_all_automake-1.13.patch b/patchsets/motif/2.3.4/07_all_automake-1.13.patch
deleted file mode 100644
index 3375f6e..0000000
--- a/patchsets/motif/2.3.4/07_all_automake-1.13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://bugs.motifzone.net/show_bug.cgi?id=1595
-
---- motif-2.3.4-orig/configure.ac
-+++ motif-2.3.4/configure.ac
-@@ -31,12 +31,11 @@
- dnl
- dnl AC_DISABLE_STATIC
-
--AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h)
-+AC_CONFIG_HEADERS(include/config.h lib/Xm/Xm.h)
-
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
--AM_PROG_CC_STDC
- AM_PROG_LIBTOOL
-
- AC_EXEEXT