summaryrefslogtreecommitdiff
path: root/system/argyllcms
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-12-29 22:59:01 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit656a421df085c7830a07f0865c4de4f9f4291596 (patch)
tree190ec358669486685c37a7201853c3a7c484dbcf /system/argyllcms
parentc968bf123f82bcef51dd6dc6de6e9504e9b2429c (diff)
downloadslackbuilds-656a421df085c7830a07f0865c4de4f9f4291596.tar.gz
system/argyllcms: Fixed build with gcc-5.3.0.
Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/argyllcms')
-rw-r--r--system/argyllcms/argyllcms-1.8.0-gcc5.patch20
-rw-r--r--system/argyllcms/argyllcms.SlackBuild3
2 files changed, 23 insertions, 0 deletions
diff --git a/system/argyllcms/argyllcms-1.8.0-gcc5.patch b/system/argyllcms/argyllcms-1.8.0-gcc5.patch
new file mode 100644
index 0000000000..28067455c3
--- /dev/null
+++ b/system/argyllcms/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__ */
diff --git a/system/argyllcms/argyllcms.SlackBuild b/system/argyllcms/argyllcms.SlackBuild
index 91480be2f4..4805c28471 100644
--- a/system/argyllcms/argyllcms.SlackBuild
+++ b/system/argyllcms/argyllcms.SlackBuild
@@ -75,6 +75,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch for gcc-5 thanks to Debian
+patch -p1 < $CWD/argyllcms-1.8.0-gcc5.patch
+
### install steps have been shamelessly copied from Arch Linux PKGBUILD
### https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/argyllcms
sh ./makeall.sh