From 9b138f88f09aabb2f0c24fbdae5ce2bd19297720 Mon Sep 17 00:00:00 2001 From: Nishant Limbachia Date: Sun, 21 Aug 2016 23:44:18 +0100 Subject: system/argyllcms: Updated for version 1.8.3. Signed-off-by: David Spencer --- system/argyllcms/argyllcms-1.8.0-gcc5.patch | 20 -------------------- system/argyllcms/argyllcms.SlackBuild | 14 +++++++------- system/argyllcms/argyllcms.info | 6 +++--- system/argyllcms/patches/argyllcms-1.8.0-gcc5.patch | 20 ++++++++++++++++++++ system/argyllcms/slack-desc | 12 ++++++------ 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 system/argyllcms/argyllcms-1.8.0-gcc5.patch create mode 100644 system/argyllcms/patches/argyllcms-1.8.0-gcc5.patch (limited to 'system') diff --git a/system/argyllcms/argyllcms-1.8.0-gcc5.patch b/system/argyllcms/argyllcms-1.8.0-gcc5.patch deleted file mode 100644 index 28067455c33e0..0000000000000 --- a/system/argyllcms/argyllcms-1.8.0-gcc5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix FTBFS with GCC 5 -Author: James Cowgill -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 4805c28471891..5b9c8ad57bb7d 100644 --- a/system/argyllcms/argyllcms.SlackBuild +++ b/system/argyllcms/argyllcms.SlackBuild @@ -3,7 +3,7 @@ # Slackware Package Build Script for ArgyllCMS # Home Page http://www.argyllcms.com/ -# Copyright (c) 2015, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2015-2016, Nishant Limbachia, Hoffman Estates, IL, USA # [nishant _AT_ mnspace _DOT_ net] # All rights reserved. # @@ -27,14 +27,14 @@ PRGNAM="argyllcms" SRCNAM="Argyll" -VERSION=${VERSION:-1.8.2} -SRCVERSION=${SRCVERSION:-V1.8.2} +VERSION=${VERSION:-1.8.3} +SRCVERSION=${SRCVERSION:-V1.8.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -45,8 +45,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -76,7 +76,7 @@ find -L . \ -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 +patch -p1 < $CWD/patches/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 diff --git a/system/argyllcms/argyllcms.info b/system/argyllcms/argyllcms.info index f8a3c94b1c690..3818e6d505e73 100644 --- a/system/argyllcms/argyllcms.info +++ b/system/argyllcms/argyllcms.info @@ -1,8 +1,8 @@ PRGNAM="argyllcms" -VERSION="1.8.2" +VERSION="1.8.3" HOMEPAGE="http://www.argyllcms.com/" -DOWNLOAD="http://argyllcms.com/Argyll_V1.8.2_src.zip" -MD5SUM="3c069c2642ad9a9750e624439b5fb01b" +DOWNLOAD="http://argyllcms.com/Argyll_V1.8.3_src.zip" +MD5SUM="037541cbc7f01b8eb2eff2e7e07ea232" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jam" diff --git a/system/argyllcms/patches/argyllcms-1.8.0-gcc5.patch b/system/argyllcms/patches/argyllcms-1.8.0-gcc5.patch new file mode 100644 index 0000000000000..28067455c33e0 --- /dev/null +++ b/system/argyllcms/patches/argyllcms-1.8.0-gcc5.patch @@ -0,0 +1,20 @@ +Description: Fix FTBFS with GCC 5 +Author: James Cowgill +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/slack-desc b/system/argyllcms/slack-desc index d33854a133938..251e3d9158e54 100644 --- a/system/argyllcms/slack-desc +++ b/system/argyllcms/slack-desc @@ -4,15 +4,15 @@ # the '|' on the right side marks the last column you can put a character in. # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - + |-----handy-ruler------------------------------------------------------| argyllcms: argyllcms (Argyll Color Management System) argyllcms: -argyllcms: ArgyllCMS is an ICC compatible color management system. It supports -argyllcms: accurate ICC profile creation for scanners, cameras and film -argyllcms: recorders and calibration and profiling of displays and RGB & CMYK -argyllcms: printers. -argyllcms: +argyllcms: ArgyllCMS is an ICC compatible color management system. It supports +argyllcms: accurate ICC profile creation for scanners, cameras and film recorders, +argyllcms: and calibration and profiling of displays and RGB & CMYK printers. +argyllcms: +argyllcms: argyllcms: argyllcms: Home Page: http://www.argyllcms.com/ argyllcms: -- cgit v1.2.3