Date: Tuesday, September 8, 2015 @ 15:20:29 Author: tredaelli Revision: 139602
archrelease: copy trunk to community-i686, community-x86_64 Added: argyllcms/repos/community-i686/PKGBUILD (from rev 139601, argyllcms/trunk/PKGBUILD) argyllcms/repos/community-i686/argyllcms-1.8.0-gcc5.patch (from rev 139601, argyllcms/trunk/argyllcms-1.8.0-gcc5.patch) argyllcms/repos/community-i686/argyllcms.install (from rev 139601, argyllcms/trunk/argyllcms.install) argyllcms/repos/community-x86_64/PKGBUILD (from rev 139601, argyllcms/trunk/PKGBUILD) argyllcms/repos/community-x86_64/argyllcms-1.8.0-gcc5.patch (from rev 139601, argyllcms/trunk/argyllcms-1.8.0-gcc5.patch) argyllcms/repos/community-x86_64/argyllcms.install (from rev 139601, argyllcms/trunk/argyllcms.install) Deleted: argyllcms/repos/community-i686/PKGBUILD argyllcms/repos/community-i686/argyllcms.install argyllcms/repos/community-x86_64/PKGBUILD argyllcms/repos/community-x86_64/argyllcms.install ---------------------------------------------+ /PKGBUILD | 122 ++++++++++++++++++++++++++ /argyllcms.install | 78 ++++++++++++++++ community-i686/PKGBUILD | 52 ----------- community-i686/argyllcms-1.8.0-gcc5.patch | 20 ++++ community-i686/argyllcms.install | 39 -------- community-x86_64/PKGBUILD | 52 ----------- community-x86_64/argyllcms-1.8.0-gcc5.patch | 20 ++++ community-x86_64/argyllcms.install | 39 -------- 8 files changed, 240 insertions(+), 182 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-09-08 13:20:17 UTC (rev 139601) +++ community-i686/PKGBUILD 2015-09-08 13:20:29 UTC (rev 139602) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) - -pkgname=argyllcms -_pkgname=Argyll -pkgver=1.7.0 -_pkgver="V${pkgver}" -pkgrel=1 -pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" -arch=(i686 x86_64) -depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr' 'zlib') -makedepends=('ftjam' 'zip' 'unzip') -# You need to fake an UserAgent or it doesn't download -source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) -url="http://www.argyllcms.com/" -license=("GPL" "AGPL") -install=${pkgname}.install -sha256sums=('dac51cf5d8f6d04bb02f2f5b119fa0e8b773a010e6377116768b082ef018f663') - -prepare() { - sed -i 's:^TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p":IMPORT{builtin}="hwdb --subsystem=usb":' ${_pkgname}_${_pkgver}/usb/55-Argyll.rules -} - -build() { - cd ${_pkgname}_${_pkgver} - echo "***running makeall.sh***" - sh ./makeall.sh - echo "***running makeinstall.sh***" - sh ./makeinstall.sh - echo "***running makepackagebin.sh***" - sh ./makepackagebin.sh - rm {bin,ref}/License.txt - rm {doc,ref}/afiles -} - -package() { - mkdir -p "${pkgdir}"/usr/bin - install -m755 ${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin - mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 ${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 ${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 ${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref - # Because there is just html documentation we have to move it - mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs - install -m644 ${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs - install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc - mkdir -p "${pkgdir}"/usr/lib/udev/rules.d - install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules -} - -# vim:set ts=2 sw=2 et: Copied: argyllcms/repos/community-i686/PKGBUILD (from rev 139601, argyllcms/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-09-08 13:20:29 UTC (rev 139602) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) + +pkgname=argyllcms +_pkgname=Argyll +pkgver=1.8.2 +_pkgver="V${pkgver}" +pkgrel=1 +pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" +arch=(i686 x86_64) +depends=('libtiff' 'libxss' 'libxinerama' 'libxxf86vm' 'libxrandr' 'openssl') +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) +url="http://www.argyllcms.com/" +license=("GPL" "AGPL") +install=${pkgname}.install +sha256sums=('59bdfaeace35d2007c90fc53234ba33bf8a64cffc08f7b27a297fc5f85455377' + 'de9b8a90e249070d457291c29ae3c732f89c51bc6f6296cb6aa7e800ba31a0e5') + +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 + + # From Gentoo argyllcms ebuild + echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop + echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop +} + +build() { + cd ${_pkgname}_${_pkgver} + + CCOPTFLAG="$CFLAGS" ./makeall.sh + ./makeinstall.sh + ./makepackagebin.sh + rm {bin,ref}/License.txt + rm {doc,ref}/afiles +} + +package() { + mkdir -p "${pkgdir}"/usr/bin + install -m755 ${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin + mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref + # Because there is just html documentation we have to move it + mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 ${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc + mkdir -p "${pkgdir}"/usr/lib/udev/rules.d + install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules +} + +# vim:set ts=2 sw=2 et: Copied: argyllcms/repos/community-i686/argyllcms-1.8.0-gcc5.patch (from rev 139601, argyllcms/trunk/argyllcms-1.8.0-gcc5.patch) =================================================================== --- community-i686/argyllcms-1.8.0-gcc5.patch (rev 0) +++ community-i686/argyllcms-1.8.0-gcc5.patch 2015-09-08 13:20:29 UTC (rev 139602) @@ -0,0 +1,20 @@ +Description: Fix FTBFS with GCC 5 +Author: James Cowgill <james...@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__ */ Deleted: community-i686/argyllcms.install =================================================================== --- community-i686/argyllcms.install 2015-09-08 13:20:17 UTC (rev 139601) +++ community-i686/argyllcms.install 2015-09-08 13:20:29 UTC (rev 139602) @@ -1,39 +0,0 @@ -post_install() { - cat << EOF - -NOTE for argyllcms: ----- - ==> The documentaion is only available as html! - ==> You will find it in /usr/share/argyllcms/doc - ==> Color charts located in /usr/share/argyllcms/ref - ==> Since release 1.5.0 ColorHug support is enabled by default. The environment variable "ENABLE_COLORHUG" is not longer needed! -EOF - -/usr/sbin/groupadd plugdev &> /dev/null -RETVAL=$? -if [ $RETVAL -eq 0 ] ; then - /bin/echo "==> Added group plugdev. Please add your argyllcms user to this group! <==" -elif [ $RETVAL -eq 9 ] ; then - /bin/echo "==> Please add your argyllcms user to plugdev group! <==" -else - /bin/echo "==> Please create group plugdev and add your argyllcms user to this group! <==" -fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - /bin/true -} - -post_remove() { - /bin/echo "==> Please check if group plugdev and your assigned argyllcms user is still required! <==" - /bin/true -} - -op=$1 -shift - -$op $* Copied: argyllcms/repos/community-i686/argyllcms.install (from rev 139601, argyllcms/trunk/argyllcms.install) =================================================================== --- community-i686/argyllcms.install (rev 0) +++ community-i686/argyllcms.install 2015-09-08 13:20:29 UTC (rev 139602) @@ -0,0 +1,39 @@ +post_install() { + cat << EOF + +NOTE for argyllcms: +---- + ==> The documentaion is only available as html! + ==> You will find it in /usr/share/argyllcms/doc + ==> Color charts located in /usr/share/argyllcms/ref + ==> Since release 1.5.0 ColorHug support is enabled by default. The environment variable "ENABLE_COLORHUG" is not longer needed! +EOF + +/usr/sbin/groupadd plugdev &> /dev/null +RETVAL=$? +if [ $RETVAL -eq 0 ] ; then + /bin/echo "==> Added group plugdev. Please add your argyllcms user to this group! <==" +elif [ $RETVAL -eq 9 ] ; then + /bin/echo "==> Please add your argyllcms user to plugdev group! <==" +else + /bin/echo "==> Please create group plugdev and add your argyllcms user to this group! <==" +fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +post_remove() { + /bin/echo "==> Please check if group plugdev and your assigned argyllcms user is still required! <==" + /bin/true +} + +op=$1 +shift + +$op $* Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-09-08 13:20:17 UTC (rev 139601) +++ community-x86_64/PKGBUILD 2015-09-08 13:20:29 UTC (rev 139602) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> -# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) - -pkgname=argyllcms -_pkgname=Argyll -pkgver=1.7.0 -_pkgver="V${pkgver}" -pkgrel=1 -pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" -arch=(i686 x86_64) -depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr' 'zlib') -makedepends=('ftjam' 'zip' 'unzip') -# You need to fake an UserAgent or it doesn't download -source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) -url="http://www.argyllcms.com/" -license=("GPL" "AGPL") -install=${pkgname}.install -sha256sums=('dac51cf5d8f6d04bb02f2f5b119fa0e8b773a010e6377116768b082ef018f663') - -prepare() { - sed -i 's:^TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p":IMPORT{builtin}="hwdb --subsystem=usb":' ${_pkgname}_${_pkgver}/usb/55-Argyll.rules -} - -build() { - cd ${_pkgname}_${_pkgver} - echo "***running makeall.sh***" - sh ./makeall.sh - echo "***running makeinstall.sh***" - sh ./makeinstall.sh - echo "***running makepackagebin.sh***" - sh ./makepackagebin.sh - rm {bin,ref}/License.txt - rm {doc,ref}/afiles -} - -package() { - mkdir -p "${pkgdir}"/usr/bin - install -m755 ${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin - mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 ${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 ${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref - install -m644 ${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref - # Because there is just html documentation we have to move it - mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs - install -m644 ${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs - install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc - mkdir -p "${pkgdir}"/usr/lib/udev/rules.d - install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules -} - -# vim:set ts=2 sw=2 et: Copied: argyllcms/repos/community-x86_64/PKGBUILD (from rev 139601, argyllcms/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-09-08 13:20:29 UTC (rev 139602) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Timothy Redaelli <timothy.redae...@gmail.com> +# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) + +pkgname=argyllcms +_pkgname=Argyll +pkgver=1.8.2 +_pkgver="V${pkgver}" +pkgrel=1 +pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" +arch=(i686 x86_64) +depends=('libtiff' 'libxss' 'libxinerama' 'libxxf86vm' 'libxrandr' 'openssl') +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) +url="http://www.argyllcms.com/" +license=("GPL" "AGPL") +install=${pkgname}.install +sha256sums=('59bdfaeace35d2007c90fc53234ba33bf8a64cffc08f7b27a297fc5f85455377' + 'de9b8a90e249070d457291c29ae3c732f89c51bc6f6296cb6aa7e800ba31a0e5') + +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 + + # From Gentoo argyllcms ebuild + echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop + echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop +} + +build() { + cd ${_pkgname}_${_pkgver} + + CCOPTFLAG="$CFLAGS" ./makeall.sh + ./makeinstall.sh + ./makepackagebin.sh + rm {bin,ref}/License.txt + rm {doc,ref}/afiles +} + +package() { + mkdir -p "${pkgdir}"/usr/bin + install -m755 ${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin + mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref + install -m644 ${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref + # Because there is just html documentation we have to move it + mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 ${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs + install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc + mkdir -p "${pkgdir}"/usr/lib/udev/rules.d + install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules +} + +# vim:set ts=2 sw=2 et: Copied: argyllcms/repos/community-x86_64/argyllcms-1.8.0-gcc5.patch (from rev 139601, argyllcms/trunk/argyllcms-1.8.0-gcc5.patch) =================================================================== --- community-x86_64/argyllcms-1.8.0-gcc5.patch (rev 0) +++ community-x86_64/argyllcms-1.8.0-gcc5.patch 2015-09-08 13:20:29 UTC (rev 139602) @@ -0,0 +1,20 @@ +Description: Fix FTBFS with GCC 5 +Author: James Cowgill <james...@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__ */ Deleted: community-x86_64/argyllcms.install =================================================================== --- community-x86_64/argyllcms.install 2015-09-08 13:20:17 UTC (rev 139601) +++ community-x86_64/argyllcms.install 2015-09-08 13:20:29 UTC (rev 139602) @@ -1,39 +0,0 @@ -post_install() { - cat << EOF - -NOTE for argyllcms: ----- - ==> The documentaion is only available as html! - ==> You will find it in /usr/share/argyllcms/doc - ==> Color charts located in /usr/share/argyllcms/ref - ==> Since release 1.5.0 ColorHug support is enabled by default. The environment variable "ENABLE_COLORHUG" is not longer needed! -EOF - -/usr/sbin/groupadd plugdev &> /dev/null -RETVAL=$? -if [ $RETVAL -eq 0 ] ; then - /bin/echo "==> Added group plugdev. Please add your argyllcms user to this group! <==" -elif [ $RETVAL -eq 9 ] ; then - /bin/echo "==> Please add your argyllcms user to plugdev group! <==" -else - /bin/echo "==> Please create group plugdev and add your argyllcms user to this group! <==" -fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - /bin/true -} - -post_remove() { - /bin/echo "==> Please check if group plugdev and your assigned argyllcms user is still required! <==" - /bin/true -} - -op=$1 -shift - -$op $* Copied: argyllcms/repos/community-x86_64/argyllcms.install (from rev 139601, argyllcms/trunk/argyllcms.install) =================================================================== --- community-x86_64/argyllcms.install (rev 0) +++ community-x86_64/argyllcms.install 2015-09-08 13:20:29 UTC (rev 139602) @@ -0,0 +1,39 @@ +post_install() { + cat << EOF + +NOTE for argyllcms: +---- + ==> The documentaion is only available as html! + ==> You will find it in /usr/share/argyllcms/doc + ==> Color charts located in /usr/share/argyllcms/ref + ==> Since release 1.5.0 ColorHug support is enabled by default. The environment variable "ENABLE_COLORHUG" is not longer needed! +EOF + +/usr/sbin/groupadd plugdev &> /dev/null +RETVAL=$? +if [ $RETVAL -eq 0 ] ; then + /bin/echo "==> Added group plugdev. Please add your argyllcms user to this group! <==" +elif [ $RETVAL -eq 9 ] ; then + /bin/echo "==> Please add your argyllcms user to plugdev group! <==" +else + /bin/echo "==> Please create group plugdev and add your argyllcms user to this group! <==" +fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +post_remove() { + /bin/echo "==> Please check if group plugdev and your assigned argyllcms user is still required! <==" + /bin/true +} + +op=$1 +shift + +$op $*