[arch-commits] CVS update of extra/network/tightvnc (3 files)

Eric Belanger eric at archlinux.org
Fri Jun 22 21:35:47 EDT 2007


    Date: Friday, June 22, 2007 @ 21:35:47
  Author: eric
    Path: /home/cvs-extra/extra/network/tightvnc

Modified: PKGBUILD (1.12 -> 1.13)
 Removed: tightvnc-1.2.9-amd64.patch (1.1)
          tightvnc-1.3dev7-x86_64-fix.patch (1.1)

upgpkg: tightvnc 1.3.9-1
removed old x86_64 patches


-----------------------------------+
 PKGBUILD                          |   13 --
 tightvnc-1.2.9-amd64.patch        |  169 ------------------------------------
 tightvnc-1.3dev7-x86_64-fix.patch |   41 --------
 3 files changed, 4 insertions(+), 219 deletions(-)


Index: extra/network/tightvnc/PKGBUILD
diff -u extra/network/tightvnc/PKGBUILD:1.12 extra/network/tightvnc/PKGBUILD:1.13
--- extra/network/tightvnc/PKGBUILD:1.12	Thu Jun 21 21:31:02 2007
+++ extra/network/tightvnc/PKGBUILD	Fri Jun 22 21:35:47 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.12 2007/06/22 01:31:02 paul Exp $
+# $Id: PKGBUILD,v 1.13 2007/06/23 01:35:47 eric Exp $
 # Maintainer: Paul Mattal <paul at archlinux.org>
 pkgname=tightvnc
 pkgver=1.3.9
@@ -10,19 +10,14 @@
 depends=('libjpeg' 'zlib' 'libxaw')
 makedepends=('imake')
 conflicts=('vnc')
-source=(http://dl.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2 tightvnc-fontpath-xcolors.patch \
-	tightvnc-1.3dev7-x86_64-fix.patch tightvnc-1.2.9-amd64.patch)
+source=(http://dl.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2 tightvnc-fontpath-xcolors.patch)
+md5sums=('49a0748ea52793f2e3069e05af28f716' '6847e08080b3214ca3c088d39670480a')
 
-md5sums=('49a0748ea52793f2e3069e05af28f716' 'bca34e7e6e5ac578562bf5b7dadcd225' \
-         'e4d9f4c51aacd65ed1dd3dfcd6a46541' '7f0dcab7d01dfc820fabe9a79872085c')
 build() {
+  export MAKEFLAGS="-j1"
   cd $startdir/src/vnc_unixsrc || return 1
   patch -Np1 -i ../tightvnc-fontpath-xcolors.patch || return 1
 
-  if [ "$CARCH" = "x86_64" ]; then
-  	  patch -p1 -i $startdir/src/tightvnc-1.3dev7-x86_64-fix.patch
-	  patch -p1 -i $startdir/src/tightvnc-1.2.9-amd64.patch
-  fi 
   xmkmf || return 1
   make World || return 1
   cd Xvnc || return 1
Index: extra/network/tightvnc/tightvnc-1.2.9-amd64.patch
diff -u extra/network/tightvnc/tightvnc-1.2.9-amd64.patch:1.1 extra/network/tightvnc/tightvnc-1.2.9-amd64.patch:removed
--- extra/network/tightvnc/tightvnc-1.2.9-amd64.patch:1.1	Wed Jan 31 11:17:51 2007
+++ extra/network/tightvnc/tightvnc-1.2.9-amd64.patch	Fri Jun 22 21:35:47 2007
@@ -1,169 +0,0 @@
-diff -rc vnc_unixsrc.org/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
-*** vnc_unixsrc.org/Xvnc/config/cf/linux.cf	Tue Jan 31 11:22:43 2006
---- vnc_unixsrc/Xvnc/config/cf/linux.cf	Tue Jan 31 22:37:34 2006
-***************
-*** 295,301 ****
-  #define OptimizedCDebugFlags	-O2
-  #define LinuxMachineDefines 	-D__x86_64__
-  #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-! #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-  #endif /* x86_64PCArchitecture */
-  
-  #ifdef ArmArchitecture
---- 295,301 ----
-  #define OptimizedCDebugFlags	-O2
-  #define LinuxMachineDefines 	-D__x86_64__
-  #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-! #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-  #endif /* x86_64PCArchitecture */
-  
-  #ifdef ArmArchitecture
-diff -rc vnc_unixsrc.org/Xvnc/include/Xmd.h vnc_unixsrc/Xvnc/include/Xmd.h
-*** vnc_unixsrc.org/Xvnc/include/Xmd.h	Sun Jun 11 07:00:52 2000
---- vnc_unixsrc/Xvnc/include/Xmd.h	Tue Jan 31 15:15:02 2006
-***************
-*** 59,65 ****
-  #ifdef CRAY
-  #define WORD64				/* 64-bit architecture */
-  #endif
-! #if defined(__alpha) || defined(__alpha__)
-  #define LONG64				/* 32/64-bit architecture */
-  #endif
-  #ifdef __sgi
---- 59,65 ----
-  #ifdef CRAY
-  #define WORD64				/* 64-bit architecture */
-  #endif
-! #if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
-  #define LONG64				/* 32/64-bit architecture */
-  #endif
-  #ifdef __sgi
-diff -rc vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c
-*** vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c	Sun Jun 11 07:00:52 2000
---- vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c	Tue Jan 31 15:15:02 2006
-***************
-*** 79,85 ****
-                  byte,
-                  glyph,
-                  scan;
-!     int         sizes[GLYPHPADOPTIONS];
-  {
-      int         widthBits,
-                  widthBytes,
---- 79,85 ----
-                  byte,
-                  glyph,
-                  scan;
-!     CARD32      sizes[GLYPHPADOPTIONS];
-  {
-      int         widthBits,
-                  widthBytes,
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c	Sun Jun 11 07:00:51 2000
---- vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c	Tue Jan 31 15:15:02 2006
-***************
-*** 404,409 ****
---- 404,410 ----
-   */
-  void
-  NoopDDA(
-+ #undef NeedVarargsPrototypes
-  #if NeedVarargsPrototypes
-      void* f, ...
-  #endif
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c	Tue Apr  8 17:18:33 2003
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c	Tue Jan 31 15:15:02 2006
-***************
-*** 39,44 ****
---- 39,45 ----
-  #endif
-  #if USE_LIBWRAP
-  #include <tcpd.h>
-+ #include <arpa/inet.h>
-  #endif
-  
-  #include "rfb.h"
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c	Fri Feb 27 06:22:47 2004
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c	Tue Jan 31 15:15:02 2006
-***************
-*** 80,85 ****
---- 80,86 ----
-  #include <sys/param.h>
-  #include "dix.h"
-  #include "rfb.h"
-+ #include <time.h>
-  
-  #ifdef CORBA
-  #include <vncserverctrl.h>
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h	Fri Feb 27 06:22:47 2004
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h	Tue Jan 31 15:15:02 2006
-***************
-*** 30,35 ****
---- 30,36 ----
-  #include <rfbproto.h>
-  #include <vncauth.h>
-  #include <zlib.h>
-+ #include <stdarg.h>
-  
-  /* It's a good idea to keep these values a bit greater than required. */
-  #define MAX_ENCODINGS 10
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c	Sun Oct 27 06:36:02 2002
---- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c	Tue Jan 31 15:15:02 2006
-***************
-*** 42,47 ****
---- 42,48 ----
-  #include <sys/time.h>
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-+ #include <arpa/inet.h>
-  #include <netinet/tcp.h>
-  #include <netdb.h>
-  #include <fcntl.h>
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h	Sun Jun 11 07:00:52 2000
---- vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h	Tue Jan 31 15:15:02 2006
-***************
-*** 479,484 ****
---- 479,485 ----
-  );
-  
-  extern void NoopDDA(
-+ #undef NeedVarargsPrototypes
-  #if NeedVarargsPrototypes
-      void *,
-      ...
-diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
-*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h	Wed Feb 19 10:39:54 2003
---- vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h	Tue Jan 31 17:05:16 2006
-***************
-*** 374,379 ****
---- 374,398 ----
-  #define NO_ONE_RECT
-  #endif
-  
-+ /* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha.
-+  */
-+ #ifdef __x86_64__
-+ #  define BITMAP_SCANLINE_UNIT			64
-+ # define BITMAP_SCANLINE_PAD 			64
-+ # define LOG2_BITMAP_PAD			6
-+ # define LOG2_BYTES_PER_SCANLINE_PAD		3
-+ 
-+ /* Add for handling protocol XPutImage and XGetImage; see comment in
-+  * Alpha section.
-+  */
-+ #define INTERNAL_VS_EXTERNAL_PADDING
-+ #define BITMAP_SCANLINE_UNIT_PROTO		32
-+ 
-+ #define BITMAP_SCANLINE_PAD_PROTO 	 	32
-+ #define LOG2_BITMAP_PAD_PROTO			5
-+ #define LOG2_BYTES_PER_SCANLINE_PAD_PROTO	2
-+ #endif
-+ 
-  #endif /* SVR4 / BSD / i386 */
-  
-  #if defined (linux) && defined (__mc68000__)
Index: extra/network/tightvnc/tightvnc-1.3dev7-x86_64-fix.patch
diff -u extra/network/tightvnc/tightvnc-1.3dev7-x86_64-fix.patch:1.1 extra/network/tightvnc/tightvnc-1.3dev7-x86_64-fix.patch:removed
--- extra/network/tightvnc/tightvnc-1.3dev7-x86_64-fix.patch:1.1	Sat May 27 13:32:56 2006
+++ extra/network/tightvnc/tightvnc-1.3dev7-x86_64-fix.patch	Fri Jun 22 21:35:47 2007
@@ -1,41 +0,0 @@
-diff -Naur vnc_unixsrc.orig/Xvnc/config/cf/Imake.cf vnc_unixsrc/Xvnc/config/cf/Imake.cf
---- vnc_unixsrc.orig/Xvnc/config/cf/Imake.cf	2005-09-25 23:57:59.000000000 +0200
-+++ vnc_unixsrc/Xvnc/config/cf/Imake.cf	2005-09-26 00:00:49.000000000 +0200
-@@ -801,6 +801,10 @@
- # ifdef PpcArchitecture
- #  define PowerPCArchitecture
- # endif
-+# ifdef __x86_64__
-+#  define x86_64Architecture
-+#  undef __x86_64__
-+# endif
- #endif /* linux */
- 
- #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
-diff -Naur vnc_unixsrc.orig/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
---- vnc_unixsrc.orig/Xvnc/config/cf/linux.cf	2005-09-25 23:57:59.000000000 +0200
-+++ vnc_unixsrc/Xvnc/config/cf/linux.cf	2005-09-26 00:01:37.000000000 +0200
-@@ -43,7 +43,7 @@
- #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
-     defined(SparcArchitecture) || defined(ArmArchitecure) || \
-     defined(i386Architecture) || defined(s390Architecture) || \
--    defined(s390xArchitecture)
-+    defined(s390xArchitecture) || defined(x86_64Architecture)
- #define DefaultLinuxCLibMajorVersion	6
- #else
- #define DefaultLinuxCLibMajorVersion	5
-@@ -290,6 +290,14 @@
- #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
- #endif /* PowerPCArchitecture */
- 
-+#ifdef x86_64Architecture
-+#define DefaultCCOptions        -fsigned-char
-+#define OptimizedCDebugFlags   -O2
-+#define LinuxMachineDefines    -D__x86_64__
-+#define ServerOSDefines                XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
-+#endif /* x86_64PCArchitecture */
-+
- #ifdef ArmArchitecture
- #define DefaultCCOptions	-fsigned-char
- #define OptimizedCDebugFlags	-O2




More information about the arch-commits mailing list