Updated package.

3 files changed, 25 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fde2c36130b3..18aa030bd3cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = cnijfilter-mg8100series
 	pkgdesc = Canon IJ Printer Driver (for mg8100 series)
 	pkgver = 3.40
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.canon.co.uk/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg8150.aspx?type=drivers&os=LINUX
 	install = cnijfilter-mg8100.install
-	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = autoconf>=2.13
@@ -19,11 +18,13 @@ pkgbase = cnijfilter-mg8100series
 	source = http://files.canon-europe.com/files/soft40245/Software/cnijfilter-source-3.40-1.tar.gz
 	source = build-fixes.patch
 	source = cups.patch
+	source = cups2.patch
 	source = id.po.patch
 	source = libpng.patch
 	sha256sums = a95dd4ca491a9e8acc3e4ee35cc84904680e82d89ff04a23dda1b0ccffbb8a7a
 	sha256sums = 2fac6cca681320ea248abb73a5d17c7a1f69176b594aeb2cb5c67bd4ace1fd37
-	sha256sums = 28a1cb7495b0e0689c1629d57130bcb020413431d6ffd0c1057cef2f7f16f72e
+	sha256sums = 65df45b57ab8b0d89578ee50f90ce3831d00ba9da2a09bbaacb58563bfc41e7b
+	sha256sums = 5ace9637d6a894b337cf312d0df06a37e5fa467b7e5b05897fbf1f0c66493e82
 	sha256sums = df6ff8ef9d8bf825c170b3d5957a93eb7c20b6b4cc39a4944dc74d2852bef1a9
 	sha256sums = d4b52edbb4cc6a56d93b176341277935357acc0c52ac48abcf0e7e7e9d3c0a7c
 
diff --git a/PKGBUILD b/PKGBUILD
index 354056b8b449..93c7908b1a31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,11 @@
 _model=mg8100
 pkgname=cnijfilter-${_model}series
 pkgver=3.40
-pkgrel=1
+pkgrel=2
 _pkgver=3.40-1
 pkgdesc="Canon IJ Printer Driver (for ${_model} series)"
 url="http://www.canon.co.uk/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg8150.aspx?type=drivers&os=LINUX"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('custom')
 depends=('cups' 'ghostscript' 'popt' 'gtk2')
 makedepends=('autoconf>=2.13' 'automake>=1.6' 'findutils' 'gawk')
@@ -19,25 +19,22 @@ install=cnijfilter-mg8100.install
 source=('http://files.canon-europe.com/files/soft40245/Software/cnijfilter-source-3.40-1.tar.gz'
         'build-fixes.patch'
         'cups.patch'
+        'cups2.patch'
 	'id.po.patch'
         'libpng.patch')
 sha256sums=('a95dd4ca491a9e8acc3e4ee35cc84904680e82d89ff04a23dda1b0ccffbb8a7a'
             '2fac6cca681320ea248abb73a5d17c7a1f69176b594aeb2cb5c67bd4ace1fd37'
-            '28a1cb7495b0e0689c1629d57130bcb020413431d6ffd0c1057cef2f7f16f72e'
+            '65df45b57ab8b0d89578ee50f90ce3831d00ba9da2a09bbaacb58563bfc41e7b'
+            '5ace9637d6a894b337cf312d0df06a37e5fa467b7e5b05897fbf1f0c66493e82'
             'df6ff8ef9d8bf825c170b3d5957a93eb7c20b6b4cc39a4944dc74d2852bef1a9'
             'd4b52edbb4cc6a56d93b176341277935357acc0c52ac48abcf0e7e7e9d3c0a7c')
 
-if [ "$CARCH" == "x86_64" ]; then  
-	_libdir=libs_bin64
-else
-	_libdir=libs_bin32
-fi
-
 prepare() {
     ## Patches
 	msg "Applying patches"
 	patch -p0 < build-fixes.patch
 	patch -p0 < cups.patch
+	patch -p0 < cups2.patch
 	patch -p0 < id.po.patch
 	patch -p0 < libpng.patch
 }
@@ -83,7 +80,7 @@ build() {
 	# backendnet
 	msg Configuring and making backendnet.
 	cd "${srcdir}/cnijfilter-source-${_pkgver}/backendnet"
-	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/${_libdir}"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/libs_bin64"
 	make 
 	# sm sub process
 	msg Configuring and making cngpijmon/cnijnpr.
@@ -107,11 +104,11 @@ package() {
 
 	# Install ${_id} libraries
 	install -d ${pkgdir}/usr/lib/
-	cp -P ${srcdir}/cnijfilter-source-${_pkgver}/${_id}/${_libdir}/*so* ${pkgdir}/usr/lib/
+	cp -P ${srcdir}/cnijfilter-source-${_pkgver}/${_id}/libs_bin64/*so* ${pkgdir}/usr/lib/
 	install -d ${pkgdir}/usr/lib/bjlib/
 	install -m 644 ${srcdir}/cnijfilter-source-${_pkgver}/${_id}/database/* ${pkgdir}/usr/lib/bjlib/
 	# Install common libraries
-	cp -P ${srcdir}/cnijfilter-source-${_pkgver}/com/${_libdir}/*so* ${pkgdir}/usr/lib/
+	cp -P ${srcdir}/cnijfilter-source-${_pkgver}/com/libs_bin64/*so* ${pkgdir}/usr/lib/
 	install -m 666 ${srcdir}/cnijfilter-source-${_pkgver}/com/ini/* ${pkgdir}/usr/lib/bjlib/
 
 	# Install license file
diff --git a/cups.patch b/cups.patch
index bb07f41d6db3..536ca242407b 100644
--- a/cups.patch
+++ b/cups.patch
@@ -31,3 +31,15 @@
  #include <sys/types.h>
  #include <unistd.h>
  #include <pwd.h>
+--- cnijfilter-source-3.40-1/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c     2010-03-11 01:33:21.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c     2020-11-15 14:45:55.968773500 +0000
+@@ -33,7 +33,7 @@
+ #include <signal.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <config.h>
+ 
+ #include <dlfcn.h>
+