summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLopo2019-10-03 19:25:30 +0200
committerLopo2019-10-03 19:25:30 +0200
commit6c40809181987efb73a8de96d4ff55f5b2debb96 (patch)
tree06add1b3319b12810722392119b794404fd9f89e
parent847daaa2a3f69cbd2a49fc43dedb40ea231f0bc1 (diff)
downloadaur-scangearmp-mg6200.tar.gz
fix for gimp2.9+
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD41
-rw-r--r--gimp.patch12
3 files changed, 37 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 120e59a6615..b78e7110a26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Dec 16 12:19:29 UTC 2015
pkgbase = scangearmp-mg6200
pkgdesc = Canon Scanner Driver (for mg6200 series)
pkgver = 1.80
- pkgrel = 3
+ pkgrel = 4
url = http://support-au.canon.com.au/contents/AU/EN/0100393102.html
arch = i686
arch = x86_64
@@ -13,15 +11,17 @@ pkgbase = scangearmp-mg6200
makedepends = gawk
makedepends = libusb-compat
makedepends = gimp
- depends = sane
+ makedepends = sane
depends = gtk2
depends = libpng>=1.2.8
source = http://gdlp01.c-wss.com/gds/1/0100003931/01/scangearmp-source-1.80-1.tar.gz
source = fix_scanfile.patch
source = configures.patch
- md5sums = 88e3891918357304a9f527d043b435d2
- md5sums = 13df0530aaf3283490e09427070311a8
- md5sums = 356b6bfbd8577f3fc19d1044605fdbad
+ source = gimp.patch
+ sha512sums = 775fdde3a2da795102e9267bde6ae59108184094c7b8e3d77bed4c0c9293543816b6e4b33ad997379a8d19e0f2698b9f84a031db63b63dcdc40c80b2cb8be56c
+ sha512sums = 9bad4f8e9092a50a3804defcd558f2ec69c7f76b266f770d350b43c861faa820796c7b7e61a6e8ea9132c4da8638dba524c0f39ee29ea511f41e1307b12fe586
+ sha512sums = 914647b8a401c9a51ec6e477fd16cff2fe74025292a86fde0bdcd9518028c37a173d6a4b37badc6e55546f075beafe9b5c933e88ccb99bce10ad8d24f9f7afda
+ sha512sums = 984062422a94cac90528abbb238806943f4d9c518f6e30cb37f45acfc9e0584363974ae7d1e0315ccd1b906c6cff957f32f405c8b22bdedae79e31b6266bebea
pkgname = scangearmp-mg6200
diff --git a/PKGBUILD b/PKGBUILD
index 0c507cb6acb..928a529321d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,41 @@
# Maintainer: Pavol Hluchy (Lopo) <lopo at losys dot eu>
+
_model=mg6200
pkgname=scangearmp-${_model}
pkgver=1.80
-pkgrel=3
+pkgrel=4
_pkgver=1.80-1
pkgdesc="Canon Scanner Driver (for ${_model} series)"
url="http://support-au.canon.com.au/contents/AU/EN/0100393102.html"
arch=('i686' 'x86_64')
license=('custom')
-depends=('sane' 'gtk2' 'libpng>=1.2.8')
-makedepends=('findutils' 'grep' 'gawk' 'libusb-compat' 'gimp')
+depends=('gtk2' 'libpng>=1.2.8')
+makedepends=('findutils' 'grep' 'gawk' 'libusb-compat' 'gimp' 'sane')
source=("http://gdlp01.c-wss.com/gds/1/0100003931/01/scangearmp-source-${_pkgver}.tar.gz"
'fix_scanfile.patch'
- 'configures.patch')
-md5sums=('88e3891918357304a9f527d043b435d2'
- '13df0530aaf3283490e09427070311a8'
- '356b6bfbd8577f3fc19d1044605fdbad')
+ 'configures.patch'
+ 'gimp.patch'
+ )
+sha512sums=('775fdde3a2da795102e9267bde6ae59108184094c7b8e3d77bed4c0c9293543816b6e4b33ad997379a8d19e0f2698b9f84a031db63b63dcdc40c80b2cb8be56c'
+ '9bad4f8e9092a50a3804defcd558f2ec69c7f76b266f770d350b43c861faa820796c7b7e61a6e8ea9132c4da8638dba524c0f39ee29ea511f41e1307b12fe586'
+ '914647b8a401c9a51ec6e477fd16cff2fe74025292a86fde0bdcd9518028c37a173d6a4b37badc6e55546f075beafe9b5c933e88ccb99bce10ad8d24f9f7afda'
+ '984062422a94cac90528abbb238806943f4d9c518f6e30cb37f45acfc9e0584363974ae7d1e0315ccd1b906c6cff957f32f405c8b22bdedae79e31b6266bebea'
+ )
_getmodelid() {
echo `grep ^PRINTER_DEPEND_PKG=scangearmp-${_model}- ${srcdir}/scangearmp-source-${_pkgver}/debian/scangearmp-${_model}series.postrm \
| gawk -F- '{print $3}'`
}
-_getlibdir() {
- if [ "$CARCH" == "x86_64" ]; then
- echo libs_bin64
- else
- echo libs_bin32
- fi
-}
-
build() {
- libdir=$(_getlibdir)
-
# Apply patch
cd ${srcdir}/scangearmp-source-${_pkgver}
patch -p1 -i ${srcdir}/fix_scanfile.patch
patch -p1 -i ${srcdir}/configures.patch
+ patch -p1 -i ${srcdir}/gimp.patch
cd ${srcdir}/scangearmp-source-${_pkgver}/scangearmp
- ./autogen.sh --prefix=/usr LDFLAGS="-L`pwd`/../com/${libdir}" LIBS=-lm
+ ./autogen.sh --prefix=/usr LDFLAGS="-L`pwd`/../com/libs_bin64" LIBS=-lm
# Force the use of system's libtool
rm libtool
ln -s `which libtool` .
@@ -50,7 +46,6 @@ build() {
package() {
_modelid=$(_getmodelid)
- libdir=$(_getlibdir)
# Install package
cd ${srcdir}/scangearmp-source-${_pkgver}/scangearmp
@@ -62,12 +57,12 @@ package() {
#Install common libraries
for _l in cmcm msimg mslld msui net; do
- install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/com/${libdir}/libcncp${_l}.so.*.*.* ${pkgdir}/usr/lib/
+ install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/com/libs_bin64/libcncp${_l}.so.*.*.* ${pkgdir}/usr/lib/
done
# Install ${_model} series specific libraries
- install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/${_modelid}/${libdir}/libcncpmsimg${_modelid}.so.*.*.* ${pkgdir}/usr/lib/
- install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/${_modelid}/${libdir}/libcncpmslld${_modelid}c.so.*.*.* ${pkgdir}/usr/lib/
- install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/${_modelid}/${libdir}/libcncpmslld${_modelid}.so.*.*.* ${pkgdir}/usr/lib/
+ install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/${_modelid}/libs_bin64/libcncpmsimg${_modelid}.so.*.*.* ${pkgdir}/usr/lib/
+ install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/${_modelid}/libs_bin64/libcncpmslld${_modelid}c.so.*.*.* ${pkgdir}/usr/lib/
+ install -m 0755 ${srcdir}/scangearmp-source-${_pkgver}/${_modelid}/libs_bin64/libcncpmslld${_modelid}.so.*.*.* ${pkgdir}/usr/lib/
# Create symbolic links
cd ${pkgdir}/usr/lib/
for _l in cmcm msimg mslld msui net; do
diff --git a/gimp.patch b/gimp.patch
new file mode 100644
index 00000000000..45b49c2cdf3
--- /dev/null
+++ b/gimp.patch
@@ -0,0 +1,12 @@
+diff -Naur old/scangearmp/src/scangimp.c new/scangearmp/src/scangimp.c
+--- old/scangearmp/src/scangimp.c 2011-02-15 13:19:45.000000000 +0100
++++ new/scangearmp/src/scangimp.c 2019-10-03 19:16:50.142296671 +0200
+@@ -43,7 +43,7 @@
+ //#include <string.h>
+ //#include <gtk/gtk.h>
+ #include <libgimp/gimp.h>
+-#include <libgimp/gimpcompat.h>
++//#include <libgimp/gimpcompat.h>
+ #include <dlfcn.h>
+
+ #include "cnmstype.h"