autu: Update to 4.00-1

2 files changed, 50 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47a370cce6e5..3e9f911fe91c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Wed Apr 18 04:13:51 UTC 2018
+# Wed Aug 29 22:31:35 UTC 2018
 pkgbase = cndrvcups-common-lb
-	pkgdesc = common printer driver modules for cndrvcups-lb package, built from source
-	pkgver = 3.90
+	pkgdesc = common printer driver modules for Canon cndrvcups-lb package, built from source
+	pkgver = 4.00
 	pkgrel = 1
-	url = https://www.canon.co.uk/for_work/products/office_print_copy_solutions/office_black_white/imagerunner_1730i/
+	url = https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -18,9 +18,9 @@ pkgbase = cndrvcups-common-lb
 	options = !emptydirs
 	options = !strip
 	options = staticlibs
-	source = http://gdlp01.c-wss.com/gds/8/0100007658/05/linux-UFRII-drv-v350-uken.tar.gz
-	sha256sums = c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f
-	sha512sums = 2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3
+	source = http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
+	sha256sums = a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd
+	sha512sums = c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 	depends_i686 = gcc-libs
 	depends_x86_64 = lib32-gcc-libs
 
diff --git a/PKGBUILD b/PKGBUILD
index c7ff7f5fdf60..cf66bf6bd74c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,13 +11,15 @@ pkgname="${pkgbase}"
 # used this name to avoid conflict with the existing cndrvcups-common (no longer in aur) which was wrong version for cndrvcups-lb
 #_pkgname='cndrvcups-common'
 #_pkgver='3.40'; _commonver='3.80'; _dl='8/0100002708/17'
-_pkgver='3.50'; _commonver='3.90'; _dl='8/0100007658/05'
+#_pkgver='3.50'; _commonver='3.90'; _dl='8/0100007658/05'
+_pkgver='3.60'; _commonver='4.00'; _dl='0/0100009240/02'
+
 pkgver="${_commonver}"
 pkgrel='1'
-pkgdesc='common printer driver modules for cndrvcups-lb package, built from source'
+pkgdesc='common printer driver modules for Canon cndrvcups-lb package, built from source'
 arch=('i686' 'x86_64')
 # Direct links to the download reference go bad on the next version. We want something that will persist for a while.
-url='https://www.canon.co.uk/for_work/products/office_print_copy_solutions/office_black_white/imagerunner_1730i/'
+url='https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx'
 #url='https://www.usa.canon.com/internet/portal/us/home/support/details/printers/black-and-white-laser/mf212w/imageclass-mf212w'
 license=('GPL' 'MIT' 'custom')
 depends=('libglade')
@@ -31,8 +33,8 @@ _srcdir="${pkgname%-lb}-${pkgver}"
 source=(
   "http://gdlp01.c-wss.com/gds/${_dl}/linux-UFRII-drv-v${_pkgver//\./}-uken.tar.gz"
 )
-sha256sums=('c00324177a6f77f0a6deb4ecc6bee8150607dd4029bad3dfc1a521f84f811e7f')
-sha512sums=('2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3')
+sha256sums=('a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd')
+sha512sums=('c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7')
 
 # build instructions are adapted from upstream file
 # cndrvcups-common.spec
@@ -43,32 +45,31 @@ prepare() {
   set +u
 }
 
+_setvars() {
+  declare -A _lib32dirs=([i686]='lib' [x86_64]='lib32')
+  _vars=(
+    _bindir='/usr/bin'
+    libs32="/usr/${_lib32dirs[${CARCH}]}"
+    _libdir='/usr/lib'
+    _prefix='/usr'
+    _includedir='/usr/include'
+    locallibs='/usr/lib/'
+  )
+}
+
 build() {
   set -u
 
-  set +u; msg2 'Building buftool'; set -u
-  cd "${_srcdir}/buftool"
-  autoreconf -i
-  ./autogen.sh --prefix='/usr/' --enable-progpath='/usr/bin' --libdir='/usr/lib'
-
-  set +u; msg2 'Building cngplp'; set -u
-  cd '../cngplp'
-  autoreconf -i
-  LIBS='-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0' \
-  ./autogen.sh --prefix='/usr' --libdir='/usr/lib'
-
-  set +u; msg2 'Building backend'; set -u
-  cd '../backend'
-  autoreconf -i
-  ./autogen.sh --prefix='/usr' --libdir='/usr/lib'
-
-  set +u; msg2 'Building all'; set -u
-  cd "${srcdir}/${_srcdir}"
-  make
-
-  set +u; msg2 'Building c3plmod_ipc'; set -u
-  cd 'c3plmod_ipc'
-  make
+  cd "${_srcdir}"
+  sed -e '2a export LIBS="-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"' -i 'cngplp/autogen.sh'
+  local _vars; _setvars
+  sed -n -e '/^%setup/,/^%install/ p' cndrvcups-*.spec | \
+  sed -e 's:^%build:'"cd '${srcdir}/${_srcdir}' # &:g" | \
+  grep -v '^%' | \
+  sed -e 's:%{:${:g' \
+      -e 's:^./autogen.sh\b:autoreconf -i\n& --prefix=${_prefix}:g ' \
+  | env "${_vars[@]}" \
+  sh -e -u -x --
 
   set +u
 }
@@ -78,59 +79,21 @@ package() {
 
   cd "${_srcdir}"
 
-  declare -A _lib32dirs=([i686]='lib' [x86_64]='lib32')
-  local _lib32dir="${_lib32dirs[${CARCH}]}"
-
-  make install DESTDIR="${pkgdir}"
-
-  install -Dpm644 'Rule/canon-laser-printer.usb-quirks' -t "${pkgdir}/usr/share/cups/usb/"
-
-  cd 'c3plmod_ipc'
-  make install DESTDIR="${pkgdir}" LIBDIR='/usr/lib'
-  cd ..
-
-  cd 'libs'
-  install -s -Dpm755 'c3pldrv' -t "${pkgdir}/usr/bin/"
-  local _libs=(
-    'libcaiowrap.so.1.0.0'
-    'libcaiousb.so.1.0.0'
-    'libc3pl.so.0.0.1'
-    'libcaepcm.so.1.0'
-    'libColorGear.so.0.0.0'
-    'libColorGearC.so.1.0.0'
-    'libcanon_slim.so.1.0.0'
-  )
-  install -s -Dpm755 "${_libs[@]}" -t "${pkgdir}/usr/${_lib32dir}/"
-
-  cd '../data'
-  install -Dpm644 *.[Ii][Cc][Cc] *.PRF -t "${pkgdir}/usr/share/caepcm/"
-
-  local _lib _libt
-  cd "${pkgdir}/usr/${_lib32dir}"
-  for _lib in "${_libs[@]}"; do
-    echo "soname ${_lib}"
-    test -f "${_lib}" || echo "${}"
-    if [[ "${_lib}" =~ ^(lib[^.]+\.so\.[0-9]+)\. ]]; then
-      _libt="${BASH_REMATCH[1]}"
-      ln -s "${_lib}" "${_libt}"
-      _libt="${_libt%.*}"
-      ln -s "${_lib}" "${_libt}"
-    fi
-  done
-
-  cd "${pkgdir}/usr/lib"
-  _libs=('libcanonc3pl.so.1.0.0')
-  for _lib in "${_libs[@]}"; do
-    echo "soname ${_lib}"
-    test -f "${_lib}" || echo "${}"
-    if [[ "${_lib}" =~ ^(lib[^.]+\.so\.[0-9]+)\. ]]; then
-      _libt="${BASH_REMATCH[1]}"
-      ln -s "${_lib}" "${_libt}"
-      _libt="${_libt%.*}"
-      ln -s "${_lib}" "${_libt}"
-    fi
-  done
+  local _vars; _setvars
+  sed -n -e '/^%install/,/^%clean/ p' cndrvcups-*.spec | \
+  grep -v '^%' | \
+  sed -e 's:%{:${:g' \
+      -e 's:${RPM_BUILD_ROOT}:"&":g' \
+  | env RPM_BUILD_ROOT="${pkgdir}" \
+  "${_vars[@]}" \
+  sh -e -u -x --
 
+  _fin
+
+  set +u
+}
+
+_fin() {
   # according to Gentoo ebuild v2.90 c3pldrv dlopens the absolute path
   # /usr/lib/libc3pl.so
   if [ "${CARCH}" = 'x86_64' ]; then
@@ -158,7 +121,5 @@ package() {
   # The filter works in /usr/bin but it's expected in .../cups/filter/
   install -d "${pkgdir}/usr/lib/cups/filter/"
   ln -s '/usr/bin/c3pldrv' -t "${pkgdir}/usr/lib/cups/filter/"
-
-  set +u
 }
 set +u