patched and updated

4 files changed, 80 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32316ddb7da8..e1347565780a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = scangearmp2
-	pkgdesc = Canon ScanGear MP for Linux
-	pkgver = 3.20
+	pkgdesc = Canon ScanGear MP v2 scanner driver.
+	pkgver = 3.40
 	pkgrel = 1
-	url = https://www.canon.com.au/home-printers
+	url = https://www.canon.co.uk
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -10,8 +10,12 @@ pkgbase = scangearmp2
 	depends = gtk2
 	depends = libusb
 	provides = scangearmp2
-	source = http://gdlp01.c-wss.com/gds/3/0100006903/01/scangearmp2-source-3.20-1.tar.gz
-	md5sums = 8a7d6e60af22b749508419b0e79e8066
+	source = http://gdlp01.c-wss.com/gds/0/0100008400/01/scangearmp2-source-3.40-1.tar.gz
+	source = initializebuf.patch
+	source = scangearmp2.desktop
+	sha256sums = cfb2af683f1d1ed0431948967bae872798d8b75da9eac1bfbf30aa8394220ab0
+	sha256sums = 6a26310478af47d6753aa251baa40e5469af42504b050818e1c6e1b9febb2e08
+	sha256sums = 6950f8f26f765d190797a3109322d54bba45fba4d8690840cccd3dd82684bc7a
 
 pkgname = scangearmp2
 
diff --git a/PKGBUILD b/PKGBUILD
index 17469e508cdc..681bdf521094 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,35 @@
-# Maintainer: Andrew Titmuss <andrew@coffeetocode.me>
+# Maintainer: Oliver Gatti
+# Contributor: Andrew Titmuss <andrew@coffeetocode.me>
 pkgname=scangearmp2
-pkgver=3.20
+pkgver=3.40
 pkgrel=1
-pkgdesc="Canon ScanGear MP for Linux"
+pkgdesc="Canon ScanGear MP v2 scanner driver."
 arch=('i686' 'x86_64')
-url="https://www.canon.com.au/home-printers"
+url="https://www.canon.co.uk"
 license=('GPL' 'custom:canon')
 depends=('gtk2' 'libusb')
 provides=('scangearmp2')
-source=("http://gdlp01.c-wss.com/gds/3/0100006903/01/$pkgname-source-$pkgver-$pkgrel.tar.gz")
-md5sums=('8a7d6e60af22b749508419b0e79e8066')
+source=("http://gdlp01.c-wss.com/gds/0/0100008400/01/$pkgname-source-$pkgver-$pkgrel.tar.gz" \
+	initializebuf.patch \
+	scangearmp2.desktop)
+sha256sums=('cfb2af683f1d1ed0431948967bae872798d8b75da9eac1bfbf30aa8394220ab0' \
+	'6a26310478af47d6753aa251baa40e5469af42504b050818e1c6e1b9febb2e08' \
+	'6950f8f26f765d190797a3109322d54bba45fba4d8690840cccd3dd82684bc7a')
 
 [[ "$CARCH" == "x86_64" ]] && _arch="64" || _arch="32"
 
+prepare() {
+	cd "$pkgname-source-$pkgver-$pkgrel"
+
+	patch -Np1 <"${srcdir}/initializebuf.patch"
+}
+
 build() {
 	cd "$pkgname-source-$pkgver-$pkgrel"
 
-	pushd scangearmp2
+	pushd "scangearmp2"
 	./autogen.sh --prefix=/usr \
-		     --enable-libpath=/usr/lib/bjlib2 \
+		     --enable-libpath=/usr/lib \
 		     LDFLAGS="-L../../com/libs_bin$_arch"
 	make
 	popd
@@ -27,23 +38,44 @@ build() {
 check() {
 	cd "$pkgname-source-$pkgver-$pkgrel"
 
-	pushd scangearmp2
+	pushd "scangearmp2"
 	make check
 	popd
 }
 
 package() {
-	mkdir -p "$pkgdir/usr/lib/bjlib2"
-	mkdir -p "$pkgdir/usr/bin"
+	mkdir -p "$pkgdir/usr/share/applications"
+	install -m755 "scangearmp2.desktop" "$pkgdir/usr/share/applications"
 
 	cd "$pkgname-source-$pkgver-$pkgrel"
 
-	install -m644 com/ini/canon_mfp2_net.ini "$pkgdir/usr/lib/bjlib2"
-	install -sm755 com/libs_bin$_arch/*.so.* "$pkgdir/usr/lib"
-	install -Dm644 doc/LICENSE-scangearmp-${pkgver}EN.txt \
-		"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	mkdir -p "$pkgdir/usr/lib/bjlib"
+
+	install -m644 "com/ini/canon_mfp2_net.ini" "$pkgdir/usr/lib/bjlib"
+
+	install -sm755 "com/libs_bin$_arch/libcncpmslld2.so.3.0.0" "$pkgdir/usr/lib"
+	ln -s "/usr/lib/libcncpmslld2.so.3.0.0" "$pkgdir/usr/lib/libcncpmslld2.so"
+
+	install -sm755 "com/libs_bin$_arch/libcncpnet2.so.1.2.4" "$pkgdir/usr/lib"
+	ln -s "/usr/lib/libcncpnet2.so.1.2.4" "$pkgdir/usr/lib/libcncpnet2.so"
+
+	install -sm755 "com/libs_bin$_arch/libcncpnet20.so.1.0.0" "$pkgdir/usr/lib"
+	ln -s "/usr/lib/libcncpnet20.so.1.0.0" "$pkgdir/usr/lib/libcncpnet20.so"
+
+	install -sm755 "com/libs_bin$_arch/libcncpnet30.so.1.0.0" "$pkgdir/usr/lib"
+	ln -s "/usr/lib/libcncpnet30.so.1.0.0" "$pkgdir/usr/lib/libcncpnet30.so"
+
+	mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
+
+	install -m644 "doc/LICENSE-scangearmp-${pkgver}EN.txt" "$pkgdir/usr/share/licenses/$pkgname"
+	install -m644 "doc/LICENSE-scangearmp-${pkgver}FR.txt" "$pkgdir/usr/share/licenses/$pkgname"
+	install -m644 "doc/LICENSE-scangearmp-${pkgver}JP.txt" "$pkgdir/usr/share/licenses/$pkgname"
+	install -m644 "doc/LICENSE-scangearmp-${pkgver}SC.txt" "$pkgdir/usr/share/licenses/$pkgname"
+
+	mkdir -p "$pkgdir/etc/udev/rules.d"
+	install -m644 "scangearmp2/etc/80-canon_mfp2.rules" "$pkgdir/etc/udev/rules.d"
 
-	pushd scangearmp2
+	pushd "scangearmp2"
 	make DESTDIR="$pkgdir/" install
 	popd
 }
diff --git a/initializebuf.patch b/initializebuf.patch
new file mode 100644
index 000000000000..cae71aedb63d
--- /dev/null
+++ b/initializebuf.patch
@@ -0,0 +1,12 @@
+diff -ura scangearmp2-source-3.40-1/scangearmp2/src/scanmain.c scangearmp2-source-3.40-1.patched/scangearmp2/src/scanmain.c
+--- scangearmp2-source-3.40-1/scangearmp2/src/scanmain.c	2016-12-08 01:35:34.000000000 +0100
++++ scangearmp2-source-3.40-1.patched/scangearmp2/src/scanmain.c	2017-04-01 09:56:23.267492255 +0200
+@@ -298,7 +298,7 @@
+ 	int					i;
+ 	int					ret = -1;
+ 	int					status;
+-	char				*buf;
++	char				*buf = NULL;
+ 	int					errCode;
+ 	int					readBytes = 0;
+ 	int					result = CIJSC_SCANMAIN_SCAN_FINISHED;
diff --git a/scangearmp2.desktop b/scangearmp2.desktop
new file mode 100644
index 000000000000..a40cd1582859
--- /dev/null
+++ b/scangearmp2.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=ScanGearMP
+Type=Application
+Exec=scangearmp2
+Terminal=false
+Icon=scanner.png
+Comment=Canon Scanner
+NoDisplay=false
+Categories=Graphics;