← Back to branch summary

~freenx-team/nx-x11/nx-x11-ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/85_nx-X11_debian-ld.dpatch

  • Committer: Marcelo Boveto Shima
  • Date: 2009-03-29 05:40:19 UTC
  • Revision ID: mshima@ufserv-20090329054019-4kbff2qlgwrx7g1o
Add debian directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/85_nx-X11_debian-ld.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 85_nx-X11_debian-ld.dpatch by  <marceloshima@gmail.com>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Change the library filename to not conflict with Xorg ones.
 
6
 
 
7
@DPATCH@
 
8
diff -urNad nx-x11_3.3.0-5~/config/cf/X11.tmpl nx-x11_3.3.0-5/config/cf/X11.tmpl
 
9
--- nx-x11_3.3.0-5~/config/cf/X11.tmpl  2005-12-14 21:41:52.000000000 -0200
 
10
+++ nx-x11_3.3.0-5/config/cf/X11.tmpl   2009-01-23 20:14:30.000000000 -0200
 
11
@@ -2665,9 +2665,9 @@
 
12
 #ifndef SharedXrenderRev
 
13
 #define SharedXrenderRev 1.2.2
 
14
 #endif
 
15
-SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
 
16
+SharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
 
17
 #else
 
18
-ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
 
19
+ProjectUnsharedLibReferences(XRENDER,Xrender-nx,$(XRENDERLIBSRC),XBuildLibDir)
 
20
 #endif
 
21
 
 
22
     XRANDRLIBSRC = $(LIBSRC)/Xrandr
 
23
diff -urNad nx-x11_3.3.0-5~/lib/X11/Imakefile nx-x11_3.3.0-5/lib/X11/Imakefile
 
24
--- nx-x11_3.3.0-5~/lib/X11/Imakefile   2009-01-23 20:14:26.000000000 -0200
 
25
+++ nx-x11_3.3.0-5/lib/X11/Imakefile    2009-01-23 20:14:30.000000000 -0200
 
26
@@ -83,7 +83,7 @@
 
27
 #define DoExtraLib SharedLibX11
 
28
 #define DoDebugLib DebugLibX11
 
29
 #define DoProfileLib ProfileLibX11
 
30
-#define LibName X11
 
31
+#define LibName X11-nx
 
32
 #define SoRev SOXLIBREV
 
33
 #define HugeLibrary YES
 
34
 #define IncSubdir X11
 
35
diff -urNad nx-x11_3.3.0-5~/lib/Xext/Imakefile nx-x11_3.3.0-5/lib/Xext/Imakefile
 
36
--- nx-x11_3.3.0-5~/lib/Xext/Imakefile  2004-08-16 12:02:59.000000000 -0300
 
37
+++ nx-x11_3.3.0-5/lib/Xext/Imakefile   2009-01-23 20:14:30.000000000 -0200
 
38
@@ -10,14 +10,15 @@
 
39
 #define DoExtraLib SharedLibXext
 
40
 #define DoDebugLib DebugLibXext
 
41
 #define DoProfileLib ProfileLibXext
 
42
-#define LibName Xext
 
43
+#define LibName Xext-nx
 
44
 #define SoRev SOXEXTREV
 
45
 #define LibHeaders NO
 
46
 
 
47
 #include <Threads.tmpl>
 
48
 
 
49
 #ifdef SharedXextReqs
 
50
-REQUIREDLIBS = SharedXextReqs
 
51
+/* REQUIREDLIBS = SharedXextReqs $(NX_REQUIREDLIBS) */
 
52
+REQUIREDLIBS = -L../../exports/lib/ -lX11-nx $(NX_REQUIREDLIBS)
 
53
 #endif
 
54
 
 
55
 #if HasShm
 
56
diff -urNad nx-x11_3.3.0-5~/lib/Xft/Imakefile nx-x11_3.3.0-5/lib/Xft/Imakefile
 
57
--- nx-x11_3.3.0-5~/lib/Xft/Imakefile   2005-10-19 00:46:56.000000000 -0200
 
58
+++ nx-x11_3.3.0-5/lib/Xft/Imakefile    2009-01-23 20:14:30.000000000 -0200
 
59
@@ -94,8 +94,7 @@
 
60
          FONTCONFIG_CFLAGS="$(FONTCONFIG_CFLAGS)" \
 
61
          FONTCONFIG_LIBS="$(FONTCONFIG_LIBS)"
 
62
 
 
63
-REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB)
 
64
-
 
65
+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2LIB)
 
66
 HEADERS = Xft.h XftCompat.h
 
67
 
 
68
    SRCS = xftcolor.c xftdbg.c xftdpy.c \
 
69
diff -urNad nx-x11_3.3.0-5~/lib/Xft1/Imakefile nx-x11_3.3.0-5/lib/Xft1/Imakefile
 
70
--- nx-x11_3.3.0-5~/lib/Xft1/Imakefile  2004-04-23 15:43:44.000000000 -0300
 
71
+++ nx-x11_3.3.0-5/lib/Xft1/Imakefile   2009-01-23 20:14:30.000000000 -0200
 
72
@@ -92,7 +92,7 @@
 
73
 FREETYPE2REQLIB = $(FREETYPE2LIB)
 
74
 #endif
 
75
 
 
76
-REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB)
 
77
+REQUIREDLIBS=$(LDPRELIBS) -L../../exports/lib/ -lXrender-nx -lX11-nx $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB)
 
78
 
 
79
 #if UseFreetype2
 
80
 FT_OLD = xftcache.c
 
81
diff -urNad nx-x11_3.3.0-5~/lib/Xrender/Imakefile nx-x11_3.3.0-5/lib/Xrender/Imakefile
 
82
--- nx-x11_3.3.0-5~/lib/Xrender/Imakefile       2004-08-06 21:40:40.000000000 -0300
 
83
+++ nx-x11_3.3.0-5/lib/Xrender/Imakefile        2009-01-23 20:14:30.000000000 -0200
 
84
@@ -74,7 +74,7 @@
 
85
 #define DoSharedLib SharedLibXrender
 
86
 #define DoDebugLib DebugLibXrender
 
87
 #define DoProfileLib ProfileLibXrender
 
88
-#define LibName Xrender
 
89
+#define LibName Xrender-nx
 
90
 #define SoRev SOXRENDERREV
 
91
 
 
92
 #ifdef XBuildIncDir
 
93
@@ -89,7 +89,8 @@
 
94
 #include <Threads.tmpl>
 
95
 
 
96
 #ifdef SharedXrenderReqs
 
97
-REQUIREDLIBS = SharedXrenderReqs
 
98
+/* REQUIREDLIBS = SharedXrenderReqs */
 
99
+REQUIREDLIBS = $(LDPRELIB) -L../../exports/lib/ -lXext-nx -lX11-nx
 
100
 #endif
 
101
 
 
102
 #if Malloc0ReturnsNull
 
103
diff -urNad nx-x11_3.3.0-5~/programs/Xserver/Imakefile nx-x11_3.3.0-5/programs/Xserver/Imakefile
 
104
--- nx-x11_3.3.0-5~/programs/Xserver/Imakefile  2009-01-23 20:14:26.000000000 -0200
 
105
+++ nx-x11_3.3.0-5/programs/Xserver/Imakefile   2009-01-23 20:14:31.000000000 -0200
 
106
@@ -997,7 +997,7 @@
 
107
 XPMLIB =  -lXpm
 
108
 NXAGENT = hw/nxagent/LibraryTargetName(nxagent)
 
109
 NXAGENTLIBS = PreFbLibs $(NXAGENT) FbPostFbLibs $(NXAGENT) $(MI)
 
110
-NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XPMLIB)
 
111
+NXAGENTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) -lX11-nx -lXext-nx -lXrender-nx $(SYSLIBS) $(XPMLIB)
 
112
 #if HasParallelMake
 
113
 MakeMutex($(NXAGENTDIRS) $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS))
 
114
 #endif
 
115
@@ -1016,11 +1016,11 @@
 
116
                 -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite
 
117
 #elif defined(cygwinArchitecture)
 
118
 NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
 
119
-                -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \
 
120
+                -lXcomp -lXcompext -lX11-nx -lXext-nx -lXrender-nx -lXcomposite -lXfixes \
 
121
                 -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst
 
122
 #else
 
123
 NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
 
124
-                -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \
 
125
+                -lXcomp -lXcompext -lXcompshad -lX11-nx -lXext-nx -lXrender-nx -lXfixes \
 
126
                 -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite
 
127
 #endif
 
128
 
 
129
@@ -1073,7 +1073,7 @@
 
130
        else exit 0; fi
 
131
        $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
 
132
        $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) $(FONTLIBS) \
 
133
-       $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lXext -lX11 $(EXTRA_LOAD_FLAGS)
 
134
+       $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lX11-nx -lXext-nx $(EXTRA_LOAD_FLAGS)
 
135
 #endif /* NXAgentServer */
 
136
 
 
137
 #if defined(XnonServer) && XnonServer