Adapting with the updated gimp package

3 files changed, 19 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 486361684b67..6ad4a54e5229 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon May  9 11:59:00 UTC 2016
+# Fri Jan 31 14:55:47 UTC 2020
 pkgbase = scangearmp
 	pkgdesc = Canon IJ Scanner Driver for MP250, MP270, MP490, MP550, MP560, and MP640 series
 	pkgver = 1.40
@@ -17,7 +17,7 @@ pkgbase = scangearmp
 	source = http://files.canon-europe.com/files/soft37281/Software/Linux_Scangear_Source_Files.tar
 	source = mychanges.patch
 	sha512sums = 257f6ffece2e43c5db7b4d73ac962ddce9256b652e980b64dead2d38fe15d1b101a4f91c87b7fce1e0154fcb7fd6fc59962d4ca9abd4a20f765845aa938d8b8a
-	sha512sums = dd5bc73edff4f8a3452058e6f635815e6697a996cf0f3bf8a6515594af22ad730333f80a4f1b8113d36549ce8a627b92eb5e36778fc72def6852d01ef5e0930b
+	sha512sums = 2f065e5558aa7fc831e5e0bff7b6b140a134d61e9efcaf3ca7fe4596cdd5dc2bea860ccf043fa8045b8a5462763275575af6dce3799cd4b2bd15ec4bdf23ae3e
 	makedepends_i686 = gcc
 	makedepends_i686 = libtool
 	makedepends_i686 = gimp
diff --git a/PKGBUILD b/PKGBUILD
index 0b18cf3e417a..3a8c6c3fa93b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ makedepends=('autoconf>=2.59' 'automake>=1.10' 'tar' 'make' 'sane')
 source=("http://files.canon-europe.com/files/soft37281/Software/Linux_Scangear_Source_Files.tar"
         "mychanges.patch")
 sha512sums=('257f6ffece2e43c5db7b4d73ac962ddce9256b652e980b64dead2d38fe15d1b101a4f91c87b7fce1e0154fcb7fd6fc59962d4ca9abd4a20f765845aa938d8b8a'
-            'dd5bc73edff4f8a3452058e6f635815e6697a996cf0f3bf8a6515594af22ad730333f80a4f1b8113d36549ce8a627b92eb5e36778fc72def6852d01ef5e0930b')
+            '2f065e5558aa7fc831e5e0bff7b6b140a134d61e9efcaf3ca7fe4596cdd5dc2bea860ccf043fa8045b8a5462763275575af6dce3799cd4b2bd15ec4bdf23ae3e')
 
 prepare() {
   cd "${srcdir}"
diff --git a/mychanges.patch b/mychanges.patch
index eabf376f51f7..27316cf51bb5 100644
--- a/mychanges.patch
+++ b/mychanges.patch
@@ -1,6 +1,6 @@
 diff -aur scangearmp-source-1.40-1/scangearmp/backend/Makefile.am scangearmp-source-1.40-1.new/scangearmp/backend/Makefile.am
 --- scangearmp-source-1.40-1/scangearmp/backend/Makefile.am	2009-04-28 11:08:03.000000000 +0430
-+++ scangearmp-source-1.40-1.new/scangearmp/backend/Makefile.am	2013-07-26 23:58:57.413152731 +0430
++++ scangearmp-source-1.40-1.new/scangearmp/backend/Makefile.am	2020-01-31 17:10:52.469454249 +0330
 @@ -17,7 +17,7 @@
  	libcnnet.h canon_mfp_debug.h
  
@@ -12,7 +12,7 @@ diff -aur scangearmp-source-1.40-1/scangearmp/backend/Makefile.am scangearmp-sou
  EXTRA_DIST = \
 diff -aur scangearmp-source-1.40-1/scangearmp/etc/80-canon_mfp.rules scangearmp-source-1.40-1.new/scangearmp/etc/80-canon_mfp.rules
 --- scangearmp-source-1.40-1/scangearmp/etc/80-canon_mfp.rules	2009-04-28 11:08:03.000000000 +0430
-+++ scangearmp-source-1.40-1.new/scangearmp/etc/80-canon_mfp.rules	2013-07-27 00:00:25.729820028 +0430
++++ scangearmp-source-1.40-1.new/scangearmp/etc/80-canon_mfp.rules	2020-01-31 17:10:52.469454249 +0330
 @@ -7,48 +7,48 @@
  
  LABEL="canon_mfp_start"
@@ -84,7 +84,7 @@ diff -aur scangearmp-source-1.40-1/scangearmp/etc/80-canon_mfp.rules scangearmp-
  LABEL="canon_mfp_end"
 diff -aur scangearmp-source-1.40-1/scangearmp/src/file_control.c scangearmp-source-1.40-1.new/scangearmp/src/file_control.c
 --- scangearmp-source-1.40-1/scangearmp/src/file_control.c	2009-04-28 11:08:03.000000000 +0430
-+++ scangearmp-source-1.40-1.new/scangearmp/src/file_control.c	2013-07-26 23:58:57.413152731 +0430
++++ scangearmp-source-1.40-1.new/scangearmp/src/file_control.c	2020-01-31 17:10:52.469454249 +0330
 @@ -32,6 +32,7 @@
  #endif

  

@@ -95,7 +95,7 @@ diff -aur scangearmp-source-1.40-1/scangearmp/src/file_control.c scangearmp-sour
  #include <sys/stat.h>

 diff -aur scangearmp-source-1.40-1/scangearmp/src/scanfile.c scangearmp-source-1.40-1.new/scangearmp/src/scanfile.c
 --- scangearmp-source-1.40-1/scangearmp/src/scanfile.c	2009-04-28 11:08:03.000000000 +0430
-+++ scangearmp-source-1.40-1.new/scangearmp/src/scanfile.c	2013-07-26 23:58:57.413152731 +0430
++++ scangearmp-source-1.40-1.new/scangearmp/src/scanfile.c	2020-01-31 17:10:52.469454249 +0330
 @@ -34,9 +34,11 @@
  //#include <sys/types.h>

  //#include <unistd.h>

@@ -120,7 +120,7 @@ diff -aur scangearmp-source-1.40-1/scangearmp/src/scanfile.c scangearmp-source-1
  }

 diff -aur scangearmp-source-1.40-1/scangearmp/src/scanflow.c scangearmp-source-1.40-1.new/scangearmp/src/scanflow.c
 --- scangearmp-source-1.40-1/scangearmp/src/scanflow.c	2009-09-18 08:40:52.000000000 +0430
-+++ scangearmp-source-1.40-1.new/scangearmp/src/scanflow.c	2013-07-26 23:58:57.416486068 +0430
++++ scangearmp-source-1.40-1.new/scangearmp/src/scanflow.c	2020-01-31 17:10:52.469454249 +0330
 @@ -38,6 +38,7 @@
  #endif
  
@@ -129,3 +129,14 @@ diff -aur scangearmp-source-1.40-1/scangearmp/src/scanflow.c scangearmp-source-1
  #include <string.h>
  #include <gtk/gtk.h>
  #include <sane/sane.h>
+diff -aur scangearmp-source-1.40-1/scangearmp/src/scangimp.c scangearmp-source-1.40-1.new/scangearmp/src/scangimp.c
+--- scangearmp-source-1.40-1/scangearmp/src/scangimp.c	2009-04-28 11:08:03.000000000 +0430
++++ scangearmp-source-1.40-1.new/scangearmp/src/scangimp.c	2020-01-31 17:11:20.629604555 +0330
+@@ -38,7 +38,6 @@
+ //#include <string.h>

+ //#include <gtk/gtk.h>

+ #include <libgimp/gimp.h>

+-#include <libgimp/gimpcompat.h>

+ 

+ #include "cnmstype.h"

+ #include "cnmsfunc.h"