Skip to content

N
nx-libs
Commit 6fc37fa7 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Mike Gabriel
Browse files
Options

Use shared libraries (301_nx-X11_use-shared-libs.full.patch).

Many distributions have a policy to reduce code duplications. One means to avoid such duplications is to use shared libraries instead of using libs that are ofter shipped for convenience. Fedora: http://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries Debian (Section 10.7.4 of Debian policy): http://www.debian.org/doc/debian-policy/ch-files.html
parent 1e99734e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 116 deletions
debian/patches/301_nx-X11_use-shared-libs.full.patch deleted 100644 → 0
View file @ 1e99734e
Description: Use shared libraries
Many distributions have a policy to reduce code duplications.
One means to avoid such duplications is to use shared libraries
instead of using libs that are ofter shipped for convenience.
.
Fedora:
http://fedoraproject.org/wiki/Packaging:Guidelines#Shared_Libraries
.
Debian (Section 10.7.4 of Debian policy):
http://www.debian.org/doc/debian-policy/ch-files.html
Forwarded: pending...
Author: Jan Engelhardt <jengelh@medozas.de>
Last-Update: 2012-02-14
---
nx-X11/config/cf/host.def | 11 ++++++-----
nx-X11/programs/Xserver/Imakefile | 6 +++---
nx-X11/programs/nxauth/Imakefile | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
Index: nx-X11/config/cf/host.def
===================================================================
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
#define BuildRenderLibrary YES
#define SharedLibFreetype2 YES
#define NormalLibFreetype2 YES
-#define FontLibSharedFreeType NO
+#define FontLibSharedFreeType YES
#endif
/*
@@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
*
#define XserverStaticFontLib NO
*/
+#define XserverStaticFontLib YES
/*
* To enable binary compatibility with previous versions of the font
@@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
#define BuildXKB YES
#define BuildXKBlib YES
-#define SharedLibXau NO
+#define SharedLibXau YES
/*
* If you are running NetBSD 0.9C or later, and have the aperture driver
@@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
#define BuildXterm YES
*/
-#define SharedLibXau NO
+#define SharedLibXau YES
-#define SharedLibXdmcp NO
+#define SharedLibXdmcp YES
#define BuildXaw7 YES
@@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.de
#define BuildFontServer NO
#define BuildFreeType NO
#define BuildXTrueType NO
-#define FontLibSharedFreeType NO
+#define FontLibSharedFreeType YES
#endif
#if !defined(NXZaurusXServer) && defined(NXiPAQXServer)
Index: nx-X11/programs/Xserver/Imakefile
===================================================================
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1013,15 +1013,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \
- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite
+ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
-lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \
- -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst
+ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp
#else
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \
- -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama
+ -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp
#endif
#endif
Index: nx-X11/programs/nxauth/Imakefile
===================================================================
--- a/nx-X11/programs/nxauth/Imakefile
+++ b/nx-X11/programs/nxauth/Imakefile
@@ -26,7 +26,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakef
INCLUDES=-I../../lib
DEPLIBS = $(DEPXAUTHLIB)
- LOCAL_LIBRARIES = ../../exports/lib/libXau.a
+ LOCAL_LIBRARIES = $(XAUTHLIB)
SRCS = xauth.c gethost.c process.c parsedpy.c
OBJS = xauth.o gethost.o process.o parsedpy.o
CONN_DEFINES = $(CONNECTION_FLAGS)
debian/patches/series
View file @ 6fc37fa7
301_nx-X11_use-shared-libs.full.patch
302_nx-X11_xkbbasedir-detection.full.patch 302_nx-X11_xkbbasedir-detection.full.patch
320_nxagent_configurable-keystrokes.full.patch 320_nxagent_configurable-keystrokes.full.patch
321_nxagent_x2go-specific-keystroke-config.full.patch 321_nxagent_x2go-specific-keystroke-config.full.patch
......
nx-X11/config/cf/host.def
View file @ 6fc37fa7
...@@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ ...@@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildRenderLibrary YES #define BuildRenderLibrary YES
#define SharedLibFreetype2 YES #define SharedLibFreetype2 YES
#define NormalLibFreetype2 YES #define NormalLibFreetype2 YES
#define FontLibSharedFreeType NO #define FontLibSharedFreeType YES
#endif #endif
/* /*
...@@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ ...@@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
* *
#define XserverStaticFontLib NO #define XserverStaticFontLib NO
*/ */
#define XserverStaticFontLib YES
/* /*
* To enable binary compatibility with previous versions of the font * To enable binary compatibility with previous versions of the font
...@@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ ...@@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildXKB YES #define BuildXKB YES
#define BuildXKBlib YES #define BuildXKBlib YES
#define SharedLibXau NO #define SharedLibXau YES
/* /*
* If you are running NetBSD 0.9C or later, and have the aperture driver * If you are running NetBSD 0.9C or later, and have the aperture driver
...@@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ ...@@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildXterm YES #define BuildXterm YES
*/ */
#define SharedLibXau NO #define SharedLibXau YES
#define SharedLibXdmcp NO #define SharedLibXdmcp YES
#define BuildXaw7 YES #define BuildXaw7 YES
...@@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ ...@@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildFontServer NO #define BuildFontServer NO
#define BuildFreeType NO #define BuildFreeType NO
#define BuildXTrueType NO #define BuildXTrueType NO
#define FontLibSharedFreeType NO #define FontLibSharedFreeType YES
#endif #endif
#if !defined(NXZaurusXServer) && defined(NXiPAQXServer) #if !defined(NXZaurusXServer) && defined(NXiPAQXServer)
......
nx-X11/programs/Xserver/Imakefile
View file @ 6fc37fa7
...@@ -1013,15 +1013,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) ...@@ -1013,15 +1013,15 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture) #if defined(SunArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lXrender -lXfixes \
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXdmcp
#elif defined(cygwinArchitecture) #elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
-lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \
-L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp
#else #else
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \
-L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -L../../../nx-X11/exports/lib -lXtst -lXdamage -lXrandr -lXcomposite -lXinerama -lXdmcp
#endif #endif
#endif #endif
......
nx-X11/programs/nxauth/Imakefile
View file @ 6fc37fa7
...@@ -26,7 +26,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5 2001/03/30 02:15:23 keithp Exp ...@@ -26,7 +26,7 @@ XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5 2001/03/30 02:15:23 keithp Exp
INCLUDES=-I../../lib INCLUDES=-I../../lib
DEPLIBS = $(DEPXAUTHLIB) DEPLIBS = $(DEPXAUTHLIB)
LOCAL_LIBRARIES = ../../exports/lib/libXau.a LOCAL_LIBRARIES = $(XAUTHLIB)
SRCS = xauth.c gethost.c process.c parsedpy.c SRCS = xauth.c gethost.c process.c parsedpy.c
OBJS = xauth.o gethost.o process.o parsedpy.o OBJS = xauth.o gethost.o process.o parsedpy.o
CONN_DEFINES = $(CONNECTION_FLAGS) CONN_DEFINES = $(CONNECTION_FLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment