From 046a52e03be6adcea47fb50ca01142b86c7e8106 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 06:10:16 +0000
Subject: import motif-2.3.4-8.el7


---

diff --git a/SOURCES/motif-2.3.5-motifzone_1654.patch b/SOURCES/motif-2.3.5-motifzone_1654.patch
new file mode 100644
index 0000000..2d5a21e
--- /dev/null
+++ b/SOURCES/motif-2.3.5-motifzone_1654.patch
@@ -0,0 +1,39 @@
+commit 33e0b7fd58ec8ce9fd23d3a66a91e9b4b7c2b928
+Author: Oleksiy Chernyavskyy <ochern@ics.com>
+Date:   Fri Jun 10 23:15:00 2016 +0300
+
+    bug 1654 fix
+
+diff --git a/lib/Xm/LabelG.c b/lib/Xm/LabelG.c
+index b674041..726b095 100644
+--- a/lib/Xm/LabelG.c
++++ b/lib/Xm/LabelG.c
+@@ -35,6 +35,7 @@ static char rcsid[] = "$TOG: LabelG.c /main/24 1999/01/26 15:31:18 mgreess $"
+ #include <config.h>
+ #endif
+ #define FIX_1517
++#define FIX_1654
+ 
+ #include <string.h>
+ #include <stdio.h>
+@@ -2352,12 +2353,20 @@ LRectangle *background_box)
+     if (LabG_StringRect(lw).width < availW - marginal_width)
+     	width = LabG_StringRect(lw).width;
+     else
++#ifdef FIX_1654
++    	width = availW - marginal_width;
++#else
+     	width = availW - marginal_width - x;
++#endif
+ 
+     if (LabG_StringRect(lw).height < availH - marginal_height)
+     	height = LabG_StringRect(lw).height;
+     else
++#ifdef FIX_1654
++    	height = availH - marginal_height;
++#else
+     	height = availH - marginal_height - y;
++#endif
+     
+     XFillRectangle(XtDisplay(lw), XtWindow(lw), LabG_BackgroundGC(lw),
+ 		x, y, width, height);
diff --git a/SOURCES/openmotif-2.3.1-rhbz_997241.patch b/SOURCES/openmotif-2.3.1-rhbz_997241.patch
new file mode 100644
index 0000000..6a2183f
--- /dev/null
+++ b/SOURCES/openmotif-2.3.1-rhbz_997241.patch
@@ -0,0 +1,11 @@
+--- openmotif-2.3.1-old/clients/mwm/WmWinConf.c	2002-01-11 02:25:38.000000000 +0530
++++ openmotif-2.3.1-old/clients/mwm/WmWinConf.c	2013-08-23 12:47:45.000000000 +0530
+@@ -1512,7 +1512,7 @@ DrawSegments (Display *dpy, Window win, 
+  *************************************<->***********************************/
+ void MoveOutline (int x, int y, unsigned int width, unsigned int height)
+ {
+-    if (wmGD.freezeOnConfig)
++    if (wmGD.freezeOnConfig || !wmGD.pActiveSD->moveOpaque)
+     {
+ 	DrawOutline (x, y, width, height);
+     }
diff --git a/SPECS/motif.spec b/SPECS/motif.spec
index 5928442..293b44f 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: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://downloads.sf.net/motif/motif-%{version}-src.tgz
@@ -32,6 +32,8 @@ 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
+Patch48: openmotif-2.3.1-rhbz_997241.patch
+Patch49: motif-2.3.5-motifzone_1654.patch
 
 Conflicts: lesstif <= 0.92.32-6
 
@@ -72,6 +74,8 @@ This package contains the static Motif libraries.
 %patch45 -p1 -b .mwmrc_dir
 %patch46 -p1 -b .bindings
 %patch47 -p1 -b .no_X11R6
+%patch48 -p1 -b .rhbz_997241
+%patch49 -p1 -b .motifzone_1654
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" \
@@ -126,6 +130,12 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Jun 13 2016 Thomas Woerner <twoerner@redhat.com> - 2.3.4-8
+- mwm: do not see outline of window when moving (RHBZ#1080548)
+  Clone of RHBZ#997241
+- Fixed rendering issues seen while scrolling window (RHBZ#1134365)
+  (MotifZone bug #1654)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 2.3.4-7
 - Mass rebuild 2014-01-24