Add patch from upstream to fix bug #395645, straight to stable

Package-Manager: portage-2.1.10.43/cvs/Linux ia64
RepoMan-Options: --force

4 files changed, 210 insertions, 6 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index f5ec69572093..e0b035468f3e 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tigervnc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.116 2011/12/27 21:15:45 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.117 2012/01/01 11:57:56 armin76 Exp $
+
+*tigervnc-1.1.0-r2 (01 Jan 2012)
+
+  01 Jan 2012; Raúl Porcel <armin76@gentoo.org>
+  +files/1.1.0-export_missing_symbol.patch, +tigervnc-1.1.0-r2.ebuild:
+  Add patch from upstream to fix bug #395645, straight to stable
 
   27 Dec 2011; Markus Meier <maekke@gentoo.org> tigervnc-1.1.0-r1.ebuild:
   x86 stable, bug #394395
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4efed30ab335..342c4fa2de44 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.1.0-export_missing_symbol.patch 606 RMD160 e3e907c4a83525f7547ed4827e7f64e6703da434 SHA1 d648e51b49f43f22122529a8f2bffe11006a707f SHA256 92559d7154c9f204fd9c2dfca1f836c19ff613bff3bd9687f60f7bde5b023bc3
 AUX tigervnc.confd 346 RMD160 07a4541c0d9ef5611afafa8db75d2caf2e7ab051 SHA1 a3b00e99fc68844a7d0be29c4a8caae3a8b5a491 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc
 AUX tigervnc.initd 1585 RMD160 2fb536e85fa490df5450bf6e9f0296beb17921b1 SHA1 389d095ce1c18b323208ac059992cbd539d5a6b4 SHA256 a705a1aacdc3149a52b222fb990c654a5b5b5133d24be675ab327ec9a0c6f0e6
 AUX xserver111.patch 6542 RMD160 0ef07d4dd2a5af434a74996f9416631d299e550e SHA1 8bd891c29b6fcb2f9381800701ca461083441332 SHA256 f3827d742211b77807f1a02a47a99dddafe9efefbf9be17a21932e50abd1e63b
@@ -11,13 +12,14 @@ DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d2712
 DIST xorg-server-1.11.2.tar.bz2 4945939 RMD160 cc69cfd86a5a870d1433262dd1445a8603a9266a SHA1 b4de5c599c90bd08d3122866ba68152cd59a880e SHA256 fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
 EBUILD tigervnc-1.0.1_p20110618-r1.ebuild 4550 RMD160 5362609ee5bb47b23ba8fe3219791a697ef49fb1 SHA1 57ccdc74bb801a13d9c431b2c46f3667fcca4087 SHA256 ffbddf412c8e445ebfc03e0a407857fea2422f4639f0fb24c0c5dc7e028e7133
 EBUILD tigervnc-1.1.0-r1.ebuild 4670 RMD160 f196ababfd171aa1a5b9ea4f98a9000092cef27d SHA1 5bc5417aacb485e1067bc80c2b2a74aae182fd91 SHA256 e48c210c727f314f17d24c17206624ebb570dfd08ee4b449e043808a09d402e7
+EBUILD tigervnc-1.1.0-r2.ebuild 4728 RMD160 776777aad54dcfc540711192c919fe33ca8faaa3 SHA1 6d6e4e7b336cea41167e370aa1373b34dcbb7376 SHA256 a08d3c6a10b2242fcf68ad90b16ed729c93b816199c57f070791abfceb114695
 EBUILD tigervnc-1.1.0.ebuild 4632 RMD160 34025ade33219e6e7ce41334e46bf9af127389d6 SHA1 622f189aff6a6c629f36eef34f97b8f3c30e9476 SHA256 c3110fb5cd0671a28e707a6445a539f123e13c8eb7563e9d274daf261c3ca3e3
-MISC ChangeLog 15253 RMD160 fcd0d2d18c4ef4d87f308bfef69e7f1d3f9055da SHA1 be8a73d38d66755c3e83c7274edbf07f52bacf86 SHA256 f0cb162f11d77481746ce709ea55a8b279f31b3a785600166abd97e42cbebc07
+MISC ChangeLog 15474 RMD160 b915bf82c4f5c0b9ad69620244157791e0e64688 SHA1 a9b8735d7c790b38a9f800f122207fcfdec23ad5 SHA256 fda38da4e0fdf8f0e21a7f58f3d319d8ea30b499bc86e52dcfb11b02e8d3c821
 MISC metadata.xml 335 RMD160 a1f13f76a1f6b93bfcda75e10afa92831f24e1a4 SHA1 7030f47cbe62c52bde156cacf6f123487ea7bee3 SHA256 821ea06553b929fa98b219ad2f17ca84dda361965182f46e030ddd3b2d950209
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk76NfMACgkQkKaRLQcq0GKC7ACdHUQFhWYblyfp21b+H1I8Scbb
-8v0AniITOU0E0ftvsvN7AlwKI1EDOV6G
-=VOfz
+iEYEARECAAYFAk8ASkoACgkQuQc30/atMkD8rwCgjJYCWSbV/Z5Yzp/o2nXMvulR
+GRsAnAtMbA6ecoPP1QpkGYf2CCZJG5Vb
+=WVC8
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch b/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch
new file mode 100644
index 000000000000..542586edffc0
--- /dev/null
+++ b/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch
@@ -0,0 +1,12 @@
+diff -Naur xorg-server-1.11.2.orig/include/input.h xorg-server-1.11.2/include/input.h
+--- xorg-server-1.11.2.orig/include/input.h	2011-07-15 17:26:40.000000000 +0400
++++ xorg-server-1.11.2/include/input.h	2011-12-22 10:38:53.581370977 +0400
+@@ -503,7 +503,7 @@
+                         DeviceIntPtr master);
+ 
+ extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
+-extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
++extern _X_EXPORT DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
+ 
+ extern _X_EXPORT int AllocDevicePair(ClientPtr client,
+                              char* name,
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..b62d5c1cd841
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.1.0-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r2.ebuild,v 1.1 2012/01/01 11:57:56 armin76 Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.11.2"
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2
+#	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
+	mirror://gentoo/${PN}.png
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE="nptl +opengl server +xorgmodule"
+
+RDEPEND="virtual/jpeg
+	sys-libs/zlib
+	media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXtst
+	app-admin/eselect-opengl
+	server? (
+		x11-libs/libXi
+		x11-libs/libXfont
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/pixman
+		x11-apps/xauth
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		media-fonts/font-adobe-100dpi
+		media-fonts/font-adobe-75dpi
+		media-fonts/font-alias
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
+	)
+	!net-misc/vnc
+	!net-misc/tightvnc
+	!net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-1.5
+	>=x11-proto/xextproto-7.0.3
+	>=x11-proto/xproto-7.0.13
+	server?	(
+		x11-misc/util-macros
+		x11-proto/bigreqsproto
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		x11-proto/dri2proto
+		x11-proto/fixesproto
+		x11-proto/fontsproto
+		>=x11-proto/randrproto-1.2.99
+		x11-proto/resourceproto
+		x11-proto/scrnsaverproto
+		x11-proto/trapproto
+		x11-proto/videoproto
+		x11-proto/xcmiscproto
+		x11-proto/xineramaproto
+		x11-proto/xf86bigfontproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86driproto
+		x11-proto/xf86miscproto
+		x11-proto/xf86vidmodeproto
+		opengl? ( >=x11-proto/glproto-1.4.10 )
+		>=media-libs/mesa-7.1
+		>=x11-proto/renderproto-0.9.3
+		x11-libs/libpciaccess
+		>=x11-libs/xtrans-1.2.2
+	)"
+
+#S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	if ! use server ; then
+		echo
+		einfo "The 'server' USE flag will build tigervnc's server."
+		einfo "If '-server' is chosen only the client is built to save space."
+		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
+		ebeep
+		epause 5
+	else
+		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
+		OLD_IMPLEM="$(eselect opengl show)"
+		eselect opengl set ${OPENGL_DIR}
+	fi
+}
+
+switch_opengl_implem() {
+	# Switch to the xorg implementation.
+	# Use new opengl-update that will not reset user selected
+	# OpenGL interface ...
+	echo
+	eselect opengl set ${OLD_IMPLEM}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+	fi
+
+	eautoreconf
+	cd unix
+
+	if use server ; then
+		epatch xserver110.patch
+		epatch "${FILESDIR}"/xserver111.patch
+		cd xserver
+		epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	econf --without-included-zlib --with-system-jpeg || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd unix/xserver
+		econf \
+			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+			--disable-static --disable-xinerama \
+			--disable-composite \
+			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+			--enable-install-libxf86config \
+			--enable-dri2 \
+			--disable-config-dbus \
+			--disable-config-hal \
+			--with-xmlto=no \
+			--disable-unit-tests \
+			$(use_enable opengl glx) \
+			$(use_enable nptl glx-tls) \
+			|| die "econf server failed"
+		emake || die "emake server failed"
+	fi
+}
+
+src_install() {
+	dodoc README.txt
+
+	cd unix
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newman vncviewer/vncviewer.man vncviewer.1
+
+	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		cd xserver/hw/vnc
+		emake DESTDIR="${D}" install || die "emake install failed"
+		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
+	else
+		cd "${D}"
+		for f in vncserver vncpasswd x0vncserver vncconfig; do
+			rm usr/bin/$f
+			rm usr/share/man/man1/$f.1
+		done
+	fi
+}
+
+pkg_postinst() {
+	use server && switch_opengl_implem
+}