diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch | 335 |
2 files changed, 2 insertions, 335 deletions
diff --git a/debian/changelog b/debian/changelog index 1d1078a09..60d1a90ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium /etc/x2go/rgb or /etc/nxagent/rgb. * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow separate .keyboard files for x2goagent and nxagent. + * Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't + patch files that get removed during code reduction. * NX code reduction efforts (from 93Mb to 60Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch index ebc77ecd0..55aa0df49 100644 --- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch +++ b/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch @@ -21,26 +21,9 @@ Author: Jan Engelhardt <jengelh@medozas.de> Last-Update: 2012-02-15 --- nx-X11/config/cf/Imake.rules | 12 - - nx-X11/config/cf/Motif.tmpl | 4 nx-X11/config/cf/X11.tmpl | 240 ++++++++++---------- - nx-X11/config/cf/bsdLib.rules | 6 - nx-X11/config/cf/bsdLib.tmpl | 2 - nx-X11/config/cf/bsdiLib.tmpl | 2 - nx-X11/config/cf/convex.cf | 6 - nx-X11/config/cf/cygwin.tmpl | 2 - nx-X11/config/cf/darwinLib.tmpl | 2 - nx-X11/config/cf/gnuLib.tmpl | 2 - nx-X11/config/cf/ibmLib.rules | 12 - - nx-X11/config/cf/ibmLib.tmpl | 2 nx-X11/config/cf/lnxLib.rules | 16 - nx-X11/config/cf/lnxLib.tmpl | 4 - nx-X11/config/cf/mingw.tmpl | 2 - nx-X11/config/cf/nto.rules | 2 - nx-X11/config/cf/os2Lib.tmpl | 58 ++-- - nx-X11/config/cf/sco5.cf | 2 - nx-X11/config/cf/sv3Lib.tmpl | 24 +- - nx-X11/config/cf/sv4Lib.tmpl | 2 - nx-X11/config/cf/usl.cf | 2 nx-X11/lib/GLw/Imakefile | 2 nx-X11/lib/X11/Imakefile | 2 nx-X11/lib/X11/Imakefile.NX.original | 2 @@ -130,20 +113,6 @@ Last-Update: 2012-02-15 #endif /* ---- a/nx-X11/config/cf/Motif.tmpl -+++ b/nx-X11/config/cf/Motif.tmpl -@@ -465,9 +465,9 @@ - #endif - - #if SharedLibXm --SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) -+SharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev) - #else --ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir) -+ProjectUnsharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),MBuildLibDir) - #endif - - #if SharedLibMrm --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1835,9 +1835,9 @@ @@ -849,134 +818,6 @@ Last-Update: 2012-02-15 #endif #ifndef NeedDefaultDepLibs ---- a/nx-X11/config/cf/bsdLib.rules -+++ b/nx-X11/config/cf/bsdLib.rules -@@ -134,9 +134,9 @@ - #ifndef SharedFontLibReferences - #define SharedFontLibReferences() @@\ - SOFONTREV = SharedFontRev @@\ --DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\ --FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\ -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - #endif - - /* ---- a/nx-X11/config/cf/bsdLib.tmpl -+++ b/nx-X11/config/cf/bsdLib.tmpl -@@ -38,7 +38,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/bsdiLib.tmpl -+++ b/nx-X11/config/cf/bsdiLib.tmpl -@@ -11,7 +11,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/convex.cf -+++ b/nx-X11/config/cf/convex.cf -@@ -90,9 +90,9 @@ - LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln) - - XMLIBSRC = $(LIBSRC)/Xm -- DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a) -- XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB)) -- LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln) -+ DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libNX_Xm.a) -+ XMLIB = LoaderLibPrefix _Use(-lNX_Xm,$(DEPXMLIB)) -+ LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lNX_Xm.ln) - - UILLIBSRC = $(LIBSRC)/uil - DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a) ---- a/nx-X11/config/cf/cygwin.tmpl -+++ b/nx-X11/config/cf/cygwin.tmpl -@@ -50,7 +50,7 @@ - - #ifndef FixupLibReferences - # define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/darwinLib.tmpl -+++ b/nx-X11/config/cf/darwinLib.tmpl -@@ -5,7 +5,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/gnuLib.tmpl -+++ b/nx-X11/config/cf/gnuLib.tmpl -@@ -6,7 +6,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/ibmLib.rules -+++ b/nx-X11/config/cf/ibmLib.rules -@@ -127,23 +127,23 @@ - # ifndef SharedFontLibReferences - # define SharedFontLibReferences() @@\ - DEPFONTLIB = /**/ @@\ --FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(FONTLIBSRC)/libNX_Xfont.a) @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - # endif - # else - # ifndef SharedFontLibReferences - # define SharedFontLibReferences() @@\ - DEPFONTLIB = /**/ @@\ --FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libNX_Xfont.a)) @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - # endif - # endif - # else /* OSMajorVersion < 5 */ - # ifndef SharedFontLibReferences - # define SharedFontLibReferences() @@\ - DEPFONTLIB = /**/ @@\ --FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\ --LintLibReferences(XFONT,Xfont,$(FONTLIBSRC)) -+FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDI)/libNX_Xfont.so)) @@\ -+LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC)) - # endif - - # endif ---- a/nx-X11/config/cf/ibmLib.tmpl -+++ b/nx-X11/config/cf/ibmLib.tmpl -@@ -81,7 +81,7 @@ - /* we want this to be defined only when building X */ - # ifndef FixupLibReferences - # define FixupLibReferences() @@\ --DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a) -+DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt.a) - # endif - #endif - --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -389,7 +389,7 @@ @@ -1044,182 +885,6 @@ Last-Update: 2012-02-15 #endif #endif /* UseElfFormat */ ---- a/nx-X11/config/cf/mingw.tmpl -+++ b/nx-X11/config/cf/mingw.tmpl -@@ -50,7 +50,7 @@ - - #ifndef FixupLibReferences - # define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/nto.rules -+++ b/nx-X11/config/cf/nto.rules -@@ -104,7 +104,7 @@ - - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/os2Lib.tmpl -+++ b/nx-X11/config/cf/os2Lib.tmpl -@@ -107,35 +107,35 @@ - #endif - - #if LinkStatically --#define SDlibX11 -lX11_s --#define SDlibXExt -lXExt_s --#define SDlibXmu -lXmu_s --#define SDlibXt -lXt_s --#define SDlibXaw -lXaw_s --#define SDlibXaw7 -lXaw_s --#define SDlibXaw6 -lXaw_s --#define SDlibXi -lXi_s --#define SDlibXtst -lXtst_s --#define SDlibXp -lXp_s --#define SDlibXv -lXv_s --#define SDlibGL -lGL_s --#define SDlibDPS -lDPS_s --#define SDlibDPSTK -lDPSTK_s -+#define SDlibX11 -lNX_X11_s -+#define SDlibXExt -lNX_XExt_s -+#define SDlibXmu -lNX_Xmu_s -+#define SDlibXt -lNX_Xt_s -+#define SDlibXaw -lNX_Xaw_s -+#define SDlibXaw7 -lNX_Xaw_s -+#define SDlibXaw6 -lNX_Xaw_s -+#define SDlibXi -lNX_Xi_s -+#define SDlibXtst -lNX_Xtst_s -+#define SDlibXp -lNX_Xp_s -+#define SDlibXv -lNX_Xv_s -+#define SDlibGL -lNX_GL_s -+#define SDlibDPS -lNX_DPS_s -+#define SDlibDPSTK -lNX_DPSTK_s - #else --#define SDlibX11 -lX11 --#define SDlibXExt -lXExt --#define SDlibXmu -lXmu --#define SDlibXt -lXt --#define SDlibXaw -lXaw --#define SDlibXaw7 -lXaw --#define SDlibXaw6 -lXaw --#define SDlibXi -lXi --#define SDlibXtst -lXtst --#define SDlibXp -lXp --#define SDlibXv -lXv --#define SDlibGL -lGL --#define SDlibDPS -lDPS --#define SDlibDPSTK -lDPSTK -+#define SDlibX11 -lNX_X11 -+#define SDlibXExt -lNX_XExt -+#define SDlibXmu -lNX_Xmu -+#define SDlibXt -lNX_Xt -+#define SDlibXaw -lNX_Xaw -+#define SDlibXaw7 -lNX_Xaw -+#define SDlibXaw6 -lNX_Xaw -+#define SDlibXi -lNX_Xi -+#define SDlibXtst -lNX_Xtst -+#define SDlibXp -lNX_Xp -+#define SDlibXv -lNX_Xv -+#define SDlibGL -lNX_GL -+#define SDlibDPS -lNX_DPS -+#define SDlibDPSTK -lNX_DPSTK - #endif - - /* -@@ -159,7 +159,7 @@ - #endif - #if SharedOldX - DEPOLDXLIB = -- OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX) -+ OLDXLIB = _Use(-lNX_oldX,-L$(OLDXLIBSRC) -lNX_oldX) - #endif - #if SharedLibXt - DEPXTOOLLIB = ---- a/nx-X11/config/cf/sco5.cf -+++ b/nx-X11/config/cf/sco5.cf -@@ -318,7 +318,7 @@ - */ - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - ---- a/nx-X11/config/cf/sv3Lib.tmpl -+++ b/nx-X11/config/cf/sv3Lib.tmpl -@@ -40,31 +40,31 @@ - * are using shared libraries, we really do not need to depend on anything - */ - #if SharedLibXext -- DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a) -- EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB)) -+ DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libNX_Xext_s.a) -+ EXTENSIONLIB = LoaderLibPrefix _Use(-lNX_Xext_s, $(DEPEXTENSIONLIB)) - #endif - #if SharedLibX -- DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a) -- XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a) -+ DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libNX_X11_s.a) -+ XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lNX_X11_s,$(XLIBSRC)/libNX_X11_s.a) - #endif - #if SharedLibXmu -- DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a) -- XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB)) -+ DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libNX_Xmu_s.a) -+ XMULIB = LoaderLibPrefix _Use(-lNX_Xmu_s,$(DEPXMULIB)) - #endif - #if SharedOldLibX - DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a) - OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB)) - #endif - #if SharedLibXt -- DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a) -- XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB)) -+ DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt_s.a) -+ XTOOLLIB = LoaderLibPrefix _Use(-lNX_Xt_s,$(DEPXTOOLLIB)) - #endif - #if SharedLibXaw -- DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a) -- XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB)) -+ DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libNX_Xaw_s.a) -+ XAWLIB = LoaderLibPrefix _Use(-lNX_Xaw_s,$(DEPXAWLIB)) - #endif - #if SharedLibXinput -- DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a) -- XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB)) -+ DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libNX_Xi_s.a) -+ XILIB = LoaderLibPrefix _Use(-lNX_Xi_s,$(DEPXILIB)) - #endif - ---- a/nx-X11/config/cf/sv4Lib.tmpl -+++ b/nx-X11/config/cf/sv4Lib.tmpl -@@ -7,7 +7,7 @@ - XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $ - - /* SVR4 shared libraries are deficient in link semantics */ --XMULIBONLY = -lXmu -+XMULIBONLY = -lNX_Xmu - #ifndef FixupLibReferences - # define FixupLibReferences() @@\ - XMULIB = $(XMULIBONLY) -z nodefs ---- a/nx-X11/config/cf/usl.cf -+++ b/nx-X11/config/cf/usl.cf -@@ -262,7 +262,7 @@ - */ - #ifndef FixupLibReferences - #define FixupLibReferences() @@\ --XMULIBONLY = -lXmu @@\ -+XMULIBONLY = -lNX_Xmu @@\ - XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) - #endif - --- a/nx-X11/lib/GLw/Imakefile +++ b/nx-X11/lib/GLw/Imakefile @@ -46,7 +46,7 @@ |