diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-07-25 22:33:20 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-07-25 22:33:20 +0000 |
| commit | f112eaa9352f761cfa95d050291dbfe80d2d8999 (patch) | |
| tree | e276d91a4f78c6a0112e498c50a4948419f645e6 /x11-libs/openmotif/files | |
| parent | Version bump; remove beta. (diff) | |
| download | gentoo-2-f112eaa9352f761cfa95d050291dbfe80d2d8999.tar.gz gentoo-2-f112eaa9352f761cfa95d050291dbfe80d2d8999.tar.bz2 gentoo-2-f112eaa9352f761cfa95d050291dbfe80d2d8999.zip | |
Fix bugs 215984 and 232742.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 i686)
Diffstat (limited to 'x11-libs/openmotif/files')
| -rw-r--r-- | x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch | 20 | ||||
| -rw-r--r-- | x11-libs/openmotif/files/openmotif-2.3.1-multilist-stipple.patch | 27 |
2 files changed, 47 insertions, 0 deletions
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch b/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch new file mode 100644 index 000000000000..9a7425b24e8f --- /dev/null +++ b/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch @@ -0,0 +1,20 @@ +--- openmotif-2.3.1-orig/lib/Xm/TextF.c 2008-04-22 18:34:22.000000000 +0200 ++++ openmotif-2.3.1/lib/Xm/TextF.c 2008-07-25 23:31:47.000000000 +0200 +@@ -1959,6 +1959,7 @@ + + if (change_stipple) { + valueMask |= GCFillStyle; ++ values.fill_style = FillStippled; + if (stipple) { + #ifdef FIX_1381 + /*added for gray insensitive foreground (instead stipple)*/ +--- openmotif-2.3.1-orig/lib/Xm/TextOut.c 2008-02-11 17:19:52.000000000 +0100 ++++ openmotif-2.3.1/lib/Xm/TextOut.c 2008-07-25 23:31:47.000000000 +0200 +@@ -623,6 +623,7 @@ + values.background = tw->core.background_pixel; + if (change_stipple) { + valueMask |= GCFillStyle; ++ values.fill_style = FillStippled; + if (stipple) { + #ifdef FIX_1381 + /*added for gray insensitive foreground (instead stipple)*/ diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-multilist-stipple.patch b/x11-libs/openmotif/files/openmotif-2.3.1-multilist-stipple.patch new file mode 100644 index 000000000000..125d9009d909 --- /dev/null +++ b/x11-libs/openmotif/files/openmotif-2.3.1-multilist-stipple.patch @@ -0,0 +1,27 @@ +--- openmotif-2.3.1-orig/lib/Xm/I18List.c 2007-09-14 18:29:52.000000000 +0200 ++++ openmotif-2.3.1/lib/Xm/I18List.c 2008-07-25 23:33:23.000000000 +0200 +@@ -2086,12 +2086,7 @@ + values.graphics_exposures = False; + + mask = GCForeground | GCBackground | GCFont | GCGraphicsExposures; +- +-#ifdef FIX_1381 +- smask = mask | GCFillStyle; +-#else + smask = mask | GCStipple | GCFillStyle; +-#endif + + XmI18List_gc(ilist) = XtGetGC(w, mask, &values); + +@@ -2122,11 +2117,6 @@ + XmI18List_entry_background_gc(ilist) = XtGetGC(w, mask, &values); + } + +-#ifdef FIX_1381 +- /*added for gray insensitive foreground (instead stipple)*/ +- values.foreground=_XmAssignInsensitiveColor(w); +-#endif +- + XmI18List_stippled_gc(ilist) = XtGetGC(w, smask, &values); + + if (XmI18List_entry_background_use(ilist)) |