From e24319d704eac6efcbaea361478bdfc1f213acdc Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 21 Mar 2024 19:05:39 +0000 Subject: [PATCH] motif package is retired on branch c10s for BAKERY-412 --- .gitignore | 1 - ...88-Out-of-bounds-read-in-XpmCreateXp.patch | 32 - ...89-Out-of-bounds-read-on-XPM-with-co.patch | 36 - dead.package | 1 + ...x-issues-with-Werror-format-security.patch | 815 ------------------ motif-2.3.4-bindings.patch | 36 - motif-2.3.4-mwmrc_dir.patch | 93 -- motif-2.3.4-no_demos.patch | 13 - motif-c99-bug1599.patch | 182 ---- motif-c99-bug1602.patch | 54 -- motif-c99-bug1605.patch | 134 --- motif-c99-bug1609.patch | 147 ---- motif-c99-string.patch | 19 - motif-c99-void-sprintf.patch | 40 - motif-configure-c99.patch | 20 - motif.spec | 583 ------------- openMotif-2.2.3-uil_lib.patch | 20 - openMotif-2.3.0-no_X11R6.patch | 47 - openMotif-2.3.0-rgbtxt.patch | 22 - sources | 1 - xmbind | 6 - 21 files changed, 1 insertion(+), 2301 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Fix-CVE-2023-43788-Out-of-bounds-read-in-XpmCreateXp.patch delete mode 100644 0001-Fix-CVE-2023-43789-Out-of-bounds-read-on-XPM-with-co.patch create mode 100644 dead.package delete mode 100644 motif-2.3.4-Fix-issues-with-Werror-format-security.patch delete mode 100644 motif-2.3.4-bindings.patch delete mode 100644 motif-2.3.4-mwmrc_dir.patch delete mode 100644 motif-2.3.4-no_demos.patch delete mode 100644 motif-c99-bug1599.patch delete mode 100644 motif-c99-bug1602.patch delete mode 100644 motif-c99-bug1605.patch delete mode 100644 motif-c99-bug1609.patch delete mode 100644 motif-c99-string.patch delete mode 100644 motif-c99-void-sprintf.patch delete mode 100644 motif-configure-c99.patch delete mode 100644 motif.spec delete mode 100644 openMotif-2.2.3-uil_lib.patch delete mode 100644 openMotif-2.3.0-no_X11R6.patch delete mode 100644 openMotif-2.3.0-rgbtxt.patch delete mode 100644 sources delete mode 100644 xmbind diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8a39d88..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/motif-2.3.4-src.tgz diff --git a/0001-Fix-CVE-2023-43788-Out-of-bounds-read-in-XpmCreateXp.patch b/0001-Fix-CVE-2023-43788-Out-of-bounds-read-in-XpmCreateXp.patch deleted file mode 100644 index 5ee660d..0000000 --- a/0001-Fix-CVE-2023-43788-Out-of-bounds-read-in-XpmCreateXp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2fa554b01ef6079a9b35df9332bdc4f139ed67e0 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 29 Apr 2023 17:50:39 -0700 -Subject: [PATCH] Fix CVE-2023-43788: Out of bounds read in - XpmCreateXpmImageFromBuffer - -When the test case for CVE-2022-46285 was run with the Address Sanitizer -enabled, it found an out-of-bounds read in ParseComment() when reading -from a memory buffer instead of a file, as it continued to look for the -closing comment marker past the end of the buffer. - -Signed-off-by: Alan Coopersmith ---- - lib/Xm/Xpmdata.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Xm/Xpmdata.c b/lib/Xm/Xpmdata.c -index 7524e65..0b0f1f3 100644 ---- a/lib/Xm/Xpmdata.c -+++ b/lib/Xm/Xpmdata.c -@@ -108,7 +108,7 @@ ParseComment(xpmData *data) - n++; - s2++; - } while (c == *s2 && *s2 != '\0' && c); -- if (*s2 == '\0') { -+ if (*s2 == '\0' || c == '\0') { - /* this is the end of the comment */ - notend = 0; - mdata->cptr--; --- -2.41.0 - diff --git a/0001-Fix-CVE-2023-43789-Out-of-bounds-read-on-XPM-with-co.patch b/0001-Fix-CVE-2023-43789-Out-of-bounds-read-on-XPM-with-co.patch deleted file mode 100644 index 292988b..0000000 --- a/0001-Fix-CVE-2023-43789-Out-of-bounds-read-on-XPM-with-co.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7e21cb63b9a1ca760a06cc4cd9b19bbc3fcd8f51 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sat, 29 Apr 2023 18:30:34 -0700 -Subject: [PATCH] Fix CVE-2023-43789: Out of bounds read on XPM with corrupted - colormap - -Found with clang's libfuzzer - -Signed-off-by: Alan Coopersmith ---- - lib/Xm/Xpmdata.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/Xm/Xpmdata.c b/lib/Xm/Xpmdata.c -index 0b0f1f3..6e87455 100644 ---- a/lib/Xm/Xpmdata.c -+++ b/lib/Xm/Xpmdata.c -@@ -259,13 +259,13 @@ xpmNextWord( - int c; - - if (!mdata->type || mdata->type == XPMBUFFER) { -- while (isspace(c = *mdata->cptr) && c != mdata->Eos) -+ while ((c = *mdata->cptr) && isspace(c) && (c != mdata->Eos)) - mdata->cptr++; - do { - c = *mdata->cptr++; - *buf++ = c; - n++; -- } while (!isspace(c) && c != mdata->Eos && n < buflen); -+ } while (c && !isspace(c) && (c != mdata->Eos) && (n < buflen)); - n--; - mdata->cptr--; - } else { --- -2.41.0 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9cdd72a --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +motif package is retired on branch c10s for BAKERY-412 \ No newline at end of file diff --git a/motif-2.3.4-Fix-issues-with-Werror-format-security.patch b/motif-2.3.4-Fix-issues-with-Werror-format-security.patch deleted file mode 100644 index f0ff860..0000000 --- a/motif-2.3.4-Fix-issues-with-Werror-format-security.patch +++ /dev/null @@ -1,815 +0,0 @@ -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 - -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(-) - -diff --git a/lib/Mrm/Mrmhier.c b/lib/Mrm/Mrmhier.c -index 2712742..2a8703c 100644 ---- a/lib/Mrm/Mrmhier.c -+++ b/lib/Mrm/Mrmhier.c -@@ -264,10 +264,10 @@ Urm__OpenHierarchy (MrmCount num_files, - case MrmSUCCESS: - break; - case MrmNOT_VALID: -- sprintf (err_stg, _MrmMMsg_0113); -+ sprintf (err_stg, "%s", _MrmMMsg_0113); - break; - default: -- sprintf (err_stg, _MrmMMsg_0114); -+ sprintf (err_stg, "%s", _MrmMMsg_0114); - break; - } - } -diff --git a/lib/Mrm/Mrmicon.c b/lib/Mrm/Mrmicon.c -index 95d4086..191e2d2 100644 ---- a/lib/Mrm/Mrmicon.c -+++ b/lib/Mrm/Mrmicon.c -@@ -1176,7 +1176,7 @@ Urm__RealizeColorTable (Screen *screen, - } - break; - default: -- sprintf(err_msg, _MrmMMsg_0040); -+ sprintf(err_msg, "%s", _MrmMMsg_0040); - return Urm__UT_Error ("Urm__RelizeColorTable", - err_msg, NULL, NULL, MrmFAILURE) ; - } -@@ -1252,7 +1252,7 @@ Urm__RealizeColorTable (Screen *screen, - break; - default: - result = MrmFAILURE; -- sprintf (err_msg, _MrmMMsg_0040); -+ sprintf (err_msg, "%s", _MrmMMsg_0040); - Urm__UT_Error ("Urm__RelizeColorTable", - err_msg, NULL, NULL, MrmFAILURE) ; - } -diff --git a/lib/Mrm/Mrmlread.c b/lib/Mrm/Mrmlread.c -index c2fd94c..be433a3 100644 ---- a/lib/Mrm/Mrmlread.c -+++ b/lib/Mrm/Mrmlread.c -@@ -698,7 +698,7 @@ MrmFetchColorLiteral (MrmHierarchy hierarchy_id, - XBlackPixelOfScreen(XDefaultScreenOfDisplay(display))); - break; - default: -- sprintf(err_msg, _MrmMMsg_0040); -+ sprintf(err_msg, "%s", _MrmMMsg_0040); - result = Urm__UT_Error ("MrmFetchColorLiteral", - err_msg, NULL, NULL, MrmFAILURE) ; - _MrmAppUnlock(app); -diff --git a/lib/Mrm/Mrmwcrw.c b/lib/Mrm/Mrmwcrw.c -index fe3db52..3c5857f 100644 ---- a/lib/Mrm/Mrmwcrw.c -+++ b/lib/Mrm/Mrmwcrw.c -@@ -1390,7 +1390,7 @@ Urm__CW_CreateArglist (Widget parent, - } - break; - default: -- sprintf (err_msg, _MrmMMsg_0040); -+ sprintf (err_msg, "%s", _MrmMMsg_0040); - result = Urm__UT_Error ("Urm__CW_ConvertValue", - err_msg, NULL, NULL, MrmFAILURE) ; - }; -@@ -2426,7 +2426,7 @@ Urm__CW_ConvertValue (Widget parent, - } - break; - default: -- sprintf(err_msg, _MrmMMsg_0040); -+ sprintf(err_msg, "%s", _MrmMMsg_0040); - return Urm__UT_Error ("Urm__CW_ConvertValue", - err_msg, NULL, NULL, MrmFAILURE) ; - }; -diff --git a/tools/wml/wmldbcreate.c b/tools/wml/wmldbcreate.c -index 07c0a3c..6de585a 100644 ---- a/tools/wml/wmldbcreate.c -+++ b/tools/wml/wmldbcreate.c -@@ -425,7 +425,7 @@ int table_id; - { - fprintf (afile, "%d, ", entry_vec[j]); - } -- fprintf (afile, "\n"); -+ fprintf (afile, "%s", "\n"); - } - } - } -diff --git a/tools/wml/wmlouth.c b/tools/wml/wmlouth.c -index d2330e3..a52843f 100644 ---- a/tools/wml/wmlouth.c -+++ b/tools/wml/wmlouth.c -@@ -225,12 +225,12 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymGen.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Write the sym_k..._object literals - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - clsobj = (WmlClassDefPtr) wml_obj_class_ptr->hvec[ndx].objptr; -@@ -244,7 +244,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Define the sym_k_..._reason literals - */ --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - resobj = (WmlResourceDefPtr) wml_obj_reason_ptr->hvec[ndx].objptr; -@@ -258,7 +258,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Define the sym_k_..._arg literals - */ --fprintf (outfil, 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++ ) - /* - * Define the sym_k_..._enumset structs and literals - */ --fprintf (outfil, canned5); -+fprintf (outfil, "%s", canned5); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - enumsetobj = (WmlEnumSetDefPtr) wml_obj_enumset_ptr->hvec[ndx].objptr; -@@ -286,7 +286,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Define the sym_k_..._enumval literals - */ --fprintf (outfil, canned6); -+fprintf (outfil, "%s", canned6); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - enumvalobj = (WmlEnumValueDefPtr) wml_obj_enumval_ptr->hvec[ndx].objptr; -@@ -301,7 +301,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - * Define the sym_k_..._charsize literals - * Define the sym_k_..._charset literals - */ --fprintf (outfil, canned7); -+fprintf (outfil, "%s", canned7); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - charsetobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -315,7 +315,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Define the sym_k_..._child literals - */ --fprintf (outfil, canned8); -+fprintf (outfil, "%s", canned8); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - childobj = (WmlChildDefPtr) wml_obj_child_ptr->hvec[ndx].objptr; -@@ -379,12 +379,12 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymChCL.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Create table entries, similar to writing sym_k... - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - childobj = (WmlChildDefPtr) wml_obj_child_ptr->hvec[ndx].objptr; -@@ -392,7 +392,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - fprintf (outfil, " sym_k_%s_object,\n", - classobj->tkname); - } --fprintf (outfil, canned1a); -+fprintf (outfil, "%s", canned1a); - - /* - * close the output file -@@ -446,12 +446,12 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymArTy.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Create table entries, similar to writing sym_k... - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - resobj = (WmlResourceDefPtr) wml_obj_arg_ptr->hvec[ndx].objptr; -@@ -459,7 +459,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - fprintf (outfil, " sym_k_%s_value,\n", - datobj->tkname); - } --fprintf (outfil, canned1a); -+fprintf (outfil, "%s", canned1a); - - /* - * close the output file -@@ -509,19 +509,19 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymRArg.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Create table entries, similar to writing sym_k... - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - resobj = (WmlResourceDefPtr) wml_obj_arg_ptr->hvec[ndx].objptr; - fprintf (outfil, " %d,\n", - resobj->related_code); - } --fprintf (outfil, canned1a); -+fprintf (outfil, "%s", canned1a); - - /* - * close the output file -@@ -621,12 +621,12 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilUrmClas.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Write entries for widgets - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - clsobj = (WmlClassDefPtr) wml_obj_class_ptr->hvec[ndx].objptr; -@@ -637,7 +637,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - else - fprintf (outfil, " \"%s\",\t\n", synobj->convfunc); - } --fprintf (outfil, canned2); -+fprintf (outfil, "%s", canned2); - - /* - * Write entries for gadget variants of widget classes -@@ -661,7 +661,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - synobj->name); - } - } --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - - /* - * Write entries for non-dialog widgets -@@ -685,7 +685,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - synobj->name); - } - } --fprintf (outfil, canned4); -+fprintf (outfil, "%s", canned4); - - /* - * Write entries for the resource a widget's controls map to -@@ -701,7 +701,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - else - fprintf (outfil, " sym_k_%s_arg,\n", mapresobj->tkname); - } --fprintf (outfil, canned5); -+fprintf (outfil, "%s", canned5); - - /* - * Write entries for arguments -@@ -714,7 +714,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - fprintf (outfil, " %s,\n", - synres->resliteral); - } --fprintf (outfil, canned6); -+fprintf (outfil, "%s", canned6); - - /* - * Write entries for reasons -@@ -727,7 +727,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - fprintf (outfil, " %s,\n", - synres->resliteral); - } --fprintf (outfil, canned7); -+fprintf (outfil, "%s", canned7); - - /* - * close the output file -@@ -781,13 +781,13 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilConst.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Process the arguments in code order. We start with 1, and write out - * the mask after processing 8 codes. - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - 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 ) - printf ("\nCouldn't open UilSymReas.h"); - return; - } --fprintf (outfil, canned_warn); --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned_warn); -+fprintf (outfil, "%s", canned1); - - /* - * 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"); - } - - /* - * Write the vector of vectors. - */ --fprintf (outfil, canned2); -+fprintf (outfil, "%s", canned2); - for ( resndx=0 ; resndxcnt ; resndx++ ) - { - resobj = (WmlResourceDefPtr) wml_obj_reason_ptr->hvec[resndx].objptr; - fprintf (outfil, " reason_class_vec%d,\n", resobj->sym_code); - } --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - - /* - * close the output file -@@ -1004,8 +1004,8 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymArTa.h"); - return; - } --fprintf (outfil, canned_warn); --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned_warn); -+fprintf (outfil, "%s", canned1); - - /* - * Generate the bit vectors for each class. Outer loop on the argument code, -@@ -1045,19 +1045,19 @@ for ( resndx=0 ; resndxcnt ; resndx++ ) - if ( itemno != 0 ) - fprintf (outfil, "%s 0};\n", maskbuf); - else -- fprintf (outfil, "};\n"); -+ fprintf (outfil, "%s", "};\n"); - } - - /* - * Write the vector of vectors. - */ --fprintf (outfil, canned2); -+fprintf (outfil, "%s", canned2); - for ( resndx=0 ; resndxcnt ; resndx++ ) - { - resobj = (WmlResourceDefPtr) wml_obj_arg_ptr->hvec[resndx].objptr; - fprintf (outfil, " arg_class_vec%d,\n", resobj->sym_code); - } --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - - /* - * close the output file -@@ -1129,8 +1129,8 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymChTa.h"); - return; - } --fprintf (outfil, canned_warn); --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned_warn); -+fprintf (outfil, "%s", canned1); - - /* - * 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"); - } - - /* - * Write the vector of vectors. - */ --fprintf (outfil, canned2); -+fprintf (outfil, "%s", canned2); - for ( childndx=0 ; childndxcnt ; childndx++ ) - { - childobj = (WmlChildDefPtr) wml_obj_child_ptr->hvec[childndx].objptr; - fprintf (outfil, " child_class_vec%d,\n", childobj->sym_code); - } --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - - /* - * close the output file -@@ -1251,8 +1251,8 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymCtl.h"); - return; - } --fprintf (outfil, canned_warn); --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned_warn); -+fprintf (outfil, "%s", canned1); - - /* - * Generate the bit vectors for each class. Outer loop on the class code, -@@ -1290,19 +1290,19 @@ for ( ctlndx=0 ; ctlndxcnt ; ctlndx++ ) - if ( itemno != 0 ) - fprintf (outfil, "%s 0};\n", maskbuf); - else -- fprintf (outfil, "};\n"); -+ fprintf (outfil, "%s", "};\n"); - } - - /* - * Write the vector of vectors. - */ --fprintf (outfil, canned2); -+fprintf (outfil, "%s", canned2); - for ( ctlndx=0 ; ctlndxcnt ; ctlndx++ ) - { - clsobj = (WmlClassDefPtr) wml_obj_class_ptr->hvec[ctlndx].objptr; - fprintf (outfil, " object_class_vec%d,\n", clsobj->sym_code); - } --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - - /* - * close the output file -@@ -1438,7 +1438,7 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymNam.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Write entries for widgets -@@ -1517,7 +1517,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - fprintf (outfil, " \"%s\",\n", - synch->name); - } --fprintf (outfil, canned7); -+fprintf (outfil, "%s", canned7); - - /* - * close the output file -@@ -1621,12 +1621,12 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymEnum.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Generate the enumeration value vectors for each enumeration set. - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - enumsetobj = (WmlEnumSetDefPtr) wml_obj_enumset_ptr->hvec[ndx].objptr; -@@ -1637,13 +1637,13 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - fprintf (outfil, " %d,\n", - evobj->sym_code); - } -- fprintf (outfil, " };\n"); -+ fprintf (outfil, "%s", " };\n"); - } - - /* - * Generate the enumeration set tables - */ --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - enumsetobj = (WmlEnumSetDefPtr) wml_obj_enumset_ptr->hvec[ndx].objptr; -@@ -1655,7 +1655,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Create enumset table entries for arguments, similar to writing sym_k... - */ --fprintf (outfil, canned4); -+fprintf (outfil, "%s", canned4); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - resobj = (WmlResourceDefPtr) wml_obj_arg_ptr->hvec[ndx].objptr; -@@ -1669,13 +1669,13 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Create the enumval values table. - */ --fprintf (outfil, canned5); -+fprintf (outfil, "%s", canned5); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - evobj = (WmlEnumValueDefPtr) wml_obj_enumval_ptr->hvec[ndx].objptr; - fprintf (outfil, " %s,\n", evobj->syndef->enumlit); - } --fprintf (outfil, canned5a); -+fprintf (outfil, "%s", canned5a); - - /* - * close the output file -@@ -1813,12 +1813,12 @@ if ( outfil == (FILE *) NULL ) - printf ("\nCouldn't open UilSymCSet.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Generate the standards name table - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1836,7 +1836,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Generate the writing direction table - */ --fprintf (outfil, canned2); -+fprintf (outfil, "%s", canned2); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1858,7 +1858,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Generate the parsing direction table - */ --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1880,7 +1880,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Generate the character size table - */ --fprintf (outfil, canned4); -+fprintf (outfil, "%s", canned4); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - csobj = (WmlCharSetDefPtr) wml_obj_charset_ptr->hvec[ndx].objptr; -@@ -1906,7 +1906,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Generate the $LANG name recognition table - */ --fprintf (outfil, canned5); -+fprintf (outfil, "%s", canned5); - lang_max = 0; - for ( ndx=0 ; ndxcnt ; ndx++ ) - { -@@ -1936,7 +1936,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * Generate the $LANG code lookup table, in upper case - */ --fprintf (outfil, canned6); -+fprintf (outfil, "%s", canned6); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - 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 ---- a/tools/wml/wmloutkey.c -+++ b/tools/wml/wmloutkey.c -@@ -574,16 +574,16 @@ if ( outfil == NULL ) - printf ("\nCouldn't open UilKeyTab.h"); - return; - } --fprintf (outfil, canned_warn); -+fprintf (outfil, "%s", canned_warn); - - /* - * Print the case sensitive and insensitive tables - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - wmlOutputUilKeyTabBody (outfil, wml_tok_sens_ptr, &maxlen, &maxkey); - fprintf (outfil, canned2, maxlen, maxkey); - wmlOutputUilKeyTabBody (outfil, wml_tok_insens_ptr, &maxlen, &maxkey); --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - - /* - * close the output file -@@ -812,8 +812,8 @@ if ( outfil == NULL ) - printf ("\nCouldn't open UilTokName.h"); - return; - } --fprintf (outfil, canned_warn); --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned_warn); -+fprintf (outfil, "%s", canned1); - - /* - * Print the token name entries -diff --git a/tools/wml/wmloutmm.c b/tools/wml/wmloutmm.c -index 84a97bb..dc8ec09 100644 ---- a/tools/wml/wmloutmm.c -+++ b/tools/wml/wmloutmm.c -@@ -209,9 +209,9 @@ int ctlndx; /* to access ordered vector */ - /* - * Write out header information - */ --fprintf (outfil, canned1); -+fprintf (outfil, "%s", canned1); - fprintf (outfil, "%s\n", name); --fprintf (outfil, canned2); -+fprintf (outfil, "%s", canned2); - - /* - * Alphabetize the controls, reason, and argument lists -@@ -264,7 +264,7 @@ while ( ctlref != NULL ) - rsnndx = 0; - ctlndx = 0; - if ( mm_ctl_ptr->cnt == 0 ) -- fprintf (outfil, "No children are supported"); -+ fprintf (outfil, "%s", "No children are supported"); - while ( rsnndxcnt || ctlndxcnt ) - { - if ( ctlndx < mm_ctl_ptr->cnt ) -@@ -275,7 +275,7 @@ while ( rsnndxcnt || ctlndxcnt ) - ctlndx += 1; - } - else -- fprintf (outfil, "@"); -+ fprintf (outfil, "%s", "@"); - - if ( rsnndx < mm_rsn_ptr->cnt ) - { -@@ -285,9 +285,9 @@ while ( rsnndxcnt || ctlndxcnt ) - rsnndx += 1; - } - else -- fprintf (outfil, "\n"); -+ fprintf (outfil, "%s", "\n"); - } --fprintf (outfil, canned3); -+fprintf (outfil, "%s", canned3); - - /* - * Write out the argument table -@@ -319,11 +319,11 @@ while ( argndx < mm_arg_ptr->cnt ) - argref->act_resource->syndef->dflt); - } - else -- fprintf (outfil, " \n"); -+ fprintf (outfil, "%s", " \n"); - } - argndx += 1; - } --fprintf (outfil, canned4); -+fprintf (outfil, "%s", canned4); - - } - -diff --git a/tools/wml/wmlresolve.c b/tools/wml/wmlresolve.c -index 464ef29..3b8642c 100644 ---- a/tools/wml/wmlresolve.c -+++ b/tools/wml/wmlresolve.c -@@ -1340,7 +1340,7 @@ for ( ndx=0 ; ndxcnt ; ndx++ ) - /* - * close the output file - */ --fprintf (outfil, "\n\n"); -+fprintf (outfil, "%s", "\n\n"); - printf ("\nCreated report file wml.report"); - fclose (outfil); - -@@ -1369,14 +1369,14 @@ fprintf (outfil, "\n\n\nClass %s:", synobj->name); - switch ( synobj->type ) - { - case WmlClassTypeMetaclass: -- fprintf (outfil, "\n Type: Metaclass\t"); -+ fprintf (outfil, "%s", "\n Type: Metaclass\t"); - if ( synobj->superclass != NULL ) - fprintf (outfil, "Superclass: %s\t", synobj->superclass); - if ( synobj->parentclass != NULL ) - fprintf (outfil, "Parentclass: %s\t", synobj->parentclass); - break; - case WmlClassTypeWidget: -- fprintf (outfil, "\n Type: Widget\t"); -+ fprintf (outfil, "%s", "\n Type: Widget\t"); - if ( synobj->superclass != NULL ) - fprintf (outfil, "Superclass: %s\t", synobj->superclass); - if ( synobj->parentclass != NULL ) -@@ -1388,7 +1388,7 @@ switch ( synobj->type ) - fprintf (outfil, "Convenience function: %s", synobj->convfunc); - break; - case WmlClassTypeGadget: -- fprintf (outfil, "\n Type: Gadget\t"); -+ fprintf (outfil, "%s", "\n Type: Gadget\t"); - if ( synobj->superclass != NULL ) - fprintf (outfil, "Superclass: %s\t", synobj->superclass); - if ( synobj->parentclass != NULL ) -@@ -1414,19 +1414,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. - */ --fprintf (outfil, "\n Arguments:"); -+fprintf (outfil, "%s", "\n Arguments:"); - wmlResolvePrintClassArgs (outfil, clsobj); - - /* - * Print the reasons valid in the class - */ --fprintf (outfil, "\n Reasons:"); -+fprintf (outfil, "%s", "\n Reasons:"); - wmlResolvePrintClassReasons (outfil, clsobj); - - /* - * Print the controls valid in the class - */ --fprintf (outfil, "\n Controls:"); -+fprintf (outfil, "%s", "\n Controls:"); - for ( ndx=0 ; ndxcnt ; ndx++ ) - { - ctrlobj = (WmlClassDefPtr) wml_obj_class_ptr->hvec[ndx].objptr; -@@ -1512,10 +1512,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; - } - if ( resref->dflt != NULL ) -@@ -1558,10 +1558,10 @@ if ( constr ) - 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; - } - 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 - diff --git a/motif-2.3.4-bindings.patch b/motif-2.3.4-bindings.patch deleted file mode 100644 index baaa573..0000000 --- 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 e6a42dc..0000000 --- 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 bf1b926..0000000 --- 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-c99-bug1599.patch b/motif-c99-bug1599.patch deleted file mode 100644 index 244340d..0000000 --- a/motif-c99-bug1599.patch +++ /dev/null @@ -1,182 +0,0 @@ -commit 23d12d1f25b33773018bb873c21547b0f4aab14c -Author: Mykola Vshyvkov -Date: Wed Jun 26 15:34:53 2013 +0300 - - Fixed bug #1599 (Eliminates 14 warnings of incompatible type argument from some modules). - -diff --git a/lib/Xm/ColorObj.c b/lib/Xm/ColorObj.c -index 63ed4748721a807e..b3a51eb99ffca232 100644 ---- a/lib/Xm/ColorObj.c -+++ b/lib/Xm/ColorObj.c -@@ -62,7 +62,7 @@ - #define WARNING2 _XmMMsgColObj_0002 - - #ifdef FIX_1400 --static void trap_XCloseDisplay(Display *disp, XExtCodes *codes); -+static int trap_XCloseDisplay(Display *disp, XExtCodes *codes); - #endif - - /** default should not be killed unless application is dying **/ -@@ -1543,9 +1543,10 @@ XmeGetDesktopColorCells (Screen * screen, - } - - #ifdef FIX_1400 --static void trap_XCloseDisplay(Display *disp, XExtCodes *codes) -+static int trap_XCloseDisplay(Display *disp, XExtCodes *codes) - { - if (disp == _XmColorObjCacheDisplay) - _XmColorObjCacheDisplay = NULL; -+ return 0; - } - #endif -diff --git a/lib/Xm/Container.c b/lib/Xm/Container.c -index f0b35a919d3e36a3..6576783f055a86f9 100644 ---- a/lib/Xm/Container.c -+++ b/lib/Xm/Container.c -@@ -3234,7 +3234,7 @@ ConstraintSetValues( - ContainerResetDepths(nc); - - #ifdef FIX_1425 -- FindMaxDepths(cc, cw); -+ FindMaxDepths(cc, (Widget)cw); - #else - cw->container.max_depth = MAX(cw->container.max_depth,nc->depth); - #endif -@@ -7181,7 +7181,7 @@ static void FindMaxDepths(XmContainerConstraint c, Widget w) - Widget child = node->widget_ptr; - XmContainerConstraint cc = GetContainerConstraint(child); - cw->container.max_depth = MAX(cw->container.max_depth, cc->depth); -- FindMaxDepths(cc, cw); -+ FindMaxDepths(cc, (Widget)cw); - node = node->next_ptr; - } - } -diff --git a/lib/Xm/DataF.c b/lib/Xm/DataF.c -index 622ee61a309c38af..a780c972e49069ba 100644 ---- a/lib/Xm/DataF.c -+++ b/lib/Xm/DataF.c -@@ -8867,7 +8867,7 @@ df_LoadFontMetrics( - #ifdef USE_XFT - } else if (XmTextF_use_xft(tf)) { - #ifdef FIX_1415 -- _XmXftFontAverageWidth((Widget) tf, TextF_XftFont(tf), &charwidth); -+ _XmXftFontAverageWidth((Widget) tf, TextF_XftFont(tf), (int *)&charwidth); - #else - charwidth = XmTextF_xft_font(tf)->max_advance_width; - #endif -diff --git a/lib/Xm/IconButton.c b/lib/Xm/IconButton.c -index 2cd206347b0bd895..5f2cae7a23853167 100644 ---- a/lib/Xm/IconButton.c -+++ b/lib/Xm/IconButton.c -@@ -1870,7 +1870,7 @@ CreateGCs(Widget w) - - #ifdef FIX_1381 - /*generally gray insensitive foreground (instead stipple)*/ -- values.foreground = _XmAssignInsensitiveColor(iw); -+ values.foreground = _XmAssignInsensitiveColor((Widget)iw); - XmIconButton_insensitive_text_gc(iw) = XtGetGC(w, smask, &values); - #else - XmIconButton_stippled_text_gc(iw) = XtGetGC(w, smask, &values); -diff --git a/lib/Xm/Label.c b/lib/Xm/Label.c -index 8f5621229d4314a6..fd4c63abb5747050 100644 ---- a/lib/Xm/Label.c -+++ b/lib/Xm/Label.c -@@ -1562,7 +1562,7 @@ Redisplay( - #ifdef FIX_1505 - if (pix_use == Pix(lw)) { - XSetFillStyle(XtDisplay(lw), gc, FillStippled); -- XSetStipple(XtDisplay(lw), gc, _XmGetInsensitiveStippleBitmap(lw)); -+ XSetStipple(XtDisplay(lw), gc, _XmGetInsensitiveStippleBitmap((Widget)lw)); - XFillRectangle(XtDisplay(lw), XtWindow(lw), gc, - lp->TextRect.x + lp->PixmapRect.x, - lp->TextRect.y + lp->PixmapRect.y, -diff --git a/lib/Xm/LabelG.c b/lib/Xm/LabelG.c -index d574e436df53a764..b674041fc9bc1f87 100644 ---- a/lib/Xm/LabelG.c -+++ b/lib/Xm/LabelG.c -@@ -2452,7 +2452,7 @@ LRectangle *background_box) - #ifdef FIX_1505 - if (pix_use == Pix(lw)) { - XSetFillStyle(XtDisplay(lw), gc, FillStippled); -- XSetStipple(XtDisplay(lw), gc, _XmGetInsensitiveStippleBitmap(lw)); -+ XSetStipple(XtDisplay(lw), gc, _XmGetInsensitiveStippleBitmap((Widget)lw)); - XFillRectangle(XtDisplay(lw), XtWindow(lw), gc, - lw->rectangle.x + LabG_TextRect(lw).x + - LabG_PixmapRect(lw).x, -diff --git a/lib/Xm/List.c b/lib/Xm/List.c -index 1dd16d2880f84ceb..98aec0e47c01c343 100644 ---- a/lib/Xm/List.c -+++ b/lib/Xm/List.c -@@ -2486,7 +2486,7 @@ DrawItems(XmListWidget lw, - #ifdef FIX_1381 - { - gc = lw->list.InsensitiveGC; -- _XmRendFG(lw->list.scratchRend) = _XmAssignInsensitiveColor(lw); -+ _XmRendFG(lw->list.scratchRend) = _XmAssignInsensitiveColor((Widget)lw); - } - #else - gc = lw->list.InsensitiveGC; -@@ -2831,7 +2831,7 @@ MakeGC(XmListWidget lw) - values.background = lw->core.background_pixel; - #ifdef FIX_1381 - /*generally gray insensitive foreground (instead stipple)*/ -- values.foreground = _XmAssignInsensitiveColor(lw); -+ values.foreground = _XmAssignInsensitiveColor((Widget)lw); - #else - values.foreground = lw->primitive.foreground; - valueMask |= GCStipple | GCFillStyle; -diff --git a/lib/Xm/ResEncod.c b/lib/Xm/ResEncod.c -index fdb44644c94be415..09d2d8f14d181379 100644 ---- a/lib/Xm/ResEncod.c -+++ b/lib/Xm/ResEncod.c -@@ -2513,9 +2513,9 @@ processCharsetAndTextUtf8(XmStringCharSet tag, - - /* Now copy in the text */ - if (ctlen > 0) { -- char *text = Convert(ctext, ctlen, "UTF-8", tag); -+ char *text = Convert((char *)ctext, ctlen, "UTF-8", tag); - if (text == NULL) return(False); -- *outc = ctextConcat(*outc, *outlen, text, strlen(text)); -+ *outc = ctextConcat(*outc, *outlen, (const_OctetPtr)text, strlen(text)); - *outlen += ctlen; - XtFree(text); - }; -diff --git a/lib/Xm/Text.c b/lib/Xm/Text.c -index 0cf37018bd68da52..427b613c97b12750 100644 ---- a/lib/Xm/Text.c -+++ b/lib/Xm/Text.c -@@ -1745,7 +1745,7 @@ _XmTextUpdateLineTable(Widget widget, - } - _XmTextSetCursorPosition(widget, cursorPos); - } else if (start == tw->text.cursor_position && tw->text.auto_show_cursor_position) { -- _XmTextShowPosition(tw, cursorPos); -+ _XmTextShowPosition((Widget)tw, cursorPos); - } - } - #else -diff --git a/lib/Xm/TextF.c b/lib/Xm/TextF.c -index 6b7a85bd7a8fe836..e8f1c78a33cef5a2 100644 ---- a/lib/Xm/TextF.c -+++ b/lib/Xm/TextF.c -@@ -6988,7 +6988,7 @@ LoadFontMetrics(XmTextFieldWidget tf) - #ifdef USE_XFT - } else if (TextF_UseXft(tf)) { - #ifdef FIX_1415 -- _XmXftFontAverageWidth((Widget) tf, TextF_XftFont(tf), &charwidth); -+ _XmXftFontAverageWidth((Widget) tf, TextF_XftFont(tf), (int *)&charwidth); - #else - charwidth = TextF_XftFont(tf)->max_advance_width; - #endif -diff --git a/lib/Xm/TextIn.c b/lib/Xm/TextIn.c -index 40f2b5ad89d846da..b4f2d111f6277cdb 100644 ---- a/lib/Xm/TextIn.c -+++ b/lib/Xm/TextIn.c -@@ -1345,7 +1345,7 @@ PrintableString(XmTextWidget tw, - #ifdef USE_XFT - } else if (o_data->use_xft) { - XGlyphInfo ext; -- XftTextExtentsUtf8(XtDisplay(tw), (XftFont*)o_data->font, str, n, &ext); -+ XftTextExtentsUtf8(XtDisplay(tw), (XftFont*)o_data->font, (_Xconst FcChar8 *)str, n, &ext); - return ext.xOff != 0; - #endif - } else { diff --git a/motif-c99-bug1602.patch b/motif-c99-bug1602.patch deleted file mode 100644 index b20340b..0000000 --- a/motif-c99-bug1602.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit 56dae22f7c2e7446852af1d68116f1809edae633 -Author: Mykola Vshyvkov -Date: Wed Jun 26 19:21:20 2013 +0300 - - Fixed bug #1602 (Eliminates 6 warnings "implicit declaration of function" in some modules). - -diff --git a/tools/wml/wml.c b/tools/wml/wml.c -index d8ad382ebb93f0cc..723288a9c29cead2 100644 ---- a/tools/wml/wml.c -+++ b/tools/wml/wml.c -@@ -80,6 +80,7 @@ static char rcsid[] = "$TOG: wml.c /main/8 1999/04/16 09:41:47 mgreess $" - #endif - #include - #include -+#include - - - /* -@@ -159,6 +160,7 @@ void wmlInit (); - * External variables - */ - extern int yyleng; -+extern int yyparse(); - - - -diff --git a/tools/wml/wmloutp1.c b/tools/wml/wmloutp1.c -index c826c4f0fad65b68..ea6a8e2780d08d78 100644 ---- a/tools/wml/wmloutp1.c -+++ b/tools/wml/wmloutp1.c -@@ -45,6 +45,11 @@ static char rcsid[] = "$XConsortium: wmloutp1.c /main/7 1995/07/13 21:04:31 drk - - #include "wml.h" - -+/* External functions declaraion */ -+extern void wmlOutputKeyWordFiles (); -+extern void wmlOutputMmFiles(); -+ -+ - - void wmlOutput () - -diff --git a/tools/wml/wmlresolve.c b/tools/wml/wmlresolve.c -index 3b8642c12474cfbd..c9bc84151f8a7902 100644 ---- a/tools/wml/wmlresolve.c -+++ b/tools/wml/wmlresolve.c -@@ -58,6 +58,7 @@ static char rcsid[] = "$XConsortium: wmlresolve.c /main/9 1995/08/29 11:11:05 dr - #include - #endif - #include -+#include - - /* - * Routines used only in this module diff --git a/motif-c99-bug1605.patch b/motif-c99-bug1605.patch deleted file mode 100644 index ac47267..0000000 --- a/motif-c99-bug1605.patch +++ /dev/null @@ -1,134 +0,0 @@ -commit d094e8c4a6a1890520ade3e1900229454dc2eac2 -Author: Mykola Vshyvkov -Date: Mon Jul 1 19:02:25 2013 +0300 - - Fixed bug #1605 (Eliminates 14 warnings of some types in WML tool). - -diff --git a/lib/Xm/XmRenderT.c b/lib/Xm/XmRenderT.c -index 0abd71265fc901b9..5ecd38bef29d2c6b 100644 ---- a/lib/Xm/XmRenderT.c -+++ b/lib/Xm/XmRenderT.c -@@ -1993,7 +1993,7 @@ GetSameRenditions(XmRendition *rend_cache, XmRendition rend, int count_rend) - for (i=0; i -Date: Wed Jul 3 18:52:21 2013 +0300 - - Fixed bug #1609 (Eliminates 18 warnings of "incompatible implicit declaration" in modules of "clients" catalog). - -diff --git a/clients/mwm/WmCmd.c b/clients/mwm/WmCmd.c -index f21d41d541dc50a3..4d723aa4848314f6 100644 ---- a/clients/mwm/WmCmd.c -+++ b/clients/mwm/WmCmd.c -@@ -48,6 +48,7 @@ - #include "WmWsm.h" - #include "WmDebug.h" - #include "WmWinConf.h" -+#include "WmFeedback.h" - - - -diff --git a/clients/mwm/WmCmd.h b/clients/mwm/WmCmd.h -index ff779defe240933b..e8bc104e850c5ec3 100644 ---- a/clients/mwm/WmCmd.h -+++ b/clients/mwm/WmCmd.h -@@ -59,5 +59,8 @@ extern void AddWindowMenuEntry (ClientData *); - extern void DeleteCommand (long, CmdTree **); - extern void SendInvokeMessage (CARD32, CARD32, Atom, Time); - -+extern void -+GetAutomationData (XtPointer input, Atom *outputType, XtPointer *output, unsigned long *outputLen, int *outputFmt); -+ - - #endif /* _WM_CMD_ */ -diff --git a/clients/mwm/WmFunction.c b/clients/mwm/WmFunction.c -index 9a2102bcf80cbf08..94fb8cde2c0ec83d 100644 ---- a/clients/mwm/WmFunction.c -+++ b/clients/mwm/WmFunction.c -@@ -112,6 +112,7 @@ extern pid_t vfork(); - #include "WmWinList.h" - #include "WmWinState.h" - #include "WmXSMP.h" -+#include "WmCmd.h" - - #include /* for MS_LastManagedMenuTime */ - extern XmMenuState _XmGetMenuState(); -diff --git a/clients/mwm/WmInitWs.c b/clients/mwm/WmInitWs.c -index aaa584cd3e4ce7b7..d29b5f96fec246fc 100644 ---- a/clients/mwm/WmInitWs.c -+++ b/clients/mwm/WmInitWs.c -@@ -134,6 +134,7 @@ typedef struct - #include - #endif /* WSM */ - #include "WmXSMP.h" -+#include "Xm/VirtKeysI.h" - - /* - * Function Declarations: -diff --git a/clients/mwm/WmResParse.c b/clients/mwm/WmResParse.c -index 465f5b4d29e99411..a63e928acd643c54 100644 ---- a/clients/mwm/WmResParse.c -+++ b/clients/mwm/WmResParse.c -@@ -63,6 +63,7 @@ static char rcsid[] = "$XConsortium: WmResParse.c /main/9 1996/11/01 10:17:34 dr - #include "WmResource.h" - - #include -+#include "Xm/VirtKeysI.h" - - #include - #include -diff --git a/clients/mwm/WmWinList.c b/clients/mwm/WmWinList.c -index a45a4fc9471ab21d..31472a5caa832d90 100644 ---- a/clients/mwm/WmWinList.c -+++ b/clients/mwm/WmWinList.c -@@ -63,7 +63,7 @@ static char rcsid[] = "$TOG: WmWinList.c /main/8 1997/06/10 15:50:50 samborn $" - #ifdef WSM - #include "WmWrkspace.h" - #endif /* WSM */ -- -+#include "WmEvent.h" - - - -diff --git a/clients/mwm/WmWsmLib/recv.c b/clients/mwm/WmWsmLib/recv.c -index 8b2833fbc2ea756f..06908e24756b0e3c 100644 ---- a/clients/mwm/WmWsmLib/recv.c -+++ b/clients/mwm/WmWsmLib/recv.c -@@ -38,6 +38,8 @@ XtPointer *, unsigned long *, int * - ); - #endif /* JUNK */ - -+extern Time GetTimestamp (Display *dpy); -+ - - /* Function Name: WSMDefaultOwnSelection - * Description: This is the default routine that owns the proper -diff --git a/clients/mwm/WmWsmLib/send.c b/clients/mwm/WmWsmLib/send.c -index 8792e2c7c8ac82bb..c261da70bfff366a 100644 ---- a/clients/mwm/WmWsmLib/send.c -+++ b/clients/mwm/WmWsmLib/send.c -@@ -45,6 +45,8 @@ static void ReplyReceived( - Widget, XtPointer, Atom *, Atom *, XtPointer, unsigned long *, int * - ); - -+extern Time GetTimestamp (Display *dpy); -+ - /* Function Name: WSMSendMessage - * Description: Sends a message to WSM or WM on the screen - * and display specified. -diff --git a/clients/uil/UilDefI.h b/clients/uil/UilDefI.h -index a0176b619e89f1eb..f17bff764bf6fd1e 100644 ---- a/clients/uil/UilDefI.h -+++ b/clients/uil/UilDefI.h -@@ -608,7 +608,7 @@ extern void sym_dump_object_variant _ARGUMENTS(( sym_def_obj_entry_type *az_sym - extern void sym_dump_root_entry _ARGUMENTS(( sym_root_entry_type *az_symbol_entry )); - extern char *sym_section_text _ARGUMENTS(( int b_type )); - extern void dump_free_list _ARGUMENTS(( void )); -- -+extern int sar_get_units_type (yystype *parse_frame); - #if defined(__cplusplus) || defined(c_plusplus) - } - #endif -diff --git a/clients/uil/UilMain.c b/clients/uil/UilMain.c -index 6120eda2fa176670..1864ba78597e2dd6 100644 ---- a/clients/uil/UilMain.c -+++ b/clients/uil/UilMain.c -@@ -104,9 +104,10 @@ static void UilWrapup _ARGUMENTS((Uil_compile_desc_type *compile_desc)); - #endif - - externaldef(uilmsg) nl_catd uil_catd = NULL; -- - #endif - -+extern int yyparse(); -+ - /* - ** - ** MODULE Definitions -diff --git a/clients/xmbind/xmbind.c b/clients/xmbind/xmbind.c -index f3d5a67ce35dab84..a16e2d968c45f7f0 100644 ---- a/clients/xmbind/xmbind.c -+++ b/clients/xmbind/xmbind.c -@@ -29,6 +29,7 @@ static char rcsid[] = "$TOG: xmbind.c /main/10 1997/06/18 17:34:48 samborn $" - #endif - #endif - #include -+#include - #include - - /* Internal routines "borrowed" from libXm. Don't try this at home! */ diff --git a/motif-c99-string.patch b/motif-c99-string.patch deleted file mode 100644 index ff07b71..0000000 --- a/motif-c99-string.patch +++ /dev/null @@ -1,19 +0,0 @@ -Unconditionally include , to avoid implicit function -declarations. libXpm defines SYSV during the build, which is why they -do not see t his isssue. - -diff --git a/lib/Xm/XpmI.h b/lib/Xm/XpmI.h -index bbba02b0cac1f91e..3468f2d1edf84f7c 100644 ---- a/lib/Xm/XpmI.h -+++ b/lib/Xm/XpmI.h -@@ -118,9 +118,9 @@ extern "C" { - extern FILE *popen(); - #endif - --#if defined(SYSV) || defined(SVR4) || defined(VMS) || defined(WIN32) || defined (_SVID_SOURCE) - #include - -+#if defined(SYSV) || defined(SVR4) || defined(VMS) || defined(WIN32) || defined (_SVID_SOURCE) - #ifndef index - #define index strchr - #endif diff --git a/motif-c99-void-sprintf.patch b/motif-c99-void-sprintf.patch deleted file mode 100644 index 040c79e..0000000 --- a/motif-c99-void-sprintf.patch +++ /dev/null @@ -1,40 +0,0 @@ -Stop defining VOID_SPRINTF, following what upstream libXpm does. The -check has an implicit declaration of exit and an implicit int, so it -will fail to build with future compilers. - -diff --git a/acinclude.m4 b/acinclude.m4 -index 88edfce3d169a267..38409a28a65cb028 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -45,19 +45,6 @@ if test $lt_cv_xthreads = yes; then - fi - ]) - --dnl This test is not very reliable probably ... --AC_DEFUN([AM_FUNC_VOID_SPRINTF], --[AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf, --[AC_TRY_RUN([#include --int sprintf(); main() { exit(sprintf(".")); }], -- ac_cv_func_void_sprintf=no, ac_cv_func_void_sprintf=yes, ac_cv_func_void_sprintf=yes)]) --if test $ac_cv_func_void_sprintf = no; then -- AC_DEFINE(VOID_SPRINTF,1, -- [Define if sprintf doesn't return the number of chars written]) --fi --]) -- -- - dnl - dnl End of special macros. - dnl -diff --git a/configure.ac b/configure.ac -index 3b412361e6f43da4..6cbeb2f5eea235eb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,7 +120,6 @@ AC_FUNC_STRCOLL - AC_FUNC_STRFTIME - AC_FUNC_FORK([]) - AC_FUNC_VPRINTF --AM_FUNC_VOID_SPRINTF - AC_CHECK_FUNCS(wcslen wcscpy wcsncpy wcschr wcscat wcsncat getcwd gettimeofday mkdir re_comp regcmp select strcspn strerror strstr strtod strtol uname) - AC_CHECK_FUNCS(strdup,,AC_DEFINE(NEED_STRDUP, 1, no strdup)) - AC_CHECK_FUNCS(strcasecmp,,AC_DEFINE(NEED_STRCASECMP, 1, no strcasecmp)) diff --git a/motif-configure-c99.patch b/motif-configure-c99.patch deleted file mode 100644 index 63a081a..0000000 --- a/motif-configure-c99.patch +++ /dev/null @@ -1,20 +0,0 @@ -Another implicit declaration of exit in the -DXTHREADS check, which -will go wrong with future compilers that do not support implicit -function declarations. - -diff --git a/acinclude.m4 b/acinclude.m4 -index 61706f3e63d94d8a..88edfce3d169a267 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -22,9 +22,9 @@ int main() { - Boolean brc; - brc=XtToolkitThreadInitialize(); - if (True==brc) -- exit(0); -+ return 0; - else -- exit(1); -+ return 1; - } - ], - lt_cv_xthreads=yes, diff --git a/motif.spec b/motif.spec deleted file mode 100644 index d163a24..0000000 --- a/motif.spec +++ /dev/null @@ -1,583 +0,0 @@ -Summary: Run-time libraries and programs -Name: motif -Version: 2.3.4 -Release: 33%{?dist} -License: LGPLv2+ -Source: http://downloads.sf.net/motif/motif-%{version}-src.tgz -Source1: xmbind -URL: http://www.motifzone.net/ -Obsoletes: openmotif < 2.3.4 -Provides: openmotif = %{version}-%{release} -Requires: xorg-x11-xbitmaps -Requires: xorg-x11-xinit - -BuildRequires: make -BuildRequires: automake, libtool, autoconf, flex -# flex static libs have been part of flex for RHEL <= 6 and Fedora <= 12 -%if 0%{?fedora} > 12 || 0%{?rhel} > 6 -BuildRequires: flex-static -%endif -BuildRequires: byacc, pkgconfig -BuildRequires: libjpeg-devel libpng-devel -BuildRequires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel -BuildRequires: xorg-x11-xbitmaps -BuildRequires: perl-interpreter - -Patch22: motif-2.3.4-no_demos.patch -Patch23: openMotif-2.2.3-uil_lib.patch -Patch43: openMotif-2.3.0-rgbtxt.patch -Patch45: motif-2.3.4-mwmrc_dir.patch -Patch46: motif-2.3.4-bindings.patch -Patch47: openMotif-2.3.0-no_X11R6.patch -# FTBFS #1448819 -Patch48: motif-2.3.4-Fix-issues-with-Werror-format-security.patch -Patch49: motif-configure-c99.patch -Patch50: motif-c99-void-sprintf.patch -Patch51: motif-c99-string.patch -Patch52: motif-c99-bug1602.patch -Patch53: motif-c99-bug1605.patch -Patch54: motif-c99-bug1609.patch -# CVE-2023-43788 -Patch55: 0001-Fix-CVE-2023-43788-Out-of-bounds-read-in-XpmCreateXp.patch -# CVE-2023-43789 -Patch56: 0001-Fix-CVE-2023-43789-Out-of-bounds-read-on-XPM-with-co.patch -Patch57: motif-c99-bug1599.patch - -Conflicts: lesstif <= 0.92.32-6 - -%description -This is the Motif %{version} run-time environment. It includes the -Motif shared libraries, needed to run applications which are dynamically -linked against Motif and the Motif Window Manager mwm. - -%package devel -Summary: Development libraries and header files -Conflicts: lesstif-devel <= 0.92.32-6 -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libjpeg-devel%{?_isa} libpng-devel%{?_isa} -Requires: libXft-devel%{?_isa} libXmu-devel%{?_isa} libXp-devel%{?_isa} -Requires: libXt-devel%{?_isa} libXext-devel%{?_isa} -Obsoletes: openmotif-devel < 2.3.4 -Provides: openmotif-devel = %{version}-%{release} - -%description devel -This is the Motif %{version} development environment. It includes the -header files and also static libraries necessary to build Motif applications. - -%package static -Summary: Static libraries -Conflicts: lesstif-devel <= 0.92.32-6 -Requires: %{name}-devel%{?_isa} = %{version}-%{release} - -%description static -This package contains the static Motif libraries. - -%prep -%setup -q -%patch22 -p1 -b .no_demos -%patch23 -p1 -b .uil_lib -%patch43 -p1 -b .rgbtxt -%patch45 -p1 -b .mwmrc_dir -%patch46 -p1 -b .bindings -%patch47 -p1 -b .no_X11R6 -%patch48 -p1 -b .format-security -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch -P 57 -p1 - -%build -./autogen.sh -%configure --enable-static --enable-xft --enable-jpeg --enable-png - -make clean %{?_smp_mflags} -make -C include -make %{?_smp_mflags} - -%install -make DESTDIR=%{buildroot} install - -install -d %{buildroot}/etc/X11/xinit/xinitrc.d -install -m 755 %{SOURCE1} %{buildroot}/etc/X11/xinit/xinitrc.d/xmbind.sh - -rm -f %{buildroot}%{_libdir}/*.la - -%ldconfig_scriptlets - -%files -%doc COPYING README RELEASE RELNOTES -/etc/X11/xinit/xinitrc.d/xmbind.sh -%dir /etc/X11/mwm -%config(noreplace) /etc/X11/mwm/system.mwmrc -%{_bindir}/mwm -%{_bindir}/xmbind -%{_includedir}/X11/bitmaps/* -%{_libdir}/libMrm.so.* -%{_libdir}/libUil.so.* -%{_libdir}/libXm.so.* -%{_datadir}/X11/bindings -%{_mandir}/man1/mwm* -%{_mandir}/man1/xmbind* -%{_mandir}/man4/mwmrc* - -%files devel -%{_bindir}/uil -%{_includedir}/Mrm -%{_includedir}/Xm -%{_includedir}/uil -%{_libdir}/lib*.so -%{_mandir}/man1/uil.1* -%{_mandir}/man3/* -%{_mandir}/man5/* - -%files static -%{_libdir}/lib*.a - -%changelog -* Thu Jan 25 2024 Fedora Release Engineering - 2.3.4-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Florian Weimer - 2.3.4-32 -- Backport upstream patch to fix incompatible-pointer-types issues - -* Sun Jan 21 2024 Fedora Release Engineering - 2.3.4-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Nov 27 2023 José Expósito - 2.3.4-30 -- Fix CVE-2023-43788: out of bounds read in XpmCreateXpmImageFromBuffer() -- Fix CVE-2023-43789: out of bounds read on XPM with corrupted colormap - -* Thu Jul 20 2023 Fedora Release Engineering - 2.3.4-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Apr 14 2023 Florian Weimer - 2.3.4-28 -- Port to C99 (#2186773) - -* Thu Jan 19 2023 Fedora Release Engineering - 2.3.4-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.3.4-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Feb 03 2022 Adam Jackson - 2.3.4-25 -- Fix invoking autogen/configure so the default CFLAGS actually get applied - -* Thu Jan 20 2022 Fedora Release Engineering - 2.3.4-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 2.3.4-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.4-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 2.3.4-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 2.3.4-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.3.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.3.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.3.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 2.3.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 2.3.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.3.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 08 2017 Petr Šabata - 2.3.4-13 -- Fix issues with -Werror=format-security (#1448819) - -* Fri Feb 10 2017 Fedora Release Engineering - 2.3.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 2.3.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.3.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 2.3.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.3.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 2.3.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue May 28 2013 Michael Schwendt - 2.3.4-6 -- fix missing BuildRequires flex-static (RHBZ#889175) - -* Thu Feb 14 2013 Fedora Release Engineering - 2.3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 2.3.4-4 -- rebuild due to "jpeg8-ABI" feature drop - -* Fri Oct 26 2012 Thomas Woerner 2.3.4-3 -- do not use _isa for build requires - -* Fri Oct 26 2012 Thomas Woerner 2.3.4-2 -- fixed requirements according to review (RHBZ#870049) -- flex-static has been renamed to flex-devel with Fedora-18 and RHEL-7 - -* Thu Oct 25 2012 Thomas Woerner 2.3.4-1 -- new version 2.3.4 with LGPL license -- fixed some rpmlint warnings -- new sub package for static libraries -- added /etc/X11/mwm directory -- removed defattrs - -* Fri May 25 2012 Thomas Woerner 2.3.3-5 -- dropped file requires for /usr/share/X11/XKeysymDB, not needed and not - available anymore -- added flex-static build requirement, because of flex package split - -* Mon Aug 15 2011 Thomas Woerner 2.3.3-4 -- fixed Label draws Xft text over border of its parent (rhbz#584300#c3) - (MotifZone bug #1521 refixed) - -* Wed Aug 10 2011 Thomas Woerner 2.3.3-3 -- fixed regression introduced with upstream FIX #1521 (rhbz#729346) - -* Mon Aug 1 2011 Thomas Woerner 2.3.3-2 -- fixed LabelGadget draws background over border of its parent (rhbz#584300) - (MotifZone bug #1517) -- fixed LabelGadget draws Xft text over border of its parent (rhbz#584300#c3) - (MotifZone bug #1521) - -* Tue Mar 23 2010 Thomas Woerner 2.3.3-1 -- new version 2.3.3 (bugfix release) - see RELNOTES file for the list of the bug fixes - -* Fri Feb 26 2010 Thomas Woerner 2.3.2-1.1 -- fixes according to review: -- fixed buildroot -- removed dot from summary -- removed dist tag from changelog -- added source download link - -* Wed Jan 13 2010 Thomas Woerner 2.3.2-1 -- new version 2.3.2 with upstream bug fixes: #1212, #1277, #1473, #1476 -- spec file cleanup -- make build work with libtool -- all man pages are utf-8, no need to convert them anymore -- enabled EditRes support with upstream fix -- fixed parallel build -- fixed patches for fuzz 0 - Related: rhbz#543948 - -* Tue Dec 08 2009 Dennis Gregorovic - 2.3.1-3.1 -- Rebuilt for RHEL 6 - -* Wed Sep 23 2009 Dennis Gregorovic - 2.3.1-3 -- update the bindings patch - -* Wed Nov 12 2008 Thomas Woerner 2.3.1-2 -- more fixes for unreliable pasting into XmTextField (MotifZone bug #1321) - Resolves: rhbz#405941 -- the fix for MotifZone bug #1400 is not working for remote displays - -* Thu Oct 2 2008 Thomas Woerner 2.3.1-1 -- using final 2.3.1 dist archive - -* Wed Sep 17 2008 Thomas Woerner 2.3.1-0 -- rebase to 2.3.1 (CVS dist release) - Resolves: rhbz#455736 -- fixes OpenMotif XmList problem - Resolves: rhbz#405801 -- fixes List.c/ReplaceItem() segfaults when item selected - Resolves: rhbz#431460 -- fixes [motifzone 1400 ] openmotif/ BadFont on multiple display application - Resolves: rhbz#438910 -- fixes applications dump core in non-UTF8 environment - Resolves: rhbz#453722 -- fixes lots of additional bugs: see release notes - -* Tue Apr 1 2008 Thomas Woerner 2.3.0-0.5 -- fixed SEGV error moving mouse over window related to XmToolTipGetLabel - (MotifZone bug fix #1388) - Resolves: rhbz#277381 - -* Thu Nov 8 2007 Thomas Woerner 2.3.0-0.4 -- fixed title bar problem using XmNdialogTitle (MotifZone bug fix #1380) - Resolves: rhbz#353251 - -* Fri Dec 1 2006 Thomas Woerner 2.3.0-0.3 -- fixed path to xmbind in /etc/X11/xinit/xinitrc.d/xmbind.sh - Resolves: rhbz#218032 - -* Wed Jul 12 2006 Jesse Keating - 2.3.0-0.2.1 -- rebuild - -* Tue Jun 6 2006 Thomas Woerner 2.3.0-0.2 -- new CVS version 2006-06-06 -- new buildprereq for pkgconfig - -* Fri Feb 10 2006 Jesse Keating - 2.3.0-0.1.9.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.3.0-0.1.9.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Thu Feb 2 2006 Thomas Woerner 2.3.0-0.1.9 -- new CVS version 2006-02-02 -- fixed CVE-2005-3964: libUil buffer overflows (#174814) -- fixed XmList out of bound accesses (#167701) -- fixed pasting into TextField (#179549) - -* Tue Jan 3 2006 Jesse Keating 2.3.0-0.1.2 -- Rebuilt on new gcc - -* Fri Dec 9 2005 Thomas Woerner 2.3.0-0.1.1 -- moved mwmrc to /etc/X11/mwm -- moved bindings to /usr/share/X11 -- fixed paths in man pages containing /usr/X11R6 - -* Thu Dec 8 2005 Thomas Woerner 2.3.0-0.1.1 -- enabled Xft, jpeg and png support -- patch for missing xft-config -- dropped duplicate include path in devel package - -* Fri Dec 2 2005 Thomas Woerner 2.3.0-0.1 -- new 2.3.0 (beta1) -- patch for new rgb.txt location (#174210) - Thanks to Ville Skyttä for the patch - -* Fri Nov 18 2005 Thomas Woerner 2.2.3-15 -- moved man pages to /usr/share/man (#173604) - -* Wed Nov 16 2005 Jeremy Katz - 2.2.3-14 -- X11R6 stuff is gone - -* Wed Nov 16 2005 Jeremy Katz - 2.2.3-13 -- also buildrequire xbitmaps - -* Wed Nov 16 2005 Thomas Woerner 2.2.3-12 -- rebuild for modular X - -* Fri Sep 2 2005 Thomas Woerner 2.2.3-11 -- fixed mrm initialization error in MrmOpenHierarchyPerDisplay (#167094) - Thanks to Arjan van de Ven for the patch. - -* Mon Apr 4 2005 Thomas Woerner 2.2.3-10 -- fixed possible libXpm overflows (#151642) - -* Mon Feb 28 2005 Thomas Woerner 2.2.3-9 -- Upstream Fix: Multiscreen mode -- Upstream Fix: Crash when restarting by a session manager (motifzone#1193) -- Upstream Fix: Crash when duplicating a window menu containing f.circle_up - (motifzone#1202) -- fixed divide by zero error in ComputeVizCount() (#144420) -- Xpmcreate: define LONG64 on 64 bit architectures (#143689) - -* Mon Nov 29 2004 Thomas Woerner 2.2.3-8.1 -- allow to write XPM files with absolute path names again (#140815) - -* Wed Nov 24 2004 Miloslav Trmac 2.2.3-8 -- Convert man pages to UTF-8 - -* Mon Nov 22 2004 Thomas Woerner 2.2.3-7 -- latest Xpm patches: CAN-2004-0914 (#134631) -- new patch for tmpnam in imake (only used for build) - -* Thu Sep 30 2004 Thomas Woerner 2.2.3-6 -- fixed CAN-2004-0687 (integer overflows) and CAN-2004-0688 (stack overflows) - in embedded Xpm library - -* Wed Sep 29 2004 Thomas Woerner 2.2.3-5.2 -- replaced libtoolize and autofoo* calls with a patch (autofoo) - -* Wed Sep 29 2004 Thomas Woerner 2.2.3-5.1 -- use new autofoo - -* Wed Sep 1 2004 Thomas Woerner 2.2.3-5 -- libXp now moved to xorg-x11-deprecated-libs, therefore no compatibility - with XFree86 packages anymore. - -* Mon Aug 30 2004 Thomas Woerner 2.2.3-4.3 -- devel package: added requires for XFree86-devel (#131202) - -* Thu Jun 17 2004 Thomas Woerner 2.2.3-4.2 -- rebuilt for fc3 - -* Wed Jun 16 2004 Thomas Woerner 2.2.3-4.1 -- renamed xmbind script to xmbind.sh (#126116) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Jun 8 2004 Thomas Woerner 2.2.3-3 -- fixed popup menus fail on Tarantella/VNC (#123027) -- fixed character not supported problem (#124960) -- fixed data out of bounds bug (#124961) - -* Wed Apr 14 2004 Thomas Woerner 2.2.3-2 -- 2.2.3 final version - -* Tue Mar 23 2004 Thomas Woerner 2.2.3-1.9.2 -- final CVS version - -* Wed Mar 17 2004 Thomas Woerner 2.2.3-1.9.1 -- new openmotif 2.2.3 beta version - -* Mon Mar 8 2004 Thomas Woerner 2.2.2-17 -- fixed popdown problem in ToolTip (#75730) - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Thu Feb 19 2004 Thomas Woerner 2.2.2-16.3 -- rebuilt - -* Thu Dec 18 2003 Thomas Woerner -- added missing BuildRequires for XFree86-devel - -* Thu Nov 27 2003 Thomas Woerner 2.2.2-16.2 -- removed rpath - -* Mon Aug 27 2003 Thomas Woerner 2.2.2-16 -- fixed ToggleBG (#101159) - -* Thu Jul 31 2003 2.2.2-15.2 -- rebuild for RHEL - -* Wed Jul 30 2003 Thomas Woerner 2.2.2-15 -- fixed ToggleB (#101159) - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 21 2003 Thomas Woerner 2.2.2-13 -- fix for Xmu/EditRes conflict (bug #80777) -- fix for wml and utf-8 (bug #80271) -- fix for Ext18List (bug #74502) - -* Thu Nov 14 2002 Than Ngo 2.2.2-12.2 -- add buildprereq byacc and flex (bug #77860) - -* Fri Nov 8 2002 Than Ngo 2.2.2-12.1 -- fix some build problem - -* Mon Aug 27 2002 Than Ngo 2.2.2-12 -- Fixed a segmentation fault in mkcatdefs (bug #71955) - -* Wed Jul 24 2002 Than Ngo 2.2.2-11 -- Added missing symlinks (bug #69117) - -* Tue Jul 23 2002 Tim Powers 2.2.2-10 -- build using gcc-3.2-0.1 - -* Tue Jun 25 2002 Than Ngo 2.2.2-9 -- fix to build openmotif (bug #64176) - -* Thu Jun 13 2002 Than Ngo 2.2.2-8 -- rebuild in new enviroment - -* Sun May 26 2002 Tim Powers -- automated rebuild - -* Thu May 23 2002 Harald Hoyer 2.2.2-6 -- patched ltmain.sh to link properly - -* Wed May 22 2002 Harald Hoyer 2.2.2-6 -- specified libraries by full name in files section - (libMrm was missing on alpha) - -* Tue Mar 26 2002 Than Ngo 2.2.2-5 -- update new 2.2.2 from ICS - -* Sun Mar 24 2002 Than Ngo 2.2.2-4 -- add missing uil - -* Fri Mar 22 2002 Tim Powers -- rebuilt to try and shake some broken deps in the devel package - -* Thu Mar 21 2002 Than Ngo 2.2.2-2 -- rebuild - -* Thu Mar 21 2002 Than Ngo 2.2.2-1 -- update to 2.2.2 release - -* Mon Feb 22 2002 Than Ngo 2.2.1-3 -- conflict with older lesstif - -* Mon Feb 22 2002 Than Ngo 2.2.1-2 -- fix bug #60816 - -* Fri Feb 22 2002 Than Ngo 2.2.1-1 -- update to 2.2.1 release -- remove somme patches, which are included in 2.2.1 - -* Fri Feb 22 2002 Tim Powers -- rebuilt in new environment - -* Fri Jan 25 2002 Tim Powers -- don't obsolete lesstif anymore, play nicely together -- rebuild against new toolchain - -* Wed Jan 21 2002 Than Ngo 2.1.30-11 -- add some patches from Darrell Commander (supporting largefile) -- fix to build on s390 - -* Thu Jan 17 2002 Than Ngo 2.1.30-10 -- rebuild in 8.0 - -* Wed Sep 6 2001 Than Ngo -- rebuild for ExtraBinge 7.2 - -* Thu May 03 2001 Than Ngo -- add 3 official motif patches -- add rm -rf $RPM_BUILD_ROOT in install section -- remove some old patches which are now in official patches - -* Fri Dec 29 2000 Than Ngo -- don't build static debug libraries - -* Mon Dec 18 2000 Than Ngo -- bzip2 source - -* Mon Jul 24 2000 Than Ngo -- rebuilt against gcc-2.96-44 - -* Wed Jul 12 2000 Than Ngo -- rebuilt - -* Sun Jun 11 2000 Than Ngo -- fix imake to built with gcc-2.96 (thanks Jakup) -- put bitmaps in /usr/X11R6/include/X11/bitmaps -- put bindings in /usr/X11R6/lib/Xm/bindings -- add define -D_GNU_SOURCE to build Motif -- gzip man pages -- cleanup specfile - -* Mon May 29 2000 Bernhard Rosenkraenzer -- Update to patchlevel 2 -- remove bindings patch, it's included in pl2 - -* Tue May 16 2000 Matt Wilson -- use -fPIC on sparc -- fixed Ngo's "fixes" - -* Mon May 15 2000 Ngo Than -- added description. -- fixed spec, added uil stuff. - -* Mon May 15 2000 Matt Wilson -- initialization of spec file. diff --git a/openMotif-2.2.3-uil_lib.patch b/openMotif-2.2.3-uil_lib.patch deleted file mode 100644 index fc3a0ce..0000000 --- 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 24d1c56..0000000 --- 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 6c5ff15..0000000 --- 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 diff --git a/sources b/sources deleted file mode 100644 index c891fa3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -612bb8127d0d31da6e5474edf8a5c247 motif-2.3.4-src.tgz diff --git a/xmbind b/xmbind deleted file mode 100644 index 832ce12..0000000 --- a/xmbind +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -if [ -x /usr/bin/xmbind ] ; then - /usr/bin/xmbind -fi -