sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (13b5d2a380343329d2f270f1525693a2b06cd480)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (13b5d2a380343329d2f270f1525693a2b06cd480)
- Date: Sun, 29 Mar 2009 12:09:19 -0500
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
editors/nedit/BUILD | 14 -----
editors/nedit/DEPENDS | 8 +--
editors/nedit/DETAILS | 10 ++++
editors/nedit/HISTORY | 7 ++
editors/nedit/nedit-5.5-svrname-in-wmclass.patch | 57
-----------------------
editors/nedit/nedit-accept-lesstif.patch | 11 ++++
editors/nedit/nedit-svrname-in-wmclass.patch | 57
+++++++++++++++++++++++
x11-toolkits/lesstif/DETAILS | 13 +++--
x11-toolkits/lesstif/HISTORY | 7 ++
x11-toolkits/lesstif/PRE_BUILD | 7 --
x11-toolkits/lesstif/c++fix.patch | 20 --------
x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch | 38 ---------------
x11-toolkits/lesstif/scroll.patch | 15 ------
13 files changed, 106 insertions(+), 158 deletions(-)
New commits:
commit 7e59b906ffa473dea63e92e54870839b1cc60606
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
nedit: switch version to snapshot 5.6-20090329
commit defec41a83f4647daeae63e175256d9660520557
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
lesstif: switch to version 0.950.0
(unofficial snapshot, patched to have a working state at least)
diff --git a/editors/nedit/BUILD b/editors/nedit/BUILD
index aac5ba2..aa55ab0 100755
--- a/editors/nedit/BUILD
+++ b/editors/nedit/BUILD
@@ -1,14 +1,2 @@
-if [[ "$NEDIT_WMCLASS" == "y" ]]
-then
- patch -Np1 < ${SCRIPT_DIRECTORY}/nedit-5.5-svrname-in-wmclass.patch
-fi &&
-cd ${SOURCE_DIRECTORY}/makefiles &&
-mv Makefile.linux Makefile.linux.tmp &&
-sed -e "s/CFLAGS\=/CFLAGS:=-DBUILD_UNTESTED_NEDIT -DREPLACE_SCOPE /" \
- -e "s/-DUSE_LPR_PRINT_CMD/& \$\(CFLAGS\)/" \
- -e 's/\(LIBS=.*\) -Wl,-Bstatic -lXm -Wl,-Bdynamic \(.*\)/\1 -lXm \2
-lXft/' \
- Makefile.linux.tmp > Makefile.linux &&
-rm Makefile.linux.tmp &&
cd ${SOURCE_DIRECTORY} &&
-# echo to make build continue in case of untested build warning
-echo | make linux
+make linux
diff --git a/editors/nedit/DEPENDS b/editors/nedit/DEPENDS
index 10519a8..debe4c6 100755
--- a/editors/nedit/DEPENDS
+++ b/editors/nedit/DEPENDS
@@ -1,5 +1,3 @@
-# lesstif screws up at least on alpha:
-# attempt to copy to unlocked clipboard
-# clipboard then unusable until server restart
-# plus nedit folks are notorious about lesstif being problematic
-depends openmotif "" "" z-rejected
+# lesstif builds and works somewhat
+# openmotif would work fine, if it builds
+depends MOTIF
diff --git a/editors/nedit/DETAILS b/editors/nedit/DETAILS
index 71b399c..776d21c 100755
--- a/editors/nedit/DETAILS
+++ b/editors/nedit/DETAILS
@@ -1,10 +1,20 @@
SPELL=nedit
+# Keeping the old info here, to ease update if there is an official release.
+if false; then
VERSION=5.5
BRANCH=`echo ${VERSION}|sed -e 's/\./_/g'`
SOURCE=${SPELL}-${VERSION}-src.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=http://www.nedit.org/ftp/v${BRANCH}/${SOURCE}
SOURCE_HASH=sha512:a1b409024851c2332c0992b5bfb8606c875795f1907a977b245cb2b081a45b53e606f615e413cfa8c34af2df782504e55351ce1a7545b7265958db06038d0858
+else
+ VERSION=5.6-20090329
+ SOURCE=nedit-$VERSION.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/nedit
+ SOURCE_URL[0]=http://sobukus.de/nedit/$SOURCE
+
SOURCE_HASH=sha512:17e6f78e033e599e2267c650c19bea4518ead13dac5f144218701e26a37f899ecd32468c4d58542528dbe1ee71f3187678f331af4713c10f58c065ba6cc10720
+fi
+
WEB_SITE=http://www.nedit.org/
ENTERED=20011120
UPDATED=20011213
diff --git a/editors/nedit/HISTORY b/editors/nedit/HISTORY
index 8fcabae..57a9b4f 100644
--- a/editors/nedit/HISTORY
+++ b/editors/nedit/HISTORY
@@ -1,3 +1,10 @@
+2009-03-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: Switch to snapshot version, to fix various issues and
+ make nedit work at all on x86_64 with lesstif.
+ * DEPENDS: depend on generic MOTIF (true in case openmotif builds)
+ * PRE_BUILD, BUILD: separate out a proper PRE_BUILD file
+ * *.patch: updated for the new source
+
2008-08-26 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: prevent build stall because of query to press enter
diff --git a/editors/nedit/nedit-5.5-svrname-in-wmclass.patch
b/editors/nedit/nedit-5.5-svrname-in-wmclass.patch
deleted file mode 100644
index e89e892..0000000
--- a/editors/nedit/nedit-5.5-svrname-in-wmclass.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ruN nedit-5.5.orig/source/window.c nedit-5.5/source/window.c
---- nedit-5.5.orig/source/window.c 2004-09-16 00:50:58.000000000 +0200
-+++ nedit-5.5/source/window.c 2006-09-21 18:31:45.000000000 +0200
-@@ -144,6 +144,9 @@
- 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x84, 0x01, 0xc4, 0x00, 0x64, 0x00,
- 0xc4, 0x00, 0x84, 0x01, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00};
-
-+/* ThOr: svrname in WM_CLASS hack */
-+static const char* def_wmclass = "textShell";
-+
- extern void _XmDismissTearOff(Widget, XtPointer, XtPointer);
-
- static void hideTooltip(Widget tab);
-@@ -359,9 +362,20 @@
- XtSetArg(al[ac], XmNgeometry, newGeometry[0]=='\0'?NULL:newGeometry);
ac++;
- XtSetArg(al[ac], XmNinitialState,
- iconic ? IconicState : NormalState); ac++;
--
-- winShell = CreateWidget(TheAppShell, "textShell",
-- topLevelShellWidgetClass, al, ac);
-+ {
-+ /* ThOr: I want different WM_CLASS for different servers */
-+ char* wmclass = NULL;
-+ if (GetPrefServerName()[0] != '\0'){
-+ wmclass = (char*) malloc(sizeof(char) *
(strlen(def_wmclass)+strlen(GetPrefServerName())+2));
-+ wmclass[0] = 0;
-+ strcat(wmclass, def_wmclass);
-+ strcat(wmclass, ":");
-+ strcat(wmclass, GetPrefServerName());
-+ }
-+ winShell = CreateWidget(TheAppShell, wmclass == NULL ? def_wmclass :
wmclass,
-+ topLevelShellWidgetClass, al, ac);
-+ if(wmclass != NULL) free(wmclass);
-+ }
- window->shell = winShell;
-
- #ifdef EDITRES
-@@ -2429,7 +2443,8 @@
- WidgetList tabs;
- int tabCount;
-
-- if (strcmp(XtName(children[n]), "textShell") ||
-+ /* ncmp for possible textShell:svrname */
-+ if (strncmp(XtName(children[n]), def_wmclass, 9) ||
- ((topWin = WidgetToWindow(children[n])) == NULL))
- continue; /* skip non-editor windows */
-
-@@ -3407,7 +3422,8 @@
-
- /* get list of tabs in all windows */
- for (n=0; n<nItems; n++) {
-- if (strcmp(XtName(children[n]), "textShell") ||
-+ /* ncmp for possible textShell:svrname */
-+ if (strncmp(XtName(children[n]), def_wmclass, 9) ||
- ((win = WidgetToWindow(children[n])) == NULL))
- continue; /* skip non-text-editor windows */
-
diff --git a/editors/nedit/nedit-accept-lesstif.patch
b/editors/nedit/nedit-accept-lesstif.patch
new file mode 100644
index 0000000..fadbe08
--- /dev/null
+++ b/editors/nedit/nedit-accept-lesstif.patch
@@ -0,0 +1,11 @@
+diff -ruN nedit/util/motif.c nedit.950/util/motif.c
+--- nedit/util/motif.c 2007-08-02 16:13:03.000000000 +0200
++++ nedit.950/util/motif.c 2009-03-25 03:16:54.000000000 +0100
+@@ -74,6 +74,7 @@
+ #ifndef __x86_64
+ "0.93.94", /* 64-bit build .93.94 is broken */
+ #endif
++ "0.950.0",
+ NULL
+ };
+
diff --git a/editors/nedit/nedit-svrname-in-wmclass.patch
b/editors/nedit/nedit-svrname-in-wmclass.patch
new file mode 100644
index 0000000..1ecd208
--- /dev/null
+++ b/editors/nedit/nedit-svrname-in-wmclass.patch
@@ -0,0 +1,57 @@
+diff -ruN nedit.orig/source/window.c nedit/source/window.c
+--- nedit.orig/source/window.c 2008-03-03 23:32:24.000000000 +0100
++++ nedit/source/window.c 2009-01-21 13:41:14.000000000 +0100
+@@ -145,6 +145,9 @@
+ 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x84, 0x01, 0xc4, 0x00, 0x64, 0x00,
+ 0xc4, 0x00, 0x84, 0x01, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00};
+
++/* ThOr: svrname in WM_CLASS hack */
++static const char* def_wmclass = "textShell";
++
+ extern void _XmDismissTearOff(Widget, XtPointer, XtPointer);
+
+ static void hideTooltip(Widget tab);
+@@ -388,8 +391,21 @@
+ XtSetArg(al[ac], XtNy, XT_IGNORE_PPOSITION); ac++;
+ }
+
+- winShell = CreateWidget(TheAppShell, "textShell",
+- topLevelShellWidgetClass, al, ac);
++ {
++ /* ThOr: I want different WM_CLASS for different servers */
++ char* wmclass = NULL;
++ if (GetPrefServerName()[0] != '\0')
++ {
++ wmclass = (char*) malloc(sizeof(char) *
(strlen(def_wmclass)+strlen(GetPrefServerName())+2));
++ wmclass[0] = 0;
++ strcat(wmclass, def_wmclass);
++ strcat(wmclass, ":");
++ strcat(wmclass, GetPrefServerName());
++ }
++ winShell = CreateWidget(TheAppShell, wmclass == NULL ? def_wmclass :
wmclass,
++ topLevelShellWidgetClass, al, ac);
++ if(wmclass != NULL) free(wmclass);
++ }
+ window->shell = winShell;
+
+ #ifdef EDITRES
+@@ -2479,7 +2495,8 @@
+ WidgetList tabs;
+ int tabCount;
+
+- if (strcmp(XtName(children[n]), "textShell") ||
++ /* ncmp for possible textShell:svrname */
++ if (strncmp(XtName(children[n]), def_wmclass, 9) ||
+ ((topWin = WidgetToWindow(children[n])) == NULL))
+ continue; /* skip non-editor windows */
+
+@@ -3507,7 +3524,8 @@
+
+ /* get list of tabs in all windows */
+ for (n=0; n<nItems; n++) {
+- if (strcmp(XtName(children[n]), "textShell") ||
++ /* ncmp for possible textShell:svrname */
++ if (strncmp(XtName(children[n]), def_wmclass, 9) ||
+ ((win = WidgetToWindow(children[n])) == NULL))
+ continue; /* skip non-text-editor windows */
+
diff --git a/x11-toolkits/lesstif/DETAILS b/x11-toolkits/lesstif/DETAILS
index 7111005..383a919 100755
--- a/x11-toolkits/lesstif/DETAILS
+++ b/x11-toolkits/lesstif/DETAILS
@@ -1,12 +1,13 @@
+# To make it clear: Once the official lesstif.sourceforge.net is alive again,
+# one has to consider switching back to the proper upstream.
SPELL=lesstif
- VERSION=0.95.0
-
SOURCE_HASH=sha512:39fffa145f523b913bb30d73c32148b0f0acbded43808ca9e4f397cd9d5d637880cf8506cd4a1561aacf802ac8b8f7b1c84379267d3bb3100066d17f6cb9c6e2
+ VERSION=0.950.0
+
SOURCE_HASH=sha512:09a93361cc625263461311afdeaf45048602952d9057906239e2fcc7256f5bc50c4da8be2d868a069130aa7447bb4961cc626153e985c838a21f4d1fe906dca5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://sobukus.de/lesstif/$SOURCE
LICENSE[0]=LGPL
SECURITY_PATCH=1
- PATCHLEVEL=1
WEB_SITE=http://www.lesstif.org
ENTERED=20011019
SHORT="Lesstif is an LGPL'd implementation of the OSF/Motif GUI
X11 toolkit."
@@ -16,4 +17,8 @@ toolkit for X11. LessTif aims to be source compatible with
the
OSF/Motif versions 1.2 and 2.1. Currently 1.2 support is almost
complete and most Motif 1.2 apps should compile and run out of the
box, whilst 2.1 still has very little functionality.
+
+Note: The version given here is no official lesstif release... it is
constructed from a
+lesstif CVS snapshot plus various patches to make it usable/stable, sort of.
+Hopefully, a future official lesstif release will replace this.
EOF
diff --git a/x11-toolkits/lesstif/HISTORY b/x11-toolkits/lesstif/HISTORY
index dcd5761..0df7e20 100644
--- a/x11-toolkits/lesstif/HISTORY
+++ b/x11-toolkits/lesstif/HISTORY
@@ -1,3 +1,9 @@
+2009-03-29 Thomas Orgs <sobukus AT sourcemage.org>
+ * c++fix.patch, scroll.patch, lesstif-CAN-2005-0605.patch, PRE_BUILD:
+ removed old patches
+ * DETAILS: Switch to snapshot from lesstif CVS with various fixes,
+ dubbed 0.950.0 . Hopefully temporary.
+
2009-02-05 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* xprint.fix.diff: fixes for death of xprint
* PRE_BUILD: apply patch for xprint removal
@@ -124,4 +130,3 @@
2002-06-11 Julian v. Bock <julian AT wongr.net>
* DETAILS: set VERSION to 0.93.34.
-
diff --git a/x11-toolkits/lesstif/PRE_BUILD b/x11-toolkits/lesstif/PRE_BUILD
index 0bae80d..a5cff5a 100755
--- a/x11-toolkits/lesstif/PRE_BUILD
+++ b/x11-toolkits/lesstif/PRE_BUILD
@@ -9,8 +9,5 @@ sed -i 's/ install-htmlDATA//'
doc/lessdox/clients/Makefile.in &&
sed -i 's/ install-htmlDATA//' doc/lessdox/functions/Makefile.in &&
sed -i 's/ install-htmlDATA//' doc/lessdox/widgets/Makefile.in &&
sed -i 's/ install-data-hook//' doc/lessdox/widgets/Makefile.in &&
-patch -p0 < $SCRIPT_DIRECTORY/c++fix.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/scroll.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/lesstif-CAN-2005-0605.patch
-# fixes for xprint death
-patch -p0 < $SPELL_DIRECTORY/xprint.fix.diff
+message "${MESSAGE_COLOR}Death of XPrint...$DEFAULT_COLOR" &&
+patch -p0 < "$SCRIPT_DIRECTORY/xprint.fix.diff"
diff --git a/x11-toolkits/lesstif/c++fix.patch
b/x11-toolkits/lesstif/c++fix.patch
deleted file mode 100644
index 0bf17bd..0000000
--- a/x11-toolkits/lesstif/c++fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/Motif-2.1/Xm/VendorSP.h.BAD 2006-08-30 11:00:30.000000000
-0500
-+++ include/Motif-2.1/Xm/VendorSP.h 2006-08-30
-11:00:47.000000000 -0500
-@@ -28,12 +28,13 @@
-
- #include <Xm/XmP.h>
- #include <Xm/VendorS.h>
--#include <X11/ShellP.h>
-
- #ifdef __cplusplus
- extern "C" {
- #endif
-
-+#include <X11/ShellP.h>
-+
- XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
- Cardinal numResources,
- WidgetClass filterClass,
-
-
diff --git a/x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch
b/x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch
deleted file mode 100644
index cc1ee63..0000000
--- a/x11-toolkits/lesstif/lesstif-CAN-2005-0605.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- lib/Xm-2.1/Xpmscan.c.BAD 2006-08-29 14:34:31.000000000 -0500
-+++ lib/Xm-2.1/Xpmscan.c 2006-08-29 14:36:05.000000000 -0500
-@@ -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-2.1/Xpmcreate.c.BAD 2006-08-29 14:36:13.000000000 -0500
-+++ lib/Xm-2.1/Xpmcreate.c 2006-08-29 14:36:36.000000000 -0500
-@@ -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/x11-toolkits/lesstif/scroll.patch
b/x11-toolkits/lesstif/scroll.patch
deleted file mode 100644
index 75db07d..0000000
--- a/x11-toolkits/lesstif/scroll.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Xm-2.1/Transltns.old 2006-12-31 18:28:29.000000000 +0200
-+++ lib/Xm-2.1/Transltns.c 2006-12-31
-18:29:12.000000000 +0200
-@@ -670,8 +670,8 @@
- /* Scroll wheel */
- "\nShift<Btn4Down>: page-left()"
- "\nShift<Btn5Down>: page-right()"
-- "\n<Btn5Down>: scroll-one-line-up()"
-- "\n<Btn4Down>: scroll-one-line-down()"
-+ "\n<Btn4Down>: scroll-one-line-up()"
-+ "\n<Btn5Down>: scroll-one-line-down()"
- #endif
- ;
-
-
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (13b5d2a380343329d2f270f1525693a2b06cd480), Thomas Orgis, 03/29/2009
Archive powered by MHonArc 2.6.24.