summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-05-24 23:30:08 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-05-24 23:30:08 +0000
commitb15a58f791ef82c511b72d57ee396b6ddbee83ee (patch)
tree51defc02d177c7e365db0cfb244ddbc5d2352b81 /net-misc/tightvnc
parentClosing #51701. (diff)
downloadhistorical-b15a58f791ef82c511b72d57ee396b6ddbee83ee.tar.gz
historical-b15a58f791ef82c511b72d57ee396b6ddbee83ee.tar.bz2
historical-b15a58f791ef82c511b72d57ee396b6ddbee83ee.zip
CLosing #51601.
Diffstat (limited to 'net-misc/tightvnc')
-rw-r--r--net-misc/tightvnc/ChangeLog4
-rw-r--r--net-misc/tightvnc/Manifest5
-rw-r--r--net-misc/tightvnc/files/tightvnc-4.0_gcc-3.4.patch12
-rw-r--r--net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild5
4 files changed, 20 insertions, 6 deletions
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index fe6b883a6527..d5a0006e6801 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,10 +1,10 @@
# ChangeLog for net-misc/tightvnc
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.31 2004/05/24 23:25:46 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.32 2004/05/24 23:30:08 aliz Exp $
24 May 2004; Daniel Ahlberg <aliz@gentoo.org>
tightvnc-4.0_beta20031113.ebuild:
- Added patch for linux 2.6 headers from Ed Catmur <ed@catmur.co.uk> in #51701.
+ Added patches for linux 2.6 headers and GCC 3.4 by Ed Catmur <ed@catmur.co.uk> in #51701 and #51601.
11 Apr 2004; Jason Wever <weeve@gentoo.org>
tightvnc-4.0_beta20031113.ebuild:
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index f4f75c1768c5..fdce9059dbf6 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,7 +1,7 @@
MD5 e3d97376c0f029056522d630552f86f6 tightvnc-1.2.8.ebuild 1614
MD5 e08d2f58129095e93553ce233ba4556c tightvnc-1.2.9-r1.ebuild 1923
-MD5 835e43a852e75a7cadf5fa755fdadb7e tightvnc-4.0_beta20031113.ebuild 2617
-MD5 324642b197fd47433de7bc691ef43503 ChangeLog 4608
+MD5 faab5dfdb3056a55200f792089ce3e5d tightvnc-4.0_beta20031113.ebuild 2661
+MD5 01b0d2eac600d83ab2ce794a301f09a8 ChangeLog 4631
MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
MD5 8a5968ab6bd3fdd835fe13c589e1cc4d files/digest-tightvnc-4.0_beta20031113 367
MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76
@@ -15,6 +15,7 @@ MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch
MD5 e6b8161e8381fd5be315641819de6425 files/tightvnc-4.0_linux-headers.patch 1359
MD5 e77df1134e59b0a9881ef1221eeffd37 files/tightvnc_cvs20031113.patch.bz2 19007
MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
+MD5 30ed72145d7123d98a8687d1746cf087 files/tightvnc-4.0_gcc-3.4.patch 262
MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
MD5 da10d05f6a76bdc27a59276c0acde9d9 files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch 364
diff --git a/net-misc/tightvnc/files/tightvnc-4.0_gcc-3.4.patch b/net-misc/tightvnc/files/tightvnc-4.0_gcc-3.4.patch
new file mode 100644
index 000000000000..bd6adbbaf564
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-4.0_gcc-3.4.patch
@@ -0,0 +1,12 @@
+--- rfb/Region.h 2004/05/20 23:56:33 1.1
++++ rfb/Region.h 2004/05/21 00:10:57
+@@ -22,7 +22,9 @@
+ #define __RFB_REGION_INCLUDED__
+
+ #include <rfb/Rect.h>
++#undef max
+ #include <vector>
++#define max(a,b) (((a) > (b)) ? (a) : (b))
+
+ struct _XRegion;
+
diff --git a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
index 5eb0b3c3f61c..e7a3cff1fed5 100644
--- a/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
+++ b/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild,v 1.5 2004/05/24 23:25:46 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-4.0_beta20031113.ebuild,v 1.6 2004/05/24 23:30:08 aliz Exp $
inherit eutils
IUSE="java tcpd"
@@ -51,9 +51,11 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/tightvnc_cvs${TIGHTVNC_CVS}.patch.bz2
+ epatch ${FILESDIR}/${PN}-4.0_gcc-3.4.patch
cd ${S}/xc
epatch ../xc.patch
+ epatch ${FILESDIR}/${PN}-4.0_linux-headers.patch
epatch ${FILESDIR}/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch
epatch ${FILESDIR}/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch
epatch ${FILESDIR}/4.0/0180_amd64_4.2.99.4-glx-nopic.patch
@@ -70,7 +72,6 @@ src_unpack() {
sed -i 's:#include <rfb/TightEncoder.h>:#include <rfb/TightEncoder.h>\nextern "C" {\n#include <jpeglib.h>\n}:g' TightEncoder.cxx
cd ${S}/xc
- epatch ${FILESDIR}/${PN}-4.0_linux-headers.patch
}
src_compile() {
autoconf