diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | mychanges.patch | 21 |
3 files changed, 33 insertions, 11 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Fri Apr 30 15:11:30 UTC 2021 pkgbase = scangearmp pkgdesc = Canon IJ Scanner Driver for MP250, MP270, MP490, MP550, MP560, and MP640 series pkgver = 1.40 - pkgrel = 8 + pkgrel = 11 url = http://www.canon-europe.com/support/pixma_software/ arch = i686 arch = x86_64 @@ -15,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 @@ -25,6 +27,7 @@ pkgbase = scangearmp makedepends_x86_64 = libtool-multilib makedepends_x86_64 = lib32-gimp makedepends_x86_64 = lib32-libusb-compat + makedepends_x86_64 = libusb-compat makedepends_x86_64 = lib32-gtk2 pkgname = scangearmp-mpseries-common @@ -36,6 +39,7 @@ pkgname = scangearmp-mpseries-common depends_i686 = libusb-compat depends_i686 = gimp depends_x86_64 = lib32-libusb-compat + depends_x86_64 = libusb-compat depends_x86_64 = lib32-gimp pkgname = scangearmp-mp250series @@ -12,7 +12,7 @@ pkgname=('scangearmp-mpseries-common' _pkgname=scangearmp pkgver=1.40 -pkgrel=8 +pkgrel=11 _pkgreview=1 pkgdesc="Canon IJ Scanner Driver for MP250, MP270, MP490, MP550, MP560, and MP640 series" @@ -23,7 +23,7 @@ license=('custom') conflicts=('lib32-cnijfilter320') -makedepends_x86_64=('gcc-multilib' 'libtool-multilib' 'lib32-gimp' 'lib32-libusb-compat' 'lib32-gtk2') +makedepends_x86_64=('gcc-multilib' 'libtool-multilib' 'lib32-gimp' 'lib32-libusb-compat' 'libusb-compat' 'lib32-gtk2') makedepends_i686=('gcc' 'libtool' 'gimp' 'libusb-compat' 'gtk2') makedepends=('autoconf>=2.59' 'automake>=1.10' 'tar' 'make' 'sane') @@ -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}" @@ -50,6 +50,8 @@ build() { cd "${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}/scangearmp" export CC="gcc -m32" + # Required for the glib2 + export PKG_CONFIG_PATH=/usr/lib32/pkgconfig ./autogen.sh --prefix=/usr --libdir=/usr/lib32 if [ -x /usr/bin/libtool ]; then @@ -68,7 +70,7 @@ package_scangearmp-mpseries-common() { conflicts=('scangearmp-common') provides=('scangearmp-common=1.40') - depends_x86_64=('lib32-libusb-compat' 'lib32-gimp') + depends_x86_64=('lib32-libusb-compat' 'libusb-compat' 'lib32-gimp') depends_i686=('libusb-compat' 'gimp') depends=('sane') @@ -87,6 +89,9 @@ package_scangearmp-mpseries-common() { done chmod 644 ${pkgdir}/usr/lib32/libsane-canon_mfp.a + install -d ${pkgdir}/usr/lib/bjlib + ln -rs ${pkgdir}/usr/lib32/bjlib/* ${pkgdir}/usr/lib/bjlib/ + install -D LICENSE-scangearmp-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scangearmp-${pkgver}EN.txt } @@ -96,12 +101,14 @@ scangearmp-mpverseries-packager() { cd "${srcdir}/${_pkgname}-source-${pkgver}-${_pkgreview}" install -d ${pkgdir}/usr/lib32/bjlib + install -d ${pkgdir}/usr/lib/bjlib for libname in ${mpid}/libs_bin/*.so.*; do install -s -m 755 ${libname} ${pkgdir}/usr/lib32 done for auxname in ${mpid}/*.{tbl,DAT}; do install -m 644 ${auxname} ${pkgdir}/usr/lib32/bjlib done + ln -rs ${pkgdir}/usr/lib32/bjlib/* ${pkgdir}/usr/lib/bjlib/ install -D LICENSE-scangearmp-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scangearmp-${pkgver}EN.txt } 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"
|