diff options
| -rw-r--r-- | net-libs/gtk-vnc/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/gtk-vnc/Manifest | 22 | ||||
| -rw-r--r-- | net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch | 21 | ||||
| -rw-r--r-- | net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild | 128 | ||||
| -rw-r--r-- | net-libs/gtk-vnc/metadata.xml | 1 | ||||
| -rw-r--r-- | net-libs/xulrunner/Manifest | 24 |
6 files changed, 192 insertions, 12 deletions
diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog index 70042ab7e215..1457127a0cf5 100644 --- a/net-libs/gtk-vnc/ChangeLog +++ b/net-libs/gtk-vnc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/gtk-vnc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.67 2011/08/13 18:03:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.68 2011/08/16 14:28:58 nirbheek Exp $ + +*gtk-vnc-0.4.3-r1 (16 Aug 2011) + + 16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +gtk-vnc-0.4.3-r1.ebuild, + +files/gtk-vnc-0.4.3-outoftree-build.patch, metadata.xml: + Bump to 0.4.3-r1 with gtk3 support, from gnome overlay for GNOME 3 13 Aug 2011; Raúl Porcel <armin76@gentoo.org> gtk-vnc-0.4.3.ebuild: alpha/ia64/sparc stable wrt #369909 diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest index 220b18dda8af..2642a6faeab0 100644 --- a/net-libs/gtk-vnc/Manifest +++ b/net-libs/gtk-vnc/Manifest @@ -6,16 +6,28 @@ AUX gtk-vnc-0.4.2-gnutls-crash-fix.patch 1977 RMD160 267f4da2c0fc2752367afb6496f AUX gtk-vnc-0.4.2-memory-leak-fix.patch 1464 RMD160 a6e0239731cda4b7e2cf67b9ed5cf7ca27a3e2f9 SHA1 60f62e3a9e8aba1418c8dbb531b2479b6c85ce1c SHA256 d5983864034c113fb148128e3061f4cc8fb80e7952a7b0e35d9ce46078bab75d AUX gtk-vnc-0.4.2-pre-conn-crash-fix.patch 1276 RMD160 dde15c2c910d36a1b37b75a67312598ba7202f23 SHA1 a2cb10cb9553f77184e3c5e56c9a63fc7229af7b SHA256 277c2205469e128fedacb59a5edc39c21ed5ea2bb26da1f229992488a0974dd5 AUX gtk-vnc-0.4.2-shared-flag.patch 1085 RMD160 2bee1cf8483328edf5b05e033ab734d944e11367 SHA1 822ec5312995034d41355a3f0f1e3476d6b6f3cb SHA256 65e86adec082c3423b7f3770eed12fa55876f36b56ba9b9876b7ca7041f0bc97 +AUX gtk-vnc-0.4.3-outoftree-build.patch 909 RMD160 3bd53af3b89100ca1ff0401d00b6b20d1ac1313e SHA1 72a570bddc7fb4fd1f38a772bc8d4ca3b76a6e88 SHA256 552477557b7aa737a44bbbcf4232fb9cc41009a003cd1c1f9e64b2ce158cb79f DIST gtk-vnc-0.4.2.tar.bz2 438062 RMD160 ba5d81a3ef4b6d6eb0322bfdc51014df38ee6c7b SHA1 8aa76bbb6a47951d4692ebb1ac241fa7b3bda2ef SHA256 96e948b62984a1a3a32fd83793fb645c493c1bc93b303eb831ecafee01a956d2 DIST gtk-vnc-0.4.3.tar.bz2 446486 RMD160 f7cc379b43088b83628dc92fb10ece463b1ab8fc SHA1 4e43d8fd68e5809b0769e26f7a7ac94d45315864 SHA256 b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377 EBUILD gtk-vnc-0.4.2-r2.ebuild 1682 RMD160 00652cf00c714d064864e1615c9e599a98000033 SHA1 f923ec76064fc16ee00dc0bae12bdeefef43d854 SHA256 26fcd19f6ad468cbc71b1c7f9e502f77db55f30a6731ad312c0bfb81ba59bed9 +EBUILD gtk-vnc-0.4.3-r1.ebuild 3072 RMD160 a5f71c049ce27767aa231bba33faad65475a2d28 SHA1 33d5ca53977a333dbf02ec2072e18a199bd9d149 SHA256 fec48600d8f619aa4e9f8e42bf67f3067c9747ff1e226d80ba34aeb45f5f0a3b EBUILD gtk-vnc-0.4.3.ebuild 1471 RMD160 7fea38c4afca6d1f038aac593fd869f948057c70 SHA1 39d8ec3b48bb6392e147bd89558bae6472a920c8 SHA256 7d65266c28d75ecd4a5c1abe229328bda89210baaf77e4f255df32f6136a0c86 -MISC ChangeLog 9643 RMD160 117ede929c05f5e0f01b7041c4baccee6331d117 SHA1 b04045a92dd97a8b45dca468c3ee24f0258c3e23 SHA256 a240e46345f77481e9569bec3b2f465f37b31597deb46aa2c1a82ec5546c4e35 -MISC metadata.xml 272 RMD160 49e05d4e55e5eb2d747b6efbc6cb9f452e9d99ce SHA1 931c4f687ac318310d20406593981c75bf79fbfd SHA256 36324a1ed74c94fadbfecc0abe90d933d6b6a06ded870441cc3f555998ff9878 +MISC ChangeLog 9887 RMD160 b4650c297d9277c12bf980ce8cd136ee6ccd099a SHA1 f49a1febd9f5937c604c752a28e64e9c079c9a53 SHA256 3c1414077b6b1acb762760e24a2d6fc0cb186e2ea76bcb3e8b0c5f66a9a86ca2 +MISC metadata.xml 351 RMD160 fb91f84774bd7557f27df3e1ec1ce48ec3185837 SHA1 f1b374f3da6b5db83461e7a5294da64b486d4ca1 SHA256 7d1e8e895138770ac0e233f67adc82aa9b25e1cc3e0164bab9f358704e495e78 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GvI0ACgkQuQc30/atMkAdNwCggJDcdDkkJlnW0VHh/SZzfwJF -+yoAoJ1UOY1LlHoa2/4rPOfbRmzbIzha -=bwGX +iQIcBAEBAgAGBQJOSn6wAAoJEO/kOhxWD91kuS0QAJLalQAnXar0U+cxxOkpHll2 +WmCENk8GQrnYVExLf41aedlXfUFAb+WpgYS0nqi3E2xon0cobnnkOpaAIosB64xf +Ze/B0CoiS7tYm9X06sJ8P/Pb9YbtwbVM/YTcgskPg33bJ544PnHKyIy0Itka6JZE +pKfu/VC8NK1f+FpTdbIS2tZjGeVwdA5hrKWBn7ERf0/+Xhg2vxAliufmEbqpqK4D +EOfDZ7Son1DkafWhkyBB6uzmOOq7WLTjefRt/c6O4wq/7OteU+2xWvk2/6IJzTuh +77mHIgFI0OBev3SenNNWqj3DJsMmvt1LfJSGVOlw/DrbLmNpecVnMOeOs3Gl+noR +CL0CzPlPxrsbTPijrmeuP/2KyL09QElP86OumNLZg7CPoJb1GpZKrR9YYCChvE3m +WZjygwWeHK8XspzQvnkjFzse/K5F9JeyIjgZ4JZLQfEbcxIPIh06gNEc0bUSJ3BZ +/2eUdPe6P2aLJrfdrO/teIasBFY4oxaSOFS6aRJ8v0Nvh65R2JbvVDUeroasks/v +jJAen2Nlb5WJvvXj9fAPiRQdQzdEsk6OxTeWeCVipBKrCdDy6/YQXruCPPAgZ/w7 +q0WOO+e57WKo4VX9BHxZ7UstmJtroYjkl4LLRo7OKFUnGL52VrWOBxYb2TG+CEU9 +C2csPDaTMGy0JR3szHaR +=Dzai -----END PGP SIGNATURE----- diff --git a/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch b/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch new file mode 100644 index 000000000000..36a3a3a9e158 --- /dev/null +++ b/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch @@ -0,0 +1,21 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 37f8444..2f72fa6 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -279,14 +279,14 @@ GVNC_INTROSPECTION_SRCS = \ + $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \ + $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \ + $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \ +- $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \ ++ $(srcdir)/vncconnectionenums.h $(srcdir)/vncconnectionenums.c \ + $(srcdir)/vncutil.h $(srcdir)/vncutil.c + + GTK_VNC_INTROSPECTION_SRCS = \ + $(srcdir)/vnccairoframebuffer.h $(srcdir)/vnccairoframebuffer.c \ + $(srcdir)/vncdisplay.h $(srcdir)/vncdisplay.c \ + $(srcdir)/vncgrabsequence.h $(srcdir)/vncgrabsequence.c \ +- $(builddir)/vncdisplayenums.h $(builddir)/vncdisplayenums.c ++ $(srcdir)/vncdisplayenums.h $(srcdir)/vncdisplayenums.c + + if HAVE_GTK_2 + GTK_VNC_INTROSPECTION_SRCS += \ diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild new file mode 100644 index 000000000000..6b81b362c2e3 --- /dev/null +++ b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild,v 1.1 2011/08/16 14:28:58 nirbheek Exp $ + +EAPI="3" + +inherit autotools eutils base gnome.org python + +DESCRIPTION="VNC viewer widget for GTK" +HOMEPAGE="http://live.gnome.org/gtk-vnc" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="examples gtk3 +introspection python sasl" + +# libview is used in examples/gvncviewer -- no need +# TODO: review nsplugin when it will be considered less experimental + +COMMON_DEPEND=">=dev-libs/glib-2.10:2 + >=net-libs/gnutls-1.4 + >=x11-libs/cairo-1.2 + >=x11-libs/gtk+-2.18:2 + x11-libs/libX11 + gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) + python? ( >=dev-python/pygtk-2:2 ) + sasl? ( dev-libs/cyrus-sasl )" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + dev-util/pkgconfig + sys-devel/gettext + >=dev-util/intltool-0.40" + +GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" +GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" + +pkg_setup() { + python_set_active_version 2 +} + +src_prepare() { + python_convert_shebangs -r 2 . + mkdir "${GTK2_BUILDDIR}" || die + mkdir "${GTK3_BUILDDIR}" || die + + # Fix incorrect rules for out of tree build + epatch "${FILESDIR}/${PN}-0.4.3-outoftree-build.patch" + + # Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk + sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \ + -i src/Makefile.* || die + + intltoolize --force --copy --automake || die + eautoreconf +} + +src_configure() { + local myconf + myconf=" + $(use_with examples) \ + $(use_enable introspection) \ + $(use_with sasl) \ + --with-coroutine=gthread \ + --without-libview \ + --disable-static" + + cd ${GTK2_BUILDDIR} + einfo "Running configure in ${GTK2_BUILDDIR}" + ECONF_SOURCE="${S}" econf ${myconf} \ + $(use_with python) \ + --with-gtk=2.0 + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running configure in ${GTK3_BUILDDIR}" + # Python support is via gobject-introspection + # Ex: from gi.repository import GtkVnc + ECONF_SOURCE="${S}" econf ${myconf} \ + --with-python=no \ + --with-gtk=3.0 + fi +} + +src_compile() { + cd ${GTK2_BUILDDIR} + einfo "Running make in ${GTK2_BUILDDIR}" + emake || die + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make in ${GTK3_BUILDDIR}" + emake || die + fi +} + +src_test() { + cd ${GTK2_BUILDDIR} + einfo "Running make check in ${GTK2_BUILDDIR}" + emake check || die + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make check in ${GTK3_BUILDDIR}" + emake check || die + fi +} + +src_install() { + dodoc AUTHORS ChangeLog NEWS README || die + + cd ${GTK2_BUILDDIR} + einfo "Running make install in ${GTK2_BUILDDIR}" + # bug #328273 + MAKEOPTS="${MAKEOPTS} -j1" base_src_install + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make install in ${GTK3_BUILDDIR}" + # bug #328273 + MAKEOPTS="${MAKEOPTS} -j1" base_src_install + fi + + python_clean_installation_image + + # Remove .la files + find "${ED}" -name '*.la' -exec rm -f '{}' + || die +} diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml index 0b6b5da045eb..21064efa27ad 100644 --- a/net-libs/gtk-vnc/metadata.xml +++ b/net-libs/gtk-vnc/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>gnome</herd> <use> + <flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 assets</flag> <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag> </use> diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest index 214c58a029a7..65c11164ec10 100644 --- a/net-libs/xulrunner/Manifest +++ b/net-libs/xulrunner/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX arm-bug-644136.patch 472 RMD160 bda46fa7a4ca306ebfa3455d90c6e54a3f0d97e1 SHA1 f2eb5ab3ce793fc7d8c30d9f9db6be3a714f5c16 SHA256 3152f9c5b3f9cd75caf522e71d4105be8fbcc4def3e2f4162663799d78e03511 AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc @@ -12,6 +12,7 @@ AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc13428 DIST firefox-3.6.12.source.tar.bz2 51423668 RMD160 196e32a4cd9c6725e115aabcf320d7d8df5bca6e SHA1 1cc3885687dd5ad21167d9d45f76eb1458f46bdd SHA256 dd478c653070f451b76befc798cfa1d6b61745d8badf831a3bae453c32e68c2d DIST firefox-3.6.17.source.tar.bz2 51522989 RMD160 af7320c7447dea4b1722b937bb77b20943e9e68d SHA1 1ae71e8e2838d438de2f6f860fe77d067f3629ee SHA256 a07abc8faba26fb613d69c3cff810542dd2da11d8892f8b57602486f7e8d6457 DIST firefox-3.6.18.source.tar.bz2 51553263 RMD160 3c4dddb454e1e5e3fa19b5b50a3aaf4fc5a78506 SHA1 635c56e9056f7c359bbb762f37fbcde41e2f76cd SHA256 6780185e0ea8e112e337c36bb7b3900ec7b72dd4445e0bd2983b748b84049e04 +DIST firefox-3.6.20.source.tar.bz2 51564376 RMD160 b2314d50020815ab432ce91931266884410bedec SHA1 d25d892b3214f92f0799ecdaf6ea6414a8950eb2 SHA256 0e8e3110c8cd1f4ad913c3c7424952b1aeebf6b375e8f6b5ccfe3e0b6d8abb18 DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c DIST xulrunner-1.9.2-patches-0.7.tar.bz2 16366 RMD160 2bfa5f56d58d5bb4508512190cf07454814fb0b5 SHA1 2c6e2cfb0c50a5595795561126de26941dbed576 SHA256 3e25e9b8d5fe9109f03889bca9240f92acd502fd68efe0e7eda304f5487b6bf0 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a @@ -19,13 +20,24 @@ DIST xulrunner-2.0-patches-1.8.tar.bz2 68053 RMD160 58ef5ff8fd037f34232a8acc706a EBUILD xulrunner-1.9.2.12.ebuild 8544 RMD160 b9237eaa83d73bfeae84245453dd5c120f33cbb7 SHA1 74ae00402ecbd1b382aa69a3e43b2b3b9826cd22 SHA256 acb634dcc7bddb968faeea0082d08470d49148c9a3bc70ed23676d99b08cffc0 EBUILD xulrunner-1.9.2.17.ebuild 8534 RMD160 04f8f664e9b6de6937a7deccd85f7df43e681bf9 SHA1 08b6b5314351364cc44001fd9ceb355602e359cb SHA256 d3275874435569b1da0efbf3cf46a91cba74e9285e7d644c33217391450af04f EBUILD xulrunner-1.9.2.18.ebuild 8542 RMD160 ef6dee2fb5171a41596da273295be458f3a0100b SHA1 0dd9585bf061befd18d06f986ebdf8d2a8b69589 SHA256 1edddec93a080d3872af085f6c0b966ccaac1b46e2cbed54c4b62c1b05b1dfee +EBUILD xulrunner-1.9.2.20.ebuild 8542 RMD160 ceba28bf26ccc589e6306577e8002998b25ea6d6 SHA1 e1e383c5c74d658e035862c7ba11e8e7f9e96d77 SHA256 61750705409db39582d4ab406806a63197bca6f9b98679c22dd01add5782ebec EBUILD xulrunner-2.0.1-r1.ebuild 6453 RMD160 57a44145197a861f5b561246096e22b61c9f227e SHA1 6a324fa88790c6be0ec45c1b2a4aa2ba9f4b7a3b SHA256 8438736203e989330ac0eeb9af05d03b02cbb91d727a191e5cdf184dba74558a -MISC ChangeLog 59684 RMD160 d2d6cf9b343ecf878375a88b464b28655551116b SHA1 03ab2879bce4a144d3c9d2315d64c7f14c95719d SHA256 4b62c291c417e9099637a9efeba0056a9068192c221ac8e64adfd47fbdb0297c +MISC ChangeLog 59826 RMD160 5622edf0af65ebe3539d7b4effbfd230939fa2f0 SHA1 c82fe080b8644ad0baf3040c912cb9d9b368d657 SHA256 8d6d8af19305c66cee5022f51aded5d2ac7edcc6c963b0b9ba6831646a477f63 MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5GsnIACgkQuQc30/atMkCOvQCgjm6ob6e3MuJkGlt+NPWNl7lK -enYAniA7DLGZMmZ5D2ABSD6NAWE9jDCK -=gpgA +iQIcBAEBCgAGBQJOSn+LAAoJEPiazRVxLXTFJtsP/2fOmYzuyXBuWQ8UimOaF5Fl +wDAH1yRY6TbggeuWRjsz+x23dYG/qfx/mksvYcvFmy6RAuKk5Ytjx+POzjmn6kYe +o++XNFWfxNTTNwXonqQJa4FAXenkoLHZFCwBLybNU/T3LGWI7yZV5htH8cDxEg0N +q73XPuIjMTJ8H0ychnk9IPlwk+zPFOHG3jA7FaXux8GEj68DgMgsSWpOrFbY7Iy/ +Imf74gPX5BDCfayNuImVnEiwSznQ25zEv7MVne1CaQpR1DNf+qjm8kLXO93x9JXy +j5m6uGlxhgytqQc4hM7qJUihKi+4TBMGY449fjBp9SodQ+9iX7a/97junFcHrbGP +4URZQ4+k007tCOTx0o7GVtFeYe2gc2I4xkc5QAM9C655Jq4X3lJAo4XGMvVWF6XF +B9/pc0iBMIg2QVGiTF/lLPA9arQwJ1LXCHvyTyyBF80L+96DIV7r8tLdp4onepSP +rfVZk8tODmjGUUD3hC3+pCJPwoQPlljkkc9pK7hhGKt8xa0OjLSJVMvCj78vtItT ++qpkoruNb/Ds6w2YbL/OI6eCoFzASMqnn3Mxqz9ee4/gkKcckWqPvxaE/GGqsmme +z9sYEroO4Q2+S5MNus6xIFiug7t/2Wpjk3RDwsTvmhCvqZRcLOxvyJVaDFheQz2i +Unj3F8PSLaxS0ADdE//x +=2x8+ -----END PGP SIGNATURE----- |