debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for new Solaris/OpenIndiana versions

Browse Source
This commit is contained in:
Ulrich Wilkens
2015-05-09 00:14:52 +02:00
committed by Jon Trulson
parent 0306c7c6f2
commit 2b8b5f25b5
14 changed files with 21 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/programs/dtlogin/config/Xsession.src
View File

@@ -57,7 +57,10 @@ XCOMM ##########################################################################
#elif defined (__hpux)
# define cpp_XDMSYS "/usr/lib/X11/xdm/sys.xsession"
#elif defined (sun)
# define cpp_XINITUSER "$HOME/.xinitrc"
# define cpp_MAIL "/var/mail/$USER"
# undef cpp_HELLO
# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &"
#endif
#ifdef __osf__

2
cde/programs/dtlogin/dm.h
View File

@@ -117,7 +117,7 @@
#define DEF_NLS_DIR "/usr/lib/nls/loc"
#elif defined(hpV4)
#define DEF_NLS_DIR "/usr/lib/nls/msg"
#elif defined(sun) || defined(__uxp__) || defined(USL)
#elif defined(__uxp__) || defined(USL)
#define DEF_NLS_DIR "/usr/lib/locale"
#else
#define DEF_NLS_DIR CDE_INSTALLATION_TOP "/lib/nls/msg"

42
cde/programs/dtlogin/util.c
View File

@@ -951,48 +951,6 @@ ScanNLSDir(char *dirname)
}
#endif /* __osf__obsoleted__ */
#elif defined(sun)
/*
* Scan for installed locales on Sun platform.
*/
{
DIR *dirp;
struct dirent *dp;
char* filename;
char path1[MAXPATHLEN], path2[MAXPATHLEN];
struct stat stat1, stat2;
int retval1, retval2;
/*
* To determin the fully installed locale list, check several locations.
*/
if((dirp = opendir(DEF_X11_NLS_SHARE_DIR)) != NULL)
{
while((dp = readdir(dirp)) != NULL)
{
filename = dp->d_name;
if ( filename[0] != '.' &&
(int)(strlen(languageList) +
strlen(filename) + 2) < LANGLISTSIZE)
{
(void) sprintf(path1, "%s/%s", DEF_X11_NLS_LIB_DIR, filename);
(void) sprintf(path2, "%s/%s", dirname, filename);
retval1 = stat(path1, &stat1);
retval2 = stat(path2, &stat2);
if ( retval1==0 && retval2==0 &&
S_ISDIR(stat1.st_mode) && S_ISDIR(stat2.st_mode) )
{
strcat(languageList, " ");
strcat(languageList, filename);
}
}
}
closedir(dirp);
}
}
#elif defined(__uxp__) || defined(USL)
#define LC_COLLATE "LC_COLLATE"