Browse Source

fake:


			
			
				rocklinux
			
			
		
fake 20 years ago
parent
commit
456cf2515b
3 changed files with 110 additions and 9 deletions
  1. +98
    -0
      package/avm/nx-X11/gcc34.diff
  2. +5
    -2
      package/avm/nx-X11/nx-X11.conf
  3. +7
    -7
      package/avm/nx-X11/nx-X11.desc

+ 98
- 0
package/avm/nx-X11/gcc34.diff

@ -0,0 +1,98 @@
--- nxcomp/Types.h.orig Wed Sep 1 21:18:18 2004
+++ nxcomp/Types.h Wed Sep 1 21:21:41 2004
@@ -74,11 +74,11 @@
void clear()
{
- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_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
@@ -86,9 +86,9 @@
#endif
- _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
- _M_start = _M_finish = _M_end_of_storage = 0;
+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
#else
@@ -108,21 +108,21 @@
void clear()
{
- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_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
- destroy(_M_start, _M_finish);
+ destroy(_M_impl._M_start, _M_impl._M_finish);
#endif
- _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
- _M_start = _M_finish = _M_end_of_storage = 0;
+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
#else
--- 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);

+ 5
- 2
package/avm/nx-X11/nx-X11.conf

@ -1,11 +1,14 @@
nxothersources="nxagent-1.3.1-32.tar.bz2 nxauth-1.3.1-2.tar.bz2 nxcomp-1.3.1-5.tar.bz2 \
nxcompext-1.3.1-2.tar.bz2 nxproxy-1.3.1-2.tar.bz2"
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

+ 7
- 7
package/avm/nx-X11/nx-X11.desc

@ -34,12 +34,12 @@
[L] GPL
[S] Beta
[V] 1.3.1-12
[V] 1.4.0-3
[P] X -?---5---9 162.300
[D] 3764094882 nx-X11-1.3.1-12.tar.gz http://www.nomachine.com/download/nxsources/nx-X11/
[D] 1104806541 nxagent-1.3.1-32.tar.gz http://www.nomachine.com/download/nxsources/nxagent/
[D] 4114421190 nxauth-1.3.1-2.tar.gz http://www.nomachine.com/download/nxsources/nxauth/
[D] 79176263 nxcomp-1.3.1-5.tar.gz http://www.nomachine.com/download/nxsources/nxcomp/
[D] 4160313356 nxcompext-1.3.1-2.tar.gz http://www.nomachine.com/download/nxsources/nxcompext/
[D] 3122192777 nxproxy-1.3.1-2.tar.gz http://www.nomachine.com/download/nxsources/nxproxy/
[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/

Loading…
Cancel
Save