a1308417c0
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2335 6952d904-891a-0410-993b-d76249ca496b
131 lines
4.5 KiB
Plaintext
131 lines
4.5 KiB
Plaintext
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
## 85_nx-X11_debian-ld.dpatch by <marceloshima@gmail.com>
|
|
##
|
|
## All lines beginning with `## DP:' are a description of the patch.
|
|
## DP: Change the library filename to not conflict with Xorg ones.
|
|
|
|
@DPATCH@
|
|
--- a/config/cf/X11.tmpl
|
|
+++ b/config/cf/X11.tmpl
|
|
@@ -2665,9 +2665,9 @@
|
|
#ifndef SharedXrenderRev
|
|
#define SharedXrenderRev 1.2.2
|
|
#endif
|
|
-SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
|
|
+SharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
|
|
#else
|
|
-ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
|
|
+ProjectUnsharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),XBuildLibDir)
|
|
#endif
|
|
|
|
XRANDRLIBSRC = $(LIBSRC)/Xrandr
|
|
--- a/lib/X11/Imakefile
|
|
+++ b/lib/X11/Imakefile
|
|
@@ -83,7 +83,7 @@
|
|
#define DoExtraLib SharedLibX11
|
|
#define DoDebugLib DebugLibX11
|
|
#define DoProfileLib ProfileLibX11
|
|
-#define LibName X11
|
|
+#define LibName X11-nx
|
|
#define SoRev SOXLIBREV
|
|
#define HugeLibrary YES
|
|
#define IncSubdir X11
|
|
--- a/lib/Xext/Imakefile
|
|
+++ b/lib/Xext/Imakefile
|
|
@@ -10,14 +10,15 @@
|
|
#define DoExtraLib SharedLibXext
|
|
#define DoDebugLib DebugLibXext
|
|
#define DoProfileLib ProfileLibXext
|
|
-#define LibName Xext
|
|
+#define LibName Xext-nx
|
|
#define SoRev SOXEXTREV
|
|
#define LibHeaders NO
|
|
|
|
#include <Threads.tmpl>
|
|
|
|
#ifdef SharedXextReqs
|
|
-REQUIREDLIBS = SharedXextReqs
|
|
+/* REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS) */
|
|
+REQUIREDLIBS = -L../../exports/lib/ -lX11-nx $(NX_REQUIREDLIBS)
|
|
#endif
|
|
|
|
#if HasShm
|
|
--- a/lib/Xft/Imakefile
|
|
+++ b/lib/Xft/Imakefile
|
|
@@ -94,8 +94,7 @@
|
|
FONTCONFIG_CFLAGS="$(FONTCONFIG_CFLAGS)" \
|
|
FONTCONFIG_LIBS="$(FONTCONFIG_LIBS)"
|
|
|
|
-REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB)
|
|
-
|
|
+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB)
|
|
HEADERS = Xft.h XftCompat.h
|
|
|
|
SRCS = xftcolor.c xftdbg.c xftdpy.c \
|
|
--- a/lib/Xft1/Imakefile
|
|
+++ b/lib/Xft1/Imakefile
|
|
@@ -92,7 +92,7 @@
|
|
FREETYPE2REQLIB = $(FREETYPE2LIB)
|
|
#endif
|
|
|
|
-REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB)
|
|
+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB)
|
|
|
|
#if UseFreetype2
|
|
FT_OLD = xftcache.c
|
|
--- a/lib/Xrender/Imakefile
|
|
+++ b/lib/Xrender/Imakefile
|
|
@@ -74,7 +74,7 @@
|
|
#define DoSharedLib SharedLibXrender
|
|
#define DoDebugLib DebugLibXrender
|
|
#define DoProfileLib ProfileLibXrender
|
|
-#define LibName Xrender
|
|
+#define LibName Xrender-nx
|
|
#define SoRev SOXRENDERREV
|
|
|
|
#ifdef XBuildIncDir
|
|
@@ -89,7 +89,8 @@
|
|
#include <Threads.tmpl>
|
|
|
|
#ifdef SharedXrenderReqs
|
|
-REQUIREDLIBS = SharedXrenderReqs
|
|
+/* REQUIREDLIBS = SharedXrenderReqs */
|
|
+REQUIREDLIBS = $(LDPRELIB) -L../../exports/lib/ -lXext-nx -lX11-nx
|
|
#endif
|
|
|
|
#if Malloc0ReturnsNull
|
|
--- a/programs/Xserver/Imakefile
|
|
+++ b/programs/Xserver/Imakefile
|
|
@@ -997,7 +997,7 @@
|
|
XPMLIB = -lXpm
|
|
NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
|
|
NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI)
|
|
-NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB)
|
|
+NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) -lX11-nx -lXext-nx -lXrender-nx $(SYSLIBS) $(XPMLIB)
|
|
#if HasParallelMake
|
|
MakeMutex($(NXAGENTDIRS) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS))
|
|
#endif
|
|
@@ -1016,11 +1016,11 @@
|
|
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite
|
|
#elif defined(cygwinArchitecture)
|
|
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
|
|
- -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \
|
|
+ -lXcomp -lXcompext -lX11-nx -lXext-nx -lXrender-nx -lXcomposite -lXfixes \
|
|
-L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst
|
|
#else
|
|
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
|
|
- -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \
|
|
+ -lXcomp -lXcompext -lXcompshad -lX11-nx -lXext-nx -lXrender-nx -lXfixes \
|
|
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite
|
|
#endif
|
|
|
|
@@ -1073,7 +1073,7 @@
|
|
else exit 0; fi
|
|
$(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
|
|
$(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \
|
|
- $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS)
|
|
+ $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lX11-nx -lXext-nx $(EXTRA_LOAD_FLAGS)
|
|
#endif /* NXAgentServer */
|
|
|
|
#if defined(XnonServer) && XnonServer
|