diff --git a/package/avm/nx-X11/gcc34.diff b/package/avm/nx-X11/gcc34.diff deleted file mode 100644 index e22de6747..000000000 --- a/package/avm/nx-X11/gcc34.diff +++ /dev/null @@ -1,110 +0,0 @@ ---- nxcomp/Types.h.orig 2004-08-10 10:47:11.000000000 +0200 -+++ nxcomp/Types.h 2004-09-16 02:19:01.364333008 +0200 -@@ -74,22 +74,26 @@ - - void clear() - { -- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) -+ #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H) - -- #if defined(__GLIBCPP_INTERNAL_VECTOR_H) -+ #if defined(_VECTOR_H) - -- _Destroy(_M_start, _M_finish); -+ _Destroy(_M_impl._M_start, _M_impl._M_finish); - -- #else -+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start); - -- destroy(_M_start, _M_finish); -+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0; - -- #endif -+ #else - - _M_deallocate(_M_start, _M_end_of_storage - _M_start); - - _M_start = _M_finish = _M_end_of_storage = 0; - -+ _Destroy(_M_start, _M_finish); -+ -+ #endif -+ - #else - - destroy(start, finish); -@@ -108,22 +112,28 @@ - - void clear() - { -- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) -+ #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H) - -- #if defined(__GLIBCPP_INTERNAL_VECTOR_H) -+ #if defined(_VECTOR_H) - -- _Destroy(_M_start, _M_finish); -+ _Destroy(_M_impl._M_start, _M_impl._M_finish); - -- #else -+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start); - -- destroy(_M_start, _M_finish); -+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0; - -- #endif -+ #else - - _M_deallocate(_M_start, _M_end_of_storage - _M_start); - - _M_start = _M_finish = _M_end_of_storage = 0; - -+ _Destroy(_M_start, _M_finish); -+ -+ #endif -+ -+ -+ - #else - - destroy(start, finish); ---- nxcomp/Jpeg.cpp.orig 2004-09-13 03:41:49.905274168 +0200 -+++ nxcomp/Jpeg.cpp 2004-09-13 03:43:06.886571232 +0200 -@@ -452,7 +452,7 @@ - // next line. - // - -- (char *) pixelPtr += RoundUp4(w * 2) - w * 2; -+ pixelPtr += RoundUp4(w * 2) - w * 2; - - dy++; - } -@@ -562,7 +562,7 @@ - pixelPtr += 3; - } - -- (char *) pixelPtr += RoundUp4(w * 3) - w * 3; -+ pixelPtr += RoundUp4(w * 3) - w * 3; - - dy++; - } ---- nxcomp/Png.cpp.orig 2004-09-13 03:43:18.138860624 +0200 -+++ nxcomp/Png.cpp 2004-09-13 03:43:41.532304280 +0200 -@@ -452,7 +452,7 @@ - // next line - // - -- (char *) pixelPtr += RoundUp4(w * 2) - w * 2; -+ pixelPtr += RoundUp4(w * 2) - w * 2; - } - - png_destroy_read_struct(&png_ptr, &info_ptr,NULL); -@@ -578,7 +578,7 @@ - pixelPtr += 3; - } - -- (char *) pixelPtr += RoundUp4(w * 3) - w * 3; -+ pixelPtr += RoundUp4(w * 3) - w * 3; - } - - png_destroy_read_struct(&png_ptr, &info_ptr,NULL); diff --git a/package/avm/nx-X11/installinopt.patch b/package/avm/nx-X11/installinopt.patch deleted file mode 100644 index 2b4c82c0c..000000000 --- a/package/avm/nx-X11/installinopt.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ruN nx-X11/config/cf/site.def nx-X11-new/config/cf/site.def ---- nx-X11/config/cf/site.def 2002-02-27 01:51:12.000000000 +0100 -+++ nx-X11-new/config/cf/site.def 2004-03-25 13:12:17.926673776 +0100 -@@ -72,23 +72,25 @@ - #ifdef AfterVendorCF - - #ifndef ProjectRoot --#define ProjectRoot /usr/X11R6 -+#define ProjectRoot /opt/nx - #endif - - /* - * On some platforms, some things may be installed outside of ProjectRoot - * by default. To disable this, uncomment the following line. - * --#define NothingOutsideProjectRoot YES - */ -+#define NothingOutsideProjectRoot YES -+#define FontconfigFontsConfDir ProjectRoot/etc/fonts -+#define LinkGLToUsrInclude NO - - /* - * Set EtcX11Directory if you want config file links installed under - * ProjectRoot rather than in /etc/X11. See also HasVarDirectory, - * UseEtcX11 and UseSeparateConfDir. - * --#define EtcX11Directory ProjectRoot/etc - */ -+#define EtcX11Directory ProjectRoot/etc - - - /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ diff --git a/package/avm/nx-X11/nx-X11.cache b/package/avm/nx-X11/nx-X11.cache deleted file mode 100644 index 19e2e1d2a..000000000 --- a/package/avm/nx-X11/nx-X11.cache +++ /dev/null @@ -1,37 +0,0 @@ -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/avm/nx-X11/nx-X11.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[TIMESTAMP] 1097079093 Wed Oct 6 18:11:33 2004 -[CONFIG-ID] 2.1.0-DEV-x86-reference-expert -[ROCKVER] 2.1.0-DEV - -[LOGS] 5-nx-X11.log - -[BUILDTIME] 72326 (5) -[SIZE] 5.45 MB, 207 files - -[DEP] 00-dirtree bash2 binutils bzip2 coreutils diffutils ed expat -[DEP] expat:dev findutils gawk gcc34 gcc34:dev glibc23 glibc23:dev -[DEP] grep libjpeg libjpeg:dev libpng libpng:dev linux24-header:dev -[DEP] make mktemp net-tools patch sed sysfiles tar util-linux xfree86 -[DEP] xfree86:dev zlib:dev - diff --git a/package/avm/nx-X11/nx-X11.conf b/package/avm/nx-X11/nx-X11.conf deleted file mode 100644 index 087ec76ea..000000000 --- a/package/avm/nx-X11/nx-X11.conf +++ /dev/null @@ -1,31 +0,0 @@ -nxothersources="nxagent-1.4.0-47.tar.bz2 nxauth-1.4.0-1.tar.bz2 nxcomp-1.4.0-23.tar.bz2 \ - nxcompext-1.4.0-3.tar.bz2 nxproxy-1.4.0-2.tar.bz2" -nx-X11_prem() { - cd .. - - for nxsource in $nxothersources; do - echo "Extracting $nxsource ($taropt) ..." - tar $taropt $archdir/$nxsource - if [[ $nxsource = nxcomp-* ]] ; then - patch -p0 < $confdir/gcc34.diff - fi - done - - cd $OLDPWD - - echo "Configuring XFree ..." - cat >> config/cf/host.def << EOT -/* Disable the internal zlib to use the system installed one */ -#define HasZlib YES -/* Disable the internal expat library to use the system installed one */ -#define HasExpat YES -/* Less warnings with recent gccs ... */ -#define DefaultCCOptions -ansi GccWarningOptions - -EOT - -} - -hook_add premake 3 "nx-X11_prem" - -var_append makeopt " " "World" diff --git a/package/avm/nx-X11/nx-X11.desc b/package/avm/nx-X11/nx-X11.desc deleted file mode 100644 index 0868b0910..000000000 --- a/package/avm/nx-X11/nx-X11.desc +++ /dev/null @@ -1,45 +0,0 @@ - -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/avm/nx-X11/nx-X11.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[I] x-X11 is a modified XFree86 distribution, extended by nx compression stuff - -[T] visit the website for some more info - -[U] http://www.nomachine.com/developers.php - -[A] NoMachine {http://www.nomachine.com} -[M] Andreas V. 'netrunner' Meier - -[C] base/x11 - -[L] GPL -[S] Beta -[V] 1.4.0-3 -[P] X -?---5---9 162.300 - -[D] 2653990278 nx-X11-1.4.0-3.tar.gz http://www.nomachine.com/download/snapshot/nxsources/ -[D] 3078335242 nxagent-1.4.0-47.tar.gz http://www.nomachine.com/download/snapshot/nxsources/ -[D] 3375682850 nxauth-1.4.0-1.tar.gz http://www.nomachine.com/download/snapshot/nxsources/ -[D] 1283267939 nxcomp-1.4.0-23.tar.gz http://www.nomachine.com/download/snapshot/nxsources/ -[D] 2995221463 nxcompext-1.4.0-3.tar.gz http://www.nomachine.com/download/snapshot/nxsources/ -[D] 3441139659 nxproxy-1.4.0-2.tar.gz http://www.nomachine.com/download/snapshot/nxsources/