diff options
Diffstat (limited to 'net-misc/spice-gtk')
| -rw-r--r-- | net-misc/spice-gtk/ChangeLog | 10 | ||||
| -rw-r--r-- | net-misc/spice-gtk/Manifest | 28 | ||||
| -rw-r--r-- | net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch | 84 | ||||
| -rw-r--r-- | net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild | 172 |
4 files changed, 278 insertions, 16 deletions
diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog index 842121d8cd5e..13c2a6c4bb26 100644 --- a/net-misc/spice-gtk/ChangeLog +++ b/net-misc/spice-gtk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/spice-gtk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.63 2013/08/08 09:41:42 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.64 2013/08/09 17:08:49 cardoe Exp $ + +*spice-gtk-0.20-r1 (09 Aug 2013) + + 09 Aug 2013; Doug Goldstein <cardoe@gentoo.org> + +files/spice-gtk-0.20-add-spice-channel-string-to-type.patch, + +spice-gtk-0.20-r1.ebuild: + Fix missing symbol in SpiceClientGtk Python module. Identified by X4 + <worldwide@online.de> on bug #480146. rhbz#981815 08 Aug 2013; Agostino Sarubbo <ago@gentoo.org> spice-gtk-0.20.ebuild: Stable for amd64, wrt bug #480146 diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index dc24b1e11036..6cf207168675 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,9 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX 0.12-parallel-install.patch 723 SHA256 8205e16a007ebb481d5cf9ee66b4c698be408038798fa7176287c5c529af572d SHA512 c6928e2e4e52e65760d7c2d69a44750d4756fea232288835d91eed9ded0d2770d062232283604163a5002565e0c4fc87b776693be5627e629ae588ab0710141c WHIRLPOOL 15af38b3f8986b08e576691fa46744cb42b3ecc51384e86f7f9c1ba2b8a40727684cb8e2529cd748c006bdb8be0bfe93604fb0fe3f90e0cdcc726bdb29f2ff61 AUX 0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch 2405 SHA256 09c6ca9e8a49f8c0040f83be35223319efed658a02b3838b55ceded7ce74e156 SHA512 28d6b25796f428bd00ab76502ce714eafaf4395e8855b89a767adedf69ff6b981f90e44d4f14465e11d5b62ca6203a51673206d880aa3caa0a8c10261c6dc59d WHIRLPOOL 04c73ec53b733973f4433e86b3d711e5c32cc3849588973b86e43080e96fabc4a7308aed3fc649eb7a84d2ed1f70f74ce5d6506704bc7b2ef99b03432f4b414a AUX 0001-build-sys-fix-out-of-tree-build-with-vala.patch 1273 SHA256 697bb0d30a9808d2d63a60ff3452e6a95a0534572a962aafd622f9e1ad81928f SHA512 82c375f565cd02976b20f648605c1d200d371a158fb7798553ad1d0785fbb24ecc8c2d144d4a010229f03d9f86b1c2f8b38d63ac136f9432e75fb5d7c94c66f8 WHIRLPOOL 3b53c8a164d2d834faddef96a8a147f881a750bacadb7fdb0a0167a24feff0aeefe69651a4a014dbd7ad1e856a0d64a0e614da4df294c52a793db6d16b83d6db +AUX spice-gtk-0.20-add-spice-channel-string-to-type.patch 2591 SHA256 9335c92940541858dcb0b36effa1bb56d3b1acff03f4343628ab720ced6ad3d1 SHA512 2216717a8aa9ab06dd95c21f83e0493809d40280ec243aa774d9f02a90a5ba90f3e7e10f7e34b3ba496f3684b40c29a992e51a84f2f4e1b05f169792ffd2d917 WHIRLPOOL a2791b24ca8fd7747d633417cc033894dcf6568f8322ab495941a4a8f38d07092ef36a05959dc8be44f3359ee212d30b3eccd2b699e761c0c6aeda9f032aaa7e AUX spice.protocol 159 SHA256 9a13ea202d5b26cbb45874c56df95d30c15a9372e55140426742f249f5b16525 SHA512 39be4ab9878e1c2eb77955e80c23b58d33b6695f1177fda675ba35330ac57c7973d354e58c2b3ffa2129badb9202799e9e07db450fbb9b2d0b123a5361e2ebda WHIRLPOOL 1df7713b6e574f23fec5164e89b16909b8a88ab4cde6204dc7f013b52e1a88018fa2a685560996dcb37df5057ce62a482599f5ef7fa217762abc6fb78c627051 AUX spice.schemas 1305 SHA256 aa21d09f57e539a9206d88051f2b4d1a15e9eb3e8ea2d104bdcdcb677801ea14 SHA512 bf894c8970c92353df0849e532ac46f7e04a3344090ca70c325ea198aa1a10e94a71649f7648a867d18b07fddc2e87be67d82d332965fc5777466e4798bfa33e WHIRLPOOL 593b2c2bad2ec1c975838ac5665a143c96f04e14a9537863eedd58ee1b34653aaa538b1e1e0a81f756c32ecc5ea4b8e08a5f988ff0fc05759633f6610eb27702 DIST spice-gtk-0.14.tar.bz2 1204821 SHA256 a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5 SHA512 64510e098927d856ac8f05c6d9f07626ee280979fd792bb92f188ff11a15ff54b11acd0471a7e30c8f6fbc594a036c6642bd3369c0d231412ea9aece6d07bba1 WHIRLPOOL 16ce4c6cfb863c76026998239b5bbbd912cdeb5044afb8533020eaf255585863f41080bcc598b51efea3dc99b5e678508f1ece3f18a6dbae0d71e4bb81b513b9 @@ -17,23 +18,20 @@ EBUILD spice-gtk-0.15.3.ebuild 4450 SHA256 3315a8d30c7b24f6455781d6590255b922086 EBUILD spice-gtk-0.16.ebuild 4390 SHA256 b5a5b788c308b74eece7a7665fba81ad121c52e2a68e3f49f5586b8bf3087260 SHA512 57cfb7f82122ef5f1b668479220da83b000827bd819cc8e6d22059ceab5e123d88e1e812f83fc304f48b608acc647e977eecadcf2a60536b831f5f0e6183fb9e WHIRLPOOL 512c5651e91291c1196d5d0307153bb6141698604081e31533ab95672e3c18d6576135b895179e12c5be6101792fa45eefed05b992e0df9853d63d478e29d2d1 EBUILD spice-gtk-0.18-r1.ebuild 4244 SHA256 55f934d5a978b33fa3e6099f17b0dd6e83b8587c4957cff9bd27f4976c30ffa8 SHA512 a796080ab34d36ffe51f27871bbef20592d99f45aa270226774b1ecacb95c5040d50e2bc9c2a4bdc50e8a9d79825413ee6d2a75589634706b41e2041bde919b5 WHIRLPOOL b7d3f254463c142db1be5192acf7c94985f31edad4610c95c4e612968b5cc723611710272d35251c26458f917ace9c22067071848c82c2bc5787a169ebec2404 EBUILD spice-gtk-0.18.ebuild 4263 SHA256 d9a35926a1049a1321e300e80c107b343991a5edad7f7f6c3ad25d22427fdc24 SHA512 79e6d106f1514fa6dff6e12785f8803ea456006a0e7d52ac7de33f1ee7c600424b86a0c971b91cd5deff44ab3f9b4ef36108c1bdb301d9ad9f45ed207cc70848 WHIRLPOOL 3c120041fff19616a9b4bd7ab0ccac94bf16df423311abad3f99bec363eafe032121081649920826fc169524538844020f3abb310bcb201f7296396dc0f33a02 +EBUILD spice-gtk-0.20-r1.ebuild 4217 SHA256 0a799752d99b4626925c60fbcfa0a32b60edce42c5ad4f389c2f46998165a424 SHA512 fb89fef89e2076b422c6267672f5583685aca9f938b40e36cf44bbea8e293f40ab3dd49290b7e6a98916ff24236bf7daad631d47487c3270859721625dffba50 WHIRLPOOL b9759b39e0823e14bd9a6933a1b1f5023f858fa119d822d64858847f0e373eb0f5fc04c699952ffb4b79baf36713ffd31a8e8ea585824a969da6a45c0dbda6e2 EBUILD spice-gtk-0.20.ebuild 4143 SHA256 eab984275b817d1c99903295ee5c09263fd48d2d352f6c48b0ed7720ec7f020d SHA512 43dd65bd55464f8a932ddd68942b99e5febfd165456fd9412f2982da681995e6c464ae99f5f313bfb48b41602a0e9c14bb6475a43bb4e086211c6a63755698cf WHIRLPOOL 9daae7fe323a2baccd6de90c334d883e523a7baf614039d87b52c83fb4a943745adaba46743a369562a762af60b2c0a6246402d3b7ec9073fb7687be08a99d06 -MISC ChangeLog 9825 SHA256 aaecd833d8b7bf42d4d800de2f3fb705f577cef12d3e7317bb4332f0b3c02c2c SHA512 9928750e25824805ba040f615fbe2b5e46ef5e53daecf8990128c9a7677d940bf1f8672d375b0abea9c521e030caf9658cdcaa84d3c68cab9b8f45ded0564df3 WHIRLPOOL 3bc5fb3a5076bd10cfac03c1245dfb68bd433474c89e190d509c03305fc4521223a336ee7f6c18213fa941ef342295f1b073b247a9c3078cb365948be042bfe9 +MISC ChangeLog 10129 SHA256 bd2f1ff272b7ad3da3b1e31093334c31491e8e02afdc1c2a73d9a0d2db1014a6 SHA512 c605a4522ca89786cc69a646195c2a49a72ca2e36b62730d8556a09cca80b3ae961b318ef59e584bb3ca4def878f4c60ee17eceea3f03154f144f34a13d4e053 WHIRLPOOL 068e0bae8412eaa0ae150af2c0a0aee35b0da5dca5eaa1d774c8abedc01321f8846fc1dc55945222bad0d90b352ad5c9cac7bb2c6219544c0dd11b059a4ab75c MISC metadata.xml 1093 SHA256 e870c8e701b20e9b02117b10d3a5a401b21df1e6259c03e0c13540db6c2fd123 SHA512 20eebe5c2396bc77a6eff62cf742ada3cd4ddbef3fa38a0cee2758964d6e9810bd45734c33e89bd18d784d16faecf3ca61e5311053e4c77d1338144f9cb5032e WHIRLPOOL 19828941ec2e27d8f06fdaeea1f45b78156c5265923492f2b2e5073cec0d072fd93ae5ec4951bd82bad306afd21ed9e9424addb3bde152038eefc8ff7d4f6407 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQIcBAEBCgAGBQJSA2fUAAoJELp701BxlEWf2M4P/AtisBAi7glI5HXHahDQjOj3 -4YpyJ3NDvXBepvwySRlqJ9Fc7CyJF/RgT7SpmqSo8IvxI0UIETVXRkekkEsKkLdc -diTo1qVKEH2rZfRlcyFBS4cVmudXhU0AdBoZkcsnI38L3KRxQucyWBYs3UTWs5aD -NrQhxuVPGfHvk+vo25HQX8PN0PtG4AZ9um1Yb3TFJwISQRMdjOFCKAV4nE5kOYjT -/pz9V74ihYQ0L7XzmfyVC2hUYzSyngyRlPeVlHjoZw93ZmLXavnv92fY6avWceUx -4piItazUoA2Yh8H08Iu6EsVJt7SnwjG9MDbr0SW1IO2NA6eslfZo+bf1fPOZjd7X -C4ARiiz8ZHQG1tqf2o+19knn7sNwWoisJCSfY+cp5K2blPsQOg/z0hQQlQlGrYLv -tgh0ygkiqRsVMOnSU9CA9ugGmQCstrOq6rXqJIQQaSLaP9auljWdMVTfa2itD1i4 -fOxcgQROuc1jX9x/t7zsrdPCpmAkLfxbiSyjanA3ZM3Hp9nFQRk+usQPlBTVZrSF -GCNWMHM6VXgRlKyd3t9EOOyHPbL/1c24TDBUHgtTpi9o8IAMbAtOF9CUiaw6sQ6S -DrocMDZ2pKLK+uRY9OzJdv4GshSngQFLy8lg0oLFnp1pP2bMkjOShOtRwEOYlgpx -6iPrV1NviX9lVwjaK0x8 -=q4Ra +iQF8BAEBCABmBQJSBSIlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE +N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvZnUH/iMCptdiojE3NwvLhln+R/sK +0p4c3KHqs2MSh7h8R4S1m4xq9eoq2nWyBwOU6mFchp88/6Ksfg4YeFI37lRQDzaW +zGcwEsTWdDo0yddBTIF7c7KHLeIy8qTKt4Qb9GR2d/sA4yQ9L4bdC6Y7oLVNFwOK +suuoApYl96wGMQ+5xrlGpluC21Mz99TIa5mouTdrSAazkaxMT8bR1CWklsXh5Ho0 +vxTBGMJgl6fKvIVXaSSoCAWRC2k2m7N/TP0pQZnZvql0wqU07KMAwM3iNe6KsYEn +txxX0BOH8DlnDrTT3fHVovZVtmHw5wPwvAdnfNFAuzamYPYNWWQ0HEmMbaE5rfM= +=BMMB -----END PGP SIGNATURE----- diff --git a/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch b/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch new file mode 100644 index 000000000000..3375d801ab2d --- /dev/null +++ b/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch @@ -0,0 +1,84 @@ +From b85ca792af72d5f1e10aa6af9515eb96a044fc5c Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Wed, 26 Jun 2013 15:39:39 +0000 +Subject: Add spice_channel_string_to_type to map files + +And document both spice_channel_string_to_type and +spice_channel_type_to_string. + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- +diff --git a/doc/reference/spice-gtk-sections.txt b/doc/reference/spice-gtk-sections.txt +index e1e2833..8d61aa9 100644 +--- a/doc/reference/spice-gtk-sections.txt ++++ b/doc/reference/spice-gtk-sections.txt +@@ -98,6 +98,7 @@ spice_channel_disconnect + spice_channel_test_capability + spice_channel_test_common_capability + spice_channel_type_to_string ++spice_channel_string_to_type + spice_channel_set_capability + spice_channel_flush_async + spice_channel_flush_finish +diff --git a/gtk/map-file b/gtk/map-file +index a0b7330..a69eb40 100644 +--- a/gtk/map-file ++++ b/gtk/map-file +@@ -11,6 +11,7 @@ spice_channel_get_type; + spice_channel_new; + spice_channel_open_fd; + spice_channel_set_capability; ++spice_channel_string_to_type; + spice_channel_test_capability; + spice_channel_test_common_capability; + spice_channel_type_to_string; +diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c +index 0a32d6c..093b292 100644 +--- a/gtk/spice-channel.c ++++ b/gtk/spice-channel.c +@@ -1884,6 +1884,15 @@ static const char *to_string[] = { + [ SPICE_CHANNEL_PORT ] = "port", + }; + ++/** ++ * spice_channel_type_to_string: ++ * @type: a channel-type property value ++ * ++ * Convert a channel-type property value to a string. ++ * ++ * Returns: string representation of @type. ++ * Since: 0.20 ++ **/ + const gchar* spice_channel_type_to_string(gint type) + { + const char *str = NULL; +@@ -1895,6 +1904,15 @@ const gchar* spice_channel_type_to_string(gint type) + return str ? str : "unknown channel type"; + } + ++/** ++ * spice_channel_string_to_type: ++ * @str: a string representation of the channel-type property ++ * ++ * Convert a channel-type property value to a string. ++ * ++ * Returns: the channel-type property value for a @str channel ++ * Since: 0.21 ++ **/ + gint spice_channel_string_to_type(const gchar *str) + { + int i; +diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file +index 2b172d0..8540307 100644 +--- a/gtk/spice-glib-sym-file ++++ b/gtk/spice-glib-sym-file +@@ -14,6 +14,7 @@ spice_channel_set_capability + spice_channel_test_capability + spice_channel_test_common_capability + spice_channel_type_to_string ++spice_channel_string_to_type + spice_client_error_quark + spice_cursor_channel_get_type + spice_display_channel_get_type +-- +cgit v0.9.0.2-2-gbebe diff --git a/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild new file mode 100644 index 000000000000..9ac27635acf1 --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild,v 1.1 2013/08/09 17:08:49 cardoe Exp $ + +EAPI=5 +GCONF_DEBUG="no" +WANT_AUTOMAKE="1.12" +VALA_MIN_API_VERSION="0.14" +VALA_USE_DEPEND="vapigen" + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit eutils python-single-r1 vala + +PYTHON_DEPEND="2" + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI." +HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" + +LICENSE="LGPL-2.1" +SLOT="0" +SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio +python sasl smartcard static-libs usbredir vala" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ?? ( pulseaudio gstreamer )" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND="${PYTHON_DEPS} + pulseaudio? ( media-sound/pulseaudio[glib] ) + gstreamer? ( + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 ) + >=x11-libs/pixman-0.17.7 + >=media-libs/celt-0.5.1.1:0.5.1 + dev-libs/openssl + gtk3? ( x11-libs/gtk+:3[introspection?] ) + x11-libs/gtk+:2[introspection?] + >=dev-libs/glib-2.26:2 + >=x11-libs/cairo-1.2 + virtual/jpeg + sys-libs/zlib + dbus? ( dev-libs/dbus-glib ) + introspection? ( dev-libs/gobject-introspection ) + python? ( dev-python/pygtk:2 ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/libcacard ) + usbredir? ( + sys-apps/hwids + >=sys-apps/usbredir-0.4.2 + virtual/libusb:1 + virtual/udev[gudev] + policykit? ( + sys-apps/acl + >=sys-auth/polkit-0.101 ) + )" +DEPEND="${RDEPEND} + dev-lang/python + virtual/pyparsing + dev-perl/Text-CSV + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + vala? ( $(vala_depend) )" + +# Hard-deps while building from git: +# dev-lang/vala:0.14 +# dev-lang/perl + +GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" +GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" + +src_prepare() { + use vala && vala_src_prepare + mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die + + epatch "${FILESDIR}"/${P}-add-spice-channel-string-to-type.patch +} + +src_configure() { + local myconf + local audio="no" + + use gstreamer && audio="gstreamer" + use pulseaudio && audio="pulse" + + if use vala ; then + # force vala regen for MinGW, etc + rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c + fi + + myconf=" + $(use_enable static-libs static) \ + $(use_enable introspection) \ + --with-audio=${audio} \ + $(use_with python) \ + $(use_with sasl) \ + $(use_enable smartcard) \ + $(use_enable usbredir) \ + $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \ + $(use_with usbredir usb-acl-helper-dir /usr/libexec) \ + $(use_enable policykit polkit) \ + $(use_enable vala) \ + $(use_enable dbus) \ + $(use_enable doc gtk-doc) \ + --disable-werror \ + --enable-pie" + + cd ${GTK2_BUILDDIR} + echo "Running configure in ${GTK2_BUILDDIR}" + ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ + --with-gtk=2.0 \ + ${myconf} + + if use gtk3; then + cd ${GTK3_BUILDDIR} + echo "Running configure in ${GTK3_BUILDDIR}" + ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ + --with-gtk=3.0 \ + ${myconf} + fi +} + +src_compile() { + cd ${GTK2_BUILDDIR} + einfo "Running make in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make in ${GTK3_BUILDDIR}" + default + fi +} + +src_test() { + cd ${GTK2_BUILDDIR} + einfo "Running make check in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make check in ${GTK3_BUILDDIR}" + default + fi +} + +src_install() { + dodoc AUTHORS ChangeLog NEWS README THANKS TODO + + cd ${GTK2_BUILDDIR} + einfo "Running make check in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make install in ${GTK3_BUILDDIR}" + default + fi + + # Remove .la files if they're not needed + use static-libs || prune_libtool_files + + use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" +} |