[arch-commits] Commit in argyllcms/trunk (3 files)

[Bruno Pagani]

    Date: Friday, November 24, 2017 @ 13:11:54
  Author: archange
Revision: 268325

Update ArgyllCMS to 2.0, rework PKGBUILD.

Make direct invocation of jam instead of using scripts.
Use `install` instruction instead of copying files manually.
Use system deps as much as possible.
Make use of systemd-sysusers vs .install file.

Added:
  argyllcms/trunk/argyllcms.sysusers
Modified:
  argyllcms/trunk/PKGBUILD
  argyllcms/trunk/argyllcms.install

--------------------+
 PKGBUILD           |   62 ++++++++++++++++++++++++---------------------------
 argyllcms.install  |   17 +------------
 argyllcms.sysusers |    1 
 3 files changed, 33 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-24 13:09:15 UTC (rev 268324)
+++ PKGBUILD	2017-11-24 13:11:54 UTC (rev 268325)
@@ -1,58 +1,56 @@
 # $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Timothy Redaelli <timothy.redaelli at gmail.com>
 # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
 
 pkgname=argyllcms
 _pkgname=Argyll
-pkgver=1.9.2
+pkgver=2.0.0
 _pkgver="V${pkgver}"
-pkgrel=2
+pkgrel=1
 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware"
-arch=(x86_64)
-depends=('libtiff' 'libxss' 'libxinerama' 'libxxf86vm' 'libxrandr' 'openssl')
+arch=('x86_64')
+url="https://www.argyllcms.com/"
+license=('GPL' 'AGPL')
+depends=('libpng' 'libtiff' 'libxss' 'libxinerama' 'libxxf86vm' 'libxrandr' 'zlib' '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)
-url="http://www.argyllcms.com/"
-license=("GPL" "AGPL")
+source=("https://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip"
+        "${pkgname}.sysusers")
 install=${pkgname}.install
-sha256sums=('4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90')
+sha256sums=('5492896c040b406892864c467466ad6b50eb62954b5874ef0eb9174d1764ff41'
+            '20c6482069c140c19f5d804ded9a85fbc746160aee9e04da712b8f6b30939a1b')
 
 prepare() {
   cd ${_pkgname}_${_pkgver}
+  # Use hwdb builtin, instead of the obsolete usb-db in the udev rules.
   sed -i 's:^TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p":IMPORT{builtin}="hwdb --subsystem=usb":' usb/55-Argyll.rules
 
-  sed -i 's/-j${NUMBER_OF_PROCESSORS:-2}/$MAKEFLAGS/' makeall.sh
+  # Fix deprecated SSL method
+  #sed -i 's:TLSv1_client_method():SSLv23_client_method:' ccast/ccpacket.c
 
-  # From Gentoo argyllcms ebuild
+  # Use LDFLAGS
   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"
+  jam -q -fJambase ${MAKEFLAGS} -sPREFIX=/usr -sDESTDIR="${pkgdir}" -sREFSUBDIR=share/argyllcms/ref all
+}
 
-  CCOPTFLAG="$CFLAGS" ./makeall.sh
-  ./makeinstall.sh
-  ./makepackagebin.sh
-  rm {bin,ref}/License.txt
+package() {
+  cd ${_pkgname}_${_pkgver}
+  jam -q -fJambase ${MAKEFLAGS} -sPREFIX=/usr -sDESTDIR="${pkgdir}" -sREFSUBDIR=share/argyllcms/ref install
+
+  rm "${pkgdir}"/usr/bin/License.txt
+
   rm {doc,ref}/afiles
-}
+  install -Dm644 doc/*.* -t "${pkgdir}"/usr/share/${pkgname}/doc/
+  install -Dm644 doc/ccmxs/*.ccmx -t "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs/
 
-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
+  install -Dm644 usb/55-Argyll.rules -t "${pkgdir}"/usr/lib/udev/rules.d/
+
+  install -Dm644 "${srcdir}"/${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
 }
 
 # vim:set ts=2 sw=2 et:

Modified: argyllcms.install
===================================================================
--- argyllcms.install	2017-11-24 13:09:15 UTC (rev 268324)
+++ argyllcms.install	2017-11-24 13:11:54 UTC (rev 268325)
@@ -1,20 +1,7 @@
 post_install() {
-/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
+    /bin/echo "Don’t forget to add yourself to the 'plugdev' group in order to use ArgyllCMS."
 }
 
 post_upgrade() {
-  post_install $1
+    post_install
 }
-
-post_remove() {
-  /bin/echo "==> Please check if group plugdev and your assigned argyllcms user is still required! <=="
-  /bin/true
-}

Added: argyllcms.sysusers
===================================================================
--- argyllcms.sysusers	                        (rev 0)
+++ argyllcms.sysusers	2017-11-24 13:11:54 UTC (rev 268325)
@@ -0,0 +1 @@
+g plugdev