Drop the glib depend back down with a fix for g_clear_pointer() and add a missing epatch_user. bug #485550

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

4 files changed, 47 insertions, 13 deletions

diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog
index 701e8721a60b..8bdd12e4ea5b 100644
--- a/net-misc/spice-gtk/ChangeLog
+++ b/net-misc/spice-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.72 2013/09/23 01:16:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.73 2013/09/23 01:24:08 cardoe Exp $
+
+  23 Sep 2013; Doug Goldstein <cardoe@gentoo.org>
+  +files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch,
+  spice-gtk-0.21.ebuild:
+  Drop the glib depend back down with a fix for g_clear_pointer() and add a
+  missing epatch_user. bug #485550
 
   23 Sep 2013; Doug Goldstein <cardoe@gentoo.org> spice-gtk-0.21.ebuild:
   Fix depend for g_clear_pointer() call in libspice-client-glib-2.0.so. Spotted
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 4e619589dc44..a9db24704f0b 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -5,24 +5,25 @@ AUX 0.12-parallel-install.patch 723 SHA256 8205e16a007ebb481d5cf9ee66b4c698be408
 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-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch 726 SHA256 1cdd0b532897cb3587db983672b7956a8d872b28fc2f2db6891f98423d146479 SHA512 a91f86082b892c93f871653ff88694437edccbc2aa1fc65d3cb7d4d854318d862dc383f94e8045fa9bb6b395ca13387368ed20bf30993d10cbc238af06f6c8c4 WHIRLPOOL 7983b836b33975180f03c7717bbfc7770d97fcf5f0b101397a2e248e20b50ef165a63ce93f9a5e9d7a5d78b8032e714cfc1791c1da7452cec326d913b4573c6c
 AUX spice.protocol 159 SHA256 9a13ea202d5b26cbb45874c56df95d30c15a9372e55140426742f249f5b16525 SHA512 39be4ab9878e1c2eb77955e80c23b58d33b6695f1177fda675ba35330ac57c7973d354e58c2b3ffa2129badb9202799e9e07db450fbb9b2d0b123a5361e2ebda WHIRLPOOL 1df7713b6e574f23fec5164e89b16909b8a88ab4cde6204dc7f013b52e1a88018fa2a685560996dcb37df5057ce62a482599f5ef7fa217762abc6fb78c627051
 AUX spice.schemas 1305 SHA256 aa21d09f57e539a9206d88051f2b4d1a15e9eb3e8ea2d104bdcdcb677801ea14 SHA512 bf894c8970c92353df0849e532ac46f7e04a3344090ca70c325ea198aa1a10e94a71649f7648a867d18b07fddc2e87be67d82d332965fc5777466e4798bfa33e WHIRLPOOL 593b2c2bad2ec1c975838ac5665a143c96f04e14a9537863eedd58ee1b34653aaa538b1e1e0a81f756c32ecc5ea4b8e08a5f988ff0fc05759633f6610eb27702
 DIST spice-gtk-0.20.tar.bz2 1210694 SHA256 b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df SHA512 db07d05d93bf5639c193f374b6eb3fe9f6bb198f0146e64f8e6e6c03d12e931c1f18a353aed123fe28535a95eb8448ef8a8babc66bdd283f951b8433839d6b9e WHIRLPOOL 82ea2e7a1ebec0155c6aadd03143456498db332e64f4a2c5cb15beb47e0371790ee5fc29b7ff1b40dba34c63dd021cecf6f27cd1aaa1c58c465f9bb2d22ca50e
 DIST spice-gtk-0.21.tar.bz2 1191082 SHA256 73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564 SHA512 970c5de33c5f2117c4c4c0864da4d3796226771be54fdcc5393d17eefecb297cdc0767003699afa03db7e72a9810de4d157217e40de62013e410b90c8c759151 WHIRLPOOL caabfcc4654077dce70d9f82d7ccd77bd390d365c23f6c82c906b5490c1dd135c82c48e2aab486b699470829b24b3253dcb39c22921c13132dc16a03369d62f9
 EBUILD spice-gtk-0.20-r1.ebuild 4223 SHA256 7e31e0ed66740cc669b7f019a6fa2cf443844a79d4d76e458f09b2d4c845d6c9 SHA512 4d82b74b9aece1af44acd4c5efcd23956ab88b7e1c828c7b4a031587c64cab48baab7ca2e8483f04b45ffd3368680fbea327521e850fb4ff7e1185afc47f4597 WHIRLPOOL 3072b6f207e818a8eb6d9e11823470db1abaa0e59f2edd93f8a2b58ced5fb3a7173577d3f938ec3dc93582099f3dec00b7cd069dd957e95ecaf9373fe1a30509
-EBUILD spice-gtk-0.21.ebuild 4185 SHA256 17afd689dd490cac179d90b9f4d5716c5a2127d47f76b72994977b6cde82ad13 SHA512 3d2f35d009874278ea3f355b643bea0d17dfb7ac8a15fd6d6f9fcddcaf39d6a176ff3db084918ae882004797e7c10329907ba6dffabdb77a60d71947a9d970ec WHIRLPOOL 9593cfa581e26acacaad918e058d8f0367ec1c71d6cc9bf4be46f08735b6b505ffccf430b8f2e079d89722f4ae3496ca42c84184773dfdccb3ec1af5feb59707
-MISC ChangeLog 11365 SHA256 ba8ed73c467a3fdd4f540b7b9f0e22b1955cf77829bd084042fb24d64bd72f1d SHA512 24790ff7c2d95ee9001a9b7779df6bf89f2a030c5767c62ea0b5606e3a254ad9ff733b717f8713fa7dce78cdc83607144155b3ca48d5b2fa9c1c959fce684cc6 WHIRLPOOL 2f5e34bcf0d54adb484713e73cf55fc9e8fd43bbc49bb6fa983c3e7cb2a5596cd0a159573adbec3e6a2c9f301242f51fb7991dd020c2123993fe848f9cb23530
+EBUILD spice-gtk-0.21.ebuild 4276 SHA256 3314824dc0c40f2bba2ebb991ceff5aa3ed49f37f82a79a072b96e12f02d8f7b SHA512 9d1a30d896b4a824ae6b1693c253c22fb01ea839133d48b700b3212ccf5a5de1adebf199eb84622b28463097b14b66ef649c396fe4ef400cf0197ddbe967d45a WHIRLPOOL a54750264a5ae2b32d36927a3646b05772d85bbb7689e744fb57d51fd6cf2d269727232330d961dbb75171029e4ff80d1fde14f271cfb7744188d60be826a3d0
+MISC ChangeLog 11615 SHA256 d6d534a3431578594ac2bbaa01e0fdba9e2d0f5434d424ca9ae021c71052ce9e SHA512 9b358990a5f1c0fe734dc08f52db9132b979158798cf1b3031846b919399f2fdd996ee27fdb91dfbe4908ca0d573cdb9968c4e10d97fac3f0fc5e567e6e0573b WHIRLPOOL 0f523d371374dde6f3ba03f5420bcbcb9eb3834cd80f5305cea4284b8ae93cf054887c8632899023996d8dd4bd936753f42531a7ff04fc5945736bd40fd9c257
 MISC metadata.xml 1093 SHA256 e870c8e701b20e9b02117b10d3a5a401b21df1e6259c03e0c13540db6c2fd123 SHA512 20eebe5c2396bc77a6eff62cf742ada3cd4ddbef3fa38a0cee2758964d6e9810bd45734c33e89bd18d784d16faecf3ca61e5311053e4c77d1338144f9cb5032e WHIRLPOOL 19828941ec2e27d8f06fdaeea1f45b78156c5265923492f2b2e5073cec0d072fd93ae5ec4951bd82bad306afd21ed9e9424addb3bde152038eefc8ff7d4f6407
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQF8BAEBCABmBQJSP5ZoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJSP5g5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv86AIAIYKhoIRN6v6+gR6ymD1PNwD
-UrWnlr4dAH0GIjspjmEqxGEEGXuKvePH84sD9E5lw7V7rGPK+iWF7GW58ErKNgMw
-gSANa1FvAbW3ElwL4n1w2gooUjECi8PFBGF2TiaCXgsgtN6vKSXMsPvtBmVxiJmY
-iDby71oUcp04vxvz7nKU5gOI0wJ3LDlnzV2GgrCOeWgM054mz7FQmFViYRvCU9J+
-A6r3kOFmhPg0FiPIbKbjMvdc/ueUVYHcto1F4PwuTJhzel1uoyluJFhSO2zCk6Rn
-TWG648gEHgyXz4Gpshsrp7k74oO9EMOyOu2rZ9gVumZSAiG2SiP3ci3mY4to73k=
-=3tvQ
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvUesH/2ROcy/pkvC5oitZqU21aMnL
+LGuFd+Z4wqV8XKKKCEvx0+XLkQvmBd+FkLzEHJbG+HXMcfsAnjcOFXrEGHo7ML4E
+wHfWrWxNet7lyidLqTh2ALodjSoD4Q417YpBuMUSq6CiWg+3C7qnDeyy5Qi/Yjoc
+/eNP9pCe0oVJnck5+K6eypjgUJyYa+aCI/PTlfrDrFTvrBfIU0dh+6NRk+ICv8+q
+5Zua626S+qvu26SDV1bgVkTUyLxg0vdIh8XB25UmOv7kOJbJ1xaBlvKk9RcAbZIo
+qez1eacx2xBHDXQVtsKrY0Oz3zQbnM6BnLdSmJRlUxRGiAyWs6KlrQb/EO20YkQ=
+=EYpI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch b/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
new file mode 100644
index 000000000000..83e51db67d8b
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
@@ -0,0 +1,22 @@
+From f31bc2a9a6700bebc258130e802f40180af77d8e Mon Sep 17 00:00:00 2001
+From: Marc-André Lureau <marcandre.lureau@redhat.com>
+Date: Fri, 20 Sep 2013 15:54:58 +0000
+Subject: build-sys: fix g_clear_pointer usage on old glib
+
+As pointed out and verified on the ML after 0.21 release by Klaus
+Hochlehnert.
+---
+diff --git a/gtk/channel-cursor.c b/gtk/channel-cursor.c
+index 0443b9f..bbfb3c9 100644
+--- a/gtk/channel-cursor.c
++++ b/gtk/channel-cursor.c
+@@ -15,6 +15,7 @@
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
++#include "glib-compat.h"
+ #include "spice-client.h"
+ #include "spice-common.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/spice-gtk-0.21.ebuild b/net-misc/spice-gtk/spice-gtk-0.21.ebuild
index 96180541ab19..e2df62203055 100644
--- a/net-misc/spice-gtk/spice-gtk-0.21.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.21.ebuild
@@ -1,6 +1,6 @@
 # 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.21.ebuild,v 1.2 2013/09/23 01:16:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.21.ebuild,v 1.3 2013/09/23 01:24:08 cardoe Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/openssl
 	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	x11-libs/gtk+:2[introspection?]
-	>=dev-libs/glib-2.34:2
+	>=dev-libs/glib-2.26:2
 	>=x11-libs/cairo-1.2
 	virtual/jpeg
 	sys-libs/zlib
@@ -77,6 +77,11 @@ GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
 GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
 
 src_prepare() {
+
+	epatch "${FILESDIR}"/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
+
+	epatch_user
+
 	use vala && vala_src_prepare
 	mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
 }