summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2015-09-04 13:43:38 +0200
committerBernard Cafarelli <voyageur@gentoo.org>2015-09-04 13:49:00 +0200
commitd20a5b7b33b4584fe47c0d570e2bdeab1d3d5549 (patch)
treeeb9f942d7205b506ce53e71d14b3b6b541663009 /media-gfx/argyllcms
parentsci-mathematics/rstudio: Bump to rstudio-0.99.482. (diff)
downloadgentoo-d20a5b7b33b4584fe47c0d570e2bdeab1d3d5549.tar.gz
gentoo-d20a5b7b33b4584fe47c0d570e2bdeab1d3d5549.tar.bz2
gentoo-d20a5b7b33b4584fe47c0d570e2bdeab1d3d5549.zip
media-gfx/argyllcms: fix compilation with GCC 5
Bug #559534 by tetromino Package-Manager: portage-2.2.20.1
Diffstat (limited to 'media-gfx/argyllcms')
-rw-r--r--media-gfx/argyllcms/argyllcms-1.8.0.ebuild1
-rw-r--r--media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch20
2 files changed, 21 insertions, 0 deletions
diff --git a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
index c59a59aaf217..eac1ccdc5706 100644
--- a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
PATCHES=(
+ "${FILESDIR}"/${P}-gcc5.patch
)
src_compile() {
diff --git a/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch b/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch
new file mode 100644
index 000000000000..28067455c33e
--- /dev/null
+++ b/media-gfx/argyllcms/files/argyllcms-1.8.0-gcc5.patch
@@ -0,0 +1,20 @@
+Description: Fix FTBFS with GCC 5
+Author: James Cowgill <james410@cowgill.org.uk>
+Bug-Debian: https://bugs.debian.org/777779
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/icc/icc.h
++++ b/icc/icc.h
+@@ -100,7 +100,11 @@
+ #define CF64PREC "LL" /* Constant precision specifier */
+
+ #ifndef ATTRIBUTE_NORETURN
++#ifdef _MSC_VER
+ # define ATTRIBUTE_NORETURN __declspec(noreturn)
++#else
++# define ATTRIBUTE_NORETURN __attribute__((noreturn))
++#endif
+ #endif
+
+ #else /* !__STDC_VERSION__ */