Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:Update
motif
openmotif-2.3.3.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File openmotif-2.3.3.diff of Package motif
Index: motif-2.3.4/Makefile.am =================================================================== --- motif-2.3.4.orig/Makefile.am +++ motif-2.3.4/Makefile.am @@ -28,7 +28,6 @@ SUBDIRS = bindings bitmaps \ include \ tools \ clients \ - doc \ - demos -AUTOMAKE_OPTIONS = 1.4 + doc +AUTOMAKE_OPTIONS = 1.4 foreign ACLOCAL_AMFLAGS = -I . Index: motif-2.3.4/clients/uil/Makefile.am =================================================================== --- motif-2.3.4.orig/clients/uil/Makefile.am +++ motif-2.3.4/clients/uil/Makefile.am @@ -13,7 +13,7 @@ UilParser.lo: UilParser.c libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la -uil_LDADD = ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la +uil_LDADD = ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la libUil.la INCLUDES = -DINCDIR=\"@INCDIR@\" \ -DLIBDIR=\"@LIBDIR@\" \ @@ -42,7 +42,7 @@ COMMON_SRC = UilCmd.c UilDiags.c UilKeyT UilLstMac.c UilSemVal.c UilSemCSet.c UilDB.c SRCS = $(COMMON_SRC) -SRCS2 = $(COMMON_SRC) UilMain.c +SRCS2 = UilMain.c HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \ UilDef.h XmAppl.uil Index: motif-2.3.4/config/cf/Imake.cf =================================================================== --- motif-2.3.4.orig/config/cf/Imake.cf +++ motif-2.3.4/config/cf/Imake.cf @@ -570,6 +570,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # ifdef i386 # define i386Architecture # undef i386 +# undef i486 +# undef i586 +# undef i686 # endif /* i386 */ # ifdef __i386__ # ifndef i386Architecture @@ -593,6 +596,32 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define PowerPCArchitecture # undef powerpc # endif +# ifdef __s390__ +# define s390Architecture +# undef __s390__ +# endif +# ifdef __s390x__ +# define s390xArchitecture +# undef __s390x__ +# endif +# ifdef __x86_64__ +# define x86_64Architecture +# undef __x86_64__ +# endif +# ifdef mips +# define MipsArchitecture +# undef mips +# endif +# ifdef sparc +# define SparcArchitecture +# undef sparc +# endif +# ifdef __sparc__ +# ifndef SparcArchitecture +# define SparcArchitecture +# endif +# undef __sparc__ +# endif # if defined(arm) || defined(__arm__) # define ArmArchitecture # undef arm @@ -607,6 +636,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # undef __ARM_ARCH_3__ # endif # endif +# ifdef __ia64__ +# define ia64Architecture +# undef __ia64__ +# endif /* __ia64__ */ #endif /* linux */ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) Index: motif-2.3.4/config/cf/Imake.tmpl =================================================================== --- motif-2.3.4.orig/config/cf/Imake.tmpl +++ motif-2.3.4/config/cf/Imake.tmpl @@ -502,14 +502,18 @@ JPTCLIBDIR = JpTclLibDir #define DefaultUsrBin /usr/bin #endif +#ifndef LibDirName +# define LibDirName lib +#endif + #ifndef UsrLibDir #ifdef ProjectRoot -#define UsrLibDir Concat(ProjectRoot,/lib) +#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir YES #endif #else -#define UsrLibDir /usr/lib +#define UsrLibDir Concat(/usr/,LibDirName) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif Index: motif-2.3.4/config/cf/linux.cf =================================================================== --- motif-2.3.4.orig/config/cf/linux.cf +++ motif-2.3.4/config/cf/linux.cf @@ -41,8 +41,9 @@ XCOMM platform: $XFree86: xc/config/cf/ /* Set some defaults for the Default* values in case imake doesn't find them */ #ifndef DefaultLinuxCLibMajorVersion #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \ - defined(SparcArchitecture) || defined(ArmArchitecure) || \ - defined(i386Architecture) + defined(SparcArchitecture) || defined(ArmArchitecure) || defined(MipsArchitecure) || \ + defined(i386Architecture) || defined(ia64Architecture) || defined(s390Architecture) \ + defined(s390xArchitecture) || defined(x86_64Architecture) #define DefaultLinuxCLibMajorVersion 6 #else #define DefaultLinuxCLibMajorVersion 5 @@ -159,7 +160,24 @@ XCOMM binutils: (LinuxBinUtilsMajorVersi #define UseStaticTermcapLib NO #endif +#ifndef HaveLib64 +# if defined (x86_64Architecture) || defined (s390xArchitecture) +# define HaveLib64 YES +# else +# define HaveLib64 NO +# endif +#endif + #define MkdirHierCmd mkdir -p + +#ifndef HaveLib64 +# if defined (x86_64Architecture) || defined (s390xArchitecture) +# define HaveLib64 YES +# else +# define HaveLib64 NO +# endif +#endif + #if LinuxElfDefault #if UseElfFormat #define CcCmd gcc @@ -261,6 +279,35 @@ XCOMM binutils: (LinuxBinUtilsMajorVersi #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AlphaArchitecture */ +#ifdef s390xArchitecture +#define DefaultCCOptions -fsigned-char +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__s390x__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#else +#ifdef s390Architecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__s390__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif /* s390Architecture */ +#endif /* s390xArchitecture */ + +#ifdef ia64Architecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__ia64__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#endif /* ia64Architecture */ + +#ifdef x86_64Architecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__x86_64__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#endif /* ia64Architecture */ + #ifdef Mc68020Architecture #define OptimizedCDebugFlags -O2 #define LinuxMachineDefines -D__mc68000__ @@ -276,6 +323,14 @@ XCOMM binutils: (LinuxBinUtilsMajorVersi #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* PowerPCArchitecture */ +#ifdef MipsArchitecture +#define DefaultCCOptions -fsigned-char +#define OptimizedCDebugFlags -O2 -mips2 +#define LinuxMachineDefines -D__mips__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif /* MipsArchitecture */ + #ifdef ArmArchitecture #define DefaultCCOptions -fsigned-char #define OptimizedCDebugFlags -O2 @@ -284,6 +339,19 @@ XCOMM binutils: (LinuxBinUtilsMajorVersi #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Arm */ +#ifdef SparcArchitecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__sparc__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#define AsVISOption -Av9a +#ifdef Sparc64Architecture +#define AsOutputArchSize 64 +#else +#define AsOutputArchSize 32 +#endif +#endif + #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines #ifndef TermcapLibrary @@ -348,5 +416,11 @@ XCOMM binutils: (LinuxBinUtilsMajorVersi #define MakeNamedTargetSubdir(dir,flags,subname)\ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname +#if HaveLib64 +# ifndef LibDirName +# define LibDirName lib64 +# endif +#endif + #include <lnxLib.rules> #include <xfree86.cf> Index: motif-2.3.4/config/imake/imakemdep.h =================================================================== --- motif-2.3.4.orig/config/imake/imakemdep.h +++ motif-2.3.4/config/imake/imakemdep.h @@ -330,6 +330,19 @@ char *cpp_argv[ARGUMENTS] = { # ifdef __i386__ "-D__i386__", # endif +# ifdef __ia64__ + "-D__ia64__", +# endif +# ifdef __s390__ + "-D__s390__", +# endif +# ifdef __s390x__ + "-D__s390x__", +# endif +# ifdef __x86_64__ + "-D__x86_64__", +# endif + # ifdef __sparc__ "-D__sparc__", # endif @@ -933,6 +946,18 @@ struct symtab predefs[] = { #ifdef __alpha__ {"__alpha__", "1"}, #endif +#ifdef __ia64__ + {"__ia64__", "1"}, +#endif +#ifdef __x86_64__ + {"__x86_64__", "1"}, +#endif +#ifdef __s390__ + {"__s390__", "1"}, +#endif +#ifdef __s390x__ + {"__s390x__", "1"}, +#endif #ifdef __DECC {"__DECC", "1"}, #endif Index: motif-2.3.4/configure.ac =================================================================== --- motif-2.3.4.orig/configure.ac +++ motif-2.3.4/configure.ac @@ -176,7 +176,7 @@ AC_SUBST(CDE_INSTALLATION_TOP) CDE_CONFIGURATION_TOP="\${prefix}/etc/dt" AC_SUBST(CDE_CONFIGURATION_TOP) -LIBDIR="${libdir}/X11" +LIBDIR="${datadir}/X11" AC_SUBST(LIBDIR) MWMRCDIR="${libdir}/X11" @@ -185,7 +185,7 @@ AC_SUBST(MWMRCDIR) INCDIR="${includedir}/X11" AC_SUBST(INCDIR) -XMBINDDIR_FALLBACK="${libdir}/X11/bindings" +XMBINDDIR_FALLBACK="${datadir}/X11/bindings" AC_SUBST(XMBINDDIR_FALLBACK) RM="rm -f" Index: motif-2.3.4/lib/Xm/EditresCom.c =================================================================== --- motif-2.3.4.orig/lib/Xm/EditresCom.c +++ motif-2.3.4/lib/Xm/EditresCom.c @@ -1771,7 +1771,7 @@ Widget w; XtFree((char *)widget_list); } -#if 0 +#if 1 /************************************************************ * * All of the following routines are public. @@ -1922,7 +1922,7 @@ ProtocolStream * stream; * Returns: TRUE if sucessful. */ -Boolean +Bool _XEditResGet8(stream, val) ProtocolStream * stream; unsigned char * val; @@ -1942,7 +1942,7 @@ unsigned char * val; * Returns: TRUE if sucessful. */ -Boolean +Bool _XEditResGet16(stream, val) ProtocolStream * stream; unsigned short * val; @@ -1963,7 +1963,7 @@ unsigned short * val; * Returns: TRUE if sucessful. */ -Boolean +Bool _XEditResGetSigned16(stream, val) ProtocolStream * stream; short * val; @@ -1992,7 +1992,7 @@ short * val; * Returns: TRUE if sucessful. */ -Boolean +Bool _XEditResGet32(stream, val) ProtocolStream * stream; unsigned long * val; @@ -2014,7 +2014,7 @@ unsigned long * val; * Returns: True if retrieval was successful. */ -Boolean +Bool _XEditResGetString8(stream, str) ProtocolStream * stream; char ** str; @@ -2047,7 +2047,7 @@ char ** str; * Returns: True if retrieval was successful. */ -Boolean +Bool _XEditResGetWidgetInfo(stream, info) ProtocolStream * stream; WidgetInfo * info;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
