From ea24f0b0eb7b82ad879810c8e84292d6bf810bea Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 26 Jul 2016 23:19:36 +0200 Subject: add XLOCALELIBDIR --- nx-X11/lib/X11/Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/lib/X11/Imakefile') diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index eae462391..d5f8026d5 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -170,7 +170,7 @@ EXTRA_LIBRARIES = /**/ #elif HasGetresuid SETID_DEFINES = -DHASGETRESUID #endif - XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\" + XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\" -DXLOCALELIBDIR=\"$(XLOCALELIBDIR)\" #if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \ defined(OpenBSDArchitecture) THRSTUBSRCS = UIThrStubs.c -- cgit v1.2.3 From 687d44b6eaa3c64a12af9bbd557b401419b208eb Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 29 Jul 2016 00:44:38 +0200 Subject: update src files *[ch] to libX11 1.3.4 --- nx-X11/lib/X11/Imakefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'nx-X11/lib/X11/Imakefile') diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index d5f8026d5..8a4ed3542 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -90,6 +90,12 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status SUBDIRS = xlibi18n #endif +/* + FIXME: This is switchable upstream via configure option, we leave it + on for now as this is the upstream default. +*/ +XCMS_DEFINES = -DXCMS + #include #ifndef MotifBC @@ -187,7 +193,7 @@ XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSOR POSTLOCALELIBDEFINES = -DPOSTLOCALELIBDIR=\"$(POSTLOCALELIBDIR)\" #endif DEFINES = $(MALLOC_DEFINES) $(LIB_DEFINES) $(MISC_DEFINES)\ - $(POSTLOCALELIBDEFINES) $(NX_INCLUDES) $(NX_DEFINES) + $(POSTLOCALELIBDEFINES) $(NX_INCLUDES) $(NX_DEFINES) ${XCMS_DEFINES} OPEN_DEFINES = -I$(EXTINCSRC) $(K5INCL) $(K5DEFS) DEPEND_DEFINES = $(OPEN_DEFINES) $(TRANS_INCLUDES) $(CONN_DEFINES) $(THREADS_DEFINES) DependDefines AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o -- cgit v1.2.3 From 22652155f361391c81592d448b7b425d2106a9d3 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 3 Aug 2016 19:19:58 +0200 Subject: set USE_XCB define to 0 to prevent compiler complaints --- nx-X11/lib/X11/Imakefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nx-X11/lib/X11/Imakefile') diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 8a4ed3542..a796406a6 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -95,6 +95,7 @@ SUBDIRS = xlibi18n on for now as this is the upstream default. */ XCMS_DEFINES = -DXCMS +XCB_DEFINES = -DUSE_XCB=0 #include @@ -193,7 +194,7 @@ XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSOR POSTLOCALELIBDEFINES = -DPOSTLOCALELIBDIR=\"$(POSTLOCALELIBDIR)\" #endif DEFINES = $(MALLOC_DEFINES) $(LIB_DEFINES) $(MISC_DEFINES)\ - $(POSTLOCALELIBDEFINES) $(NX_INCLUDES) $(NX_DEFINES) ${XCMS_DEFINES} + $(POSTLOCALELIBDEFINES) $(NX_INCLUDES) $(NX_DEFINES) ${XCMS_DEFINES} ${XCB_DEFINES} OPEN_DEFINES = -I$(EXTINCSRC) $(K5INCL) $(K5DEFS) DEPEND_DEFINES = $(OPEN_DEFINES) $(TRANS_INCLUDES) $(CONN_DEFINES) $(THREADS_DEFINES) DependDefines AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o -- cgit v1.2.3 From 8a5f30fb1b9fa89ceff96beb681befbdbb89b0fa Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 27 Aug 2016 00:31:05 +0200 Subject: Add (Free|Get)EventData.c from libX11 1.3.4 --- nx-X11/lib/X11/Imakefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nx-X11/lib/X11/Imakefile') diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index a796406a6..9e1ceb255 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -293,6 +293,7 @@ SRCS1 = \ FreeCols.c \ FreeCurs.c \ FreeEData.c \ + FreeEventData.c \ FreeGC.c \ FreePix.c \ FSSaver.c \ @@ -301,6 +302,7 @@ SRCS1 = \ GetAtomNm.c \ GetColor.c \ GetDflt.c \ + GetEventData.c \ GetFPath.c \ GetFProp.c \ GetGeom.c \ @@ -423,6 +425,7 @@ OBJS1 = \ FreeCols.o \ FreeCurs.o \ FreeEData.o \ + FreeEventData.o \ FreeGC.o \ FreePix.o \ FSSaver.o \ @@ -431,6 +434,7 @@ OBJS1 = \ GetAtomNm.o \ GetColor.o \ GetDflt.o \ + GetEventData.o \ GetFPath.o \ GetFProp.o \ GetGeom.o \ -- cgit v1.2.3 From d3ae0b2c9559e70448746240caaf5634c78d0eef Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 27 Aug 2016 01:44:41 +0200 Subject: replace {x11,xim}trans.c links by libX11 1.3.4 solution --- nx-X11/lib/X11/Imakefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'nx-X11/lib/X11/Imakefile') diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 9e1ceb255..76f26be5d 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -147,8 +147,8 @@ EXTRA_LIBRARIES = /**/ POLL_DEFINES = -DUSE_POLL #endif CONN_DEFINES = $(CONNECTION_FLAGS) - XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) - XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) + XTRANS_X_DEFINES = $(XTRANS_FAILDEFINES) + XTRANS_XIM_DEFINES = $(XTRANS_FAILDEFINES) #if HasBSD44Sockets SOCK_DEFINES = -DBSD44SOCKETS #endif @@ -800,8 +800,8 @@ SRCS3 = \ RegstFlt.c \ locking.c \ LockDis.c \ - x11trans.c \ - ximtrans.c \ + x11_trans.c \ + xim_trans.c \ $(XKBSRCS) $(LCSRCS) $(MISCSRCS) OBJS3 = \ @@ -883,8 +883,8 @@ OBJS3 = \ RegstFlt.o \ locking.o \ LockDis.o \ - x11trans.o \ - ximtrans.o \ + x11_trans.o \ + xim_trans.o \ $(XKBOBJS) $(LCOBJS) $(MISCOBJS) #if BuildLoadableXlibI18n @@ -1065,10 +1065,8 @@ EXTRASHAREDOBJS = $(STATICLCOBJS) SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES)) SpecialCLibObjectRule(StrKeysym,$(ICONFIGFILES),$(KDB_DEFINES)) SpecialCLibObjectRule(ConnDis,$(ICONFIGFILES),$(XDMAUTHDEFS) $(RPCDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES) $(K5INCL) $(K5DEFS)) -SpecialCLibObjectRule(x11trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES)) -LinkFile(x11trans.c,$(TRANSCOMMSRC)/transport.c) -SpecialCLibObjectRule(ximtrans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES)) -LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c) +SpecialCLibObjectRule(x11_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES)) +SpecialCLibObjectRule(xim_trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES)) SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES)) SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES)) SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES)) -- cgit v1.2.3 From 0bcb4bba2a1c4bf0464f0ce0305648ee539ece98 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 27 Aug 2016 03:24:22 +0200 Subject: adapt Imakefile to call makekeys correctly after update makekeys expects filenames as arguments instead of stdin --- nx-X11/lib/X11/Imakefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'nx-X11/lib/X11/Imakefile') diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 76f26be5d..d4045b615 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -1108,6 +1108,7 @@ LOCAL_LDFLAGS=-F #endif MAKEKEYS = ./makekeys +KEYSYMDEFS = $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h #if CrossCompiling HOST_LDLIBS= @@ -1118,10 +1119,10 @@ HOST_LDLIBS=$(LDLIBS) HOST_CFLAGS=$(CFLAGS) #endif -ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c +ks_tables.h: $(KEYSYMDEFS) util/makekeys.c RemoveFiles($@ HostProgramTargetName(makekeys) makekeys.Osuf) -HostLinkRule(HostProgramTargetName(makekeys),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(HOST_LDLIBS)) - RunProgram(MAKEKEYS,< $(XINCLUDESRC)/keysymdef.h > ks_tables_h) + RunProgram(MAKEKEYS, $(KEYSYMDEFS) > ks_tables_h) $(MV) ks_tables_h $@ RemoveFiles(HostProgramTargetName(makekeys) makekeys.Osuf ks_tables_h) -- cgit v1.2.3