From: Bernard Cafarelli Date: Wed, 21 Mar 2007 00:15:30 +0000 (+0000) Subject: Revision bump to NX 2.1, amd64 support X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78f5a5a74c9a07ab23f2dc750ac06657b3447fca;p=gentoo.git Revision bump to NX 2.1, amd64 support Package-Manager: portage-2.1.2.2 --- diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog index 9124c621166d..f70de48a503a 100644 --- a/net-misc/nx/ChangeLog +++ b/net-misc/nx/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-misc/nx -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.1 2006/11/08 21:27:10 stuart Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.2 2007/03/21 00:15:30 voyageur Exp $ + +*nx-2.1.0 (21 Mar 2007) + + 21 Mar 2007; Bernard Cafarelli + +files/nx-2.1.0-deprecated-headers.patch, + +files/nx-2.1.0-invalid-options.patch, + +files/nx-2.1.0-nxagent-mem-leaks.patch, +nx-2.1.0.ebuild: + Bump to NX components 2.1, including: + added ~amd64 support + compilation warnings fix, thanks masterdriverz , bug + #154132 08 Nov 2006; Stuart Herbert ChangeLog: Initial import; replaces net-misc/nx-x11 and net-misc/nx-x11-bin diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index dd1f0f193670..71be1c1eeb79 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -30,22 +30,46 @@ AUX 1.5.0/nxwrapper 136 RMD160 ca7f9cf47c4f5ad31f76f4f8b3c567d6c40196ef SHA1 f3c MD5 e4786ac74a1db0ea674655dd4df0147d files/1.5.0/nxwrapper 136 RMD160 ca7f9cf47c4f5ad31f76f4f8b3c567d6c40196ef files/1.5.0/nxwrapper 136 SHA256 fa3f44295ba003f897076fc1ea2f665f7d1d8ce73e3bcb1fca934477292e7125 files/1.5.0/nxwrapper 136 +AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a SHA1 fc41d3539af12dd3d5a1dafc63b0ca40893fbf1b SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973 +MD5 a61a10fdf2346b908a7a9bc6638ac3ac files/nx-2.1.0-deprecated-headers.patch 3095 +RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a files/nx-2.1.0-deprecated-headers.patch 3095 +SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973 files/nx-2.1.0-deprecated-headers.patch 3095 +AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01 +MD5 08d051f5c082efc3ab71dabbd384d543 files/nx-2.1.0-invalid-options.patch 978 +RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 files/nx-2.1.0-invalid-options.patch 978 +SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01 files/nx-2.1.0-invalid-options.patch 978 +AUX nx-2.1.0-nxagent-mem-leaks.patch 3384 RMD160 db6a81a9cbccc49c372df6a40a83b4196a98ab64 SHA1 e0be9d2e8e0415a4ba58638397f7106ca61862be SHA256 6a033b36db8fb5e9456f23516a16a5cbb3ad775ac5b3a06d8d68055766356b39 +MD5 e9c59c55f7c0ac98387f1cd97155cec3 files/nx-2.1.0-nxagent-mem-leaks.patch 3384 +RMD160 db6a81a9cbccc49c372df6a40a83b4196a98ab64 files/nx-2.1.0-nxagent-mem-leaks.patch 3384 +SHA256 6a033b36db8fb5e9456f23516a16a5cbb3ad775ac5b3a06d8d68055766356b39 files/nx-2.1.0-nxagent-mem-leaks.patch 3384 DIST nx-X11-1.5.0-21.tar.gz 32390668 RMD160 adaf757f20c59d39c2700f9082e414eefdc2c62f SHA1 2fe4ed9de7047dc35b9b606551fda5f099fc4dba SHA256 075570e59aa749fe4f11fca6ebf7579e5785b24b89cb8c62a368f4e2fe7d9123 +DIST nx-X11-2.1.0-3.tar.gz 32532518 RMD160 69c4b24f8279d9c92bb3ef22a4399806b5fb8050 SHA1 3cb5bfa0bed63b71077d9c38b8e0fdf54f2f00e1 SHA256 dabec82696c23d0c9da0d1a66fee12fd6ffe232e7aecf10f0929e968fe0703f4 DIST nxagent-1.5.0-112.tar.gz 818946 RMD160 a0c3f5cd8f459ba46c3bb1161a2330df2589351d SHA1 421cc364cb09f6e06b036b179b419efb1457fcbf SHA256 f6008505a38cf6f3f7c06b0e97cbf0309c5f43dff99a21fd610a592c4326755d +DIST nxagent-2.1.0-18.tar.gz 950859 RMD160 b9d5e50ba2a3b385ee9adc463bb02481ce32db51 SHA1 af405ccae2164f6f9a9a5dc4c28394bab67b8651 SHA256 fc9836702039690ca94e44cefb5ec0edce1f968f55666b8afc66ec15456eae33 DIST nxauth-1.5.0-1.tar.gz 23077 RMD160 53c14a8195a39ecc7a1ea4151214921a6148ed41 SHA1 b08315749472cfd2926b2168a54153e7712a7f15 SHA256 42549f5767627378653d11f1d16d7334a6e08f3b1ecdd5edd0188aaaa7c36e4d +DIST nxauth-2.1.0-2.tar.gz 30296 RMD160 e20dbac668d98e59d42359d71a1be4947a64d492 SHA1 5027488e7c7252d74971934600cbf9eaf90fec7b SHA256 a3231b42daf1e5add3aaa876f5f99dae0dcf196c2122ad0db11c317851e75799 DIST nxcomp-1.5.0-80.tar.gz 525688 RMD160 7a367ef235c50c143b4a25cd78aedd9fe83c8772 SHA1 b3bea98e5e47ba7d540491e7160f842338d1af61 SHA256 2a93eb6c32436028b11b8b5ef5be58a7138bc14cefb68e74b96cc7049f5a0367 +DIST nxcomp-2.1.0-8.tar.gz 556291 RMD160 b8960b616eb48521404e9ee39cf7e6f64e060394 SHA1 a5465b9062aab9e0db5dcab7dbc86c81b40cae37 SHA256 74ad4bf63602c3e50622d74420c3840f2e7f0d690b2176c0331ad2011756e776 DIST nxcompext-1.5.0-20.tar.gz 124036 RMD160 4c7bfe55df09e4726eadb2498e94475a059aac7f SHA1 b5d1937d83bbf8eb40b2a3bd5ea0c4a632fe50f2 SHA256 468944ea3e605468a032dd56c58570029a56c489a60b504b3cd16018f6ccb760 +DIST nxcompext-2.1.0-5.tar.gz 102588 RMD160 f9c7ea4ca0013063406d18b2e3e928ebfa600169 SHA1 788690ac52eebd2613e6d774679ab133270ff172 SHA256 acd81ab9f0ab74317a9d34902d77f5978432d3488664c501a42378577b81f06c DIST nxdesktop-1.5.0-78.tar.gz 201893 RMD160 15ee898cbfd2fa02c2259f90ca5383657759fd41 SHA1 0bbc6385d550c3e53863c27cb69531dce4366a0d SHA256 5f35aecf1cc12940d0a00afe19879278bc886c7fd3ab70b8b779f3cfcd324719 +DIST nxdesktop-2.1.0-9.tar.gz 823225 RMD160 5b42c2e55856d5cd3873b18dfbb6fb128497d5f6 SHA1 4db4756aad23d3cfa3b99b0cfac841c896843fe7 SHA256 35cd77ea63d7381bad5745224bd93635a53bfe4b3e545085f09bf512075c08db DIST nxproxy-1.5.0-9.tar.gz 73470 RMD160 e6104a85893b28453b3e4f96cfa7b1c193dca6b6 SHA1 16c29ac815c1ec91a0dd7b9796b62be66cf01ad0 SHA256 33227370c90cdb5e65824001255f4df5a20eecff19f75483df21bf55ab888d4a +DIST nxproxy-2.1.0-3.tar.gz 82753 RMD160 71c9a069cb9b8ede2505753656cd5b83fff80f8e SHA1 2ec0bafb9546bbde155baeb844454da704aabcc9 SHA256 3c2db68cb0fa931db1b2ef74c76c848357d332ada8397c511719215bd8eeabac DIST nxviewer-1.5.0-15.tar.gz 86414 RMD160 c13a693a6b528f2d5703d38ac22b390439ae691c SHA1 ca598dc3e7df851037ee7e43ed2622df975cee1a SHA256 31d05d083b591a22bacbd4407cfec717116756eb2e0ba327b74a209f5eb09b56 +DIST nxviewer-2.1.0-12.tar.gz 228158 RMD160 0462706c5ea0f49700e4ccdfc2adba1278b0e3ec SHA1 af1f6dc337cd13739037c45d9284c7596e87c732 SHA256 dc41c4f3cc6f6e4e7985a37d5b3cddf9c9571b8e9752fbb056a4d6e4c9b59178 EBUILD nx-1.5.0.ebuild 4031 RMD160 322d3fada6c86904ecbfffa8cdf17c3e3c8d96cc SHA1 eb95a4061039f03c269fc9eba201586974db52d6 SHA256 2820b22dc81019cead45dfae5f924a92f5aae182d9583b3a7517cf1241e3a9be MD5 1f468a67e1a03a49fcb832b0cb8b2677 nx-1.5.0.ebuild 4031 RMD160 322d3fada6c86904ecbfffa8cdf17c3e3c8d96cc nx-1.5.0.ebuild 4031 SHA256 2820b22dc81019cead45dfae5f924a92f5aae182d9583b3a7517cf1241e3a9be nx-1.5.0.ebuild 4031 -MISC ChangeLog 324 RMD160 8ea8319349ff9e141960b99c634da3166ae7bfd8 SHA1 30cdda987f87f6e56f44e152e29df42e76af1746 SHA256 d3ae437414b51a9f587e9957d79499ddc136da308e05d0dab1c09df5a10199c7 -MD5 e8006bc18a6ad9bf9ba74182d97b9771 ChangeLog 324 -RMD160 8ea8319349ff9e141960b99c634da3166ae7bfd8 ChangeLog 324 -SHA256 d3ae437414b51a9f587e9957d79499ddc136da308e05d0dab1c09df5a10199c7 ChangeLog 324 +EBUILD nx-2.1.0.ebuild 3297 RMD160 559e82d7292b1795fd1387f3200222fe942aef8d SHA1 b70dbcc05e93d16653a2a0e1f89f5f2c10f82307 SHA256 6539bca0f50fd6940f6e26fb27ef3b001450c4cb0771095d6a59bdb15a288702 +MD5 078650affa81f5ce39d3149bf3739ebe nx-2.1.0.ebuild 3297 +RMD160 559e82d7292b1795fd1387f3200222fe942aef8d nx-2.1.0.ebuild 3297 +SHA256 6539bca0f50fd6940f6e26fb27ef3b001450c4cb0771095d6a59bdb15a288702 nx-2.1.0.ebuild 3297 +MISC ChangeLog 707 RMD160 4f325faad05351b01e1ae0580335a8eb831b79eb SHA1 f1fa99b7e3376853c2dc94bd09dd207738daab2b SHA256 778b66343f0f56bf1ede31f475829d1e381d16e0d580f41990300304265a656e +MD5 5832b3b41186b68aa0ad1e184586a563 ChangeLog 707 +RMD160 4f325faad05351b01e1ae0580335a8eb831b79eb ChangeLog 707 +SHA256 778b66343f0f56bf1ede31f475829d1e381d16e0d580f41990300304265a656e ChangeLog 707 MISC metadata.xml 312 RMD160 245dc74ea927b730125f0581c38d728319a37824 SHA1 e586c8dc5fbbcdddacf4bdf7fc739bfc9fb716df SHA256 9d3698e1818b09e36ecd3350cf578e2561794828453110d2645c6cceca1cf7dc MD5 aa33dcd9727334aae3a5e6fe0ba4958b metadata.xml 312 RMD160 245dc74ea927b730125f0581c38d728319a37824 metadata.xml 312 @@ -53,3 +77,6 @@ SHA256 9d3698e1818b09e36ecd3350cf578e2561794828453110d2645c6cceca1cf7dc metadata MD5 4afb4893a484c52696b828567eb2fca0 files/digest-nx-1.5.0 2000 RMD160 b1dd9e28dc90d09b26b500eca2f2157607e2bd90 files/digest-nx-1.5.0 2000 SHA256 191116a943ddec07072d5032c7152fc2b4fc1f3a27a47d5eb086e9b829aaa014 files/digest-nx-1.5.0 2000 +MD5 b831307d823d7e1b8137750fe121b380 files/digest-nx-2.1.0 1988 +RMD160 8aef196c297c83f66408cfe246a6bb280aaa2422 files/digest-nx-2.1.0 1988 +SHA256 cfd6609293f71e27c38c0b41b41aafe07e71f902f6f4435ff539191df83e0020 files/digest-nx-2.1.0 1988 diff --git a/net-misc/nx/files/digest-nx-2.1.0 b/net-misc/nx/files/digest-nx-2.1.0 new file mode 100644 index 000000000000..a1eed4aead7b --- /dev/null +++ b/net-misc/nx/files/digest-nx-2.1.0 @@ -0,0 +1,24 @@ +MD5 9c6e9e4c35c4ec3a7664fcdd397eb7f0 nx-X11-2.1.0-3.tar.gz 32532518 +RMD160 69c4b24f8279d9c92bb3ef22a4399806b5fb8050 nx-X11-2.1.0-3.tar.gz 32532518 +SHA256 dabec82696c23d0c9da0d1a66fee12fd6ffe232e7aecf10f0929e968fe0703f4 nx-X11-2.1.0-3.tar.gz 32532518 +MD5 cae6005f50bab78aa7abba448fca4ed9 nxagent-2.1.0-18.tar.gz 950859 +RMD160 b9d5e50ba2a3b385ee9adc463bb02481ce32db51 nxagent-2.1.0-18.tar.gz 950859 +SHA256 fc9836702039690ca94e44cefb5ec0edce1f968f55666b8afc66ec15456eae33 nxagent-2.1.0-18.tar.gz 950859 +MD5 74811bc9ef86f2d97b3b2ba2ba53f9d3 nxauth-2.1.0-2.tar.gz 30296 +RMD160 e20dbac668d98e59d42359d71a1be4947a64d492 nxauth-2.1.0-2.tar.gz 30296 +SHA256 a3231b42daf1e5add3aaa876f5f99dae0dcf196c2122ad0db11c317851e75799 nxauth-2.1.0-2.tar.gz 30296 +MD5 7e35e48adb66786ad720ff9fbfa950a3 nxcomp-2.1.0-8.tar.gz 556291 +RMD160 b8960b616eb48521404e9ee39cf7e6f64e060394 nxcomp-2.1.0-8.tar.gz 556291 +SHA256 74ad4bf63602c3e50622d74420c3840f2e7f0d690b2176c0331ad2011756e776 nxcomp-2.1.0-8.tar.gz 556291 +MD5 d3347382860670cfd4471d228fb1b730 nxcompext-2.1.0-5.tar.gz 102588 +RMD160 f9c7ea4ca0013063406d18b2e3e928ebfa600169 nxcompext-2.1.0-5.tar.gz 102588 +SHA256 acd81ab9f0ab74317a9d34902d77f5978432d3488664c501a42378577b81f06c nxcompext-2.1.0-5.tar.gz 102588 +MD5 bbbb9b91b8bc6759d42524c3f3f5be42 nxdesktop-2.1.0-9.tar.gz 823225 +RMD160 5b42c2e55856d5cd3873b18dfbb6fb128497d5f6 nxdesktop-2.1.0-9.tar.gz 823225 +SHA256 35cd77ea63d7381bad5745224bd93635a53bfe4b3e545085f09bf512075c08db nxdesktop-2.1.0-9.tar.gz 823225 +MD5 29b0e8be069a8258f5b8774362fc7464 nxproxy-2.1.0-3.tar.gz 82753 +RMD160 71c9a069cb9b8ede2505753656cd5b83fff80f8e nxproxy-2.1.0-3.tar.gz 82753 +SHA256 3c2db68cb0fa931db1b2ef74c76c848357d332ada8397c511719215bd8eeabac nxproxy-2.1.0-3.tar.gz 82753 +MD5 e9f5b692278025856b09bd71d0966100 nxviewer-2.1.0-12.tar.gz 228158 +RMD160 0462706c5ea0f49700e4ccdfc2adba1278b0e3ec nxviewer-2.1.0-12.tar.gz 228158 +SHA256 dc41c4f3cc6f6e4e7985a37d5b3cddf9c9571b8e9752fbb056a4d6e4c9b59178 nxviewer-2.1.0-12.tar.gz 228158 diff --git a/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch b/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch new file mode 100644 index 000000000000..c9741d5ca53e --- /dev/null +++ b/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch @@ -0,0 +1,111 @@ +diff -urN BlockCacheSet.cpp BlockCacheSet.cpp +--- BlockCacheSet.cpp 2006-11-05 13:22:45.963189321 +0000 ++++ BlockCacheSet.cpp 2006-11-05 13:23:25.000000000 +0000 +@@ -15,7 +15,9 @@ + /* */ + /**************************************************************************/ + +-#include ++using namespace std; ++ ++#include + #include "BlockCacheSet.h" + + +diff -urN Loop.cpp Loop.cpp +--- Loop.cpp 2006-11-05 13:22:45.854205948 +0000 ++++ Loop.cpp 2006-11-05 13:23:25.000000000 +0000 +@@ -15,6 +15,8 @@ + /* */ + /**************************************************************************/ + ++using namespace std; ++ + #include + #include + #include +@@ -29,7 +31,7 @@ + #include + #include + +-#include ++#include + #include + + #include +diff -urN Message.cpp Message.cpp +--- Message.cpp 2006-11-05 13:22:45.963189321 +0000 ++++ Message.cpp 2006-11-05 13:23:25.000000000 +0000 +@@ -15,8 +15,10 @@ + /* */ + /**************************************************************************/ + ++using namespace std; ++ + #include +-#include ++#include + #include + #include + +diff -urN Misc.cpp Misc.cpp +--- Misc.cpp 2006-11-05 13:22:45.701229285 +0000 ++++ Misc.cpp 2006-11-05 13:23:25.000000000 +0000 +@@ -15,7 +15,9 @@ + /* */ + /**************************************************************************/ + +-#include ++using namespace std; ++ ++#include + #include + #include + #include +diff -urN Misc.h Misc.h +--- Misc.h 2006-11-05 13:22:45.643238132 +0000 ++++ Misc.h 2006-11-05 13:23:25.000000000 +0000 +@@ -18,8 +18,10 @@ + #ifndef Misc_H + #define Misc_H + +-#include +-#include ++using namespace std; ++ ++#include ++#include + + #include + #include +diff -urN Proxy.cpp Proxy.cpp +--- Proxy.cpp 2006-11-05 13:22:45.856205642 +0000 ++++ Proxy.cpp 2006-11-05 13:23:25.000000000 +0000 +@@ -15,10 +15,12 @@ + /* */ + /**************************************************************************/ + ++using namespace std; ++ + #include + #include + #include +-#include ++#include + #include + #include + +diff -urN Split.cpp Split.cpp +--- Split.cpp 2006-11-05 13:22:45.797214643 +0000 ++++ Split.cpp 2006-11-05 13:23:25.000000000 +0000 +@@ -15,7 +15,9 @@ + /* */ + /**************************************************************************/ + +-#include ++using namespace std; ++ ++#include + #include + #include + #include diff --git a/net-misc/nx/files/nx-2.1.0-invalid-options.patch b/net-misc/nx/files/nx-2.1.0-invalid-options.patch new file mode 100644 index 000000000000..17e4f43a0b6e --- /dev/null +++ b/net-misc/nx/files/nx-2.1.0-invalid-options.patch @@ -0,0 +1,38 @@ +--- configure.in 2006-11-04 19:37:56.000000000 +0000 ++++ configure.in 2006-11-04 19:38:23.000000000 +0000 +@@ -52,35 +52,6 @@ + AC_PROG_CC + AC_LANG_CPLUSPLUS + +-dnl Check whether option -Wno-deprecated +-dnl is needed by GCC compiler. +- +-AC_MSG_CHECKING([whether compiler needs -Wno-deprecated]) +-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1` +-case "${gcc_version}" in +- gcc*) +- AC_MSG_RESULT([yes]) +- CXXFLAGS="$CXXFLAGS -Wno-deprecated" +- ;; +- +- *) +- AC_MSG_RESULT([no]) +- ;; +-esac +- +-AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and -Wnested-externs]) +-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1` +-case "${gcc_version}" in +- gcc*) +- AC_MSG_RESULT([no]) +- ;; +- +- *) +- AC_MSG_RESULT([yes]) +- CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs" +- ;; +-esac +- + dnl Check for BSD compatible install. + + AC_PROG_INSTALL diff --git a/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch b/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch new file mode 100644 index 000000000000..eb9d7cf317d6 --- /dev/null +++ b/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch @@ -0,0 +1,125 @@ +diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/Atoms.c nx-X11/programs/Xserver/hw/nxagent/Atoms.c +--- new/nx-X11/programs/Xserver/hw/nxagent/Atoms.c 2006-04-18 11:40:18.000000000 -0355 ++++ nx-X11/programs/Xserver/hw/nxagent/Atoms.c 2007-02-19 12:54:51.000000000 -0455 +@@ -785,6 +785,8 @@ + + nxagentWriteAtom(local, remote, string, True); + ++ XFree(string); ++ + return local; + } + +diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +--- new/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c 2006-11-09 12:22:35.000000000 -0455 ++++ nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c 2007-02-21 13:23:59.000000000 -0455 +@@ -2521,7 +2521,7 @@ + err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases) + ((pointer) c->client, fpe, c->current.pattern, + c->current.patlen, c->current.max_names - c->names->nnames, +- &c->current.private); ++ &c->current.private); /* FIXME: returned mem c->current.private (needed by list_next_font_or_alias) may never be freed */ + if (err == Suspended) { + if (!c->slept) { + ClientSleep(client, +diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +--- new/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c 2006-11-09 12:18:00.000000000 -0455 ++++ nx-X11/programs/Xserver/hw/nxagent/Pixmap.c 2007-02-21 13:28:54.000000000 -0455 +@@ -1115,6 +1115,7 @@ + { + FatalError("XGetImage: Failed.\n"); + ++ free(data); + return False; + } + +@@ -1600,6 +1601,7 @@ + fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n"); + #endif + ++ xfree(data); + return 0; + } + +@@ -1661,6 +1663,7 @@ + fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n"); + #endif + ++ xfree(data); + return 0; + } + +@@ -1772,6 +1775,7 @@ + int useExtents; + int imageLength, corruptedLength; + int corruptedWidth, corruptedHeight; ++ int ret = 0; /* Used by error handling. 0 is error(?, based on previous code) */ + + #ifdef TEST + static int totalLength; +@@ -1812,7 +1816,7 @@ + (void *) pDrawable); + #endif + +- return 0; ++ goto SR_FREE_CLIP; + } + + /* +@@ -1836,7 +1840,7 @@ + (void *) pDrawable); + #endif + +- return 0; ++ goto SR_FREE_CLIP; + } + } + +@@ -1861,7 +1865,7 @@ + fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to allocate memory for the operation.\n"); + #endif + +- return 0; ++ goto SR_FREE_CLIP; + } + + pSrcDrawable = (pDrawable -> type == DRAWABLE_PIXMAP ? +@@ -1876,7 +1880,7 @@ + fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to create the temporary GC.\n"); + #endif + +- return 0; ++ goto SR_FREE_XALLOC; + } + + ValidateGC(pDrawable, pGC); +@@ -1935,7 +1939,7 @@ + + #endif + +- return 1; ++ goto SR_FREE_GC; + } + + /* +@@ -2029,13 +2033,17 @@ + + nxagentGCTrap = saveTrap; + +- nxagentFreeRegion(pDrawable, clipRegion); ++SR_FREE_GC: ++ ret = 1; ++ FreeScratchGC(pGC); + ++SR_FREE_XALLOC: + xfree(data); + +- FreeScratchGC(pGC); ++SR_FREE_CLIP: ++ nxagentFreeRegion(pDrawable, clipRegion); + +- return 1; ++ return ret; + } + + void nxagentSynchronizeBox(DrawablePtr pDrawable, BoxPtr pBox) diff --git a/net-misc/nx/nx-2.1.0.ebuild b/net-misc/nx/nx-2.1.0.ebuild new file mode 100644 index 000000000000..f17f92025524 --- /dev/null +++ b/net-misc/nx/nx-2.1.0.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-2.1.0.ebuild,v 1.1 2007/03/21 00:15:30 voyageur Exp $ + +inherit autotools eutils multilib + +DESCRIPTION="NX compression technology core libraries" +HOMEPAGE="http://www.nomachine.com/developers.php" + +URI_BASE="http://web04.nomachine.com/download/${PV}/sources" +SRC_NX_X11="nx-X11-$PV-3.tar.gz" +SRC_NXAGENT="nxagent-$PV-18.tar.gz" +SRC_NXAUTH="nxauth-$PV-2.tar.gz" +SRC_NXCOMP="nxcomp-$PV-8.tar.gz" +SRC_NXCOMPEXT="nxcompext-$PV-5.tar.gz" +SRC_NXDESKTOP="nxdesktop-$PV-9.tar.gz" +SRC_NXVIEWER="nxviewer-$PV-12.tar.gz" +SRC_NXPROXY="nxproxy-$PV-3.tar.gz" + +SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY + $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMP + rdesktop? ( $URI_BASE/$SRC_NXDESKTOP ) + vnc? ( $URI_BASE/$SRC_NXVIEWER )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="rdesktop vnc" + +RDEPEND="x86? ( x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXpm + >=media-libs/jpeg-6b-r4 + >=media-libs/libpng-1.2.8 + >=sys-libs/zlib-1.2.3 ) + amd64? ( >=app-emulation/emul-linux-x86-xlibs-10.0 )" + +DEPEND="${RDEPEND} + x11-misc/gccmakedep + x11-misc/imake + !net-misc/nx-x11 + !net-misc/nx-x11-bin + !net-misc/nxcomp + !net-misc/nxproxy + !net-misc/nxssh" + +S=${WORKDIR}/${PN}-X11 + +src_unpack() { + unpack ${A} + + cd ${WORKDIR} + epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-tmp-exec.patch + epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch + epatch ${FILESDIR}/${P}-nxagent-mem-leaks.patch + + cd ${WORKDIR}/nxcomp + epatch ${FILESDIR}/${P}-deprecated-headers.patch + epatch ${FILESDIR}/${P}-invalid-options.patch + eautoreconf +} + +src_compile() { + # nx-X11 will only compile in 32-bit + use amd64 && multilib_toolchain_setup x86 + + cd ${WORKDIR}/nxcomp || die + econf || die + emake || die + + cd ${WORKDIR}/nxproxy || die + econf || die + emake || die + + cd ${WORKDIR}/nx-X11 || die + emake World || die + + cd ${WORKDIR}/nxcompext || die + econf || die + emake || die + + if use vnc ; then + cd ${WORKDIR}/nxviewer || die + xmkmf -a || die + emake World || die + fi + + if use rdesktop ; then + cd ${WORKDIR}/nxdesktop || die + CC=(tc-getCC) ./configure || die + emake || die + fi +} + +src_install() { + NX_ROOT=/usr/$(get_libdir)/NX + + for x in nxagent nxauth nxproxy; do + make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die + done + if use vnc ; then + make_wrapper nxviewer ./nxviewer ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die + make_wrapper nxpasswd ./nxpasswd ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die + fi + if use rdesktop ; then + make_wrapper nxdesktop ./nxdesktop ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die + fi + + into ${NX_ROOT} + dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent + dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth + dobin ${WORKDIR}/nxproxy/nxproxy + + if use vnc ; then + dobin ${WORKDIR}/nxviewer/nxviewer/nxviewer + dobin ${WORKDIR}/nxviewer/nxpasswd/nxpasswd + fi + + if use rdesktop ; then + dobin ${WORKDIR}/nxdesktop/nxdesktop + fi + + dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so* + dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so* + dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so* + dolib.so ${WORKDIR}/nxcomp/libXcomp.so* + dolib.so ${WORKDIR}/nxcompext/libXcompext.so* +}