From fb64a5c1f0c6b3644a0579a762cd00c766254a2d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 26 2018 15:02:20 +0000
Subject: import motif-2.3.4-14.el7_5


---

diff --git a/SOURCES/motif-2.3.6-removed-redundant-includes.patch b/SOURCES/motif-2.3.6-removed-redundant-includes.patch
new file mode 100644
index 0000000..3a462d6
--- /dev/null
+++ b/SOURCES/motif-2.3.6-removed-redundant-includes.patch
@@ -0,0 +1,24 @@
+From c7342e7361d2ac93e240c8c7234d6c93166dcc66 Mon Sep 17 00:00:00 2001
+From: Oleksiy Chernyavskyy <ochern@ics.com>
+Date: Tue, 28 Mar 2017 01:32:30 +0300
+Subject: [PATCH] removed redundant includes
+
+---
+ lib/Xm/GrabShellP.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/Xm/GrabShellP.h b/lib/Xm/GrabShellP.h
+index e258554..92fe508 100644
+--- a/lib/Xm/GrabShellP.h
++++ b/lib/Xm/GrabShellP.h
+@@ -30,7 +30,6 @@
+ #include <Xm/GrabShell.h>
+ #include <Xm/XmP.h>
+ #include <X11/ShellP.h>
+-#include "XmI.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--
+libgit2 0.26.0
+
diff --git a/SOURCES/motifzone_1665.patch b/SOURCES/motifzone_1665.patch
new file mode 100644
index 0000000..26936cf
--- /dev/null
+++ b/SOURCES/motifzone_1665.patch
@@ -0,0 +1,48 @@
+From 5583843084fe8ce68e6e0072e2e85d79bbd8edb8 Mon Sep 17 00:00:00 2001
+From: Carlos Soriano <csoriano@gnome.org>
+Date: Wed, 8 Nov 2017 00:27:55 +0100
+Subject: [PATCH] CascadeBG: Fix shortcuts not working after mouse click
+
+The situation is that when a menu is clicked twice to open and close,
+the shorcuts stop working.
+
+This happens because when the mouse click to close the pop menu finishes,
+it starts a drag. When a drag is started, the bit "wasposted" is set to
+prevent the menu from being messed with.
+
+When the user clicks again with the mouse, this bit is unset and all is
+fine.
+
+However, when using the keyboard this was not unset and when trying to
+select the menu it realized it was in a drag and instead of opening it
+was closing it, effectively preventing to use the shortcuts closing the
+menu while trying to opening it.
+
+There are three possibilities:
+1- Don't start a drag when the pop menu is dismissed
+2- Unset the bit before selecting the menu when arming
+3- Not disarming the menu when the "wasposted" bit is on
+
+This patch goes with the option 2.
+---
+ lib/Xm/CascadeBG.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/Xm/CascadeBG.c b/lib/Xm/CascadeBG.c
+index 720cb732..c08c88d3 100644
+--- a/lib/Xm/CascadeBG.c
++++ b/lib/Xm/CascadeBG.c
+@@ -1394,6 +1394,10 @@ ArmAndActivate(
+ 	  else
+ 	     menuSTrait -> menuBarCleanup((Widget) parent);
+ 
++      /* if we are arming and activating doesn't make sense to have the menu bar
++       * as posted, so clean the state in case we initiated a drag in the last
++       * mouse click event */
++      CBG_SetWasPosted(cb, FALSE);
+ 	  /* do the select without calling the cascading callbacks again */
+ 	  Select (cb, event, FALSE);
+ 
+-- 
+2.14.3
+
diff --git a/SPECS/motif.spec b/SPECS/motif.spec
index 695dda5..dfec059 100644
--- a/SPECS/motif.spec
+++ b/SPECS/motif.spec
@@ -1,7 +1,7 @@
 Summary: Run-time libraries and programs
 Name: motif
 Version: 2.3.4
-Release: 12%{?dist}
+Release: 14%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://downloads.sf.net/motif/motif-%{version}-src.tgz
@@ -38,6 +38,8 @@ Patch50: motif-2.3.4-motifzone_1564-88bdce1.patch
 Patch51: revert-of-motifzone_1565.patch
 Patch52: motifzone_1660.patch
 Patch53: motifzone_1612.patch
+Patch54: motifzone_1665.patch
+Patch55: motif-2.3.6-removed-redundant-includes.patch
 
 Conflicts: lesstif <= 0.92.32-6
 
@@ -84,6 +86,8 @@ This package contains the static Motif libraries.
 %patch51 -p1 -b .revert-of-motifzone_1565
 %patch52 -p1 -b .motifzone_1660
 %patch53 -p1 -b .motifzone_1612
+%patch54 -p1 -b .motifzone_1665
+%patch55 -p1 -b .motif_remove_redundant_includes
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
@@ -138,6 +142,15 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Wed May 30 2018 Carlos Soriano <csoriano@redhat.com> - 2.3.4-14
+- Remove redundant includes that were left by mistake upstream.
+  Resolves: rhbz#1518966
+
+* Wed May 30 2018 Carlos Soriano <csoriano@redhat.com> - 2.3.4-13
+- Fix motifzone 1665. Motif was deactivating shorcuts in cascade menus when
+  closing them by mouse.
+  Resolves: RHBZ#1467303
+
 * Wed Nov 15 2017 Carlos Soriano <csoriano@redhat.com> - 2.3.4-12
 - Fix label size computed wrong within form. Fixes MotifZone#1612.
   Resolves: rhbz#1510534