From d7bb1f353346534626003d1cb578d2d2ec64debc Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 23 Apr 2012 09:41:20 +0000 Subject: Support building against net-misc/npapi-sdk instead of obsolete net-libs/xulrunner wrt #383145 by Michał Górny MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64 --- app-emulation/virt-viewer/ChangeLog | 7 +++- app-emulation/virt-viewer/Manifest | 21 +++++++++-- .../files/virt-viewer-0.5.x-npapi-sdk.patch | 42 ++++++++++++++++++++++ app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild | 32 ++++++++--------- app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild | 41 +++++++++++++++------ 5 files changed, 111 insertions(+), 32 deletions(-) create mode 100644 app-emulation/virt-viewer/files/virt-viewer-0.5.x-npapi-sdk.patch (limited to 'app-emulation/virt-viewer') diff --git a/app-emulation/virt-viewer/ChangeLog b/app-emulation/virt-viewer/ChangeLog index d76d81521baa..03f1c74eb42a 100644 --- a/app-emulation/virt-viewer/ChangeLog +++ b/app-emulation/virt-viewer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/virt-viewer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.14 2012/03/11 00:50:09 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.15 2012/04/23 09:41:20 ssuominen Exp $ + + 23 Apr 2012; Samuli Suominen virt-viewer-0.4.2.ebuild, + virt-viewer-0.5.2.ebuild, +files/virt-viewer-0.5.x-npapi-sdk.patch: + Support building against net-misc/npapi-sdk instead of obsolete + net-libs/xulrunner wrt #383145 by Michał Górny *virt-viewer-0.5.2 (10 Mar 2012) diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest index 43759213d3c4..5f63c0825982 100644 --- a/app-emulation/virt-viewer/Manifest +++ b/app-emulation/virt-viewer/Manifest @@ -1,6 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX virt-viewer-0.5.x-npapi-sdk.patch 888 RMD160 0dbb6956810f38abe5b3fe3824fd7aeebdbc01a8 SHA1 b880bb941216051b4b735ab18e9d91b341d7593e SHA256 570c329839650fd683b839676016ae4d1d9e3c5e5ad00cbf5444b68ada4ce307 DIST virt-viewer-0.4.2.tar.gz 442244 RMD160 f1094a374b0d808af77ba992fd12ba38c25a0623 SHA1 3b1d253c3c5f9cc89786e601e40a6ac72e52d4ee SHA256 32057e115ee53d9894af05ac4659893dc7e6ff9efba8d74999147b1bfda1439c DIST virt-viewer-0.5.2.tar.gz 583436 RMD160 4371ca8e6d95c38c223299c2a8175c2f5d135fc0 SHA1 634667d56945307046ff378843975bbd5290c4d1 SHA256 e7f09b5de988fd3c81568d05d2b5db97c620b547ec8f92eab8e6a88604a18009 -EBUILD virt-viewer-0.4.2.ebuild 1235 RMD160 c27687836b4652491f58fbbbb70d7edc158c15bc SHA1 8904e619e7b518685734e10bd337c61f19f3ed7a SHA256 33767158b76135a4bf2fccfcbb3dc766aa3606fb0d26ffae4f7fb9a28c6992e2 -EBUILD virt-viewer-0.5.2.ebuild 1237 RMD160 eb3e700d8d353d36cdb5693fc9b6147e700e80ee SHA1 42f517ae89429ccd0c8a836e49bb7dec2e6d6469 SHA256 de15b7e4a43c331a33e76fcf3dc2e7806e36157a98414abae1617bf1927c0f4e -MISC ChangeLog 2531 RMD160 41c51baa680e9af6013624c38382e20866c1a3d9 SHA1 91c00cc9ed2b33a227f6139a8872978a3558606a SHA256 0579c5961e654f472263e606c4785ac1bc2e2b3843f66a705573972d41c781c9 +EBUILD virt-viewer-0.4.2.ebuild 1040 RMD160 73626b299a4e46a2f03adaf43a2bd1cde89ff515 SHA1 9465a7dacd0b775e97cb2bb876034527116e73a7 SHA256 3e7f46cf77e169b14b173bcdbd9bbc2b7dc8cceec64d3e6de9971b3c8c3d7b0f +EBUILD virt-viewer-0.5.2.ebuild 1558 RMD160 4be61f111495f9c35f45e480b0cd081c3e1c0978 SHA1 e774438d16e8893249d2d6984fc9053b25207338 SHA256 09ef437fe4c820007d9465e94acd936f2a68dc9644046fd18a146b1cff518916 +MISC ChangeLog 2802 RMD160 e0ad099e37b7bce4b7cf9ce877796cafeb0355b4 SHA1 34a2a2a5d987fe832a9d0342babba00f035a6cf7 SHA256 03bf596888183595764b97f623ee7f663d3fac31609557137650d1690a2ae3e7 MISC metadata.xml 458 RMD160 b2da4655fe9f03fa5a2c9d74b6ab64b51002b3d2 SHA1 5e084322b3ac4b50f622e7a7155c3a6856818693 SHA256 8ed1c7a57660494a298c83bfd496954a3676b992317363e2cb5f2a4aec0b9345 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBAgAGBQJPlSNiAAoJEEdUh39IaPFN/CAIAIOn2anjWjkptJGjj+MvghaL ++/7ERXtFmgW0IN10mEaWoyoLFYUgwljszD18C3Cu//hXasO31izDRFB51o8iLMg6 +NvZxdiATLO8TRlWLB15d5qogSexpdHWAanyoHD3H3hfgC6ymlcaAkPYBws4kKLUK +uNZuReh91qecuGN5wImu6jdmDhc/HjVRFdJKTFWJ/nnwazlJLnD51m8qDJQEsedW +wngeqbN6ksPh1X79bo/tqdqlWbrgqqOJZYtbtI5CrXShHviLpwryYc3ouaZN2FuF +WrCYWHWUGoj1bfOZUz5kIF3C78HB+PfEErwvcWXCMQspZbff5nnDV2qROZNKBNA= +=VRdI +-----END PGP SIGNATURE----- diff --git a/app-emulation/virt-viewer/files/virt-viewer-0.5.x-npapi-sdk.patch b/app-emulation/virt-viewer/files/virt-viewer-0.5.x-npapi-sdk.patch new file mode 100644 index 000000000000..a945872782a4 --- /dev/null +++ b/app-emulation/virt-viewer/files/virt-viewer-0.5.x-npapi-sdk.patch @@ -0,0 +1,42 @@ +This patch is expecting result of `pkg-config --cflags npapi-sdk nspr` passed to the compiler. + +http://bugs.gentoo.org/383145 + +--- plugin/npshell.c ++++ plugin/npshell.c +@@ -83,8 +83,9 @@ + #include + #include + ++#include + #include +-#include ++#include + + #include "virt-viewer-plugin.h" + +--- plugin/npunix.c ++++ plugin/npunix.c +@@ -56,8 +56,9 @@ + #define XP_UNIX 1 + + #include ++#include + #include +-#include ++#include + + #include /* just for G_GNUC_UNUSED */ + +--- plugin/virt-viewer-plugin.h ++++ plugin/virt-viewer-plugin.h +@@ -36,7 +36,9 @@ + #ifndef VIRT_VIEWER_PLUGIN_H + #define VIRT_VIEWER_PLUGIN_H + ++#include + #include ++#include + #include + #include + #include "virt-viewer-app.h" diff --git a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild index d7e2e426ffe1..42e88cbe0e93 100644 --- a/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild +++ b/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild @@ -1,37 +1,35 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.4 2012/03/11 00:50:09 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.4.2.ebuild,v 1.5 2012/04/23 09:41:20 ssuominen Exp $ EAPI=4 - -inherit eutils gnome2 +inherit gnome2 DESCRIPTION="Graphical console client for connecting to virtual machines" HOMEPAGE="http://virt-manager.org/" SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gtk3 nsplugin sasl spice +vnc" -RDEPEND=">=app-emulation/libvirt-0.6.0 - >=dev-libs/libxml2-2.6.0:2 +IUSE="gtk3 sasl spice +vnc" + +RDEPEND=">=app-emulation/libvirt-0.6 + >=dev-libs/libxml2-2.6 gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( >=x11-libs/gtk+-2.10.0:2 - >=gnome-base/libglade-2.6.0:2.0 ) - nsplugin? ( >=dev-libs/nspr-4.0.0 - >=net-libs/xulrunner-1.9.1:1.9 - >=x11-libs/gtk+-2.10.0:2 - >=gnome-base/libglade-2.6.0:2.0 ) + !gtk3? ( + >=x11-libs/gtk+-2.10:2 + >=gnome-base/libglade-2.6 + ) spice? ( >=net-misc/spice-gtk-0.6[sasl?,gtk3?] ) vnc? ( >=net-libs/gtk-vnc-0.4.3 )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/pkgconfig" -REQUIRED_USE="|| ( spice vnc ) - nsplugin? ( !gtk3 ) - gtk3? ( !nsplugin )" +REQUIRED_USE="|| ( spice vnc )" pkg_setup() { - G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)" + G2CONF="--disable-plugin $(use_with spice spice-gtk)" G2CONF="${G2CONF} $(use_with vnc gtk-vnc)" use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0" use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0" diff --git a/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild b/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild index c11ffeb87363..307a1b49dcc4 100644 --- a/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild +++ b/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild @@ -1,30 +1,36 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild,v 1.1 2012/03/11 00:50:09 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.2.ebuild,v 1.2 2012/04/23 09:41:20 ssuominen Exp $ EAPI=4 - -inherit eutils gnome2 +inherit eutils gnome2 toolchain-funcs DESCRIPTION="Graphical console client for connecting to virtual machines" HOMEPAGE="http://virt-manager.org/" SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gtk3 nsplugin sasl +spice +vnc" + RDEPEND=">=app-emulation/libvirt-0.9.7 - >=dev-libs/libxml2-2.6.0:2 + >=dev-libs/libxml2-2.6 gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( >=x11-libs/gtk+-2.18.0:2 - >=gnome-base/libglade-2.6.0:2.0 ) - nsplugin? ( >=dev-libs/nspr-4.0.0 - >=net-libs/xulrunner-1.9.1:1.9 - >=x11-libs/gtk+-2.18.0:2 - >=gnome-base/libglade-2.6.0:2.0 ) + !gtk3? ( + >=x11-libs/gtk+-2.18:2 + >=gnome-base/libglade-2.6 + ) + nsplugin? ( + >=dev-libs/nspr-4 + >=x11-libs/gtk+-2.18:2 + >=gnome-base/libglade-2.6 + ) spice? ( >=net-misc/spice-gtk-0.11[sasl?,gtk3?] ) vnc? ( >=net-libs/gtk-vnc-0.4.3 )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/pkgconfig + nsplugin? ( >=net-misc/npapi-sdk-0.27 )" REQUIRED_USE="|| ( spice vnc ) nsplugin? ( !gtk3 ) @@ -36,3 +42,16 @@ pkg_setup() { use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0" use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0" } + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch +} + +src_configure() { + if use nsplugin; then + export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)" + export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)" + fi + + gnome2_src_configure +} -- cgit v1.2.3-65-gdbad