Date: Friday, February 24, 2012 @ 05:13:24 Author: pierre Revision: 150962
archrelease: copy trunk to extra-i686, extra-x86_64 Added: tightvnc/repos/extra-i686/PKGBUILD (from rev 150961, tightvnc/trunk/PKGBUILD) tightvnc/repos/extra-i686/tightvnc-fontpath-xcolors.patch (from rev 150961, tightvnc/trunk/tightvnc-fontpath-xcolors.patch) tightvnc/repos/extra-x86_64/PKGBUILD (from rev 150961, tightvnc/trunk/PKGBUILD) tightvnc/repos/extra-x86_64/tightvnc-fontpath-xcolors.patch (from rev 150961, tightvnc/trunk/tightvnc-fontpath-xcolors.patch) Deleted: tightvnc/repos/extra-i686/PKGBUILD tightvnc/repos/extra-i686/tightvnc-fontpath-xcolors.patch tightvnc/repos/extra-x86_64/PKGBUILD tightvnc/repos/extra-x86_64/tightvnc-fontpath-xcolors.patch ----------------------------------------------+ extra-i686/PKGBUILD | 81 ++++++++++++------------- extra-i686/tightvnc-fontpath-xcolors.patch | 26 ++++---- extra-x86_64/PKGBUILD | 81 ++++++++++++------------- extra-x86_64/tightvnc-fontpath-xcolors.patch | 26 ++++---- 4 files changed, 110 insertions(+), 104 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-02-24 10:12:58 UTC (rev 150961) +++ extra-i686/PKGBUILD 2012-02-24 10:13:24 UTC (rev 150962) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Paul Mattal <p...@archlinux.org> -pkgname=tightvnc -pkgver=1.3.10 -pkgrel=5 -pkgdesc="VNC Unix server && viewer" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.tightvnc.com" -depends=('libjpeg>=7' 'zlib' 'libxaw' 'libxp' 'xorg-xauth') -makedepends=('imake') -conflicts=('vnc') -options=(!makeflags) -source=(http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2 - tightvnc-fontpath-xcolors.patch) -md5sums=('397b35faad32d5246b6d44b142f8304f' - '21aa7f3376ec3c608ff22d199a19c601') - -build() { - cd $srcdir/vnc_unixsrc || return 1 - patch -Np1 -i ../tightvnc-fontpath-xcolors.patch || return 1 - sed -i 's|/usr/local/|/usr/share/|' vncserver || return 1 - - xmkmf || return 1 - make World || return 1 - cd Xvnc || return 1 - ./configure || return 1 - sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \ - -i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1 - make || return 1 - cd .. || return 1 - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 || return 1 - ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man || return 1 - - # install java classes - mkdir -p $pkgdir/usr/share/vnc/classes || return 1 - install -Dm644 $srcdir/vnc_unixsrc/classes/* \ - $pkgdir/usr/share/vnc/classes || return 1 -} Copied: tightvnc/repos/extra-i686/PKGBUILD (from rev 150961, tightvnc/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-02-24 10:13:24 UTC (rev 150962) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Paul Mattal <p...@archlinux.org> +pkgname=tightvnc +pkgver=1.3.10 +pkgrel=6 +pkgdesc="VNC Unix server && viewer" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.tightvnc.com" +depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth') +makedepends=('imake') +conflicts=('vnc') +options=('!makeflags') +source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" + 'tightvnc-fontpath-xcolors.patch') +md5sums=('397b35faad32d5246b6d44b142f8304f' + '21aa7f3376ec3c608ff22d199a19c601') + +build() { + cd $srcdir/vnc_unixsrc + patch -Np1 -i ../tightvnc-fontpath-xcolors.patch + sed -i 's|/usr/local/|/usr/share/|' vncserver + + xmkmf + make World + cd Xvnc + ./configure + sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \ + -i programs/Xserver/os/Makefile lib/font/fc/Makefile + make +} + +package() { + cd $srcdir/vnc_unixsrc + mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man + + # install java classes + mkdir -p $pkgdir/usr/share/vnc/classes + install -Dm644 $srcdir/vnc_unixsrc/classes/* \ + $pkgdir/usr/share/vnc/classes +} Deleted: extra-i686/tightvnc-fontpath-xcolors.patch =================================================================== --- extra-i686/tightvnc-fontpath-xcolors.patch 2012-02-24 10:12:58 UTC (rev 150961) +++ extra-i686/tightvnc-fontpath-xcolors.patch 2012-02-24 10:13:24 UTC (rev 150962) @@ -1,13 +0,0 @@ -diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver ---- vnc_unixsrc/vncserver 2009-02-11 23:27:18.000000000 -0500 -+++ vnc_unixsrc.fixed/vncserver 2009-04-23 21:46:46.000000000 -0400 -@@ -34,7 +34,8 @@ - $desktopName = "X"; - $vncClasses = "/usr/local/vnc/classes"; - $vncUserDir = "$ENV{HOME}/.vnc"; --$fontPath = "unix/:7100"; -+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/"; -+$colorPath = "/usr/share/X11/rgb"; - $authType = "-rfbauth $vncUserDir/passwd"; - - # Read configuration from the system-wide and user files if present. Copied: tightvnc/repos/extra-i686/tightvnc-fontpath-xcolors.patch (from rev 150961, tightvnc/trunk/tightvnc-fontpath-xcolors.patch) =================================================================== --- extra-i686/tightvnc-fontpath-xcolors.patch (rev 0) +++ extra-i686/tightvnc-fontpath-xcolors.patch 2012-02-24 10:13:24 UTC (rev 150962) @@ -0,0 +1,13 @@ +diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver +--- vnc_unixsrc/vncserver 2009-02-11 23:27:18.000000000 -0500 ++++ vnc_unixsrc.fixed/vncserver 2009-04-23 21:46:46.000000000 -0400 +@@ -34,7 +34,8 @@ + $desktopName = "X"; + $vncClasses = "/usr/local/vnc/classes"; + $vncUserDir = "$ENV{HOME}/.vnc"; +-$fontPath = "unix/:7100"; ++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/"; ++$colorPath = "/usr/share/X11/rgb"; + $authType = "-rfbauth $vncUserDir/passwd"; + + # Read configuration from the system-wide and user files if present. Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-02-24 10:12:58 UTC (rev 150961) +++ extra-x86_64/PKGBUILD 2012-02-24 10:13:24 UTC (rev 150962) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Paul Mattal <p...@archlinux.org> -pkgname=tightvnc -pkgver=1.3.10 -pkgrel=5 -pkgdesc="VNC Unix server && viewer" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.tightvnc.com" -depends=('libjpeg>=7' 'zlib' 'libxaw' 'libxp' 'xorg-xauth') -makedepends=('imake') -conflicts=('vnc') -options=(!makeflags) -source=(http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2 - tightvnc-fontpath-xcolors.patch) -md5sums=('397b35faad32d5246b6d44b142f8304f' - '21aa7f3376ec3c608ff22d199a19c601') - -build() { - cd $srcdir/vnc_unixsrc || return 1 - patch -Np1 -i ../tightvnc-fontpath-xcolors.patch || return 1 - sed -i 's|/usr/local/|/usr/share/|' vncserver || return 1 - - xmkmf || return 1 - make World || return 1 - cd Xvnc || return 1 - ./configure || return 1 - sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \ - -i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1 - make || return 1 - cd .. || return 1 - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 || return 1 - ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man || return 1 - - # install java classes - mkdir -p $pkgdir/usr/share/vnc/classes || return 1 - install -Dm644 $srcdir/vnc_unixsrc/classes/* \ - $pkgdir/usr/share/vnc/classes || return 1 -} Copied: tightvnc/repos/extra-x86_64/PKGBUILD (from rev 150961, tightvnc/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-02-24 10:13:24 UTC (rev 150962) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Paul Mattal <p...@archlinux.org> +pkgname=tightvnc +pkgver=1.3.10 +pkgrel=6 +pkgdesc="VNC Unix server && viewer" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.tightvnc.com" +depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth') +makedepends=('imake') +conflicts=('vnc') +options=('!makeflags') +source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" + 'tightvnc-fontpath-xcolors.patch') +md5sums=('397b35faad32d5246b6d44b142f8304f' + '21aa7f3376ec3c608ff22d199a19c601') + +build() { + cd $srcdir/vnc_unixsrc + patch -Np1 -i ../tightvnc-fontpath-xcolors.patch + sed -i 's|/usr/local/|/usr/share/|' vncserver + + xmkmf + make World + cd Xvnc + ./configure + sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \ + -i programs/Xserver/os/Makefile lib/font/fc/Makefile + make +} + +package() { + cd $srcdir/vnc_unixsrc + mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 + ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man + + # install java classes + mkdir -p $pkgdir/usr/share/vnc/classes + install -Dm644 $srcdir/vnc_unixsrc/classes/* \ + $pkgdir/usr/share/vnc/classes +} Deleted: extra-x86_64/tightvnc-fontpath-xcolors.patch =================================================================== --- extra-x86_64/tightvnc-fontpath-xcolors.patch 2012-02-24 10:12:58 UTC (rev 150961) +++ extra-x86_64/tightvnc-fontpath-xcolors.patch 2012-02-24 10:13:24 UTC (rev 150962) @@ -1,13 +0,0 @@ -diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver ---- vnc_unixsrc/vncserver 2009-02-11 23:27:18.000000000 -0500 -+++ vnc_unixsrc.fixed/vncserver 2009-04-23 21:46:46.000000000 -0400 -@@ -34,7 +34,8 @@ - $desktopName = "X"; - $vncClasses = "/usr/local/vnc/classes"; - $vncUserDir = "$ENV{HOME}/.vnc"; --$fontPath = "unix/:7100"; -+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/"; -+$colorPath = "/usr/share/X11/rgb"; - $authType = "-rfbauth $vncUserDir/passwd"; - - # Read configuration from the system-wide and user files if present. Copied: tightvnc/repos/extra-x86_64/tightvnc-fontpath-xcolors.patch (from rev 150961, tightvnc/trunk/tightvnc-fontpath-xcolors.patch) =================================================================== --- extra-x86_64/tightvnc-fontpath-xcolors.patch (rev 0) +++ extra-x86_64/tightvnc-fontpath-xcolors.patch 2012-02-24 10:13:24 UTC (rev 150962) @@ -0,0 +1,13 @@ +diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver +--- vnc_unixsrc/vncserver 2009-02-11 23:27:18.000000000 -0500 ++++ vnc_unixsrc.fixed/vncserver 2009-04-23 21:46:46.000000000 -0400 +@@ -34,7 +34,8 @@ + $desktopName = "X"; + $vncClasses = "/usr/local/vnc/classes"; + $vncUserDir = "$ENV{HOME}/.vnc"; +-$fontPath = "unix/:7100"; ++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/"; ++$colorPath = "/usr/share/X11/rgb"; + $authType = "-rfbauth $vncUserDir/passwd"; + + # Read configuration from the system-wide and user files if present.