Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (9f0cbca60ecdbafca600f8035ff38f90e2c7e0be)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (9f0cbca60ecdbafca600f8035ff38f90e2c7e0be)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (9f0cbca60ecdbafca600f8035ff38f90e2c7e0be)
  • Date: Fri, 1 Feb 2008 17:36:31 -0600
GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-x11/openmotif/BUILD | 1
z-x11/openmotif/DEPENDS | 4
z-x11/openmotif/DETAILS | 11
-
z-x11/openmotif/HISTORY | 7
z-x11/openmotif/PRE_BUILD | 22
++
z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 |binary
z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 |binary
z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch | 14
+
z-x11/openmotif/patches/openmotif-2.2.3-CAN-2005-0605.patch | 38
+++
z-x11/openmotif/patches/openmotif-2.2.3-XmResizeHashTable.patch | 11
+
z-x11/openmotif/patches/openmotif-2.2.3-automake.patch | 10
z-x11/openmotif/patches/openmotif-2.2.3-char_not_supported.patch | 31
+++
z-x11/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch | 39
+++
z-x11/openmotif/patches/openmotif-2.2.3-no_demos.patch | 101
++++++++++
z-x11/openmotif/patches/openmotif-2.2.3-pixel_length.patch | 11
+
z-x11/openmotif/patches/openmotif-2.2.3-popup_timeout.patch | 12
+
z-x11/openmotif/patches/openmotif-2.2.3-utf8.patch | 77
+++++++
17 files changed, 373 insertions(+), 16 deletions(-)

New commits:
commit 9f0cbca60ecdbafca600f8035ff38f90e2c7e0be
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "openmotif-2.3.0"

This reverts commit 07460b1329645ae355e93575af4e9d42de163c08.

Breaks Sorcery! See Bug #14262

diff --git a/z-x11/openmotif/BUILD b/z-x11/openmotif/BUILD
index 994d729..81eca21 100755
--- a/z-x11/openmotif/BUILD
+++ b/z-x11/openmotif/BUILD
@@ -1,5 +1,4 @@
if ! check_if_xorg_modular_libs ; then
OPTS="--prefix=/usr/X11R6 $OPTS"
fi &&
-make_single &&
default_build
diff --git a/z-x11/openmotif/DEPENDS b/z-x11/openmotif/DEPENDS
index 4514e9d..47e20b5 100755
--- a/z-x11/openmotif/DEPENDS
+++ b/z-x11/openmotif/DEPENDS
@@ -1,7 +1,5 @@
. $GRIMOIRE/FUNCTIONS &&
-depends fontconfig &&
-depends freetype2 &&
-depends expat &&
+
depends X11-LIBS &&

if check_if_xorg_modular_libs ; then
diff --git a/z-x11/openmotif/DETAILS b/z-x11/openmotif/DETAILS
index ee28c5a..6cf830f 100755
--- a/z-x11/openmotif/DETAILS
+++ b/z-x11/openmotif/DETAILS
@@ -1,11 +1,12 @@
SPELL=openmotif
- VERSION=2.3.0
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.ics.com/openmotif/${VERSION//.0}/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:f560c9b150c260c3633ac02cf3e3dd6f3dfb564560c2ac2d4f5806b32e4b3ddc2ac67953fded9355bf546fe696f9d32b2f71c95e3f13f8f15182a14fdf5fd80d
+ VERSION=2.2.3
+ SOURCE=openMotif-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/openMotif-$VERSION
+ SOURCE_URL[0]=http://ftp.motifzone.net/om${VERSION}/src/$SOURCE
+
SOURCE_HASH=sha512:322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
WEB_SITE=http://www.motifzone.net/
ENTERED=20020510
+ PATCHLEVEL=1
LICENSE[0]=http://www.opengroup.org/openmotif/license
KEYWORDS="x11 libs"
SHORT="OSF/Motif GUI X11 toolkit"
diff --git a/z-x11/openmotif/HISTORY b/z-x11/openmotif/HISTORY
index 799d529..f75c371 100644
--- a/z-x11/openmotif/HISTORY
+++ b/z-x11/openmotif/HISTORY
@@ -1,10 +1,3 @@
-2008-01-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.3.0
- new url
- * PRE_BUILD, patches: delete
- * DEPENDS: add fontconfig. freetype2, expat
- * BUILD: add make_single
-
2006-09-27 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: FUNCTIONS is not sourced here automatically, so source it
for
check_if_xorg_modular_libs().
diff --git a/z-x11/openmotif/PRE_BUILD b/z-x11/openmotif/PRE_BUILD
new file mode 100755
index 0000000..00407b8
--- /dev/null
+++ b/z-x11/openmotif/PRE_BUILD
@@ -0,0 +1,22 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-mwm-configdir.patch
&&
+bzcat
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 |
patch -p1 &&
+bzcat
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 |
patch -p0 &&
+patch -p1 <
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch &&
+patch -p1 <
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-char_not_supported.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-pixel_length.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-popup_timeout.patch
&&
+patch -p0 <
${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-XmResizeHashTable.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-utf8.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-no_demos.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-automake.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patches/openmotif-2.2.3-CAN-2005-0605.patch
&&
+
+# autotool stuff
+#export WANT_AUTOCONF=2.5 &&
+
+libtoolize --force --copy &&
+aclocal &&
+automake -a -c -f --foreign &&
+autoconf
diff --git
a/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2
new file mode 100644
index 0000000..b61d8e0
Binary files /dev/null and
b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 differ
diff --git
a/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2
b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2
new file mode 100644
index 0000000..f00beea
Binary files /dev/null and
b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 differ
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch
new file mode 100644
index 0000000..0bf4bcb
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2004-0914_sec8.patch
@@ -0,0 +1,14 @@
+--- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c.CAN-2004-0914_sec8 2004-11-29
15:04:10.105373839 +0100
++++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c 2004-11-29 15:04:10.150367679 +0100
+@@ -322,10 +322,7 @@
+ #ifndef NO_ZPIPE
+ size_t len = strlen(filename);
+
+- if(len == 0 ||
+- filename[0] == '/' ||
+- strstr(filename, "../") != NULL ||
+- filename[len-1] == '/')
++ if(len == 0)
+ return(XpmOpenFailed);
+
+ if (len > 2 && !strcmp(".Z", filename + (len - 2))) {
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2005-0605.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2005-0605.patch
new file mode 100644
index 0000000..f70a884
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-CAN-2005-0605.patch
@@ -0,0 +1,38 @@
+--- lib/Xm/Xpmscan.c.orig 2005-03-02 17:00:16.415070960 +0100
++++ lib/Xm/Xpmscan.c 2005-03-02 17:01:38.949709879 +0100
+@@ -672,8 +672,8 @@
+ char *dst;
+ unsigned int *iptr;
+ char *data;
+- unsigned int x, y, i;
+- int bits, depth, ibu, ibpp, offset;
++ unsigned int x, y;
++ int bits, depth, ibu, ibpp, offset, i;
+ unsigned long lbt;
+ Pixel pixel, px;
+
+@@ -684,6 +684,9 @@
+ ibpp = image->bits_per_pixel;
+ offset = image->xoffset;
+
++ if (image->bitmap_unit < 0)
++ return (XpmNoMemory);
++
+ if ((image->bits_per_pixel | image->depth) == 1) {
+ ibu = image->bitmap_unit;
+ for (y = 0; y < height; y++)
+--- lib/Xm/Xpmcreate.c.orig 2005-03-02 17:02:00.626412844 +0100
++++ lib/Xm/Xpmcreate.c 2005-03-02 17:02:35.183562480 +0100
+@@ -1265,10 +1265,10 @@
+ register char *src;
+ register char *dst;
+ register unsigned int *iptr;
+- register unsigned int x, y, i;
++ register unsigned int x, y;
+ register char *data;
+ Pixel pixel, px;
+- int nbytes, depth, ibu, ibpp;
++ int nbytes, depth, ibu, ibpp, i;
+
+ data = image->data;
+ iptr = pixelindex;
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-XmResizeHashTable.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-XmResizeHashTable.patch
new file mode 100644
index 0000000..5982f72
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-XmResizeHashTable.patch
@@ -0,0 +1,11 @@
+--- lib/Xm/Hash.c
++++ lib/Xm/Hash.c
+@@ -198,6 +198,8 @@
+ } else {
+ table -> buckets[index] = current;
+ }
++ } else {
++ last = current;
+ }
+ current = next;
+ }
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-automake.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-automake.patch
new file mode 100644
index 0000000..ed8fc14
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-automake.patch
@@ -0,0 +1,10 @@
+--- clients/uil/Makefile.am Fri Aug 15 04:56:19 2003
++++ clients/uil/Makefile.am.new Tue Feb 8 12:06:15 2005
+@@ -65,6 +65,7 @@
+ lib_LTLIBRARIES = libUil.la
+
+ libUil_la_SOURCES = $(SRCS)
++libUil_la_CFLAGS = $(AM_CFLAGS)
+
+ libUil_la_DEPENDENCIES = UilDBDef.h UilParser.lo
+
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-char_not_supported.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-char_not_supported.patch
new file mode 100644
index 0000000..edd841b
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-char_not_supported.patch
@@ -0,0 +1,31 @@
+--- openMotif-2.2.3/lib/Xm/TextF.c.char_not_supported 2004-06-03
12:59:10.241822710 +0200
++++ openMotif-2.2.3/lib/Xm/TextF.c 2004-06-03 13:02:18.987890852 +0200
+@@ -3723,20 +3723,17 @@
+ cache_ptr = tmp = XmStackAlloc(buf_size, cache);
+
+ tmp_str = (wchar_t *)str;
+- ret_val = wctomb(tmp, *tmp_str);
++ // Fixed MZ BZ#1257: by Brad Despres <brad AT sd.aonix.com>
+ count = 0;
+- while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) )
+- {
+- count += 1;
+- tmp += ret_val;
+- buf_size -= ret_val;
+- tmp_str++;
+- ret_val = wctomb(tmp, *tmp_str);
+- }
+-
++ do {
++ ret_val = wctomb(tmp, *tmp_str);
++ count += 1;
++ tmp += ret_val;
++ buf_size -= ret_val;
++ tmp_str++;
++ } while ( (ret_val > 0)&& (buf_size >= MB_CUR_MAX) && (count < n) ) ;
+ if (ret_val == -1) /* bad character */
+ return (False);
+-
+ is_printable = XTextWidth(TextF_Font(tf), cache_ptr, tmp - cache_ptr);
+ XmStackFree(cache_ptr, cache);
+ return (is_printable);
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch
new file mode 100644
index 0000000..c83f34a
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch
@@ -0,0 +1,39 @@
+diff -urN openMotif-2.2.2.orig/clients/mwm/WmResParse.c
openMotif-2.2.2/clients/mwm/WmResParse.c
+--- openMotif-2.2.2.orig/clients/mwm/WmResParse.c 2002-01-10
21:55:37.000000000 +0100
++++ openMotif-2.2.2/clients/mwm/WmResParse.c 2003-06-04 22:20:22.000000000
+0200
+@@ -2411,7 +2411,7 @@
+ if (MwmBehavior)
+ {
+ strcpy(cfileName, LIBDIR);
+- strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
++ strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
+ strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
+ strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+ }
+@@ -2427,7 +2427,7 @@
+ * Try /$LANG/system.mwmrc within the install tree
+ */
+ strcpy(cfileName, LIBDIR);
+- strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
++ strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
+ strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
+ strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+ #endif /* WSM */
+@@ -2449,7 +2449,7 @@
+ if (MwmBehavior)
+ {
+ strcpy(cfileName, LIBDIR);
+- strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
++ strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+ #ifdef PANELIST
+ fileP = fopen (cfileName, "r");
+ #else /* PANELIST */
+@@ -2473,7 +2473,7 @@
+ * Try /system.mwmrc within the install tree
+ */
+ strcpy(cfileName, LIBDIR);
+- strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
++ strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
+
+ if (LANG != NULL)
+ {
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-no_demos.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-no_demos.patch
new file mode 100644
index 0000000..d0a3969
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-no_demos.patch
@@ -0,0 +1,101 @@
+--- openmotif/configure.in.no_demos 2003-09-19 18:40:33.000000000 +0200
++++ openmotif/configure.in 2003-12-16 12:16:33.000000000 +0100
+@@ -259,88 +259,4 @@
+ doc/man/man5/Makefile \
+ tools/Makefile \
+ tools/wml/Makefile \
+-demos/Makefile \
+-demos/lib/Makefile \
+-demos/lib/Xmd/Makefile \
+-demos/lib/Wsm/Makefile \
+-demos/lib/Exm/Makefile \
+-demos/lib/Exm/wml/Makefile \
+-demos/programs/Makefile \
+-demos/programs/Exm/Makefile \
+-demos/programs/Exm/app_in_c/Makefile \
+-demos/programs/Exm/app_in_uil/Makefile \
+-demos/programs/Exm/simple_app/Makefile \
+-demos/programs/airport/Makefile \
+-demos/programs/animate/Makefile \
+-demos/programs/drag_and_drop/Makefile \
+-demos/programs/draw/Makefile \
+-demos/programs/earth/Makefile \
+-demos/programs/filemanager/Makefile \
+-demos/programs/fileview/Makefile \
+-demos/programs/getsubres/Makefile \
+-demos/programs/hellomotif/Makefile \
+-demos/programs/hellomotifi18n/Makefile \
+-demos/programs/hellomotifi18n/C/Makefile \
+-demos/programs/hellomotifi18n/C/uid/Makefile \
+-demos/programs/hellomotifi18n/english/Makefile \
+-demos/programs/hellomotifi18n/english/uid/Makefile \
+-demos/programs/hellomotifi18n/french/Makefile \
+-demos/programs/hellomotifi18n/french/uid/Makefile \
+-demos/programs/hellomotifi18n/hebrew/Makefile \
+-demos/programs/hellomotifi18n/hebrew/uid/Makefile \
+-demos/programs/hellomotifi18n/japan/Makefile \
+-demos/programs/hellomotifi18n/japan/uid/Makefile \
+-demos/programs/hellomotifi18n/japanese/Makefile \
+-demos/programs/hellomotifi18n/japanese/uid/Makefile \
+-demos/programs/hellomotifi18n/swedish/Makefile \
+-demos/programs/hellomotifi18n/swedish/uid/Makefile \
+-demos/programs/i18ninput/Makefile \
+-demos/programs/panner/Makefile \
+-demos/programs/periodic/Makefile \
+-demos/programs/piano/Makefile \
+-demos/programs/popups/Makefile \
+-demos/programs/sampler2_0/Makefile \
+-demos/programs/setdate/Makefile \
+-demos/programs/todo/Makefile \
+-demos/programs/workspace/Makefile \
+-demos/programs/tooltips/Makefile \
+-demos/programs/FontSel/Makefile \
+-demos/programs/ButtonBox/Makefile \
+-demos/programs/ColorSel/Makefile \
+-demos/programs/Column/Makefile \
+-demos/programs/DropDown/Makefile \
+-demos/programs/MultiList/Makefile \
+-demos/programs/MultiList/pixmaps/Makefile \
+-demos/programs/IconB/Makefile \
+-demos/programs/Outline/Makefile \
+-demos/programs/Paned/Makefile \
+-demos/programs/TabStack/Makefile \
+-demos/programs/Tree/Makefile \
+-demos/programs/pixmaps/Makefile \
+-demos/unsupported/Makefile \
+-demos/unsupported/Exm/Makefile \
+-demos/unsupported/aicon/Makefile \
+-demos/unsupported/dainput/Makefile \
+-demos/unsupported/dogs/Makefile \
+-demos/unsupported/hellomotif/Makefile \
+-demos/unsupported/motifshell/Makefile \
+-demos/unsupported/uilsymdump/Makefile \
+-demos/unsupported/xmapdef/Makefile \
+-demos/unsupported/xmfonts/Makefile \
+-demos/unsupported/xmforc/Makefile \
+-demos/unsupported/xmform/Makefile \
+-demos/doc/Makefile \
+-demos/doc/programGuide/Makefile \
+-demos/doc/programGuide/ch05/Makefile \
+-demos/doc/programGuide/ch05/Scale/Makefile \
+-demos/doc/programGuide/ch06/Makefile \
+-demos/doc/programGuide/ch06/spin_box/Makefile \
+-demos/doc/programGuide/ch06/combo_box/Makefile \
+-demos/doc/programGuide/ch08/Makefile \
+-demos/doc/programGuide/ch08/Notebook/Makefile \
+-demos/doc/programGuide/ch08/Container/Makefile \
+-demos/doc/programGuide/ch16/Makefile \
+-demos/doc/programGuide/ch17/Makefile \
+-demos/doc/programGuide/ch17/simple_drop/Makefile \
+-demos/doc/programGuide/ch17/simple_drag/Makefile \
+ ])
+--- openmotif/Makefile.am.no_demos 2003-12-16 12:17:02.000000000 +0100
++++ openmotif/Makefile.am 2003-12-16 12:17:03.000000000 +0100
+@@ -28,6 +28,5 @@
+ include \
+ tools \
+ clients \
+- doc \
+- demos
++ doc
+ AUTOMAKE_OPTIONS = 1.4
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-pixel_length.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-pixel_length.patch
new file mode 100644
index 0000000..7aba08b
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-pixel_length.patch
@@ -0,0 +1,11 @@
+--- openMotif-2.2.3/lib/Xm/DataF.c.pixel_length 2004-06-03
15:11:52.932820812 +0200
++++ openMotif-2.2.3/lib/Xm/DataF.c 2004-06-03 15:12:27.323091126 +0200
+@@ -8648,7 +8648,7 @@
+ curr_str++;
+ i++;
+ } else {
+- wchar_t tmp;
++ wchar_t tmp[XmTextF_max_char_size(tf)+1];
+ int num_conv;
+ num_conv = mbtowc(&tmp, curr_str, XmTextF_max_char_size(tf));
+ if (num_conv >= 0 && df_FindPixelLength(tf, (char*) &tmp, 1)) {
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-popup_timeout.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-popup_timeout.patch
new file mode 100644
index 0000000..f216abe
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-popup_timeout.patch
@@ -0,0 +1,12 @@
+--- openMotif-2.2.3/lib/Xm/MenuUtil.c.popup_timeout 2002-01-31
15:49:35.000000000 +0100
++++ openMotif-2.2.3/lib/Xm/MenuUtil.c 2004-06-08 17:14:46.311285603 +0200
+@@ -156,6 +156,9 @@
+ cursor, time)) == GrabSuccess)
+ break;
+
++ if (status == GrabInvalidTime)
++ time = CurrentTime;
++
+ XmeMicroSleep(1000);
+ }
+ if (status != GrabSuccess)
diff --git a/z-x11/openmotif/patches/openmotif-2.2.3-utf8.patch
b/z-x11/openmotif/patches/openmotif-2.2.3-utf8.patch
new file mode 100644
index 0000000..bb7c7f8
--- /dev/null
+++ b/z-x11/openmotif/patches/openmotif-2.2.3-utf8.patch
@@ -0,0 +1,77 @@
+--- openMotif-2.2.3/tools/wml/UilSymCSet.h.utf8 2004-03-04
17:41:48.000000000 +0100
++++ openMotif-2.2.3/tools/wml/UilSymCSet.h 2004-03-17 12:54:23.000000000
+0100
+@@ -32,6 +32,7 @@
+ "JISX0201.1976-0", /* jis_katakana */
+ "KSC5601.1987-0", /* ksc_hangul */
+ "KSC5601.1987-1", /* ksc_hangul_gr */
++ "UTF-8", /* utf-8 */
+ };
+ externaldef(uil_sym_glbl) char **charset_xmstring_names_table =
+ charset_xmstring_names_table_vec;
+@@ -66,6 +67,7 @@
+ XmSTRING_DIRECTION_L_TO_R, /* jis_katakana */
+ XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul */
+ XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul_gr */
++ XmSTRING_DIRECTION_L_TO_R, /* utf-8 */
+ };
+ externaldef(uil_sym_glbl) unsigned char *charset_writing_direction_table =
+ charset_wrdirection_table_vec;
+@@ -100,6 +102,7 @@
+ XmSTRING_DIRECTION_L_TO_R, /* jis_katakana */
+ XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul */
+ XmSTRING_DIRECTION_L_TO_R, /* ksc_hangul_gr */
++ XmSTRING_DIRECTION_L_TO_R, /* utf-8 */
+ };
+ externaldef(uil_sym_glbl) unsigned char *charset_parsing_direction_table =
+ charset_parsdirection_table_vec;
+@@ -134,6 +137,7 @@
+ sym_k_onebyte_charsize, /* jis_katakana */
+ sym_k_twobyte_charsize, /* ksc_hangul */
+ sym_k_twobyte_charsize, /* ksc_hangul_gr */
++ sym_k_onebyte_charsize, /* utf-8 */
+ };
+ externaldef(uil_sym_glbl) unsigned char *charset_character_size_table =
+ charset_charsize_table_vec;
+@@ -215,6 +219,7 @@
+ "KSC_HANGUL_GL", /* ksc_hangul */
+ "KSC_HANGUL_GR", /* ksc_hangul_gr */
+ "KSC5601.1987-1", /* ksc_hangul_gr */
++ "UTF-8", /* utf-8 */
+ };
+ externaldef(uil_sym_glbl) char **charset_lang_names_table =
+ charset_lang_names_table_vec;
+@@ -295,10 +300,11 @@
+ sym_k_ksc_hangul_charset,
+ sym_k_ksc_hangul_gr_charset,
+ sym_k_ksc_hangul_gr_charset,
++ sym_k_utf8_charset,
+ };
+ externaldef(uil_sym_glbl) unsigned short int *charset_lang_codes_table =
+ charset_lang_codes_table_vec;
+ /*
+ * The number of entries in charset_lang_..._table tables
+ */
+-externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 72;
++externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 73;
+--- openMotif-2.2.3/tools/wml/UilSymGen.h.utf8 2004-03-04 17:41:48.000000000
+0100
++++ openMotif-2.2.3/tools/wml/UilSymGen.h 2004-03-17 12:54:23.000000000
+0100
+@@ -1417,6 +1417,7 @@
+ #define sym_k_jis_katakana_charset 21
+ #define sym_k_ksc_hangul_charset 22
+ #define sym_k_ksc_hangul_gr_charset 23
++#define sym_k_utf8_charset 24
+
+ /* Define literals for automatic children */
+
+--- openMotif-2.2.3/tools/wml/motif.wml.utf8 2003-10-08 23:07:47.000000000
+0200
++++ openMotif-2.2.3/tools/wml/motif.wml 2004-03-17 12:56:09.000000000
+0100
+@@ -163,6 +163,9 @@
+ ksc_hangul_gr
+ { XmStringCharsetName = "KSC5601.1987-1";
+ CharacterSize = TwoByte; };
++ utf8
++ { XmStringCharsetName = "UTF-8"; };
++
+ XmFONTLIST_DEFAULT_TAG
+ { FontListElementTag = XmFONTLIST_DEFAULT_TAG; };
+


Archive powered by MHonArc 2.6.24.

Top of Page