From 3edce2a0c0dede80d3b0c96cfd0c8e7c19a5021c Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 24 Jul 2012 17:51:29 -0600 Subject: [PATCH 1/6] sys.resources.src: make HIGH_COLOR the default --- cde/programs/dtsession/sys.resources.src | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cde/programs/dtsession/sys.resources.src b/cde/programs/dtsession/sys.resources.src index e61b28cfb..1b25c16fc 100644 --- a/cde/programs/dtsession/sys.resources.src +++ b/cde/programs/dtsession/sys.resources.src @@ -117,6 +117,14 @@ Dtfile*dirHeight: 400 XCOMM endif XCOMM endif +!################################################################# +!# +!# Default ColorUse resource +!# +!################################################################# + +*ColorUse: HIGH_COLOR + !################################################################# !# !# Motif resources From ff0dc919ed59aec57dd7dea5fd40da042606a8fe Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 24 Jul 2012 17:53:57 -0600 Subject: [PATCH 2/6] localized/templates: remove remaining attempts at building dtinfo related catalogs and other files Attempts were still being made to build dtinfo.cat and other related dtinfo files. This could cause build failures in programs/localized/... --- .../localized/templates/app-defaults.tmpl | 15 ++++++++++++++- cde/programs/localized/templates/msg.C.tmpl | 14 ++++++++++++-- cde/programs/localized/templates/types.tmpl | 18 +++++++++++++++++- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/cde/programs/localized/templates/app-defaults.tmpl b/cde/programs/localized/templates/app-defaults.tmpl index b0e14be81..c835823e0 100644 --- a/cde/programs/localized/templates/app-defaults.tmpl +++ b/cde/programs/localized/templates/app-defaults.tmpl @@ -8,6 +8,13 @@ SHELL=/bin/ksh .NO_PARALLEL: #endif +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd +DTINFO= +#else +DTINFO="Dtinfo" +#endif + OBJS = \ Dthelpview \ Dtimsstart \ @@ -26,7 +33,7 @@ OBJS = \ Dtterm \ Dtmail \ Dtbuilder \ - Dtinfo \ + $(DTINFO) \ Dtudcfonted \ Dt @@ -49,7 +56,10 @@ LinkFile(Dtcm.nls,$(CDESRC)/dtcm/dtcm/Dtcm.ad) LinkFile(Dtterm.nls,$(CDESRC)/dtterm/Dtterm.ad) LinkFile(Dtmail.nls,$(CDESRC)/dtmail/dtmail/Dtmail) LinkFile(Dtbuilder.nls,$(CDESRC)/dtappbuilder/src/ab/Dtbuilder.ad) +#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd LinkFile(Dtinfo.nls,$(CDESRC)/dtinfo/dtinfo/src/Dtinfo) +#endif LinkFile(Dtudcfonted.nls,$(CDESRC)/dtudcfonted/resource/Dtudcfonted) LinkFile(Dt.nls,$(DTSVCSRC)/DtUtil2/Dt.ad) @@ -70,7 +80,10 @@ DtstyleDescRule(Dtcm,Dtcm) DtstyleDescRule(Dtterm,Dtterm) DtstyleDescRule(Dtmail,Dtmail) DtstyleDescRule(Dtbuilder,Dtbuilder) +#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd DtstyleDescRule(Dtinfo,Dtinfo) +#endif DtstyleDescRule(Dtudcfonted,Dtudcfonted) DtstyleDescRule(Dt,Dt) diff --git a/cde/programs/localized/templates/msg.C.tmpl b/cde/programs/localized/templates/msg.C.tmpl index b0ae5cb4a..aa1a88ddd 100644 --- a/cde/programs/localized/templates/msg.C.tmpl +++ b/cde/programs/localized/templates/msg.C.tmpl @@ -8,6 +8,14 @@ SHELL=/bin/ksh .NO_PARALLEL: #endif +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd +DTINFOCATS= +#else +DTINFOCATS="dtinfo.cat dtinfo_start.cat" +#endif + + OBJS= \ Xm.cat \ Mrm.cat \ @@ -34,8 +42,7 @@ OBJS= \ dthelpprint.cat \ dticon.cat \ dtimsstart.cat \ - dtinfo.cat \ - dtinfo_start.cat \ + $(DTINFOCATS) \ dtksh.cat \ dtlogin.cat \ dtlp.cat \ @@ -86,8 +93,11 @@ LinkFile(dthelpgen.msg,$(CDESRC)/dthelp/dthelpgen/dthelpgen.msg) LinkFile(dthelpprint.msg,$(CDESRC)/dthelp/dthelpprint/dthelpprint.msg) LinkFile(dticon.msg,$(CDESRC)/dticon/dticon.msg) LinkFile(dtimsstart.msg,$(CDESRC)/dtimsstart/dtimsstart.msg) +#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd LinkFile(dtinfo.msg,$(CDESRC)/dtinfo/dtinfo/src/dtinfo.msg.updated) LinkFile(dtinfo_start.msg,$(CDESRC)/dtinfo/clients/dtinfo_start/dtinfo_start.msg) +#endif LinkFile(dtksh.msg,$(CDESRC)/dtksh/dtksh.msg) LinkFile(dtlogin.msg,$(CDESRC)/dtlogin/dtlogin.msg) LinkFile(dtlp.msg,$(CDESRC)/dtprintegrate/dtlp.msg) diff --git a/cde/programs/localized/templates/types.tmpl b/cde/programs/localized/templates/types.tmpl index f8315d733..f20d20978 100644 --- a/cde/programs/localized/templates/types.tmpl +++ b/cde/programs/localized/templates/types.tmpl @@ -4,6 +4,13 @@ XCOMM $TOG: types.tmpl /main/9 1998/08/05 18:05:45 mgreess $ SHELL=/bin/ksh #endif +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd +DTINFODT= +#else +DTINFODT="dtinfo.dt" +#endif + OBJS1 = \ autoStart.dt \ user-prefs.dt \ @@ -14,7 +21,7 @@ OBJS1 = \ dtappman.dt \ dtfile.dt \ dtims.dt \ - dtinfo.dt \ + $(DTINFODT) \ dtpad.dt \ xclients.dt \ dthelp.dt \ @@ -56,7 +63,10 @@ LinkFile(datatypes.dt.nls,$(CDESRC)/types/datatypes.dt) LinkFile(dtappman.dt.nls,$(CDESRC)/types/dtappman.dt) LinkFile(dtfile.dt.nls,$(CDESRC)/types/dtfile.dt) LinkFile(dtims.dt.nls,$(CDESRC)/types/dtims.dt) +#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd LinkFile(dtinfo.dt.nls,$(CDESRC)/types/dtinfo.dt) +#endif LinkFile(dtpad.dt.nls,$(CDESRC)/types/dtpad.dt) LinkFile(xclients.dt.nls,$(CDESRC)/types/xclients.dt) LinkFile(dthelp.dt.nls,$(CDESRC)/types/dthelp.dt) @@ -89,7 +99,10 @@ LinkFile(datatypes.dt.tmsg,_common.dt.tmsg) LinkFile(dtappman.dt.tmsg,_common.dt.tmsg) LinkFile(dtfile.dt.tmsg,_common.dt.tmsg) LinkFile(dtims.dt.tmsg,_common.dt.tmsg) +#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd LinkFile(dtinfo.dt.tmsg,_common.dt.tmsg) +#endif LinkFile(dtpad.dt.tmsg,_common.dt.tmsg) LinkFile(xclients.dt.tmsg,_common.dt.tmsg) LinkFile(dthelp.dt.tmsg,_common.dt.tmsg) @@ -121,7 +134,10 @@ DtstyleDescRule(datatypes.dt,datatypes.dt) DtstyleDescRule(dtappman.dt,dtappman.dt) DtstyleDescRule(dtfile.dt,dtfile.dt) DtstyleDescRule(dtims.dt,dtims.dt) +#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture) +XCOMM no dtinfo for linux/fbsd DtstyleDescRule(dtinfo.dt,dtinfo.dt) +#endif DtstyleDescRule(dtpad.dt,dtpad.dt) DtstyleDescRule(xclients.dt,xclients.dt) DtstyleDescRule(dthelp.dt,dthelp.dt) From 56d6a7a2c92a9b2e9196341228b32d7c9431ab3a Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 24 Jul 2012 18:15:09 -0600 Subject: [PATCH 3/6] CDE-MIN: copy the 'COPYING' file to /usr/dt/ on install --- cde/databases/CDE-MIN.udb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cde/databases/CDE-MIN.udb b/cde/databases/CDE-MIN.udb index 630b856bb..75526e94f 100644 --- a/cde/databases/CDE-MIN.udb +++ b/cde/databases/CDE-MIN.udb @@ -177,6 +177,16 @@ copyright install_target = /usr/dt/copyright } +# +#>>----------------------------- +# the COPYING file +#<<----------------------------- +# +COPYING +{ default + install_target = /usr/dt/COPYING +} + # # PAM configuration file. # From 427c1035d368573b9c5ded3a4d026bb23deb5bc0 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 24 Jul 2012 18:49:11 -0600 Subject: [PATCH 4/6] copy CONTRIBUTORS file into /usr/dt/ during install --- cde/databases/CDE-MIN.udb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cde/databases/CDE-MIN.udb b/cde/databases/CDE-MIN.udb index 75526e94f..e6542efa3 100644 --- a/cde/databases/CDE-MIN.udb +++ b/cde/databases/CDE-MIN.udb @@ -175,6 +175,7 @@ copyright { default install_target = /usr/dt/copyright + mode = 0644 } # @@ -185,6 +186,18 @@ copyright COPYING { default install_target = /usr/dt/COPYING + mode = 0644 +} + +# +#>>----------------------------- +# the CONTRIBUTORS file +#<<----------------------------- +# +CONTRIBUTORS +{ default + install_target = /usr/dt/CONTRIBUTORS + mode = 0644 } # From f3be2367671b1d68adfd5f31d0a17f546be48ef4 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 24 Jul 2012 20:48:43 -0600 Subject: [PATCH 5/6] Dtwm.defs.src: set proper mail file path for linux --- cde/programs/dtwm/Dtwm.defs.src | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cde/programs/dtwm/Dtwm.defs.src b/cde/programs/dtwm/Dtwm.defs.src index 52c89e1da..fe1fe02f3 100644 --- a/cde/programs/dtwm/Dtwm.defs.src +++ b/cde/programs/dtwm/Dtwm.defs.src @@ -186,6 +186,8 @@ Dtwm*VersionDialog_popup*columns: %|nls-6-40^columns| !#### #ifdef __osf__ Dtwm*Mail*fileName: /usr/spool/mail/$LOGNAME +#elif defined(linux) +Dtwm*Mail*fileName: /var/mail/$LOGNAME #else !# Dtwm*Mail*fileName: /usr/mail/$LOGNAME #endif From 80559fcfdd2cafa49496fda33853ee8d5f186c75 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 24 Jul 2012 21:21:27 -0600 Subject: [PATCH 6/6] dtwm: add missing workspace 'Occupy" commands to the C, de, es, fr, and it locales. The dtwm DefaultWindowMenu did not list any of the workspace enabled Occupy commands, which makes it a bit difficult to move windows into a workspace, or to occupy multiple workspaces. This was rectified by copying the relevant lines from the SampleWindowMenu sections containing them that already existed in the localized files. Tested on C and DE (German). --- cde/programs/localized/C/config/sys.dtwmrc.tmsg | 4 ++++ cde/programs/localized/de_DE.ISO8859-1/config/sys.dtwmrc.tmsg | 4 ++++ cde/programs/localized/es_ES.ISO8859-1/config/sys.dtwmrc.tmsg | 4 ++++ cde/programs/localized/fr_FR.ISO8859-1/config/sys.dtwmrc.tmsg | 4 ++++ cde/programs/localized/it_IT.ISO8859-1/config/sys.dtwmrc.tmsg | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/cde/programs/localized/C/config/sys.dtwmrc.tmsg b/cde/programs/localized/C/config/sys.dtwmrc.tmsg index 2a7dbb167..98c4f627d 100644 --- a/cde/programs/localized/C/config/sys.dtwmrc.tmsg +++ b/cde/programs/localized/C/config/sys.dtwmrc.tmsg @@ -135,6 +135,10 @@ $ *--------------------------------------------------------------------------* "Minimize" _n AltF9 f.minimize\n\ "Maximize" _x AltF10 f.maximize\n\ "Lower" _L AltF3 f.lower\n\ + no-label f.separator\n\ + "Occupy Workspace..." _O f.workspace_presence\n\ + "Occupy All Workspaces" _A f.occupy_all\n\ + "Unoccupy Workspace" _U f.remove\n\ no-label f.separator\n\ "Close" _C AltF4 f.kill $ * diff --git a/cde/programs/localized/de_DE.ISO8859-1/config/sys.dtwmrc.tmsg b/cde/programs/localized/de_DE.ISO8859-1/config/sys.dtwmrc.tmsg index 1a108be87..0a9e13f28 100644 --- a/cde/programs/localized/de_DE.ISO8859-1/config/sys.dtwmrc.tmsg +++ b/cde/programs/localized/de_DE.ISO8859-1/config/sys.dtwmrc.tmsg @@ -142,6 +142,10 @@ $ *--------------------------------------------------------------------------* \"Symbolgröße\"\t_S\tAltF9\tf.minimize\n\ \"Maximale Größe\"\t_M\tAltF10\tf.maximize\n\ \"Nach hinten\"\t_u\tAltF3\tf.lower\n\ + no-label\t\t\t\t\t\tf.separator\n\ + \"Arbeitsbereich belegen...\"\t_b\t\t\tf.workspace_presence\n\ + \"Alle Arbeitsbereiche belegen\"\t_A\t\t\tf.occupy_all\n\ + \"Aus Arbeitsbereich entfernen\"\t_e\t\t\tf.remove\n\ no-label\t\t\t\tf.separator\n\ \"Schließen\"\t_c\tAltF4\tf.kill" $ * diff --git a/cde/programs/localized/es_ES.ISO8859-1/config/sys.dtwmrc.tmsg b/cde/programs/localized/es_ES.ISO8859-1/config/sys.dtwmrc.tmsg index 734f38bc2..b26eb3b67 100644 --- a/cde/programs/localized/es_ES.ISO8859-1/config/sys.dtwmrc.tmsg +++ b/cde/programs/localized/es_ES.ISO8859-1/config/sys.dtwmrc.tmsg @@ -142,6 +142,10 @@ $ *--------------------------------------------------------------------------* \"Minimizar\"\t_n\tAltF9\tf.minimize\n\ \"Maximizar\"\t_x\tAltF10\tf.maximize\n\ \"Bajar\"\t_P\tAltF3\tf.lower\n\ + no-label\t\t\t\t\t\tf.separator\n\ + \"Ocupar Espacio de trabajo...\"\t_O\t\t\tf.workspace_presence\n\ + \"Ocupar todos los Espacios de Trabajo\"\t_T\t\t\tf.occupy_all\n\ + \"Desocupar Espacio de trabajo\"\t_u\t\t\tf.remove\n\ no-label\t\t\t\tf.separator\n\ \"Cerrar\"\t_C\tAltF4\tf.kill" $ * diff --git a/cde/programs/localized/fr_FR.ISO8859-1/config/sys.dtwmrc.tmsg b/cde/programs/localized/fr_FR.ISO8859-1/config/sys.dtwmrc.tmsg index 91b376ac0..1829a1dda 100644 --- a/cde/programs/localized/fr_FR.ISO8859-1/config/sys.dtwmrc.tmsg +++ b/cde/programs/localized/fr_FR.ISO8859-1/config/sys.dtwmrc.tmsg @@ -142,6 +142,10 @@ $ *--------------------------------------------------------------------------* \"Réduire\"\t_u\tAltF9\tf.minimize\n\ \"Agrandir\"\t_A\tAltF10\tf.maximize\n\ \"Derrière\"\t_r\tAltF3\tf.lower\n\ + no-label\t\t\t\t\t\tf.separator\n\ + \"Occuper l'espace de travail...\"\t_O\t\t\tf.workspace_presence\n\ + \"Occuper tous les espaces de travail\"\t_l\t\t\tf.occupy_all\n\ + \"Libérer l'espace de travail\"\t_v\t\t\tf.remove\n\ no-label\t\t\t\tf.separator\n\ \"Fermer\"\t_F\tAltF4\tf.kill" $ * diff --git a/cde/programs/localized/it_IT.ISO8859-1/config/sys.dtwmrc.tmsg b/cde/programs/localized/it_IT.ISO8859-1/config/sys.dtwmrc.tmsg index 5fb82d37d..38a52ca70 100644 --- a/cde/programs/localized/it_IT.ISO8859-1/config/sys.dtwmrc.tmsg +++ b/cde/programs/localized/it_IT.ISO8859-1/config/sys.dtwmrc.tmsg @@ -135,6 +135,10 @@ $ *--------------------------------------------------------------------------* "Ridurre a icona" _i AltF9 f.minimize\n\ "Ingrandire" _g AltF10 f.maximize\n\ "In fondo" _f AltF3 f.lower\n\ + no-label f.separator\n\ + "Occupare spazio di lavoro..." _O f.workspace_presence\n\ + "Occupare tutti gli spazi di lavoro" _t f.occupy_all\n\ + "Eliminare dallo spazio di lavoro" _l f.remove\n\ no-label f.separator\n\ "Chiudere" _C AltF4 f.kill $ *