summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmanuel Amaral Couto2021-11-21 17:44:36 +0000
committerEmanuel Amaral Couto2021-11-21 18:45:32 +0000
commit899a3417eb4657a50b72fefc22c0687b10441b01 (patch)
treec2443a120bab4edab9f23af0d3d35715e462e4e4
parente26b578c3ebf22eae155b1bb23d82492f9275b7e (diff)
downloadaur-899a3417eb4657a50b72fefc22c0687b10441b01.tar.gz
Update to version 6.20
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD17
2 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 99292bcbb224..b464845f6bef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cnijfilter2
pkgdesc = Canon IJ Printer Driver for Linux
- pkgver = 6.10
+ pkgver = 6.20
pkgrel = 1
url = https://www.canon.com.au/home-printers
arch = i686
@@ -15,8 +15,9 @@ pkgbase = cnijfilter2
provides = tocanonij
provides = tocnpwg
provides = cnijlgmon3
- source = http://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz
- md5sums = 207715a8b1fd0f727670a87ac46ce46d
+ conflicts = cnijfilter
+ conflicts = cnijfilter-mg3600
+ source = https://gdlp01.c-wss.com/gds/7/0100011057/01/cnijfilter2-source-6.20-1.tar.gz
+ md5sums = b191a33b924d5a9afe8027b9688cb62a
pkgname = cnijfilter2
-
diff --git a/PKGBUILD b/PKGBUILD
index 719b36112d82..0a9242284430 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=cnijfilter2
-pkgver=6.10
+pkgver=6.20
pkgrel=1
pkgdesc="Canon IJ Printer Driver for Linux"
arch=('i686' 'x86_64')
@@ -8,10 +8,9 @@ license=('GPL' 'custom:canon')
depends=('cups' 'libxml2' 'ghostscript')
makedepends=('automake' 'autoconf')
provides=('tocanonij' 'tocnpwg' 'cnijlgmon3')
-source=("https://gdlp01.c-wss.com/gds/1/0100010921/01/$pkgname-source-$pkgver-1.tar.gz")
-md5sums=('207715a8b1fd0f727670a87ac46ce46d')
-
-[[ "$CARCH" == "x86_64" ]] && _arch="64" || _arch="32"
+conflicts=('cnijfilter' 'cnijfilter-mg3600')
+source=("https://gdlp01.c-wss.com/gds/7/0100011057/01/$pkgname-source-$pkgver-1.tar.gz")
+md5sums=('b191a33b924d5a9afe8027b9688cb62a')
prepare() {
cd "$pkgname-source-$pkgver-1"
@@ -24,14 +23,14 @@ build() {
pushd cmdtocanonij2
./autogen.sh --prefix=/usr \
--datadir=/usr/share \
- LDFLAGS="-L../../com/libs_bin$_arch"
+ LDFLAGS="-L../../com/libs_bin_$CARCH"
make
popd
pushd cmdtocanonij3
./autogen.sh --prefix=/usr \
--datadir=/usr/share \
- LDFLAGS="-L../../com/libs_bin$_arch"
+ LDFLAGS="-L../../com/libs_bin_$CARCH"
make
popd
@@ -46,7 +45,7 @@ build() {
--enable-libpath=/usr/lib/bjlib2 \
--enable-progpath=/usr/bin \
--datadir=/usr/share \
- LDFLAGS="-L../../com/libs_bin$_arch"
+ LDFLAGS="-L../../com/libs_bin_$CARCH"
make #CFLAGS="${CFLAGS} -fcommon"
popd
@@ -109,7 +108,7 @@ package() {
cd "$pkgname-source-$pkgver-1"
install -m644 com/ini/cnnet.ini "$pkgdir/usr/lib/bjlib2"
- install -sm755 com/libs_bin$_arch/*.so.* "$pkgdir/usr/lib"
+ install -sm755 com/libs_bin_$CARCH/*.so.* "$pkgdir/usr/lib"
install -Dm644 doc/LICENSE-cnijfilter-${pkgver}EN.txt \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"