Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8ed39c96bb414a8a8dcc659967185678aaa7ea69)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8ed39c96bb414a8a8dcc659967185678aaa7ea69)
  • Date: Fri, 22 Sep 2006 05:55:25 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

editors/nedit/BUILD | 22 +++++---
editors/nedit/CONFIGURE | 1
editors/nedit/DEPENDS | 6 ++
editors/nedit/DETAILS | 1
editors/nedit/HISTORY | 8 +++
editors/nedit/lesstif-0.94.4-is-ok.patch | 11 ----
editors/nedit/nedit-5.5-svrname-in-wmclass.patch | 57
+++++++++++++++++++++++
7 files changed, 85 insertions(+), 21 deletions(-)

New commits:
commit 8ed39c96bb414a8a8dcc659967185678aaa7ea69
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fix nedit to build again; switch to openmotif, small feature patch (by
myself)

diff --git a/editors/nedit/BUILD b/editors/nedit/BUILD
index b3192d5..fc65df5 100755
--- a/editors/nedit/BUILD
+++ b/editors/nedit/BUILD
@@ -1,9 +1,13 @@
- patch -Np1 < ${SCRIPT_DIRECTORY}/lesstif-0.94.4-is-ok.patch
- cd ${SOURCE_DIRECTORY}/makefiles
&&
- cp Makefile.linux Makefile.linux.orig
&&
- sed "s/CFLAGS\=/CFLAGS:=-DBUILD_UNTESTED_NEDIT -DREPLACE_SCOPE /"
Makefile.linux.orig | \
- sed "s/-DUSE_LPR_PRINT_CMD/& \$\(CFLAGS\)/" |
\
- sed 's/\(LIBS=.*\)/\1 -lXft/' >
\
- Makefile.linux
&&
- cd ${SOURCE_DIRECTORY}
&&
- make linux
\ No newline at end of file
+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} &&
+make linux
diff --git a/editors/nedit/CONFIGURE b/editors/nedit/CONFIGURE
new file mode 100755
index 0000000..d627002
--- /dev/null
+++ b/editors/nedit/CONFIGURE
@@ -0,0 +1 @@
+config_query NEDIT_WMCLASS "Enable hack for server name in WM_CLASS" n
diff --git a/editors/nedit/DEPENDS b/editors/nedit/DEPENDS
index 415c099..c598888 100755
--- a/editors/nedit/DEPENDS
+++ b/editors/nedit/DEPENDS
@@ -1 +1,5 @@
-depends lesstif
+# 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
diff --git a/editors/nedit/DETAILS b/editors/nedit/DETAILS
index 15687b3..59e9d55 100755
--- a/editors/nedit/DETAILS
+++ b/editors/nedit/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SP
ENTERED=20011120
UPDATED=20011213
LICENSE[0]=GPL
+ PATCHLEVEL=1
KEYWORDS="editors"
SHORT="NEdit is a multi-purpose text editor for the X Window
System"
cat << EOF
diff --git a/editors/nedit/HISTORY b/editors/nedit/HISTORY
old mode 100755
new mode 100644
index 8de11dc..cb56c09
--- a/editors/nedit/HISTORY
+++ b/editors/nedit/HISTORY
@@ -1,3 +1,11 @@
+2006-09-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD, DEPENDS, lesstif-0.94.4-is-ok.patch: switched to openmotif
+ as upstream recommends, lesstif patch obsolete, now dynamic linking
+ * CONFIGURE, BUILD, nedit-5.5-svrname-in-wmclass.patch: added
+ feature patch to distinguish server instances by WM_CLASS in
+ window managers
+ * DETAILS: added PATCHLEVEL
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.

diff --git a/editors/nedit/lesstif-0.94.4-is-ok.patch
b/editors/nedit/lesstif-0.94.4-is-ok.patch
deleted file mode 100644
index 1f2e72b..0000000
--- a/editors/nedit/lesstif-0.94.4-is-ok.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru ../nedit-5.5.orig/util/check_lin_tif.c ./util/check_lin_tif.c
---- ../nedit-5.5.orig/util/check_lin_tif.c 2004-07-21 13:32:07.000000000
+0200
-+++ ./util/check_lin_tif.c 2006-02-02 02:45:31.000000000 +0100
-@@ -87,6 +87,7 @@
- "0.93.12",
- "0.93.18",
- "0.93.94",
-+ "0.94.4",
- NULL
- };
-
diff --git a/editors/nedit/nedit-5.5-svrname-in-wmclass.patch
b/editors/nedit/nedit-5.5-svrname-in-wmclass.patch
new file mode 100644
index 0000000..e89e892
--- /dev/null
+++ b/editors/nedit/nedit-5.5-svrname-in-wmclass.patch
@@ -0,0 +1,57 @@
+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 */
+



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (8ed39c96bb414a8a8dcc659967185678aaa7ea69), Thomas Orgis, 09/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page