diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/xcb-util-image/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/xcb-util-image/files')
-rw-r--r-- | x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch | 46 |
1 files changed, 46 insertions, 0 deletions
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 |