diff --git a/motif-2.3.4-Fix-issues-with-Werror-format-security.patch b/0001-fix-motif-no-autogen.patch similarity index 57% rename from motif-2.3.4-Fix-issues-with-Werror-format-security.patch rename to 0001-fix-motif-no-autogen.patch index f0ff860d9d49db56a23a18ab12348180d6558c4e..9c07da8082d442b5b26e15adf7a016e7dd3684b7 100644 --- a/motif-2.3.4-Fix-issues-with-Werror-format-security.patch +++ b/0001-fix-motif-no-autogen.patch @@ -1,29 +1,262 @@ -From 4783fb4cec8624311bb87b2eb4a2ac94a5c7d849 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20=C5=A0abata?= -Date: Thu, 8 Jun 2017 12:12:04 +0200 -Subject: [PATCH] Fix issues with -Werror=format-security -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 4a8f9e268269b59157d6c87c1ba6aeb9b9cfb3bc Mon Sep 17 00:00:00 2001 +From: bzg1107 +Date: Wed, 29 Dec 2021 14:34:43 +0800 +Subject: [PATCH] fix motif no autogen -Signed-off-by: Petr Šabata --- - lib/Mrm/Mrmhier.c | 4 +- - lib/Mrm/Mrmicon.c | 4 +- - lib/Mrm/Mrmlread.c | 2 +- - lib/Mrm/Mrmwcrw.c | 4 +- - tools/wml/wmldbcreate.c | 2 +- - tools/wml/wmlouth.c | 128 ++++++++++++++++++++++++------------------------ - tools/wml/wmloutkey.c | 10 ++-- - tools/wml/wmloutmm.c | 16 +++--- - tools/wml/wmlresolve.c | 26 +++++----- - 9 files changed, 98 insertions(+), 98 deletions(-) + Makefile.am | 3 +- + autogen.sh | 24 +++++++ + clients/mwm/WmResParse.c | 2 +- + clients/uil/Makefile.am | 4 +- + configure.ac | 4 +- + doc/man/man1/mwm.1 | 16 ++--- + doc/man/man3/VirtualBindings.3 | 2 +- + doc/man/man3/XmColorSelector.3 | 2 +- + doc/man/man4/mwmrc.4 | 12 ++-- + lib/Mrm/Mrmhier.c | 4 +- + lib/Mrm/Mrmicon.c | 4 +- + lib/Mrm/Mrmlread.c | 2 +- + lib/Mrm/Mrmwcrw.c | 4 +- + lib/Xm/ColorS.c | 2 +- + lib/Xm/XmosP.h | 2 +- + tools/wml/wmldbcreate.c | 2 +- + tools/wml/wmlouth.c | 124 ++++++++++++++++----------------- + tools/wml/wmloutkey.c | 10 +-- + tools/wml/wmloutmm.c | 16 ++--- + tools/wml/wmlresolve.c | 22 +++--- + 20 files changed, 142 insertions(+), 119 deletions(-) + create mode 100755 autogen.sh +diff --git a/Makefile.am b/Makefile.am +index ebd376a..3701667 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -27,7 +27,6 @@ SUBDIRS = bindings bitmaps \ + include \ + tools \ + clients \ +- doc \ +- demos ++ doc + AUTOMAKE_OPTIONS = 1.4 + ACLOCAL_AMFLAGS = -I . +diff --git a/autogen.sh b/autogen.sh +new file mode 100755 +index 0000000..726f927 +--- /dev/null ++++ b/autogen.sh +@@ -0,0 +1,24 @@ ++#!/bin/sh ++ ++srcdir=`dirname $0` ++test -z "$srcdir" && srcdir=. ++ ++THEDIR="`pwd`" ++cd "$srcdir" ++DIE=0 ++ ++libtoolize --force --automake ++aclocal -I . ++autoconf ++autoheader ++automake --foreign --include-deps --add-missing ++ ++if test -z "$*"; then ++ echo "I am going to run ./configure with no arguments - if you wish " ++ echo "to pass any to it, please specify them on the $0 command line." ++fi ++ ++cd "$THEDIR" ++ ++$srcdir/configure "$@" ++ +diff --git a/clients/mwm/WmResParse.c b/clients/mwm/WmResParse.c +index 14c8f0e..f8726ae 100644 +--- a/clients/mwm/WmResParse.c ++++ b/clients/mwm/WmResParse.c +@@ -2388,7 +2388,7 @@ FILE *FopenConfigFile (void) + #endif /* PANELIST */ + + #ifndef MWMRCDIR +-#define MWMRCDIR "/usr/lib/X11" ++#define MWMRCDIR "/etc/X11/mwm" + #endif + if (LANG != NULL) + { +diff --git a/clients/uil/Makefile.am b/clients/uil/Makefile.am +index c4f6492..b19994b 100644 +--- a/clients/uil/Makefile.am ++++ b/clients/uil/Makefile.am +@@ -13,7 +13,7 @@ UilParser.lo: UilParser.c + + libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la + +-uil_LDADD = ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la ++uil_LDADD = libUil.la ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la + + INCLUDES = -DINCDIR=\"@INCDIR@\" \ + -DLIBDIR=\"@LIBDIR@\" \ +@@ -42,7 +42,7 @@ COMMON_SRC = UilCmd.c UilDiags.c UilKeyTab.c UilLexAna.c \ + UilLstMac.c UilSemVal.c UilSemCSet.c UilDB.c + + SRCS = $(COMMON_SRC) +-SRCS2 = $(COMMON_SRC) UilMain.c ++SRCS2 = UilMain.c + + HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \ + UilDef.h XmAppl.uil +diff --git a/configure.ac b/configure.ac +index 9d1d11e..3fd70d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,13 +175,13 @@ AC_SUBST(CDE_CONFIGURATION_TOP) + LIBDIR="${libdir}/X11" + AC_SUBST(LIBDIR) + +-MWMRCDIR="${libdir}/X11" ++MWMRCDIR="/etc/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/doc/man/man1/mwm.1 b/doc/man/man1/mwm.1 +index dd4b3b8..f527e58 100644 +--- a/doc/man/man1/mwm.1 ++++ b/doc/man/man1/mwm.1 +@@ -366,7 +366,7 @@ The \fBmwm\fP command is configured from its resource + database\&. This database is built from the following sources\&. They are listed + in order of precedence, low to high: + .PP +-\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP ++\fB/usr/share/X11/app-defaults/Mwm\fP + .PP + \fB$HOME/Mwm\fP + .PP +@@ -595,7 +595,7 @@ lw(1.528376i) lw(1.592955i) lw(1.054795i) lw(1.323875i). + NameClassValue TypeDefault + autoKeyFocusAutoKeyFocusT/FT + autoRaiseDelayAutoRaiseDelaymillisec500 +-bitmap-Bitmap-directory/usr/X11R6/include- ++bitmap-Bitmap-directory/usr/include- + DirectoryDirectory/X11/bitmaps + clientAutoPlaceClientAutoPlaceT/FT + colormapFocus-ColormapFocus-stringkeyboard +@@ -650,7 +650,7 @@ the keyboard focus\&. The default value of this resource is 500 (ms)\&. + This resource identifies a directory to be searched for bitmaps referenced + by \fBmwm\fP resources\&. This directory is searched if a bitmap + is specified without an absolute pathname\&. The default value for this resource +-is \fB/usr/X11R6/include/X11/bitmaps\fP\&. The directory \fB/usr/X11R6/include/X11/bitmaps\fP ++is \fB/usr/include/X11/bitmaps\fP\&. The directory \fB/usr/include/X11/bitmaps\fP + represents the customary locations for this directory\&. The actual + location of this directory may vary on some systems\&. If the bitmap is not + found in the specified directory, \fBXBMLANGPATH\fP is searched\&. +@@ -678,8 +678,8 @@ is set, \fBmwm\fP looks for \fI$HOME/$LANG\fP/ \fBconfigFile\fP\&. If that file + \fB$HOME\fP/\fBconfigFile\fP\&. If the \fIconfigFile\fP pathname does not begin with "~/" or "/", \fBmwm\fP considers it to be relative to the current working directory\&. If + the \fIconfigFile\fP resource is not specified + or if that file does not exist, \fBmwm\fP uses several default +-paths to find a configuration file\&. The order of the search is shown below: \fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP\(dg +-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are ++paths to find a configuration file\&. The order of the search is shown below: \fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP\(dg ++\fB/etc/X11/mwm/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are + implementation dependent\&. + .IP "\fIdeiconifyKeyFocus\fP\ (class\ \fIDeiconifyKeyFocus\fP)" 10 + This resource applies only when the keyboard input focus policy is explicit\&. +@@ -1344,11 +1344,11 @@ the shell to use when executing commands via the \fBf\&.exec\fP + function\&. + .SS "Files" + .PP +-\fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP ++\fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP + .PP +-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP ++\fB/etc/X11/mwm/system\&.mwmrc\fP + .PP +-\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP ++\fB/usr/share/X11/app-defaults/Mwm\fP + .PP + \fB$HOME/Mwm\fP + .PP +diff --git a/doc/man/man3/VirtualBindings.3 b/doc/man/man3/VirtualBindings.3 +index e227f0e..8c10e18 100644 +--- a/doc/man/man3/VirtualBindings.3 ++++ b/doc/man/man3/VirtualBindings.3 +@@ -90,7 +90,7 @@ bindings contained in that file\&. + If it has found no bindings, Motif next looks for the file + \fBxmbind\&.alias\fP in the directory specified by the environment + variable \fBXMBINDDIR\fP, if \fBXMBINDDIR\fP is set, or in the directory +-\fB/usr/lib/Xm/bindings\fP if \fBXMBINDDIR\fP is not set\&. ++\fB/usr/share/X11/bindings\fP if \fBXMBINDDIR\fP is not set\&. + If this file exists Motif searches it for a pathname associated with the + vendor string or with the vendor string and vendor release\&. + If it finds such a pathname and if that file exists, Motif loads the +diff --git a/doc/man/man3/XmColorSelector.3 b/doc/man/man3/XmColorSelector.3 +index 22e0047..fb43803 100644 +--- a/doc/man/man3/XmColorSelector.3 ++++ b/doc/man/man3/XmColorSelector.3 +@@ -34,7 +34,7 @@ marginWidth%MarginWidth%HorizontalDimension%2 + noCellError%NoCellError%XmString%"No Color Cell + %%% Available" + redSliderLabel%SliderLabel%XmString%"Red" +-rgbFile%String%String%/usr/lib/X11/rgb.txt ++rgbFile%String%String%/usr/share/X11/rgb.txt + sliderTogLabel%TogLabel%XmString%"Color Sliders" + .TE + .PP +diff --git a/doc/man/man4/mwmrc.4 b/doc/man/man4/mwmrc.4 +index e8de9f9..5d16fca 100644 +--- a/doc/man/man4/mwmrc.4 ++++ b/doc/man/man4/mwmrc.4 +@@ -57,7 +57,7 @@ file that controls much of the behavior of the Motif window manager \fBmwm\fP\&. + It contains descriptions of resources that cannot easily be + written using standard X Window System, Version 11 resource syntax\&. The resource + description file contains entries that are referred to by X resources in +-defaults files (for example, \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP) ++defaults files (for example, \fB/usr/share/X11/app-defaults/Mwm\fP) + or in the \fBRESOURCE_MANAGER\fP property on the + root window\&. For example, the resource description file enables you to specify + different types of window menus; however, an X resource is used to specify +@@ -72,8 +72,8 @@ on a per-user basis: + .nf + \f(CW$HOME/$LANG/\&.mwmrc + $HOME/\&.mwmrc +-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc +-/usr/X11R6/lib/X11/system\&.mwmrc\fR ++/etc/X11/mwm/$LANG/system\&.mwmrc ++/etc/X11/mwm/system\&.mwmrc\fR + .fi + .PP + .PP +@@ -84,7 +84,7 @@ resource\&. The following shows how a different resource description file can + be specified from the command line: + .PP + .nf +-\f(CW/usr/X11R6/bin/X11/mwm -xrm "mwm*configFile: mymwmrc"\fR ++\f(CW/usr/bin/mwm -xrm "mwm*configFile: mymwmrc"\fR + .fi + .PP + .SS "Resource Types" +@@ -626,8 +626,8 @@ is not what you expect\&. + .nf + \fB$HOME/$LANG/\&.mwmrc + $HOME/\&.mwmrc +-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc +-/usr/X11R6/lib/X11/system\&.mwmrc\fP ++/etc/X11/mwm/$LANG/system\&.mwmrc ++/etc/X11/mwm/system\&.mwmrc\fP + .fi + .SH "RELATED INFORMATION" + .PP diff --git a/lib/Mrm/Mrmhier.c b/lib/Mrm/Mrmhier.c -index 2712742..2a8703c 100644 +index 666854f..e041b49 100644 --- a/lib/Mrm/Mrmhier.c +++ b/lib/Mrm/Mrmhier.c -@@ -264,10 +264,10 @@ Urm__OpenHierarchy (MrmCount num_files, +@@ -259,10 +259,10 @@ Urm__OpenHierarchy (MrmCount num_files, case MrmSUCCESS: break; case MrmNOT_VALID: @@ -37,10 +270,10 @@ index 2712742..2a8703c 100644 } } diff --git a/lib/Mrm/Mrmicon.c b/lib/Mrm/Mrmicon.c -index 95d4086..191e2d2 100644 +index f44a73b..ee7db95 100644 --- a/lib/Mrm/Mrmicon.c +++ b/lib/Mrm/Mrmicon.c -@@ -1176,7 +1176,7 @@ Urm__RealizeColorTable (Screen *screen, +@@ -1170,7 +1170,7 @@ Urm__RealizeColorTable (Screen *screen, } break; default: @@ -49,7 +282,7 @@ index 95d4086..191e2d2 100644 return Urm__UT_Error ("Urm__RelizeColorTable", err_msg, NULL, NULL, MrmFAILURE) ; } -@@ -1252,7 +1252,7 @@ Urm__RealizeColorTable (Screen *screen, +@@ -1246,7 +1246,7 @@ Urm__RealizeColorTable (Screen *screen, break; default: result = MrmFAILURE; @@ -59,10 +292,10 @@ index 95d4086..191e2d2 100644 err_msg, NULL, NULL, MrmFAILURE) ; } diff --git a/lib/Mrm/Mrmlread.c b/lib/Mrm/Mrmlread.c -index c2fd94c..be433a3 100644 +index 489b66a..1f3ae43 100644 --- a/lib/Mrm/Mrmlread.c +++ b/lib/Mrm/Mrmlread.c -@@ -698,7 +698,7 @@ MrmFetchColorLiteral (MrmHierarchy hierarchy_id, +@@ -685,7 +685,7 @@ MrmFetchColorLiteral (MrmHierarchy hierarchy_id, XBlackPixelOfScreen(XDefaultScreenOfDisplay(display))); break; default: @@ -72,10 +305,10 @@ index c2fd94c..be433a3 100644 err_msg, NULL, NULL, MrmFAILURE) ; _MrmAppUnlock(app); diff --git a/lib/Mrm/Mrmwcrw.c b/lib/Mrm/Mrmwcrw.c -index fe3db52..3c5857f 100644 +index ada9aa3..0823928 100644 --- a/lib/Mrm/Mrmwcrw.c +++ b/lib/Mrm/Mrmwcrw.c -@@ -1390,7 +1390,7 @@ Urm__CW_CreateArglist (Widget parent, +@@ -1385,7 +1385,7 @@ Urm__CW_CreateArglist (Widget parent, } break; default: @@ -84,7 +317,7 @@ index fe3db52..3c5857f 100644 result = Urm__UT_Error ("Urm__CW_ConvertValue", err_msg, NULL, NULL, MrmFAILURE) ; }; -@@ -2426,7 +2426,7 @@ Urm__CW_ConvertValue (Widget parent, +@@ -2421,7 +2421,7 @@ Urm__CW_ConvertValue (Widget parent, } break; default: @@ -93,11 +326,37 @@ index fe3db52..3c5857f 100644 return Urm__UT_Error ("Urm__CW_ConvertValue", err_msg, NULL, NULL, MrmFAILURE) ; }; +diff --git a/lib/Xm/ColorS.c b/lib/Xm/ColorS.c +index 6baf2e3..22224ae 100644 +--- a/lib/Xm/ColorS.c ++++ b/lib/Xm/ColorS.c +@@ -146,7 +146,7 @@ static XtResource resources[] = + { + XmNrgbFile, XmCString, XmRString, + sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file), +- XmRString, (XtPointer) "/usr/lib/X11/rgb.txt" ++ XmRString, (XtPointer) "/usr/share/X11/rgb.txt" + }, + #endif + { +diff --git a/lib/Xm/XmosP.h b/lib/Xm/XmosP.h +index 66e52af..9cc5ddb 100644 +--- a/lib/Xm/XmosP.h ++++ b/lib/Xm/XmosP.h +@@ -169,7 +169,7 @@ extern "C" { + + #define XMBINDDIR "XMBINDDIR" + #ifndef XMBINDDIR_FALLBACK +-#define XMBINDDIR_FALLBACK "/usr/lib/Xm/bindings" ++#define XMBINDDIR_FALLBACK "/usr/lib/X11/bindings" + #endif + #define XMBINDFILE "xmbind.alias" + #define MOTIFBIND ".motifbind" diff --git a/tools/wml/wmldbcreate.c b/tools/wml/wmldbcreate.c -index 07c0a3c..6de585a 100644 +index 878220e..65aecf0 100644 --- a/tools/wml/wmldbcreate.c +++ b/tools/wml/wmldbcreate.c -@@ -425,7 +425,7 @@ int table_id; +@@ -418,7 +418,7 @@ int table_id; { fprintf (afile, "%d, ", entry_vec[j]); } @@ -107,10 +366,10 @@ index 07c0a3c..6de585a 100644 } } diff --git a/tools/wml/wmlouth.c b/tools/wml/wmlouth.c -index d2330e3..a52843f 100644 +index 62cf682..ead4512 100644 --- a/tools/wml/wmlouth.c +++ b/tools/wml/wmlouth.c -@@ -225,12 +225,12 @@ if ( outfil == (FILE *) NULL ) +@@ -219,12 +219,12 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymGen.h"); return; } @@ -125,7 +384,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { clsobj = (WmlClassDefPtr) wml_obj_class_ptr->hvec[ndx].objptr; -@@ -244,7 +244,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -238,7 +238,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Define the sym_k_..._reason literals */ @@ -134,16 +393,16 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { resobj = (WmlResourceDefPtr) wml_obj_reason_ptr->hvec[ndx].objptr; -@@ -258,7 +258,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -252,7 +252,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Define the sym_k_..._arg literals */ -fprintf (outfil, canned4); -+fprintf (outfil, "%s", canned4); ++fprintf (outfil,"%s", canned4); for ( ndx=0 ; ndxcnt ; ndx++ ) { resobj = (WmlResourceDefPtr) wml_obj_arg_ptr->hvec[ndx].objptr; -@@ -272,7 +272,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -266,7 +266,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Define the sym_k_..._enumset structs and literals */ @@ -152,7 +411,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { enumsetobj = (WmlEnumSetDefPtr) wml_obj_enumset_ptr->hvec[ndx].objptr; -@@ -286,7 +286,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -280,7 +280,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Define the sym_k_..._enumval literals */ @@ -161,7 +420,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { enumvalobj = (WmlEnumValueDefPtr) wml_obj_enumval_ptr->hvec[ndx].objptr; -@@ -301,7 +301,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -295,7 +295,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) * Define the sym_k_..._charsize literals * Define the sym_k_..._charset literals */ @@ -170,7 +429,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { charsetobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -315,7 +315,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -309,7 +309,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Define the sym_k_..._child literals */ @@ -179,7 +438,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { childobj = (WmlChildDefPtr) wml_obj_child_ptr->hvec[ndx].objptr; -@@ -379,12 +379,12 @@ if ( outfil == (FILE *) NULL ) +@@ -373,12 +373,12 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymChCL.h"); return; } @@ -194,7 +453,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { childobj = (WmlChildDefPtr) wml_obj_child_ptr->hvec[ndx].objptr; -@@ -392,7 +392,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -386,7 +386,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) fprintf (outfil, " sym_k_%s_object,\n", classobj->tkname); } @@ -203,7 +462,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -446,12 +446,12 @@ if ( outfil == (FILE *) NULL ) +@@ -440,12 +440,12 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymArTy.h"); return; } @@ -218,7 +477,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { resobj = (WmlResourceDefPtr) wml_obj_arg_ptr->hvec[ndx].objptr; -@@ -459,7 +459,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -453,7 +453,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) fprintf (outfil, " sym_k_%s_value,\n", datobj->tkname); } @@ -227,7 +486,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -509,19 +509,19 @@ if ( outfil == (FILE *) NULL ) +@@ -503,19 +503,19 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymRArg.h"); return; } @@ -250,7 +509,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -621,12 +621,12 @@ if ( outfil == (FILE *) NULL ) +@@ -615,12 +615,12 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilUrmClas.h"); return; } @@ -265,7 +524,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { clsobj = (WmlClassDefPtr) wml_obj_class_ptr->hvec[ndx].objptr; -@@ -637,7 +637,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -631,7 +631,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) else fprintf (outfil, " \"%s\",\t\n", synobj->convfunc); } @@ -274,7 +533,7 @@ index d2330e3..a52843f 100644 /* * Write entries for gadget variants of widget classes -@@ -661,7 +661,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -655,7 +655,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) synobj->name); } } @@ -283,7 +542,7 @@ index d2330e3..a52843f 100644 /* * Write entries for non-dialog widgets -@@ -685,7 +685,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -679,7 +679,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) synobj->name); } } @@ -292,7 +551,7 @@ index d2330e3..a52843f 100644 /* * Write entries for the resource a widget's controls map to -@@ -701,7 +701,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -695,7 +695,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) else fprintf (outfil, " sym_k_%s_arg,\n", mapresobj->tkname); } @@ -301,7 +560,7 @@ index d2330e3..a52843f 100644 /* * Write entries for arguments -@@ -714,7 +714,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -708,7 +708,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) fprintf (outfil, " %s,\n", synres->resliteral); } @@ -310,7 +569,7 @@ index d2330e3..a52843f 100644 /* * Write entries for reasons -@@ -727,7 +727,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -721,7 +721,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) fprintf (outfil, " %s,\n", synres->resliteral); } @@ -319,7 +578,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -781,13 +781,13 @@ if ( outfil == (FILE *) NULL ) +@@ -775,13 +775,13 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilConst.h"); return; } @@ -335,16 +594,7 @@ index d2330e3..a52843f 100644 strcpy (maskbuf, "0"); for ( ndx=0 ; ndxcnt ; ndx++ ) { -@@ -805,7 +805,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - } - if ( bitno != 8 ) - fprintf (outfil, "%s", maskbuf); --fprintf (outfil, canned1a); -+fprintf (outfil, "%s", canned1a); - - /* - * close the output file -@@ -878,8 +878,8 @@ if ( outfil == (FILE *) NULL ) +@@ -872,8 +872,8 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymReas.h"); return; } @@ -355,14 +605,7 @@ index d2330e3..a52843f 100644 /* * Generate the bit vectors for each class. Outer loop on the reason code, -@@ -919,19 +919,19 @@ for ( resndx=0 ; resndxcnt ; resndx++ ) - if ( itemno != 0 ) - fprintf (outfil, "%s 0};\n", maskbuf); - else -- fprintf (outfil, "};\n"); -+ fprintf (outfil, "%s", "};\n"); - } - +@@ -919,13 +919,13 @@ for ( resndx=0 ; resndxcnt ; resndx++ ) /* * Write the vector of vectors. */ @@ -378,7 +621,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -1004,8 +1004,8 @@ if ( outfil == (FILE *) NULL ) +@@ -998,8 +998,8 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymArTa.h"); return; } @@ -389,7 +632,7 @@ index d2330e3..a52843f 100644 /* * Generate the bit vectors for each class. Outer loop on the argument code, -@@ -1045,19 +1045,19 @@ for ( resndx=0 ; resndxcnt ; resndx++ ) +@@ -1039,19 +1039,19 @@ for ( resndx=0 ; resndxcnt ; resndx++ ) if ( itemno != 0 ) fprintf (outfil, "%s 0};\n", maskbuf); else @@ -412,7 +655,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -1129,8 +1129,8 @@ if ( outfil == (FILE *) NULL ) +@@ -1123,8 +1123,8 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymChTa.h"); return; } @@ -423,14 +666,7 @@ index d2330e3..a52843f 100644 /* * Generate the bit vectors for each class. Outer loop on the child code, -@@ -1168,19 +1168,19 @@ for ( childndx=0 ; childndxcnt ; childndx++ ) - if ( itemno != 0 ) - fprintf (outfil, "%s 0};\n", maskbuf); - else -- fprintf (outfil, "};\n"); -+ fprintf (outfil, "%s", "};\n"); - } - +@@ -1168,13 +1168,13 @@ for ( childndx=0 ; childndxcnt ; childndx++ ) /* * Write the vector of vectors. */ @@ -446,7 +682,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -1251,8 +1251,8 @@ if ( outfil == (FILE *) NULL ) +@@ -1245,8 +1245,8 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymCtl.h"); return; } @@ -457,7 +693,7 @@ index d2330e3..a52843f 100644 /* * Generate the bit vectors for each class. Outer loop on the class code, -@@ -1290,19 +1290,19 @@ for ( ctlndx=0 ; ctlndxcnt ; ctlndx++ ) +@@ -1284,19 +1284,19 @@ for ( ctlndx=0 ; ctlndxcnt ; ctlndx++ ) if ( itemno != 0 ) fprintf (outfil, "%s 0};\n", maskbuf); else @@ -480,7 +716,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -1438,7 +1438,7 @@ if ( outfil == (FILE *) NULL ) +@@ -1432,7 +1432,7 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymNam.h"); return; } @@ -489,7 +725,7 @@ index d2330e3..a52843f 100644 /* * Write entries for widgets -@@ -1517,7 +1517,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1511,7 +1511,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) fprintf (outfil, " \"%s\",\n", synch->name); } @@ -498,7 +734,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -1621,12 +1621,12 @@ if ( outfil == (FILE *) NULL ) +@@ -1615,12 +1615,12 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymEnum.h"); return; } @@ -513,7 +749,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { enumsetobj = (WmlEnumSetDefPtr) wml_obj_enumset_ptr->hvec[ndx].objptr; -@@ -1637,13 +1637,13 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1631,13 +1631,13 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) fprintf (outfil, " %d,\n", evobj->sym_code); } @@ -529,7 +765,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { enumsetobj = (WmlEnumSetDefPtr) wml_obj_enumset_ptr->hvec[ndx].objptr; -@@ -1655,7 +1655,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1649,12 +1649,12 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Create enumset table entries for arguments, similar to writing sym_k... */ @@ -538,7 +774,13 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { resobj = (WmlResourceDefPtr) wml_obj_arg_ptr->hvec[ndx].objptr; -@@ -1669,13 +1669,13 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) + if ( resobj->enumset_def == NULL ) +- fprintf (outfil, " 0,\n"); ++ fprintf (outfil, "%s", " 0,\n"); + else + fprintf (outfil, " %d,\n", + resobj->enumset_def->sym_code); +@@ -1663,13 +1663,13 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Create the enumval values table. */ @@ -554,7 +796,7 @@ index d2330e3..a52843f 100644 /* * close the output file -@@ -1813,12 +1813,12 @@ if ( outfil == (FILE *) NULL ) +@@ -1807,12 +1807,12 @@ if ( outfil == (FILE *) NULL ) printf ("\nCouldn't open UilSymCSet.h"); return; } @@ -569,7 +811,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1836,7 +1836,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1830,7 +1830,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Generate the writing direction table */ @@ -578,7 +820,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1858,7 +1858,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1852,7 +1852,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Generate the parsing direction table */ @@ -587,7 +829,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1880,7 +1880,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1874,7 +1874,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Generate the character size table */ @@ -596,7 +838,7 @@ index d2330e3..a52843f 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1906,7 +1906,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1900,7 +1900,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Generate the $LANG name recognition table */ @@ -605,7 +847,7 @@ index d2330e3..a52843f 100644 lang_max = 0; for ( ndx=0 ; ndxcnt ; ndx++ ) { -@@ -1936,7 +1936,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1930,7 +1930,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * Generate the $LANG code lookup table, in upper case */ @@ -615,10 +857,10 @@ index d2330e3..a52843f 100644 { csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; diff --git a/tools/wml/wmloutkey.c b/tools/wml/wmloutkey.c -index af42f22..4c14728 100644 +index eb90a71..c829b83 100644 --- a/tools/wml/wmloutkey.c +++ b/tools/wml/wmloutkey.c -@@ -574,16 +574,16 @@ if ( outfil == NULL ) +@@ -568,16 +568,16 @@ if ( outfil == NULL ) printf ("\nCouldn't open UilKeyTab.h"); return; } @@ -638,7 +880,7 @@ index af42f22..4c14728 100644 /* * close the output file -@@ -812,8 +812,8 @@ if ( outfil == NULL ) +@@ -806,8 +806,8 @@ if ( outfil == NULL ) printf ("\nCouldn't open UilTokName.h"); return; } @@ -650,10 +892,10 @@ index af42f22..4c14728 100644 /* * Print the token name entries diff --git a/tools/wml/wmloutmm.c b/tools/wml/wmloutmm.c -index 84a97bb..dc8ec09 100644 +index 6183339..835da80 100644 --- a/tools/wml/wmloutmm.c +++ b/tools/wml/wmloutmm.c -@@ -209,9 +209,9 @@ int ctlndx; /* to access ordered vector */ +@@ -203,9 +203,9 @@ int ctlndx; /* to access ordered vector */ /* * Write out header information */ @@ -665,7 +907,7 @@ index 84a97bb..dc8ec09 100644 /* * Alphabetize the controls, reason, and argument lists -@@ -264,7 +264,7 @@ while ( ctlref != NULL ) +@@ -258,7 +258,7 @@ while ( ctlref != NULL ) rsnndx = 0; ctlndx = 0; if ( mm_ctl_ptr->cnt == 0 ) @@ -674,7 +916,7 @@ index 84a97bb..dc8ec09 100644 while ( rsnndxcnt || ctlndxcnt ) { if ( ctlndx < mm_ctl_ptr->cnt ) -@@ -275,7 +275,7 @@ while ( rsnndxcnt || ctlndxcnt ) +@@ -269,7 +269,7 @@ while ( rsnndxcnt || ctlndxcnt ) ctlndx += 1; } else @@ -683,7 +925,7 @@ index 84a97bb..dc8ec09 100644 if ( rsnndx < mm_rsn_ptr->cnt ) { -@@ -285,9 +285,9 @@ while ( rsnndxcnt || ctlndxcnt ) +@@ -279,9 +279,9 @@ while ( rsnndxcnt || ctlndxcnt ) rsnndx += 1; } else @@ -695,7 +937,7 @@ index 84a97bb..dc8ec09 100644 /* * Write out the argument table -@@ -319,11 +319,11 @@ while ( argndx < mm_arg_ptr->cnt ) +@@ -313,11 +313,11 @@ while ( argndx < mm_arg_ptr->cnt ) argref->act_resource->syndef->dflt); } else @@ -710,10 +952,10 @@ index 84a97bb..dc8ec09 100644 } diff --git a/tools/wml/wmlresolve.c b/tools/wml/wmlresolve.c -index 464ef29..3b8642c 100644 +index 8dc359e..cd3ce3b 100644 --- a/tools/wml/wmlresolve.c +++ b/tools/wml/wmlresolve.c -@@ -1340,7 +1340,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1335,7 +1335,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) /* * close the output file */ @@ -722,7 +964,7 @@ index 464ef29..3b8642c 100644 printf ("\nCreated report file wml.report"); fclose (outfil); -@@ -1369,14 +1369,14 @@ fprintf (outfil, "\n\n\nClass %s:", synobj->name); +@@ -1364,14 +1364,14 @@ fprintf (outfil, "\n\n\nClass %s:", synobj->name); switch ( synobj->type ) { case WmlClassTypeMetaclass: @@ -739,7 +981,7 @@ index 464ef29..3b8642c 100644 if ( synobj->superclass != NULL ) fprintf (outfil, "Superclass: %s\t", synobj->superclass); if ( synobj->parentclass != NULL ) -@@ -1388,7 +1388,7 @@ switch ( synobj->type ) +@@ -1383,7 +1383,7 @@ switch ( synobj->type ) fprintf (outfil, "Convenience function: %s", synobj->convfunc); break; case WmlClassTypeGadget: @@ -748,7 +990,7 @@ index 464ef29..3b8642c 100644 if ( synobj->superclass != NULL ) fprintf (outfil, "Superclass: %s\t", synobj->superclass); if ( synobj->parentclass != NULL ) -@@ -1414,19 +1414,19 @@ if ( clsobj->nondialog != NULL ) +@@ -1409,19 +1409,19 @@ if ( clsobj->nondialog != NULL ) * is intended to match the way resources are printed in the toolkit manual, * so that checking is as easy as possible. */ @@ -771,7 +1013,7 @@ index 464ef29..3b8642c 100644 for ( ndx=0 ; ndxcnt ; ndx++ ) { ctrlobj = (WmlClassDefPtr) wml_obj_class_ptr->hvec[ndx].objptr; -@@ -1512,10 +1512,10 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) +@@ -1507,10 +1507,10 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) switch ( resref->exclude ) { case WmlAttributeTrue: @@ -784,7 +1026,7 @@ index 464ef29..3b8642c 100644 break; } if ( resref->dflt != NULL ) -@@ -1558,10 +1558,10 @@ if ( constr ) +@@ -1553,10 +1553,10 @@ if ( constr ) switch ( resref->exclude ) { case WmlAttributeTrue: @@ -797,19 +1039,6 @@ index 464ef29..3b8642c 100644 break; } if ( resref->dflt != NULL ) -@@ -1632,10 +1632,10 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - switch ( resref->exclude ) - { - case WmlAttributeTrue: -- fprintf (outfil, "\n\tExclude = True;"); -+ fprintf (outfil, "%s", "\n\tExclude = True;"); - break; - case WmlAttributeFalse: -- fprintf (outfil, "\n\tExclude = False;"); -+ fprintf (outfil, "%s", "\n\tExclude = False;"); - break; - } - resobj->ref_ptr = NULL; -- -2.13.0 +2.30.0 diff --git a/motif-2.3.4-bindings.patch b/motif-2.3.4-bindings.patch deleted file mode 100644 index baaa573b8d9c1a9554133b3de68684e9783ddc80..0000000000000000000000000000000000000000 --- a/motif-2.3.4-bindings.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up openmotif-2.3.3/configure.ac.bindings openmotif-2.3.3/configure.ac ---- openmotif-2.3.3/configure.ac.bindings 2009-10-27 17:10:23.000000000 +0100 -+++ openmotif-2.3.3/configure.ac 2010-03-19 11:12:39.000000000 +0100 -@@ -185,7 +185,7 @@ 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 -up openmotif-2.3.3/doc/man/man3/VirtualBindings.3.bindings openmotif-2.3.3/doc/man/man3/VirtualBindings.3 ---- openmotif-2.3.3/doc/man/man3/VirtualBindings.3.bindings 2005-07-20 13:47:21.000000000 +0200 -+++ openmotif-2.3.3/doc/man/man3/VirtualBindings.3 2010-03-19 11:11:42.000000000 +0100 -@@ -90,7 +90,7 @@ bindings contained in that file\&. - If it has found no bindings, Motif next looks for the file - \fBxmbind\&.alias\fP in the directory specified by the environment - variable \fBXMBINDDIR\fP, if \fBXMBINDDIR\fP is set, or in the directory --\fB/usr/lib/Xm/bindings\fP if \fBXMBINDDIR\fP is not set\&. -+\fB/usr/share/X11/bindings\fP if \fBXMBINDDIR\fP is not set\&. - If this file exists Motif searches it for a pathname associated with the - vendor string or with the vendor string and vendor release\&. - If it finds such a pathname and if that file exists, Motif loads the -diff -up openmotif-2.3.3/lib/Xm/XmosP.h.bindings openmotif-2.3.3/lib/Xm/XmosP.h ---- openmotif-2.3.3/lib/Xm/XmosP.h.bindings 2002-06-17 22:36:30.000000000 +0200 -+++ openmotif-2.3.3/lib/Xm/XmosP.h 2010-03-19 11:11:42.000000000 +0100 -@@ -188,7 +188,7 @@ extern "C" { - - #define XMBINDDIR "XMBINDDIR" - #ifndef XMBINDDIR_FALLBACK --#define XMBINDDIR_FALLBACK "/usr/lib/Xm/bindings" -+#define XMBINDDIR_FALLBACK "/usr/share/X11/bindings" - #endif - #define XMBINDFILE "xmbind.alias" - #define MOTIFBIND ".motifbind" diff --git a/motif-2.3.4-mwmrc_dir.patch b/motif-2.3.4-mwmrc_dir.patch deleted file mode 100644 index e6a42dc5fbabe27743ceda1643447ed5a8240401..0000000000000000000000000000000000000000 --- a/motif-2.3.4-mwmrc_dir.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -up openmotif-2.3.3/clients/mwm/WmResParse.c.mwmrc_dir openmotif-2.3.3/clients/mwm/WmResParse.c ---- openmotif-2.3.3/clients/mwm/WmResParse.c.mwmrc_dir 2009-06-22 23:51:51.000000000 +0200 -+++ openmotif-2.3.3/clients/mwm/WmResParse.c 2010-03-23 13:37:03.000000000 +0100 -@@ -2403,7 +2403,7 @@ FILE *FopenConfigFile (void) - #endif /* PANELIST */ - - #ifndef MWMRCDIR --#define MWMRCDIR "/usr/lib/X11" -+#define MWMRCDIR "/etc/X11/mwm" - #endif - if (LANG != NULL) - { -diff -up openmotif-2.3.3/configure.ac.mwmrc_dir openmotif-2.3.3/configure.ac ---- openmotif-2.3.3/configure.ac.mwmrc_dir 2009-10-27 17:10:23.000000000 +0100 -+++ openmotif-2.3.3/configure.ac 2010-03-23 13:38:33.000000000 +0100 -@@ -179,7 +179,7 @@ AC_SUBST(CDE_CONFIGURATION_TOP) - LIBDIR="${libdir}/X11" - AC_SUBST(LIBDIR) - --MWMRCDIR="${libdir}/X11" -+MWMRCDIR="/etc/X11/mwm" - AC_SUBST(MWMRCDIR) - - INCDIR="${includedir}/X11" -diff -up openmotif-2.3.3/doc/man/man1/mwm.1.mwmrc_dir openmotif-2.3.3/doc/man/man1/mwm.1 ---- openmotif-2.3.3/doc/man/man1/mwm.1.mwmrc_dir 2002-01-05 16:21:11.000000000 +0100 -+++ openmotif-2.3.3/doc/man/man1/mwm.1 2010-03-23 13:37:03.000000000 +0100 -@@ -678,8 +678,8 @@ is set, \fBmwm\fP looks for \fI$HOME/$LA - \fB$HOME\fP/\fBconfigFile\fP\&. If the \fIconfigFile\fP pathname does not begin with "~/" or "/", \fBmwm\fP considers it to be relative to the current working directory\&. If - the \fIconfigFile\fP resource is not specified - or if that file does not exist, \fBmwm\fP uses several default --paths to find a configuration file\&. The order of the search is shown below: \fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP\(dg --\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are -+paths to find a configuration file\&. The order of the search is shown below: \fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP\(dg -+\fB/etc/X11/mwm/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are - implementation dependent\&. - .IP "\fIdeiconifyKeyFocus\fP\ (class\ \fIDeiconifyKeyFocus\fP)" 10 - This resource applies only when the keyboard input focus policy is explicit\&. -@@ -1344,9 +1344,9 @@ the shell to use when executing commands - function\&. - .SS "Files" - .PP --\fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP -+\fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP - .PP --\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP -+\fB/etc/X11/mwm/system\&.mwmrc\fP - .PP - \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP - .PP -diff -up openmotif-2.3.3/doc/man/man4/mwmrc.4.mwmrc_dir openmotif-2.3.3/doc/man/man4/mwmrc.4 ---- openmotif-2.3.3/doc/man/man4/mwmrc.4.mwmrc_dir 2002-01-05 16:21:12.000000000 +0100 -+++ openmotif-2.3.3/doc/man/man4/mwmrc.4 2010-03-23 13:37:03.000000000 +0100 -@@ -57,7 +57,7 @@ file that controls much of the behavior - It contains descriptions of resources that cannot easily be - written using standard X Window System, Version 11 resource syntax\&. The resource - description file contains entries that are referred to by X resources in --defaults files (for example, \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP) -+defaults files (for example, \fB/usr/share/X11/app-defaults/Mwm\fP) - or in the \fBRESOURCE_MANAGER\fP property on the - root window\&. For example, the resource description file enables you to specify - different types of window menus; however, an X resource is used to specify -@@ -72,8 +72,8 @@ on a per-user basis: - .nf - \f(CW$HOME/$LANG/\&.mwmrc - $HOME/\&.mwmrc --/usr/X11R6/lib/X11/$LANG/system\&.mwmrc --/usr/X11R6/lib/X11/system\&.mwmrc\fR -+/etc/X11/mwm/$LANG/system\&.mwmrc -+/etc/X11/mwm/system\&.mwmrc\fR - .fi - .PP - .PP -@@ -84,7 +84,7 @@ resource\&. The following shows how a di - be specified from the command line: - .PP - .nf --\f(CW/usr/X11R6/bin/X11/mwm -xrm "mwm*configFile: mymwmrc"\fR -+\f(CW/usr/bin/mwm -xrm "mwm*configFile: mymwmrc"\fR - .fi - .PP - .SS "Resource Types" -@@ -626,8 +626,8 @@ is not what you expect\&. - .nf - \fB$HOME/$LANG/\&.mwmrc - $HOME/\&.mwmrc --/usr/X11R6/lib/X11/$LANG/system\&.mwmrc --/usr/X11R6/lib/X11/system\&.mwmrc\fP -+/etc/X11/mwm/$LANG/system\&.mwmrc -+/etc/X11/mwm/system\&.mwmrc\fP - .fi - .SH "RELATED INFORMATION" - .PP diff --git a/motif-2.3.4-no_demos.patch b/motif-2.3.4-no_demos.patch deleted file mode 100644 index bf1b92656d501e87bec4cb0ce1c256a7a0c9c0e9..0000000000000000000000000000000000000000 --- a/motif-2.3.4-no_demos.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up openmotif-2.3.3/Makefile.am.no_demos openmotif-2.3.3/Makefile.am ---- openmotif-2.3.3/Makefile.am.no_demos 2008-09-19 16:38:05.000000000 +0200 -+++ openmotif-2.3.3/Makefile.am 2010-03-23 13:53:13.000000000 +0100 -@@ -29,7 +29,7 @@ SUBDIRS = bindings bitmaps \ - include \ - tools \ - clients \ -- doc \ -- demos -+ doc -+ - AUTOMAKE_OPTIONS = 1.4 - ACLOCAL_AMFLAGS = -I . diff --git a/motif-2.3.4-src.tgz b/motif-2.3.8.tar.gz similarity index 37% rename from motif-2.3.4-src.tgz rename to motif-2.3.8.tar.gz index 09e2aaf0c2b694c7f494af02b0071f943cd54975..ebbc582a9b5709f54dc8e7fa10b31425ef176b6b 100644 Binary files a/motif-2.3.4-src.tgz and b/motif-2.3.8.tar.gz differ diff --git a/motif.spec b/motif.spec index cf0e8bfde173b2b7a624f8d01760ad61134cccb9..ee6fb1bc9cc4766ad0e1b232076405870029f1bf 100644 --- a/motif.spec +++ b/motif.spec @@ -1,10 +1,10 @@ Name: motif -Version: 2.3.4 -Release: 20 +Version: 2.3.8 +Release: 1 Summary: Run-time libraries and programs License: LGPLv2+ URL: https://motif.ics.com/ -Source0: http://downloads.sf.net/motif/motif-%{version}-src.tgz +Source0: http://downloads.sf.net/motif/motif-%{version}.tar.gz Source1: xmbind BuildRequires: automake, libtool, autoconf, flex, flex-static, byacc, pkgconfig, libjpeg-devel libpng-devel @@ -12,16 +12,8 @@ BuildRequires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel, Requires: xorg-x11-xbitmaps, xorg-x11-xinit Requires: %{name}-help = %{version}-%{release} Provides: openmotif = %{version}-%{release} -Obsoletes: openmotif < %{version} Conflicts: lesstif <= 0.92.32-6 - -Patch0: motif-2.3.4-no_demos.patch -Patch1: openMotif-2.2.3-uil_lib.patch -Patch2: openMotif-2.3.0-rgbtxt.patch -Patch3: motif-2.3.4-mwmrc_dir.patch -Patch4: motif-2.3.4-bindings.patch -Patch5: openMotif-2.3.0-no_X11R6.patch -Patch6: motif-2.3.4-Fix-issues-with-Werror-format-security.patch +Patch0: 0001-fix-motif-no-autogen.patch %description This module is motif run-time environment, which includes the motif shared libraries. @@ -89,6 +81,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man*/* %changelog +* Wed Dec 29 2021 baizhonggui - 2.3.8-1 +- update to 2.3.8 + * Thu Nov 26 2020 zhanghua - 2.3.4-20 - fix url requests timeout problem diff --git a/openMotif-2.2.3-uil_lib.patch b/openMotif-2.2.3-uil_lib.patch deleted file mode 100644 index fc3a0ceb3f5c9cc35055a257c67773a3e28bcede..0000000000000000000000000000000000000000 --- a/openMotif-2.2.3-uil_lib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- openmotif/clients/uil/Makefile.am.uil_lib 2003-12-16 13:41:53.000000000 +0100 -+++ openmotif/clients/uil/Makefile.am 2003-12-16 13:41:55.000000000 +0100 -@@ -13,7 +13,7 @@ - - libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la - --uil_LDADD = ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la -+uil_LDADD = libUil.la ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la - - INCLUDES = -DINCDIR=\"@INCDIR@\" \ - -DLIBDIR=\"@LIBDIR@\" \ -@@ -42,7 +42,7 @@ - UilLstMac.c UilSemVal.c UilSemCSet.c UilDB.c - - SRCS = $(COMMON_SRC) --SRCS2 = $(COMMON_SRC) UilMain.c -+SRCS2 = UilMain.c - - HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \ - UilDef.h XmAppl.uil diff --git a/openMotif-2.3.0-no_X11R6.patch b/openMotif-2.3.0-no_X11R6.patch deleted file mode 100644 index 24d1c5632ed8f4599de192e0d41fa59059449474..0000000000000000000000000000000000000000 --- a/openMotif-2.3.0-no_X11R6.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- openmotif-2.3.0/doc/man/man1/mwm.1.no_X11R6 2005-12-09 15:08:21.000000000 +0100 -+++ openmotif-2.3.0/doc/man/man1/mwm.1 2005-12-09 15:09:06.000000000 +0100 -@@ -366,7 +366,7 @@ - database\&. This database is built from the following sources\&. They are listed - in order of precedence, low to high: - .PP --\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP -+\fB/usr/share/X11/app-defaults/Mwm\fP - .PP - \fB$HOME/Mwm\fP - .PP -@@ -376,7 +376,7 @@ - .PP - \fBmwm\fP command line options - .PP --The file names \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP and \fB$HOME/Mwm\fP represent customary locations for these files\&. The actual -+The file names \fB/usr/share/X11/app-defaults/Mwm\fP and \fB$HOME/Mwm\fP represent customary locations for these files\&. The actual - location of the system-wide class resource file may depend on the \fBXFILESEARCHPATH\fP environment variable and the - current language environment\&. The actual location of the user-specific class - resource file may depend on the \fBXUSERFILESEARCHPATH\fP and \fBXAPPLRESDIR\fP -@@ -595,7 +595,7 @@ - NameClassValue TypeDefault - autoKeyFocusAutoKeyFocusT/FT - autoRaiseDelayAutoRaiseDelaymillisec500 --bitmap-Bitmap-directory/usr/X11R6/include- -+bitmap-Bitmap-directory/usr/include- - DirectoryDirectory/X11/bitmaps - clientAutoPlaceClientAutoPlaceT/FT - colormapFocus-ColormapFocus-stringkeyboard -@@ -650,7 +650,7 @@ - This resource identifies a directory to be searched for bitmaps referenced - by \fBmwm\fP resources\&. This directory is searched if a bitmap - is specified without an absolute pathname\&. The default value for this resource --is \fB/usr/X11R6/include/X11/bitmaps\fP\&. The directory \fB/usr/X11R6/include/X11/bitmaps\fP -+is \fB/usr/include/X11/bitmaps\fP\&. The directory \fB/usr/include/X11/bitmaps\fP - represents the customary locations for this directory\&. The actual - location of this directory may vary on some systems\&. If the bitmap is not - found in the specified directory, \fBXBMLANGPATH\fP is searched\&. -@@ -1348,7 +1348,7 @@ - .PP - \fB/etc/X11/mwm/system\&.mwmrc\fP - .PP --\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP -+\fB/usr/share/X11/app-defaults/Mwm\fP - .PP - \fB$HOME/Mwm\fP - .PP diff --git a/openMotif-2.3.0-rgbtxt.patch b/openMotif-2.3.0-rgbtxt.patch deleted file mode 100644 index 6c5ff1504cd5b91279ba140ad713f3121452a839..0000000000000000000000000000000000000000 --- a/openMotif-2.3.0-rgbtxt.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- openmotif-2.3.0/lib/Xm/ColorS.c.rgbtxt 2004-07-07 14:24:07.000000000 +0200 -+++ openmotif-2.3.0/lib/Xm/ColorS.c 2005-12-02 13:26:11.000000000 +0100 -@@ -131,7 +131,7 @@ - { - XmNrgbFile, XmCString, XmRString, - sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file), -- XmRString, (XtPointer) "/usr/lib/X11/rgb.txt" -+ XmRString, (XtPointer) "/usr/share/X11/rgb.txt" - }, - #endif - { ---- openmotif-2.3.0/doc/man/man3/XmColorSelector.3.rgbtxt 2002-01-17 21:32:48.000000000 +0100 -+++ openmotif-2.3.0/doc/man/man3/XmColorSelector.3 2005-12-02 13:25:26.000000000 +0100 -@@ -34,7 +34,7 @@ - noCellError%NoCellError%XmString%"No Color Cell - %%% Available" - redSliderLabel%SliderLabel%XmString%"Red" --rgbFile%String%String%/usr/lib/X11/rgb.txt -+rgbFile%String%String%/usr/share/X11/rgb.txt - sliderTogLabel%TogLabel%XmString%"Color Sliders" - .TE - .PP