-1,6 +1,6 @@
---- acinclude.m4.orig	2017-08-27 19:29:50.000000000 -0700
-+++ acinclude.m4	2023-12-04 15:48:12.951361000 -0800
-@@ -50,7 +50,12 @@
+--- acinclude.m4.orig	2017-12-05 12:46:16 UTC
++++ acinclude.m4
+@@ -50,7 +50,12 @@ AC_DEFUN([AM_FUNC_VOID_SPRINTF],
  AC_DEFUN([AM_FUNC_VOID_SPRINTF],
  [AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf,
  [AC_TRY_RUN([#include <stdio.h>
diff --git a/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h b/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
index 372e8d628a37..1b462b9d19a4 100644
--- a/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
+++ b/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
@@ -1,6 +1,6 @@
---- clients/uil/UilDefI.h.orig	2012-10-22 07:50:39.000000000 -0700
-+++ clients/uil/UilDefI.h	2012-10-26 15:18:31.064731493 -0700
-@@ -270,7 +270,7 @@
+--- clients/uil/UilDefI.h.orig	2017-12-05 12:46:16 UTC
++++ clients/uil/UilDefI.h
+@@ -263,7 +263,7 @@ extern char* uil_mmove(char*, char*, int);
  #include "UilIODef.h"
  #include "UilDiagDef.h"
  #include "UilSarDef.h"
diff --git a/x11-toolkits/open-motif/files/patch-configure.ac b/x11-toolkits/open-motif/files/patch-configure.ac
index b2a72792d9a8..2da49dd1e518 100644
--- a/x11-toolkits/open-motif/files/patch-configure.ac
+++ b/x11-toolkits/open-motif/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2012-10-22 16:50:39.000000000 +0200
-+++ configure.ac	2014-01-27 22:38:58.000000000 +0100
-@@ -164,7 +164,7 @@
+--- configure.ac.orig	2017-12-05 12:46:16 UTC
++++ configure.ac
+@@ -160,7 +160,7 @@ then
  if test x$GCC = xyes
  then
      CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c b/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
index 4a96f46a04f4..ef6a2ade197a 100644
--- a/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
@@ -1,6 +1,6 @@
---- lib/Xm/DragC.c.orig	2017-08-16 17:38:43.000000000 -0700
-+++ lib/Xm/DragC.c	2023-12-04 15:58:26.431030000 -0800
-@@ -846,35 +846,18 @@
+--- lib/Xm/DragC.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/DragC.c
+@@ -846,35 +846,18 @@ ValidateDragOver(
    if (newStyle != oldStyle) 
      {
        /*
@@ -45,7 +45,7 @@
      }
  }
  
-@@ -1687,23 +1670,13 @@
+@@ -1687,23 +1670,13 @@ NewScreen(
    /* Build a new one */
    i = 0;
    /*
diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c b/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c
index af94efe107ae..793f27cee134 100644
--- a/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c
@@ -1,6 +1,6 @@
---- lib/Xm/MenuShell.c.orig	2017-08-16 17:38:43.000000000 -0700
-+++ lib/Xm/MenuShell.c	2023-12-04 15:33:35.350531000 -0800
-@@ -988,6 +988,7 @@
+--- lib/Xm/MenuShell.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/MenuShell.c
+@@ -988,6 +988,7 @@ ForceMenuPaneOnScreen(
     if (bottomEdgeOfMenu >= (Position)dispHeight)
     {
        if (pulldown_button && XtParent(pulldown_button) &&
diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
index 84b92bd900b7..5c0291dbe59d 100644
--- a/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
@@ -1,6 +1,6 @@
---- lib/Xm/XmRenderT.c.orig	2017-03-27 15:24:31.000000000 -0700
-+++ lib/Xm/XmRenderT.c	2023-12-04 15:42:22.406098000 -0800
-@@ -2091,10 +2091,9 @@
+--- lib/Xm/XmRenderT.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/XmRenderT.c
+@@ -2091,10 +2091,9 @@ ValidateAndLoadFont(XmRendition rend, Display *display
  						  static int count_rend=0, num_rend;
  						  num_rend = GetSameRenditions(rend_cache, rend, count_rend);
  
diff --git a/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c b/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
index 2e70cc3035fb..1fe1879c0b7e 100644
--- a/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
+++ b/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
@@ -1,6 +1,6 @@
---- lib/Xm/ColorS.c.orig	2005-12-17 16:54:03.000000000 +0300
-+++ lib/Xm/ColorS.c	2011-01-16 00:48:05.000000000 +0300
-@@ -41,6 +41,10 @@
+--- lib/Xm/ColorS.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/ColorS.c
+@@ -56,6 +56,10 @@
  
  #define SUPERCLASS ((WidgetClass) &xmManagerClassRec)
  
@@ -11,7 +11,7 @@
  /************************************************************
   *       MACROS
   ************************************************************/
-@@ -131,7 +135,7 @@
+@@ -146,7 +150,7 @@ static XtResource resources[] =
    {
      XmNrgbFile, XmCString, XmRString,
      sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file),