diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2007-08-10 18:17:14 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2007-08-10 18:17:14 +0000 |
commit | bea729cf3504fb2a39eb8de2d52bea5839d57a2a (patch) | |
tree | 3bf1e8597a25100db4077de82e68ceb67580aeef /net-misc/nx/files | |
parent | x86 stable wrt #188383 (diff) | |
download | gentoo-2-bea729cf3504fb2a39eb8de2d52bea5839d57a2a.tar.gz gentoo-2-bea729cf3504fb2a39eb8de2d52bea5839d57a2a.tar.bz2 gentoo-2-bea729cf3504fb2a39eb8de2d52bea5839d57a2a.zip |
Removing old NX 1.5 version
(Portage version: 2.1.3.3)
Diffstat (limited to 'net-misc/nx/files')
-rw-r--r-- | net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch | 15 | ||||
-rw-r--r-- | net-misc/nx/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch | 20 | ||||
-rw-r--r-- | net-misc/nx/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch | 424 | ||||
-rw-r--r-- | net-misc/nx/files/1.5.0/nx-x11-windows-linux-resume.patch | 37 | ||||
-rw-r--r-- | net-misc/nx/files/1.5.0/nxcomp-1.5.0-gcc4.patch | 12 | ||||
-rw-r--r-- | net-misc/nx/files/1.5.0/nxwrapper | 7 | ||||
-rw-r--r-- | net-misc/nx/files/digest-nx-1.5.0 | 24 |
7 files changed, 0 insertions, 539 deletions
diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch deleted file mode 100644 index 0c7279b6ece2..000000000000 --- a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru nx-X11-orig/lib/X11/XlcDL.c nx-X11/lib/X11/XlcDL.c ---- nx-X11-orig/lib/X11/XlcDL.c 2006-10-04 16:51:54.000000000 -0600 -+++ nx-X11/lib/X11/XlcDL.c 2006-10-04 16:52:55.000000000 -0600 -@@ -58,10 +58,8 @@ - #ifdef _LP64 - # if defined(__sparcv9) - # define _MACH64_NAME "sparcv9" --# elif defined(__ia64__) --# undef MACH64_NAME - # else --# error "Unknown architecture" -+# undef MACH64_NAME - # endif /* defined(__sparcv9) */ - # ifdef _MACH64_NAME - # define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch deleted file mode 100644 index 640c9a7d0c4f..000000000000 --- a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- nx-X11/programs/Xserver/hw/nxagent/GCOps.c~ 2005-11-25 21:42:23.000000000 +0100 -+++ nx-X11/programs/Xserver/hw/nxagent/GCOps.c 2006-03-08 11:28:43.000000000 +0100 -@@ -2385,7 +2385,7 @@ - { - if ((pDrawable)->type == DRAWABLE_PIXMAP) - { -- miPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments); -+ fbPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments); - } - - return; -@@ -2423,7 +2423,7 @@ - } - - nxagentGCTrap++; -- miPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments); -+ fbPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments); - nxagentGCTrap--; - return; - } diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch deleted file mode 100644 index cb270246b379..000000000000 --- a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch +++ /dev/null @@ -1,424 +0,0 @@ -diff -purN nx-X11.orig/lib/fontconfig/fonts.conf.in nx-X11/lib/fontconfig/fonts.conf.in ---- nx-X11.orig/lib/fontconfig/fonts.conf.in 2002-10-03 17:06:28.000000000 -0500 -+++ nx-X11/lib/fontconfig/fonts.conf.in 2006-03-21 08:15:22.000000000 -0600 -@@ -24,7 +24,7 @@ - Common X11R6 font directories - --> - -- <dir>/usr/X11R6/lib/X11/fonts</dir> -+ <dir>/usr/share/fonts</dir> - <dir>/usr/share/fonts</dir> - <dir>~/.fonts</dir> - -diff -purN nx-X11.orig/lib/fontconfig/src/fontconfig.man nx-X11/lib/fontconfig/src/fontconfig.man ---- nx-X11.orig/lib/fontconfig/src/fontconfig.man 2003-02-16 11:44:36.000000000 -0600 -+++ nx-X11/lib/fontconfig/src/fontconfig.man 2006-03-21 08:15:22.000000000 -0600 -@@ -1352,8 +1352,8 @@ This is an example of a system-wide conf - <!-- - Find fonts in these directories - --> --<dir>/usr/X11R6/lib/X11/fonts/truetype</dir> --<dir>/usr/X11R6/lib/X11/fonts/Type1</dir> -+<dir>/usr/share/fonts/truetype</dir> -+<dir>/usr/share/fonts/Type1</dir> - - <!-- - Accept deprecated 'mono' alias, replacing it with 'monospace' -diff -purN nx-X11.orig/programs/Xserver/hw/nxagent/Font.c nx-X11/programs/Xserver/hw/nxagent/Font.c ---- nx-X11.orig/programs/Xserver/hw/nxagent/Font.c 2005-12-12 10:51:51.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/nxagent/Font.c 2006-03-21 08:14:17.000000000 -0600 -@@ -60,13 +60,13 @@ is" without express or implied warranty. - #undef TEST - #undef DEBUG - --#define NXAGENT_DEFAULT_FONT_DIR "/usr/X11R6/lib/X11/fonts" -+#define NXAGENT_DEFAULT_FONT_DIR "/usr/share/fonts" - #define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/X11/fonts" - - #define NXAGENT_DEFAULT_FONT_PATH \ --"/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ --/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\ --/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/" -+"/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\ -+/usr/share/fonts/Type1/,/usr/share/fonts/75dpi/,\ -+/usr/share/fonts/100dpi/,/usr/share/fonts/TTF/" - - #define NXAGENT_ALTERNATE_FONT_PATH \ - "/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\ -@@ -1008,7 +1008,7 @@ void nxagentVerifyDefaultFontPath(void) - S_ISDIR(dirStat.st_mode) != 0) - { - /* -- * Let's use the old "/usr/X11R6/lib/X11/fonts" style. -+ * Let's use the old "/usr/share/fonts" style. - */ - - #ifdef TEST -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Install nx-X11/programs/Xserver/hw/xfree86/doc/Install ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Install 2003-02-24 23:29:10.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/Install 2006-03-21 08:14:26.000000000 -0600 -@@ -318,7 +318,7 @@ tion procedure for this case is as follo - chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK - /sbin/ldconfig /usr/X11R6/lib # For Linux - /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD -- /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc -+ /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc - - 4.2 Installing over an old installation - -@@ -378,7 +378,7 @@ Once that's done, the main part of the i - chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK - /sbin/ldconfig /usr/X11R6/lib # For Linux - /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD -- /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc -+ /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc - - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.17 2003/02/24 17:09:16 dawes Exp $ - -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man 1998-04-04 20:28:40.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man 2006-03-21 08:14:26.000000000 -0600 -@@ -99,16 +99,16 @@ EndSection - .\" X11R6 allows the X server to request fonts from a font server. A - .\" font server is specified by placing a "<trans>/<hostname>:<port_number>" - .\" entry into the fontpath. For example, the fontpath --.\" "/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" tells the X server -+.\" "/usr/share/fonts/misc/,tcp/zok:7100" tells the X server - .\" to first try to locate the font in the local directory --.\" /usr/X11R6/lib/X11/fonts/misc. If that fails, then request the -+.\" /usr/share/fonts/misc. If that fails, then request the - .\" font from the \fIfont server\fP running on machine zok listening - .\" for connections on TCP port number 7100. - X11R6 は X サーバがフォントサーバにフォントを要求することが可能 - になりました。フォントサーバは場所を "<trans>/<hostname>:<port_number>" - とフォントパスに指定します。例えば、フォントパス --"/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" はまず最初にローカル --ディレクトリ /usr/X11R6/lib/X11/fonts/misc を X サーバに伝えます。 -+"/usr/share/fonts/misc/,tcp/zok:7100" はまず最初にローカル -+ディレクトリ /usr/share/fonts/misc を X サーバに伝えます。 - これが失敗したときに、ポート番号 7100 から TCP で接続して聞いて - (listening) いる zok というホストで動作している \fIフォントサーバ\fP - にフォントを要求します。 -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml 1997-01-25 22:34:24.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml 2006-03-21 08:14:26.000000000 -0600 -@@ -1372,7 +1372,7 @@ However, if you didn't install <tt>X312D - 3.1.2D (or are not sure if you installed it), you should run the following: - - <tscreen><verb> -- /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc -+ /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc - </verb></tscreen> - - An up-to-date version of the xterm termcap and terminfo entries is -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.SVR4 nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4 ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.SVR4 2000-02-29 19:48:14.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4 2006-03-21 08:14:27.000000000 -0600 -@@ -295,9 +295,9 @@ you need to do: - for i in *pc???.bdf - do - /usr/X11R6/bin/bdftopcf $i > \ -- /usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf -+ /usr/share/fonts/misc/`basename $i .bdf`.pcf - done -- cd /usr/X11R6/lib/X11/fonts/misc -+ cd /usr/share/fonts/misc - /usr/X11R6/bin/mkfontdir - # Do this only if the server is already running. - /usr/X11R6/bin/xset fp rehash -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.fonts nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.fonts 2003-01-19 22:10:02.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts 2006-03-21 08:14:27.000000000 -0600 -@@ -253,7 +253,7 @@ CMap `UniKS-UCS2-H' is called - - The CIDFont code in XFree86 requires a very rigid directory structure. The - main directory must be called `CID' (its location defaults to --`/usr/X11R6/lib/X11/fonts/CID' but it may be located anywhere), and it should -+`/usr/share/fonts/CID' but it may be located anywhere), and it should - contain a subdirectory for every CID collection. Every subdirectory must - contain subdirectories called CIDFont (containing the actual CIDFont files), - CMap (containing all the needed CMaps), AFM (containing the font metric -@@ -398,7 +398,7 @@ dard fonts in a number of regional encod - - For example, the font file - -- /usr/X11R6/lib/X11/fonts/misc/6x13.bdf -+ /usr/share/fonts/misc/6x13.bdf - - with XLFD - -@@ -442,7 +442,7 @@ The main ClearlyU font has the XLFD - - and resides in the font file - -- /usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz -+ /usr/share/fonts/misc/cu12.pcf.gz - - Additional ClearlyU fonts include - -@@ -480,7 +480,7 @@ Standard Encoding. These fonts have XLF - - and reside in the font files - -- /usr/X11R6/lib/X11/fonts/Type1/cour*.pfa -+ /usr/share/fonts/Type1/cour*.pfa - - The Adobe Utopia set of fonts only cover ISO 8859-1 as well as Adobe Standard - Encoding. These fonts have XLFD -@@ -489,7 +489,7 @@ Encoding. These fonts have XLFD - - and reside in the font files - -- /usr/X11R6/lib/X11/fonts/Type1/UT*.pfa -+ /usr/share/fonts/Type1/UT*.pfa - - Finally, XFree86 also comes with Type 1 versions of Bitstream Courier and - Charter. These fonts have XLFD -@@ -499,7 +499,7 @@ Charter. These fonts have XLFD - - and reside in the font files - -- /usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb -+ /usr/share/fonts/Type1/c*bt_.pfb - - 3.3.2 Standard Speedo fonts - -@@ -515,7 +515,7 @@ XLFD name - - and reside in the font files - -- /usr/X11R6/lib/X11/fonts/Speedo/font*.spd -+ /usr/share/fonts/Speedo/font*.spd - - 3.4 The Bigelow & Holmes Luxi family - -@@ -699,7 +699,7 @@ The Speedo backend limits all encodings - In order to use a font in an encoding that the font backend does not know - about, you need to have an `encodings.dir' file either in the same directory - as the font file used or in a system-wide location --(`/usr/X11R6/lib/X11/fonts/encodings/' by default). -+(`/usr/share/fonts/encodings/' by default). - - The `encodings.dir' file has a similar format to `fonts.dir'. Its first line - specifies the number of encodings, while every successive line has two -@@ -709,9 +709,9 @@ should agree with the encoding name defi - ple, - - 3 -- mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc -- mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc -- mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc -+ mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc -+ mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc -+ mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc - - The name of an encoding must be specified in the encoding file's `STARTENCOD- - ING' or `ALIAS' line. It is not enough to create an `encodings.dir' entry. -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml 2003-02-24 11:09:16.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml 2006-03-21 08:14:26.000000000 -0600 -@@ -432,7 +432,7 @@ ln -s /etc/X11/xserver /usr/X11R6/lib/X1 - chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK - /sbin/ldconfig /usr/X11R6/lib # For Linux - /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD --/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc -+/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc - </verb></tscreen> - - <sect1>Installing over an old installation -@@ -511,7 +511,7 @@ Once that's done, the main part of the i - chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK - /sbin/ldconfig /usr/X11R6/lib # For Linux - /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD --/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc -+/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc - </verb></tscreen> - - ]]> -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml 1999-08-23 01:38:52.000000000 -0500 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml 2006-03-21 08:14:26.000000000 -0600 -@@ -328,9 +328,9 @@ things you need to do: - for i in *pc???.bdf - do - /usr/X11R6/bin/bdftopcf $i > \ -- /usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf -+ /usr/share/fonts/misc/`basename $i .bdf`.pcf - done -- cd /usr/X11R6/lib/X11/fonts/misc -+ cd /usr/share/fonts/misc - /usr/X11R6/bin/mkfontdir - # Do this only if the server is already running. - /usr/X11R6/bin/xset fp rehash -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml ---- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml 2003-01-19 21:43:08.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml 2006-03-21 08:14:26.000000000 -0600 -@@ -296,7 +296,7 @@ Munhwa-Regular--UniKS-UCS2-H - - The CIDFont code in XFree86 requires a very rigid directory - structure. The main directory must be called `<tt/CID/' (its location --defaults to `<tt>/usr/X11R6/lib/X11/fonts/CID</tt>' but it may be -+defaults to `<tt>/usr/share/fonts/CID</tt>' but it may be - located anywhere), and it should contain a subdirectory for every CID - collection. Every subdirectory <it/must/ contain subdirectories - called <tt/CIDFont/ (containing the actual CIDFont files), <tt/CMap/ -@@ -457,7 +457,7 @@ with no duplication of work. - - For example, the font file - <tscreen><verb> --/usr/X11R6/lib/X11/fonts/misc/6x13.bdf -+/usr/share/fonts/misc/6x13.bdf - </verb></tscreen> - with XLFD - <tscreen><verb> -@@ -502,7 +502,7 @@ The main ClearlyU font has the XLFD - </verb></tscreen> - and resides in the font file - <tscreen><verb> --/usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz -+/usr/share/fonts/misc/cu12.pcf.gz - </verb></tscreen> - Additional ClearlyU fonts include - <tscreen><verb> -@@ -542,7 +542,7 @@ XLFD - </verb></tscreen> - and reside in the font files - <tscreen><verb> --/usr/X11R6/lib/X11/fonts/Type1/cour*.pfa -+/usr/share/fonts/Type1/cour*.pfa - </verb></tscreen> - - The Adobe Utopia set of fonts only cover ISO 8859-1 as well as -@@ -552,7 +552,7 @@ Adobe Standard Encoding. These fonts ha - </verb></tscreen> - and reside in the font files - <tscreen><verb> --/usr/X11R6/lib/X11/fonts/Type1/UT*.pfa -+/usr/share/fonts/Type1/UT*.pfa - </verb></tscreen> - - Finally, XFree86 also comes with Type 1 versions of Bitstream -@@ -563,7 +563,7 @@ Courier and Charter. These fonts have X - </verb></tscreen> - and reside in the font files - <tscreen><verb> --/usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb -+/usr/share/fonts/Type1/c*bt_.pfb - </verb></tscreen> - - <sect2>Standard Speedo fonts -@@ -581,7 +581,7 @@ ISO 8859-2. They have XLFD name - </verb></tscreen> - and reside in the font files - <tscreen><verb> --/usr/X11R6/lib/X11/fonts/Speedo/font*.spd -+/usr/share/fonts/Speedo/font*.spd - </verb></tscreen> - - <sect1>The Bigelow & Holmes Luxi family -@@ -770,7 +770,7 @@ The Speedo backend limits all encodings - <p>In order to use a font in an encoding that the font backend does - not know about, you need to have an `<tt/encodings.dir/' file either - in the same directory as the font file used or in a system-wide --location (`<tt>/usr/X11R6/lib/X11/fonts/encodings/</tt>' by default). -+location (`<tt>/usr/share/fonts/encodings/</tt>' by default). - - The `<tt/encodings.dir/' file has a similar format to - `<tt/fonts.dir/'. Its first line specifies the number of encodings, -@@ -781,9 +781,9 @@ encoding name defined in the encoding fi - - <tscreen><verb> - 3 --mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc --mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc --mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc -+mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc -+mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc -+mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc - </verb></tscreen> - - The name of an encoding <it/must/ be specified in the encoding file's -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy ---- nx-X11.orig/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy 2003-02-19 22:05:16.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy 2006-03-21 08:14:34.000000000 -0600 -@@ -52,15 +52,15 @@ Section "Files" - # as well as specifying multiple comma-separated entries in one FontPath - # command (or a combination of both methods) - -- FontPath "/usr/X11R6/lib/X11/fonts/local/" -- FontPath "/usr/X11R6/lib/X11/fonts/misc/" -- FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled" -- FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled" -- FontPath "/usr/X11R6/lib/X11/fonts/Type1/" -- FontPath "/usr/X11R6/lib/X11/fonts/CID/" -- FontPath "/usr/X11R6/lib/X11/fonts/Speedo/" -- FontPath "/usr/X11R6/lib/X11/fonts/75dpi/" -- FontPath "/usr/X11R6/lib/X11/fonts/100dpi/" -+ FontPath "/usr/share/fonts/local/" -+ FontPath "/usr/share/fonts/misc/" -+ FontPath "/usr/share/fonts/75dpi/:unscaled" -+ FontPath "/usr/share/fonts/100dpi/:unscaled" -+ FontPath "/usr/share/fonts/Type1/" -+ FontPath "/usr/share/fonts/CID/" -+ FontPath "/usr/share/fonts/Speedo/" -+ FontPath "/usr/share/fonts/75dpi/" -+ FontPath "/usr/share/fonts/100dpi/" - - # ModulePath can be used to set a search path for the X server modules. - # The default path is shown here. -diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/etc/install.sv3 nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3 ---- nx-X11.orig/programs/Xserver/hw/xfree86/etc/install.sv3 1999-03-28 09:32:52.000000000 -0600 -+++ nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3 2006-03-21 08:14:25.000000000 -0600 -@@ -549,9 +549,9 @@ then - read answer - [ "$answer" = "y" -o "$answer" = "Y" ] && { - sed -e 's/FONT 8x16/FONT vga/' </usr/lib/loadfont/vga437.bdf \ -- | bdftopcf -t >/usr/X11R6/lib/X11/fonts/misc/vga.pcf -- chmod 644 /usr/X11R6/lib/X11/fonts/misc/fonts.dir -- mkfontdir /usr/X11R6/lib/X11/fonts/misc -+ | bdftopcf -t >/usr/share/fonts/misc/vga.pcf -+ chmod 644 /usr/share/fonts/misc/fonts.dir -+ mkfontdir /usr/share/fonts/misc - } - fi - } -diff -purN nx-X11.orig/programs/mkcfm/mkcfm.c nx-X11/programs/mkcfm/mkcfm.c ---- nx-X11.orig/programs/mkcfm/mkcfm.c 2002-12-09 11:30:12.000000000 -0600 -+++ nx-X11/programs/mkcfm/mkcfm.c 2006-03-21 08:14:10.000000000 -0600 -@@ -48,7 +48,7 @@ - static void CIDFillVals(FontScalablePtr); - static Bool DoDirectory(char *dirName); - --#define DEFAULTCID "/usr/X11R6/lib/X11/fonts/CID" -+#define DEFAULTCID "/usr/share/fonts/CID" - #define DECIPOINTSPERINCH 722.7 - #define DEFAULTRES 75 - #define DEFAULTPOINTSIZE 120 -diff -purN nx-X11.orig/programs/mkcfm/mkcfm.man nx-X11/programs/mkcfm/mkcfm.man ---- nx-X11.orig/programs/mkcfm/mkcfm.man 1999-05-15 07:10:38.000000000 -0500 -+++ nx-X11/programs/mkcfm/mkcfm.man 2006-03-21 08:14:10.000000000 -0600 -@@ -24,7 +24,7 @@ mkcfm - create summaries of font metric - [\fICID-font-directory-name\fP] - .SH DESCRIPTION - There is usually only one CID font directory on the X font path. It is --usually called \fI/usr/X11R6/lib/X11/fonts/CID\fP. If you do not specify -+usually called \fI/usr/share/fonts/CID\fP. If you do not specify - an argument, \fImkcfm\fP will try to go through the subdirectories of - that directory, and create one summary of font metric files for each - CIDFont (character descriptions) file and each CMap (Character Maps) file -diff -purN nx-X11.orig/programs/xfs/xfs.man nx-X11/programs/xfs/xfs.man ---- nx-X11.orig/programs/xfs/xfs.man 2001-12-14 14:01:32.000000000 -0600 -+++ nx-X11/programs/xfs/xfs.man 2006-03-21 08:14:56.000000000 -0600 -@@ -186,9 +186,9 @@ XCOMM where to look for fonts - XCOMM the first is a set of Speedo outlines, the second is a set of - XCOMM misc bitmaps and the last is a set of 100dpi bitmaps - XCOMM --catalogue = /usr/X11R6/lib/X11/fonts/speedo, -- /usr/X11R6/lib/X11/fonts/misc, -- /usr/X11R6/lib/X11/fonts/100dpi/ -+catalogue = /usr/share/fonts/speedo, -+ /usr/share/fonts/misc, -+ /usr/share/fonts/100dpi/ - - XCOMM in 12 points, decipoints - default-point-size = 120 diff --git a/net-misc/nx/files/1.5.0/nx-x11-windows-linux-resume.patch b/net-misc/nx/files/1.5.0/nx-x11-windows-linux-resume.patch deleted file mode 100644 index 97b248588846..000000000000 --- a/net-misc/nx/files/1.5.0/nx-x11-windows-linux-resume.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- nx-X11/programs/Xserver/hw/nxagent/Display.c.orig 2005-07-29 09:01:11.000000000 -0700 -+++ nx-X11/programs/Xserver/hw/nxagent/Display.c 2005-07-30 07:16:06.000000000 -0700 -@@ -1531,11 +1531,12 @@ - reconnectDisplayState = NOTHING; - } - -+#define WARNING - static Bool reloadVisuals(int flexibility) - { - int i, nitems; - XVisualInfo *newVisuals, *vi; -- unsigned long mask = VisualAllMask & ~VisualIDMask; -+ unsigned long mask = VisualAllMask & ~VisualIDMask & ~VisualBitsPerRGBMask; - - newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals); - -@@ -1577,6 +1578,10 @@ - } - } - -+ #ifdef WARNING -+ fprintf(stderr, "matched for %d visuals and found %d matching\n", nxagentNumVisuals,i); -+ #endif -+ - if (i == nxagentNumVisuals) - { - nxagentVisuals = newVisuals; ---- nx-X11/programs/Xserver/hw/nxagent/Visual.c.orig 2005-07-30 07:17:40.000000000 -0700 -+++ nx-X11/programs/Xserver/hw/nxagent/Visual.c 2005-07-30 07:17:44.000000000 -0700 -@@ -48,7 +48,6 @@ - for (i = 0; i < nxagentNumVisuals; i++) - { - if (pVisual->class == nxagentVisuals[i].class && -- pVisual->bitsPerRGBValue == nxagentVisuals[i].bits_per_rgb && - pVisual->ColormapEntries == nxagentVisuals[i].colormap_size && - pVisual->nplanes == nxagentVisuals[i].depth && - pVisual->redMask == nxagentVisuals[i].red_mask && diff --git a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-gcc4.patch b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-gcc4.patch deleted file mode 100644 index 96da04209118..000000000000 --- a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-gcc4.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nxcomp/RenderExtension.h.orig 2005-02-19 18:23:32.000000000 +0000 -+++ nxcomp/RenderExtension.h 2005-08-27 23:16:05.000000000 +0100 -@@ -68,6 +68,8 @@ - // The message class. - // - -+class RenderMinorExtensionStore; -+ - class RenderExtensionMessage : public Message - { - friend class RenderExtensionStore; - diff --git a/net-misc/nx/files/1.5.0/nxwrapper b/net-misc/nx/files/1.5.0/nxwrapper deleted file mode 100644 index b93407b78702..000000000000 --- a/net-misc/nx/files/1.5.0/nxwrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -NXCOMMAND=$(basename $0) - -export LD_LIBRARY_PATH=/usr/lib/NX/lib:$LD_LIBRARY_PATH -exec /usr/lib/NX/bin/$NXCOMMAND ${1+"$@"} - diff --git a/net-misc/nx/files/digest-nx-1.5.0 b/net-misc/nx/files/digest-nx-1.5.0 deleted file mode 100644 index 7eac0e183b7b..000000000000 --- a/net-misc/nx/files/digest-nx-1.5.0 +++ /dev/null @@ -1,24 +0,0 @@ -MD5 11877c3357732a957e3bf7e3d2f2ca0a nx-X11-1.5.0-21.tar.gz 32390668 -RMD160 adaf757f20c59d39c2700f9082e414eefdc2c62f nx-X11-1.5.0-21.tar.gz 32390668 -SHA256 075570e59aa749fe4f11fca6ebf7579e5785b24b89cb8c62a368f4e2fe7d9123 nx-X11-1.5.0-21.tar.gz 32390668 -MD5 160726ed67698a9694b707950c49e19e nxagent-1.5.0-112.tar.gz 818946 -RMD160 a0c3f5cd8f459ba46c3bb1161a2330df2589351d nxagent-1.5.0-112.tar.gz 818946 -SHA256 f6008505a38cf6f3f7c06b0e97cbf0309c5f43dff99a21fd610a592c4326755d nxagent-1.5.0-112.tar.gz 818946 -MD5 a7c5e68e9678cb5c722c334b33baf660 nxauth-1.5.0-1.tar.gz 23077 -RMD160 53c14a8195a39ecc7a1ea4151214921a6148ed41 nxauth-1.5.0-1.tar.gz 23077 -SHA256 42549f5767627378653d11f1d16d7334a6e08f3b1ecdd5edd0188aaaa7c36e4d nxauth-1.5.0-1.tar.gz 23077 -MD5 782f04870142c9fc5b2e1f654fd0a5d7 nxcomp-1.5.0-80.tar.gz 525688 -RMD160 7a367ef235c50c143b4a25cd78aedd9fe83c8772 nxcomp-1.5.0-80.tar.gz 525688 -SHA256 2a93eb6c32436028b11b8b5ef5be58a7138bc14cefb68e74b96cc7049f5a0367 nxcomp-1.5.0-80.tar.gz 525688 -MD5 6a5b8b79b9e0cc81b88233b18c4f227f nxcompext-1.5.0-20.tar.gz 124036 -RMD160 4c7bfe55df09e4726eadb2498e94475a059aac7f nxcompext-1.5.0-20.tar.gz 124036 -SHA256 468944ea3e605468a032dd56c58570029a56c489a60b504b3cd16018f6ccb760 nxcompext-1.5.0-20.tar.gz 124036 -MD5 6c20c1300ca6b4d362237ef44cfee7f7 nxdesktop-1.5.0-78.tar.gz 201893 -RMD160 15ee898cbfd2fa02c2259f90ca5383657759fd41 nxdesktop-1.5.0-78.tar.gz 201893 -SHA256 5f35aecf1cc12940d0a00afe19879278bc886c7fd3ab70b8b779f3cfcd324719 nxdesktop-1.5.0-78.tar.gz 201893 -MD5 d2e3c1a109db336dfa497f4c2004f2d5 nxproxy-1.5.0-9.tar.gz 73470 -RMD160 e6104a85893b28453b3e4f96cfa7b1c193dca6b6 nxproxy-1.5.0-9.tar.gz 73470 -SHA256 33227370c90cdb5e65824001255f4df5a20eecff19f75483df21bf55ab888d4a nxproxy-1.5.0-9.tar.gz 73470 -MD5 ff3e5a4c1601b58f5fc405f990691bdf nxviewer-1.5.0-15.tar.gz 86414 -RMD160 c13a693a6b528f2d5703d38ac22b390439ae691c nxviewer-1.5.0-15.tar.gz 86414 -SHA256 31d05d083b591a22bacbd4407cfec717116756eb2e0ba327b74a209f5eb09b56 nxviewer-1.5.0-15.tar.gz 86414 |