[arch-commits] Commit in argyllcms/trunk (PKGBUILD argyllcms-1.8.0-gcc5.patch)

[Timothy Redaelli]

    Date: Tuesday, October 25, 2016 @ 15:13:30
  Author: tredaelli
Revision: 193309

upgpkg: argyllcms 1.9.2-1

Modified:
  argyllcms/trunk/PKGBUILD
Deleted:
  argyllcms/trunk/argyllcms-1.8.0-gcc5.patch

----------------------------+
 PKGBUILD                   |    9 +++------
 argyllcms-1.8.0-gcc5.patch |   20 --------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-25 15:08:40 UTC (rev 193308)
+++ PKGBUILD	2016-10-25 15:13:30 UTC (rev 193309)
@@ -4,7 +4,7 @@
 
 pkgname=argyllcms
 _pkgname=Argyll
-pkgver=1.8.3
+pkgver=1.9.2
 _pkgver="V${pkgver}"
 pkgrel=1
 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware"
@@ -13,18 +13,15 @@
 makedepends=('ftjam' 'zip' 'unzip')
 # You need to fake an UserAgent or it doesn't download
 DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -A "Mozilla/4.0" -o %o %u')
-source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip
-        argyllcms-1.8.0-gcc5.patch)
+source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip)
 url="http://www.argyllcms.com/"
 license=("GPL" "AGPL")
 install=${pkgname}.install
-sha256sums=('60494176785f6c2e4e4daefb9452d83859880449040b2a843ed81de3bd0c558e'
-            'de9b8a90e249070d457291c29ae3c732f89c51bc6f6296cb6aa7e800ba31a0e5')
+sha256sums=('4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90')
 
 prepare() {
   cd ${_pkgname}_${_pkgver}
   sed -i 's:^TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p":IMPORT{builtin}="hwdb --subsystem=usb":' usb/55-Argyll.rules
-  patch -Np1 -i "$srcdir"/argyllcms-1.8.0-gcc5.patch
 
   sed -i 's/-j${NUMBER_OF_PROCESSORS:-2}/$MAKEFLAGS/' makeall.sh
 

Deleted: argyllcms-1.8.0-gcc5.patch
===================================================================
--- argyllcms-1.8.0-gcc5.patch	2016-10-25 15:08:40 UTC (rev 193308)
+++ argyllcms-1.8.0-gcc5.patch	2016-10-25 15:13:30 UTC (rev 193309)
@@ -1,20 +0,0 @@
-Description: Fix FTBFS with GCC 5
-Author: James Cowgill <james410 at 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__ */