dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net-misc/nx-X11: Initial checkin

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2265 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2010-06-14 21:53:10 +00:00
parent a2ebe5e909
commit fcd952a7e8
10 changed files with 460 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
net-misc/nx-X11/files/01_build_nx-X11_without_nxcomp.dpatch Normal file
View File

@@ -0,0 +1,54 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_build_nx-X11_without_nxcomp.dpatch by <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct build without nxcomp and nxcompext
@DPATCH@
Index: nx-x11-ubuntu/lib/X11/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/X11/Imakefile 2010-03-18 17:43:37.333686996 -0300
+++ nx-x11-ubuntu/lib/X11/Imakefile 2010-03-18 17:52:15.493687076 -0300
@@ -1150,30 +1150,30 @@
#if NXLibraries
$(NX_XCOMPCONFIGTARGET):
- cd ../../../nxcomp && \
- ./configure
+# cd ../../../nxcomp && \
+# ./configure
$(NX_XCOMPEXTCONFIGTARGET):
- cd ../../../nxcompext && \
- ./configure
+# cd ../../../nxcompext && \
+# ./configure
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- cd $(NX_XCOMPLIBDIR) && \
- gmake
+# cd $(NX_XCOMPLIBDIR) && \
+# gmake
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- gmake
+# cd ../../../nxcompext && \
+# gmake
#else
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- cd $(NX_XCOMPLIBDIR) && \
- make
+# cd $(NX_XCOMPLIBDIR) && \
+# make
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- make
+# cd ../../../nxcompext && \
+# make
#endif

35
net-misc/nx-X11/files/02_dont_build_nxcompshad.dpatch Normal file
View File

@@ -0,0 +1,35 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_dont_build_nxcompshad.dpatch by <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct build without nxcompext
@DPATCH@
Index: nx-x11-ubuntu/programs/Xserver/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/programs/Xserver/Imakefile 2010-03-18 17:43:37.233685038 -0300
+++ nx-x11-ubuntu/programs/Xserver/Imakefile 2010-03-18 17:52:15.423684745 -0300
@@ -1037,17 +1037,17 @@
NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status
$(NX_XSHADOWCONFIGTARGET):
- cd $(NX_XSHADOWLIBDIR) && \
- ./configure
+# cd $(NX_XSHADOWLIBDIR) && \
+# ./configure
#ifdef SunArchitecture
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
- cd $(NX_XSHADOWLIBDIR) && \
- gmake
+# cd $(NX_XSHADOWLIBDIR) && \
+# gmake
#else
$(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
- cd $(NX_XSHADOWLIBDIR) && \
- make
+# cd $(NX_XSHADOWLIBDIR) && \
+# make
#endif
ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \

144
net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch Normal file
View File

@@ -0,0 +1,144 @@
#! /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@
Index: nx-x11-ubuntu/config/cf/X11.tmpl
===================================================================
--- nx-x11-ubuntu.orig/config/cf/X11.tmpl 2010-03-18 17:43:37.113684797 -0300
+++ nx-x11-ubuntu/config/cf/X11.tmpl 2010-03-18 17:46:07.532435434 -0300
@@ -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
Index: nx-x11-ubuntu/lib/X11/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/X11/Imakefile 2010-03-18 17:46:05.702437552 -0300
+++ nx-x11-ubuntu/lib/X11/Imakefile 2010-03-18 17:46:07.532435434 -0300
@@ -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
Index: nx-x11-ubuntu/lib/Xext/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xext/Imakefile 2010-03-18 17:43:37.033687480 -0300
+++ nx-x11-ubuntu/lib/Xext/Imakefile 2010-03-18 17:46:07.532435434 -0300
@@ -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
Index: nx-x11-ubuntu/lib/Xft/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xft/Imakefile 2010-03-18 17:43:37.053695190 -0300
+++ nx-x11-ubuntu/lib/Xft/Imakefile 2010-03-18 17:46:07.532435434 -0300
@@ -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 \
Index: nx-x11-ubuntu/lib/Xft1/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xft1/Imakefile 2010-03-18 17:43:37.073687814 -0300
+++ nx-x11-ubuntu/lib/Xft1/Imakefile 2010-03-18 17:46:07.532435434 -0300
@@ -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
Index: nx-x11-ubuntu/lib/Xrender/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/lib/Xrender/Imakefile 2010-03-18 17:43:37.093686165 -0300
+++ nx-x11-ubuntu/lib/Xrender/Imakefile 2010-03-18 17:46:07.532435434 -0300
@@ -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
Index: nx-x11-ubuntu/programs/Xserver/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/programs/Xserver/Imakefile 2010-03-18 17:46:06.573684670 -0300
+++ nx-x11-ubuntu/programs/Xserver/Imakefile 2010-03-18 17:46:07.542462477 -0300
@@ -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

38
net-misc/nx-X11/files/95_fix_Imakefile.dpatch Normal file
View File

@@ -0,0 +1,38 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 95_fix_Imakefile.dpatch by <marceloshima@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
Index: nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Imakefile
===================================================================
--- nx-x11-ubuntu.orig/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-03-18 17:43:36.743684770 -0300
+++ nx-x11-ubuntu/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-03-18 17:46:10.473686346 -0300
@@ -137,7 +137,7 @@
NXFONTINCLUDES = -I../../../../lib/font/include
LIBXRANDRINCLUDES= -I../../../../lib/Xrandr
-INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
+INCLUDES = -I. -I/usr/include -I/usr/include/nx \
-I../../../../extras/Mesa/include \
-I$(XBUILDINCDIR) -I$(FONTINCSRC) \
-I../../mi -I../../include -I../../os \
@@ -146,7 +146,7 @@
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES)
#ifdef SunArchitecture
-INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
+INCLUDES = -I. -I/usr/include -I/usr/include/nx \
-I../../../../extras/Mesa/include \
-I$(XBUILDINCDIR) -I$(FONTINCSRC) \
-I/usr/sfw/include \
@@ -161,7 +161,7 @@
-I../../mi -I../../include -I../../os \
-I../../GL/glx -I../../GL/include -I../../../../lib/GL/include -I../../Xext \
-I../../miext/damage -I../../miext/cw \
- -I../../../../../nxcomp -I../../../../../nxcompext -I../../../../../nxcompshad \
+ -I/usr/include -I/usr/include/nx \
-I../../../../extras/Mesa/include \
-I$(EXTINCSRC) -I$(XINCLUDESRC) \
$(VFBINCLUDES) $(NXFONTINCLUDES) $(LIBXRANDRINCLUDES)

34
net-misc/nx-X11/files/nx-X11-3.4.0-Imake-fix-1.patch Normal file
View File

@@ -0,0 +1,34 @@
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
Date: 2010-06-14
Initial Package Version: 3.4.0
Origin: me
Upstream Status: unknown
Description: fix location of header files
diff -Naur nx-X11.orig/lib/X11/Imakefile nx-X11/lib/X11/Imakefile
--- nx-X11.orig/lib/X11/Imakefile 2010-06-14 21:00:25.766704602 +0000
+++ nx-X11/lib/X11/Imakefile 2010-06-14 21:00:57.692957389 +0000
@@ -37,9 +37,9 @@
#if NXLibraries
#ifdef SunArchitecture
-NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include
+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1 -I/usr/sfw/include
#else
-NX_INCLUDES = -I../../../nxcomp
+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
#endif
NX_DEFINES = -DNX_TRANS_SOCKET \
diff -Naur nx-X11.orig/programs/Xserver/os/Imakefile nx-X11/programs/Xserver/os/Imakefile
--- nx-X11.orig/programs/Xserver/os/Imakefile 2010-06-14 21:00:26.230954814 +0000
+++ nx-X11/programs/Xserver/os/Imakefile 2010-06-14 21:01:37.215706106 +0000
@@ -30,7 +30,7 @@
#if NXLibraries
-NX_INCLUDES = -I../../../../nxcomp
+NX_INCLUDES = -I/usr/include/nx -I/usr/include/X11 -I/usr/include/xorg -I/usr/include/pixman-1
NX_DEFINES = -DNX_TRANS_SOCKET \
-DNX_TRANS_AUTH \

11
net-misc/nx-X11/files/nx-x11-1.5.0-tmp-exec.patch Normal file
View File

@@ -0,0 +1,11 @@
--- nx-X11/config/imake/imake.c.orig 2006-11-05 00:10:49.000000000 +0000
+++ nx-X11/config/imake/imake.c 2006-11-05 00:11:49.000000000 +0000
@@ -974,7 +974,7 @@
static void
get_libc_version(FILE *inFile)
{
- char aout[] = "/tmp/imakeXXXXXX";
+ char aout[] = "./imakeXXXXXX";
FILE *fp;
const char *format = "%s -o %s -x c -";
char *cc;