summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2018-11-05 12:44:57 -0500
committerChris Severance2018-11-05 12:44:57 -0500
commita29a8721f37aff5c609d8e2f09b7058de98d9010 (patch)
treef7c4862305ad6d95ef36807545a738c29aa9a30d
parent018abbf0eca7c9bf7e5b0efb3b1a289374975a1c (diff)
downloadaur-a29a8721f37aff5c609d8e2f09b7058de98d9010.tar.gz
autu: Update to 3.60-1 Fix build for paths with spaces
-rw-r--r--.SRCINFO10
-rw-r--r--0000-cgnplp-po-Makefile-quote-spaces.patch46
-rw-r--r--PKGBUILD39
3 files changed, 92 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4f04a916abc..9feeda42bf5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Sep 4 19:45:56 UTC 2018
+# Mon Nov 5 17:44:57 UTC 2018
pkgbase = cndrvcups-lb
pkgdesc = CUPS Canon UFR II LIPSLX CARPS2 printer driver for LBP iR MF ImageCLASS ImageRUNNER Laser Shot i-SENSYS ImagePRESS ADVANCE printers and copiers
pkgver = 3.60
@@ -18,13 +18,21 @@ pkgbase = cndrvcups-lb
options = !strip
options = !libtool
source = http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
+ source = 0000-cgnplp-po-Makefile-quote-spaces.patch
source = how-to.txt
+ md5sums = a613792136de44958a9953814ef0e6b6
+ md5sums = 638b9668916f5973df0dba0526ba803a
+ md5sums = e9b4391436a9ccf730a4f6e8adc74657
sha256sums = a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd
+ sha256sums = b2e4185c66d42facb57783d3d4b7d571b826b8af23d66f60574e0604b3bfd0b7
sha256sums = 62c4bfe3e4155e5e805b51eaa4b9dd3581ba029259c2817d9ebe66077aad7280
sha512sums = c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
+ sha512sums = cc24afbc841125dc3556ada8fa2fc9b432f9b648efe18f0f6c659fdf916fe22d80f5524340877696e896d7f4a00206ba54c89943290c08377cbfaa6c9569fc00
sha512sums = 736e1785c443c4d129c8801a127410012889f46691259e8a7f6a54106a0647beb5b6267aabb78b3ed0a1c7a9d8ce216e159515d3aad425812e5be52c8b58e4ee
+ depends_i686 = gcc-libs
depends_i686 = libxml2
optdepends_i686 = libjpeg6-turbo: improves printing results for color imageRUNNER/i-SENSYS LBP devices
+ depends_x86_64 = lib32-gcc-libs
depends_x86_64 = lib32-libxml2
optdepends_x86_64 = lib32-libjpeg6-turbo: improves printing results for color imageRUNNER/i-SENSYS LBP devices
diff --git a/0000-cgnplp-po-Makefile-quote-spaces.patch b/0000-cgnplp-po-Makefile-quote-spaces.patch
new file mode 100644
index 00000000000..9cab52a5ad3
--- /dev/null
+++ b/0000-cgnplp-po-Makefile-quote-spaces.patch
@@ -0,0 +1,46 @@
+--- cndrvcups-common-4.00/cngplp/po/Makefile.orig 2018-11-03 12:01:57.233864195 -0400
++++ cndrvcups-common-4.00/cngplp/po/Makefile 2018-11-03 11:55:35.019161804 -0400
+@@ -130,36 +130,36 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTF
+ install: install-exec install-data
+ install-exec:
+ install-data: install-data-yes
+ install-data-no: all
+ install-data-yes: all
+- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
++ $(MKINSTALLDIRS) "$(DESTDIR)$(datadir)"; \
+ catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ case "$$cat" in \
+ *.gmo) destdir=$(gnulocaledir);; \
+ *) destdir=$(localedir);; \
+ esac; \
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+- $(MKINSTALLDIRS) $$dir; \
++ dir="$(DESTDIR)$$destdir/$$lang/LC_MESSAGES"; \
++ $(MKINSTALLDIRS) "$$dir"; \
+ if test -r $$cat; then \
+- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
++ $(INSTALL_DATA) $$cat "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ else \
+- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
++ $(INSTALL_DATA) $(srcdir)/$$cat "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ echo "installing $(srcdir)/$$cat as" \
+ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ fi; \
+ if test -r $$cat.m; then \
+- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
++ $(INSTALL_DATA) $$cat.m "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ else \
+ if test -r $(srcdir)/$$cat.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$cat.m \
+- $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
++ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ echo "installing $(srcdir)/$$cat as" \
+ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ else \
+ true; \
+ fi; \
diff --git a/PKGBUILD b/PKGBUILD
index e50ea85dc0d..9c9e5ff6a67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,6 +6,9 @@
# TODO: cndrvcups-common-lb and cndrvcups-lb should be a single split package
set -u
+#if [ ! -z "${BUILDDIR:-}" ] && [ "${BUILDDIR// /}" != "${BUILDDIR}" ]; then
+# BUILDDIR="/tmp/makepkg.${USER// /}"
+#fi
pkgbase='cndrvcups-lb'
pkgname="${pkgbase}"
#_pkgver='3.40'; _commonver='3.80'; _dl='8/0100002708/17'
@@ -21,7 +24,8 @@ url='https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i
#url='https://www.usa.canon.com/internet/portal/us/home/support/details/printers/black-and-white-laser/mf212w/imageclass-mf212w'
license=('custom')
depends=("cndrvcups-common-lb>=${_commonver}") # >= makes upgrades easier
-depends_i686=('libxml2')
+depends_i686=('gcc-libs')
+depends_i686+=('libxml2')
depends_x86_64=("${depends_i686[@]/#/lib32-}")
optdepends_i686=('libjpeg6-turbo: improves printing results for color imageRUNNER/i-SENSYS LBP devices')
optdepends_x86_64=("${optdepends_i686[@]/#/lib32-}")
@@ -34,11 +38,17 @@ install="${pkgname}.install"
_srcdir="${pkgbase}-${pkgver}"
source=(
"http://gdlp01.c-wss.com/gds/${_dl}/linux-UFRII-drv-v${_pkgver//\./}-uken.tar.gz"
+ '0000-cgnplp-po-Makefile-quote-spaces.patch'
'how-to.txt'
)
+md5sums=('a613792136de44958a9953814ef0e6b6'
+ '638b9668916f5973df0dba0526ba803a'
+ 'e9b4391436a9ccf730a4f6e8adc74657')
sha256sums=('a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd'
+ 'b2e4185c66d42facb57783d3d4b7d571b826b8af23d66f60574e0604b3bfd0b7'
'62c4bfe3e4155e5e805b51eaa4b9dd3581ba029259c2817d9ebe66077aad7280')
sha512sums=('c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7'
+ 'cc24afbc841125dc3556ada8fa2fc9b432f9b648efe18f0f6c659fdf916fe22d80f5524340877696e896d7f4a00206ba54c89943290c08377cbfaa6c9569fc00'
'736e1785c443c4d129c8801a127410012889f46691259e8a7f6a54106a0647beb5b6267aabb78b3ed0a1c7a9d8ce216e159515d3aad425812e5be52c8b58e4ee')
prepare() {
@@ -78,6 +88,7 @@ prepare() {
-e '# ln -f hides problems so should be avoided' \
-e 's:ln -sf :ln -s :g' \
> 'make.install.Arch'
+
set +u
}
@@ -107,9 +118,33 @@ build() {
package() {
set -u
-
cd "${_srcdir}"
+ #if [ "${BUILDDIR// /}" != "${BUILDDIR}" ]; then
+ set +u; msg2 'paths with spaces patch'; set -u
+ # Fix a Makefile space quoting bug https://bbs.archlinux.org/viewtopic.php?id=241671
+ # diff -pNau5 'cndrvcups-common-4.00/cngplp/po/Makefile'{.orig,} > '0000-cgnplp-po-Makefile-quote-spaces.patch'
+ if [ ! -s 'cngplp/po/Makefile.orig' ]; then
+ patch -Nbup1 -i "${srcdir}/0000-cgnplp-po-Makefile-quote-spaces.patch"
+ fi
+
+ # Make libtool compatible with spaces in paths
+ local _libtools=(*/libtool)
+ local _libtool
+ for _libtool in "${_libtools[@]}"; do
+ cp -n -p "${_libtool}"{,.Arch}
+ sed -e '/^\s\+func_show_eval "\$install/ s: \(\$[^ "]\+\)": \\"\1\\"":g' \
+ -e '/^\s\+func_show_eval "\$install/ s: \(\\\$[^ "]\+\)": \\"\1\\"":g' \
+ -e '# These errors do not halt the build' \
+ -e '/eval\b/ s:"(cd \([$\\][^ ]\+\) :"(cd \\"\1\\" :g' \
+ -e '/eval\b/ s:'"'"'(cd \([$\\][^ ]\+\) :'"'"'(cd "\1" :g' \
+ -e '# Not sure why single quote works here.' \
+ -e '/^old_postinstall_cmds=.* \\\$oldlib/ s:\\\$oldlib:'"'&':g" \
+ -e '/^old_postinstall_cmds=.* \\\$tool_oldlib/ s:\\\$tool_oldlib:'"'&':g" \
+ "${_libtool}.Arch" > "${_libtool}"
+ done
+ #fi
+
local _vars; _setvars
env "${_vars[@]}" \
RPM_BUILD_ROOT="${pkgdir}" \