summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2018-11-03 16:11:44 -0400
committerChris Severance2018-11-03 16:11:44 -0400
commit70d6158382b7f52a2c7c4c2e5b4c0156472f8663 (patch)
tree667ee7a17c0e50330a5522aa6c1a1af8199b9f76
parent33d559651281820668945961b569d60160698d9c (diff)
downloadaur-70d6158382b7f52a2c7c4c2e5b4c0156472f8663.tar.gz
autu: Update to 4.00-1 Fix quoting
-rw-r--r--.SRCINFO11
-rw-r--r--0000-cgnplp-po-Makefile-quote-spaces.patch46
-rw-r--r--0002-c3plmod_ipc-Makefile-quote-spaces.patch15
-rw-r--r--PKGBUILD35
4 files changed, 103 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c9cded700d9..414095bc8da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Sep 4 19:45:00 UTC 2018
+# Sat Nov 3 20:11:44 UTC 2018
pkgbase = cndrvcups-common-lb
pkgdesc = common printer driver modules for Canon cndrvcups-lb package, built from source
pkgver = 4.00
@@ -19,8 +19,17 @@ pkgbase = cndrvcups-common-lb
options = !strip
options = staticlibs
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 = 0002-c3plmod_ipc-Makefile-quote-spaces.patch
+ md5sums = a613792136de44958a9953814ef0e6b6
+ md5sums = 638b9668916f5973df0dba0526ba803a
+ md5sums = d3484478d650132ab6cf5f0a820b9286
sha256sums = a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd
+ sha256sums = b2e4185c66d42facb57783d3d4b7d571b826b8af23d66f60574e0604b3bfd0b7
+ sha256sums = 2a769d95f443ce6bbb4b52a2d1819a7dcacf855ac38a21fea056941bdf3f4b72
sha512sums = c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
+ sha512sums = cc24afbc841125dc3556ada8fa2fc9b432f9b648efe18f0f6c659fdf916fe22d80f5524340877696e896d7f4a00206ba54c89943290c08377cbfaa6c9569fc00
+ sha512sums = 1f98bf1341e2ed188d48640c49aef5209564ad9249b78d44ee53378c4cb5a4153ddbe53813523e2790c4adb314cd9047364e147dfa659d981f0f7d657a0d34fc
depends_i686 = gcc-libs
depends_x86_64 = lib32-gcc-libs
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/0002-c3plmod_ipc-Makefile-quote-spaces.patch b/0002-c3plmod_ipc-Makefile-quote-spaces.patch
new file mode 100644
index 00000000000..09ff0283d17
--- /dev/null
+++ b/0002-c3plmod_ipc-Makefile-quote-spaces.patch
@@ -0,0 +1,15 @@
+--- cndrvcups-common-4.00/c3plmod_ipc/Makefile.orig 2018-11-03 13:39:48.641785549 -0400
++++ cndrvcups-common-4.00/c3plmod_ipc/Makefile 2018-11-03 13:40:00.611833670 -0400
+@@ -9,11 +9,11 @@
+ # Compiler Definition
+ CC=gcc
+
+ # Directories
+ CLIBDIR=$(LIBDIR)
+-CLIENT_INSTALLDIR = $(DESTDIR)$(CLIBDIR)
++CLIENT_INSTALLDIR = "$(DESTDIR)$(CLIBDIR)"
+ IPCLIBDIR = ./ipclib
+
+ # Compile/Link Options
+ #LINKOPTIONS_R=-o
+ LINKOPTIONS_R=-g -o
diff --git a/PKGBUILD b/PKGBUILD
index fdd7ef4975d..582b54e2315 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,9 +33,18 @@ options+=('staticlibs')
_srcdir="${pkgname%-lb}-${pkgver}"
source=(
"http://gdlp01.c-wss.com/gds/${_dl}/linux-UFRII-drv-v${_pkgver//\./}-uken.tar.gz"
+ '0000-cgnplp-po-Makefile-quote-spaces.patch'
+ '0002-c3plmod_ipc-Makefile-quote-spaces.patch'
)
-sha256sums=('a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd')
-sha512sums=('c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7')
+md5sums=('a613792136de44958a9953814ef0e6b6'
+ '638b9668916f5973df0dba0526ba803a'
+ 'd3484478d650132ab6cf5f0a820b9286')
+sha256sums=('a5bf2c2d53049ad64acf2ed8b6dc954ff261c4b996ce1cc81471e5baaf5e40cd'
+ 'b2e4185c66d42facb57783d3d4b7d571b826b8af23d66f60574e0604b3bfd0b7'
+ '2a769d95f443ce6bbb4b52a2d1819a7dcacf855ac38a21fea056941bdf3f4b72')
+sha512sums=('c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7'
+ 'cc24afbc841125dc3556ada8fa2fc9b432f9b648efe18f0f6c659fdf916fe22d80f5524340877696e896d7f4a00206ba54c89943290c08377cbfaa6c9569fc00'
+ '1f98bf1341e2ed188d48640c49aef5209564ad9249b78d44ee53378c4cb5a4153ddbe53813523e2790c4adb314cd9047364e147dfa659d981f0f7d657a0d34fc')
prepare() {
set -u
@@ -80,6 +89,7 @@ prepare() {
-e '# ln -f hides problems so should be avoided' \
-e 's:ln -sf :ln -s :g' \
> 'make.install.Arch'
+
set +u
}
@@ -109,9 +119,28 @@ build() {
package() {
set -u
-
cd "${_srcdir}"
+ # 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
+
+ # Fix a libtool space quoting bug
+ sed -e '/^\tfunc_show_eval.* \\\$destfile/ s:\\\$destfile:\\"&\\":g' \
+ -e '/^\s\+func_show_eval.* \\\$oldlib/ s:\\\$oldlib:\\"&\\":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" \
+ -i */libtool
+
+ # Fix a Makefile space quoting bug
+ # diff -pNau5 'cndrvcups-common-4.00/c3plmod_ipc/Makefile'{.orig,} > '0002-c3plmod_ipc-Makefile-quote-spaces.patch'
+ if [ ! -s 'c3plmod_ipc/Makefile.orig' ]; then
+ patch -Nbup1 -i "${srcdir}/0002-c3plmod_ipc-Makefile-quote-spaces.patch"
+ fi
+
local _vars; _setvars
env "${_vars[@]}" \
RPM_BUILD_ROOT="${pkgdir}" \