Add patch for build error, bug #423909.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 59 insertions, 14 deletions

diff --git a/x11-libs/xcb-util-image/ChangeLog b/x11-libs/xcb-util-image/ChangeLog
index 3af1a87c5704..ef9351b0ae98 100644
--- a/x11-libs/xcb-util-image/ChangeLog
+++ b/x11-libs/xcb-util-image/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xcb-util-image
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/ChangeLog,v 1.18 2013/02/23 02:48:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/ChangeLog,v 1.19 2013/11/04 00:28:33 chithanh Exp $
+
+  04 Nov 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xcb-util-image-0.3.9-return-type.patch, xcb-util-image-0.3.9.ebuild:
+  Add patch for build error, bug #423909.
 
   23 Feb 2013; Zac Medico <zmedico@gentoo.org> xcb-util-image-0.3.9.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 9cf5920614cc..e9304cb25ec5 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX xcb-util-image-0.3.9-return-type.patch 1581 SHA256 05a16fb3ae61bd1e02cc3c55f24ab677865ab514c0935151af63e58b647ac515 SHA512 12c9d36375e42c127fd0e50363b5289cfa86ec238f94af9914e1a5375e55180fe37645a7cc473ff19c286c84dfdee74b6bdb7c3aa6ae1f3d0f0608e482d4c76c WHIRLPOOL 9a3bf549ea0ffa5a9ad1592f89f06d5fdf2891e841437f6138517fd16722328eacb138705bcd0a68c7ca631097e671dedc8f9871a650e473f63b2d360119b6f2
 DIST xcb-util-image-0.3.8.tar.bz2 289004 SHA256 40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9 SHA512 265790e7e5dc436a463408ce988ef245abea546aedb37384d6199aadec2dca3ec60f59aa72e676eb1a555f63da89c520fd89430d3613682700a3edd6d046f701 WHIRLPOOL 5ae5ee9c8f3c3457e12fdcea11fffa5ba49473f2b610f26d8b9ea5ab168d2754fae69c70dc651f8781e8fc9516b4634d2258b6676a9134bad7d6c2f08a682960
 DIST xcb-util-image-0.3.9.tar.bz2 310947 SHA256 d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df SHA512 6cf7e191f3814528d977aa2acb2a106aaba0732c5d5f4041ac39039e18b9064f90f96da087300f4061d700e3521648e5540117794fdc41dad36ca5f973370394 WHIRLPOOL 6848c12e1f98a4989c8ae2f6765de99639aef178c28f5d782eca132e0ea7adf32aecbd1da0b2631213898a2315dec71beacb8a4dfc717d3701d6500e70092828
 EBUILD xcb-util-image-0.3.8.ebuild 975 SHA256 6e55959669fe01f882634be846cd748d36215ad3f0c38c7a44bb18e479a5a339 SHA512 b0fe694cfd78f6e6d70cb6fe4fdc94059a3931dd0cd32ef33779e94d057e7cd818fdb45eb558a41f9d82d17c5c0d59fafe8a9fb97ebbbff03c4b8b9e2224d886 WHIRLPOOL 7721486fa0b7a876694559e70fbb969a639410cded3acb107fe351addc9d23f66e0128304f6d5b7bc158052036ba676fb5cb03ac9b4547d6b64128048f849e47
-EBUILD xcb-util-image-0.3.9.ebuild 984 SHA256 c09449cce65896d79db0b51a766701e289d4ffe06248186e313179886f763594 SHA512 94caf8022ff0d7dfc513292cd993cb6fcbfa638a57bf96fae1f501804c16a16fee9eee9a10d1a7cc0abf20bf28ac295e1fc2fa08f9da10c5ba413a247ceef74a WHIRLPOOL ad89e6fcd397951857d2b00a79f54275214cbd5b7a5ac4a0bf9edb3d7ae02501c01086c6a40d54e28479f022851234b45c1f55ff107f0ec758838cc23be99019
-MISC ChangeLog 2424 SHA256 a23b82c0919d3984d4a595dd96c7e085fab651b605c6bec61b2aa101d1c750ad SHA512 ae151f2c2d0c15d6b8e8995eb293fac63b73b7d195393144d0948a6eaef87853d72d116b9b2853eb1675595a442fbce9f80270e74e704c93c5bd2e7e9512a364 WHIRLPOOL 9f7fb16404e661eade5f46de6fb0def0d07e1ab9a8d42ff3f566c4b89c39c4826f93bae7ca153b8a429efdd4b7be10183bd388b788fdbe6a330da9f8abcd3996
+EBUILD xcb-util-image-0.3.9.ebuild 1037 SHA256 7cc26d32376c99de6160dfc426e8fb5d274cc9bde4553c8fdc14781c612f01e1 SHA512 6e72c7f3016002f18d00563ee0bf486ea560629e1acde9f8efaf4cd28e361a8794f2bca627d5d2caa25c31b4e058af279fcbdc330cfac33abf4aa3d852e62ba8 WHIRLPOOL 2f67dc56d30de99454929b584f1ab779a36b4f38df1f503d5721badad8597f10d4b2cba5812af95eed8bd17d66a9c81a4d648028ff55c7088bc932145906d8fe
+MISC ChangeLog 2615 SHA256 05fd78eb65974cd5f7d1d789573b9de7348421c2e3ac9b60a9bc73fc168f2d07 SHA512 d3dba15a62f8c57232a949f3a007ec55063670996f28783bf8b40c4606fe2d4cb4d33bed944eca0380d361aceb8e5fb0be6332bd18494da87b54299ab838a9a2 WHIRLPOOL 31ba1ae6ab9ac669770cc3d62a62de60cae3c93c4d4975e5e70e025a8ba6677c827c7cbca4ee009b3b7c92fae345e9fa8498424fd8d2f327c2c3b00f416d08a6
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlEoLgMACgkQ/ejvha5XGaPoSgCgleYbmGyG9VlPwHTDLapiBdVd
-AlIAni5On49j9+orHv+IftvffZD+oWge
-=dzXH
------END PGP SIGNATURE-----
diff --git a/x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch b/x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch
new file mode 100644
index 000000000000..d1ebc397a942
--- /dev/null
+++ b/x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch
@@ -0,0 +1,46 @@
+From 3577db110e03985d4486cae6caf3ceb5696c45e9 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu, 20 Dec 2012 22:56:28 +0000
+Subject: Fix compilation when NDEBUG is defined
+
+XORG_DEFAULT_OPTIONS enables -Werror=return-type
+
+xcb_image_get_pixel() and xcb_image_create_native() assume assert(0) is
+noreturn, and don't return a value in that case.  But assert(0) isn't noreturn
+if NDEBUG is defined.
+
+Fix this by returning a suitable value.
+
+(Also, on the MinGW target, assert(0) is non-standard and may return even in the
+!NDEBUG case, as the C runtime may ask the user if they want to abort or not...)
+
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c: In function 'xcb_image_get_pixel':
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c:754:1: error: control reaches end of non-void function [-Wreturn-type]
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c: In function 'xcb_image_create_native':
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c:190:1: error: control reaches end of non-void function [-Wreturn-type]
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+Signed-off-by: Peter Harris <pharris@opentext.com>
+---
+diff --git a/image/xcb_image.c b/image/xcb_image.c
+index e426cbd..101aa4f 100644
+--- a/image/xcb_image.c
++++ b/image/xcb_image.c
+@@ -187,6 +187,7 @@ xcb_image_create_native (xcb_connection_t *  c,
+       assert(0);
+   }
+   assert(0);
++  return NULL;
+ }
+ 
+ 
+@@ -751,6 +752,7 @@ xcb_image_get_pixel (xcb_image_t *image,
+   default:
+       assert(0);
+   }
++  return 0;
+ }
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild
index 7b6bdf31862c..6f7fb05b9b72 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.3.9.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/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild,v 1.9 2013/02/23 02:48:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild,v 1.10 2013/11/04 00:28:33 chithanh Exp $
 
 EAPI=4
 
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.1
 	test? ( >=dev-libs/check-0.9.4 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-return-type.patch
+)
+
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_with doc doxygen)