summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-08-25 11:15:58 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-08-25 11:15:58 +0000
commitf642a037cde493e14b9566db2f8a735479ee57ae (patch)
tree32ca1f2307b42532417f2ecb8c45ec936208e18c /net-misc
parent2.0.3 to x86. add metadata, remove ancient version (Manifest recommit) (diff)
downloadgentoo-2-f642a037cde493e14b9566db2f8a735479ee57ae.tar.gz
gentoo-2-f642a037cde493e14b9566db2f8a735479ee57ae.tar.bz2
gentoo-2-f642a037cde493e14b9566db2f8a735479ee57ae.zip
Added missing patch.
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/vnc/ChangeLog6
-rw-r--r--net-misc/vnc/files/xc.patch-cfbglblt8.patch63
-rw-r--r--net-misc/vnc/vnc-4.0.ebuild4
3 files changed, 70 insertions, 3 deletions
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 469721322187..ed23055a24bd 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/vnc
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.27 2004/08/23 12:53:44 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.28 2004/08/25 11:15:58 aliz Exp $
+
+ 25 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> vnc-4.0.ebuild,
+ files/xc.patch-cfbglblt8.patch:
+ Added missing patch.
*vnc-4.0 (20 Aug 2004)
diff --git a/net-misc/vnc/files/xc.patch-cfbglblt8.patch b/net-misc/vnc/files/xc.patch-cfbglblt8.patch
new file mode 100644
index 000000000000..e39ebe50f8e1
--- /dev/null
+++ b/net-misc/vnc/files/xc.patch-cfbglblt8.patch
@@ -0,0 +1,63 @@
+--- xc.patch 2004-08-25 11:13:06.749688613 +0000
++++ xc.patch 2004-08-25 11:13:37.307230320 +0000
+@@ -116,60 +116,6 @@
+ ! nlwMiddle >>= 3; \
+ while (h--) { \
+ srcpix = psrc[srcy]; \
+-*** xc/programs/Xserver/cfb/cfbglblt8.c.orig Fri Dec 14 19:59:23 2001
+---- xc/programs/Xserver/cfb/cfbglblt8.c Tue Aug 12 10:05:57 2003
+-***************
+-*** 284,288 ****
+- register glyphPointer glyphBits;
+- register int xoff;
+-! #if defined(USE_LEFT_BITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
+- register CfbBits *dst;
+- #endif
+---- 284,288 ----
+- register glyphPointer glyphBits;
+- register int xoff;
+-! #if defined(USE_LEFTBITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
+- register CfbBits *dst;
+- #endif
+-***************
+-*** 292,296 ****
+- CfbBits *dstLine;
+- CfbBits *pdstBase;
+-! #ifdef USE_LEFT_BITS
+- CARD32 *cTmp;
+- #endif
+---- 292,296 ----
+- CfbBits *dstLine;
+- CfbBits *pdstBase;
+-! #ifdef USE_LEFTBITS
+- CARD32 *cTmp;
+- #endif
+-***************
+-*** 399,403 ****
+- } while (--hTmp);
+- break;
+-! #else /* !USE_LEFT_BITS */
+- {
+- int h;
+---- 399,403 ----
+- } while (--hTmp);
+- break;
+-! #else /* !USE_LEFTBITS */
+- {
+- int h;
+-***************
+-*** 412,416 ****
+- glyphBits = clips;
+- /* fall through */
+-! #endif /* USE_LEFT_BITS */
+- case rgnIN:
+- #ifdef STIPPLE
+---- 412,416 ----
+- glyphBits = clips;
+- /* fall through */
+-! #endif /* USE_LEFTBITS */
+- case rgnIN:
+- #ifdef STIPPLE
+ *** xc/programs/Xserver/cfb/cfbcppl.c.orig Fri Dec 14 19:59:22 2001
+ --- xc/programs/Xserver/cfb/cfbcppl.c Sun Apr 18 12:53:36 2004
+ ***************
diff --git a/net-misc/vnc/vnc-4.0.ebuild b/net-misc/vnc/vnc-4.0.ebuild
index 2a8adaf9cf9b..83eac3a9a5fe 100644
--- a/net-misc/vnc/vnc-4.0.ebuild
+++ b/net-misc/vnc/vnc-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+v# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.1 2004/08/23 12:53:44 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.2 2004/08/25 11:15:58 aliz Exp $
inherit eutils