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

net-misc/nx-X11: Bump

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2335 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2010-08-28 08:18:00 +00:00
parent 0b2109cd1a
commit a1308417c0
20 changed files with 1398 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
net-misc/nx-X11/files/85_nx-X11_debian-ld.dpatch
View File

@@ -5,10 +5,8 @@
## 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
--- a/config/cf/X11.tmpl
+++ b/config/cf/X11.tmpl
@@ -2665,9 +2665,9 @@
#ifndef SharedXrenderRev
#define SharedXrenderRev 1.2.2
@@ -21,10 +19,8 @@ Index: nx-x11-ubuntu/config/cf/X11.tmpl
#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
--- a/lib/X11/Imakefile
+++ b/lib/X11/Imakefile
@@ -83,7 +83,7 @@
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
@@ -34,10 +30,8 @@ Index: nx-x11-ubuntu/lib/X11/Imakefile
#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
--- a/lib/Xext/Imakefile
+++ b/lib/Xext/Imakefile
@@ -10,14 +10,15 @@
#define DoExtraLib SharedLibXext
#define DoDebugLib DebugLibXext
@@ -56,10 +50,8 @@ Index: nx-x11-ubuntu/lib/Xext/Imakefile
#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
--- a/lib/Xft/Imakefile
+++ b/lib/Xft/Imakefile
@@ -94,8 +94,7 @@
FONTCONFIG_CFLAGS="$(FONTCONFIG_CFLAGS)" \
FONTCONFIG_LIBS="$(FONTCONFIG_LIBS)"
@@ -70,10 +62,8 @@ Index: nx-x11-ubuntu/lib/Xft/Imakefile
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
--- a/lib/Xft1/Imakefile
+++ b/lib/Xft1/Imakefile
@@ -92,7 +92,7 @@
FREETYPE2REQLIB = $(FREETYPE2LIB)
#endif
@@ -83,10 +73,8 @@ Index: nx-x11-ubuntu/lib/Xft1/Imakefile
#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
--- a/lib/Xrender/Imakefile
+++ b/lib/Xrender/Imakefile
@@ -74,7 +74,7 @@
#define DoSharedLib SharedLibXrender
#define DoDebugLib DebugLibXrender
@@ -106,10 +94,8 @@ Index: nx-x11-ubuntu/lib/Xrender/Imakefile
#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
--- a/programs/Xserver/Imakefile
+++ b/programs/Xserver/Imakefile
@@ -997,7 +997,7 @@
XPMLIB = -lXpm
NXAGENT = hw/nxagent/LibraryTargetName(nxagent)