system/cnijfilter2: Updated for version 6.10.1 and bug fixes.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 63 insertions, 52 deletions

diff --git a/system/cnijfilter2/cnijfilter2.SlackBuild b/system/cnijfilter2/cnijfilter2.SlackBuild
index c412f110fd..3f573cc37d 100644
--- a/system/cnijfilter2/cnijfilter2.SlackBuild
+++ b/system/cnijfilter2/cnijfilter2.SlackBuild
@@ -25,13 +25,13 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cnijfilter2
-VERSION=${VERSION:-5.90.1}
+VERSION=${VERSION:-6.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=$PRGNAM-source
-SRCVERSION=5.90-1
+SRCVERSION=6.10-1
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -56,18 +56,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="32"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32"
-  BITS="i386"
+  BITS="32"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin64"
-  BITS="amd64"
+  BITS="64"
 else
   echo "Package for $(uname -m) architecture is not available."
   exit 1
@@ -94,40 +91,64 @@ find -L . \
 
 patch -p1 < $CWD/gcc10.patch
 
+for dir in cmdtocanonij2 cmdtocanonij3 ; do
+  pushd $dir
+  ./autogen.sh --prefix=/usr --datadir=/usr/share LDFLAGS="-L../../com/libs_bin${BITS}"
+  make
+  popd
+done
+
+pushd cnijbe2
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+  make
+popd
+
+pushd lgmon3
+  ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib${LIBDIRSUFFIX}/bjlib2 --enable-progpath=/usr/bin \
+    --datadir=/usr/share LDFLAGS="-L../../com/libs_bin${BITS}"
+  make
+popd
+
+pushd rastertocanonij
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+  make
+popd
+
+for dir in tocanonij tocnpwg ; do
+  pushd $dir
+  ./autogen.sh --prefix=/usr
+  make
+  popd
+done
+
 common_pkg="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
 for dir in $common_pkg; do
-  cd $dir
-    ./autogen.sh --prefix=/usr LDFLAGS="$LDFLAGS"
-    make
-    make install-strip DESTDIR=$PKG
-  cd ..
+  pushd $dir
+    make install DESTDIR=$PKG
+  popd
 done
-cd lgmon3
-  ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib2 LDFLAGS="$LDFLAGS"
-  make
-  make install-strip DESTDIR=$PKG
-cd ..
 
 if [ "$ARCH" = "x86_64" ]; then
   mv $PKG/usr/lib $PKG/usr/lib64
-  mkdir $PKG/usr/lib64/bjlib2
-  install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib64/bjlib2/
-  install -c -m 755 com/libs_bin64/libcnnet2.so.* $PKG/usr/lib64/
-  install -c -m 755 com/libs_bin64/libcnbpnet20.so.* $PKG/usr/lib64/
-  install -c -m 755 com/libs_bin64/libcnbpnet30.so.* $PKG/usr/lib64/
-  install -c -m 755 com/libs_bin64/libcnbpcnclapicom2.so.* $PKG/usr/lib64/
-elif [ "$ARCH" = "i686" ]; then
-  mkdir $PKG/usr/lib/bjlib2
-  install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib/bjlib2/
-  install -c -m 755 com/libs_bin32/libcnnet2.so.* $PKG/usr/lib/
-  install -c -m 755 com/libs_bin32/libcnbpnet20.so.* $PKG/usr/lib/
-  install -c -m 755 com/libs_bin32/libcnbpnet30.so.* $PKG/usr/lib/
-  install -c -m 755 com/libs_bin32/libcnbpcnclapicom2.so.* $PKG/usr/lib/
+fi
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/bjlib2
+install -c -o lp -g lp -m 644 com/ini/cnnet.ini $PKG/usr/lib${LIBDIRSUFFIX}/bjlib2/
+install -c -m 755 com/libs_bin${BITS}/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/
+
+# Run ldconfig in the build script so that /usr/lib{64}/libcn*.so
+# are tracked by doinst.sh
+if [ -x /sbin/ldconfig ]; then
+  /sbin/ldconfig $PKG/usr/lib${LIBDIRSUFFIX}
 fi
 
-mkdir -p $PKG/usr/share/ppd/cnijfilter2
+mkdir -p $PKG/usr/share/ppd/cnijfilter2 $PKG/usr/share/cups/model
 cp -a ppd/*.ppd $PKG/usr/share/ppd/cnijfilter2
 
+PPD_FILES=$( cd $PKG/usr/share/ppd/cnijfilter2 ; ls *.ppd )
+for f in $PPD_FILES; do
+  ln -fs /usr/share/ppd/cnijfilter2/${f} $PKG/usr/share/cups/model/${f}
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/lproptions
 cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a lproptions/lpr* $PKG/usr/doc/$PRGNAM-$VERSION/lproptions
@@ -135,11 +156,11 @@ cat ppd/NEWS > $PKG/usr/doc/$PRGNAM-$VERSION/NEWS
 # Copy all README to /usr/doc
 for dir in $common_pkg; do
   mkdir $PKG/usr/doc/$PRGNAM-$VERSION/$dir
-  cd $dir
-    for file in AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README; do
+  pushd $dir
+    for file in AUTHORS COPYING ChangeLog INSTALL LICENSE* NEWS README; do
       [ -f $file ] && cp -a $file $PKG/usr/doc/$PRGNAM-$VERSION/$dir
     done
-  cd ..
+  popd
 done
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/cnijfilter2/cnijfilter2.info b/system/cnijfilter2/cnijfilter2.info
index f71f314189..15dabc9821 100644
--- a/system/cnijfilter2/cnijfilter2.info
+++ b/system/cnijfilter2/cnijfilter2.info
@@ -1,8 +1,8 @@
 PRGNAM="cnijfilter2"
-VERSION="5.90.1"
-HOMEPAGE="https://asia.canon/en/support/0101048401"
-DOWNLOAD="http://gdlp01.c-wss.com/gds/4/0100010484/01/cnijfilter2-source-5.90-1.tar.gz"
-MD5SUM="11029121b7003a3ebd5d53a1331673a7"
+VERSION="6.10.1"
+HOMEPAGE="https://asia.canon/en/support/0101092101"
+DOWNLOAD="https://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz"
+MD5SUM="207715a8b1fd0f727670a87ac46ce46d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cnijfilter2/gcc10.patch b/system/cnijfilter2/gcc10.patch
index 78c1b82156..0616f6a870 100644
--- a/system/cnijfilter2/gcc10.patch
+++ b/system/cnijfilter2/gcc10.patch
@@ -1,15 +1,5 @@
-From
-https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64544b43f2c14be54531ad8764419dde09
-
-Fix build error:
-
-libtool: link: gcc -O2 -Wall -I/usr/include/libusb-1.0 -I./common -I/usr/include/libxml2 -o cnijlgmon3 cnijcomif.o cnijifusb.o cnijlgmon3.o cnijifnet.o keytext.o cnijifnet2.o cnijutil.o  -L../../com/libs_bin64 -ldl -lusb-1.0 -lcnnet2 -lxml2 -lcnbpcnclapicom2 -lcnbpnet30 -lcups
-/usr/bin/ld: cnijifnet2.o:(.bss+0x0): multiple definition of `GET_PROTOCOL'; cnijlgmon3.o:(.bss+0x0): first defined here
-collect2: error: ld returned 1 exit status
-
-diff -Naur cnijfilter2-source-5.90-1.orig/lgmon3/src/cnijlgmon3.c cnijfilter2-source-5.90-1/lgmon3/src/cnijlgmon3.c
---- cnijfilter2-source-5.90-1.orig/lgmon3/src/cnijlgmon3.c	2019-07-23 03:07:22.000000000 +0200
-+++ cnijfilter2-source-5.90-1/lgmon3/src/cnijlgmon3.c	2021-08-06 19:15:46.556546000 +0200
+--- cnijfilter2-source-6.10-1.orig/lgmon3/src/cnijlgmon3.c	2020-06-18 14:22:58.000000000 +1200
++++ cnijfilter2-source-6.10-1/lgmon3/src/cnijlgmon3.c	2021-09-06 10:42:18.796063817 +1200
 @@ -55,7 +55,7 @@
  int (*GET_STATUS)(char *, int, int *, int * , char *);
  int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *);
diff --git a/system/cnijfilter2/slack-desc b/system/cnijfilter2/slack-desc
index 5d9d84e58f..7b191845ca 100644
--- a/system/cnijfilter2/slack-desc
+++ b/system/cnijfilter2/slack-desc
@@ -16,4 +16,4 @@ cnijfilter2: series, MG2900 series, MB2000 series, MB2300, iB4000 series,
 cnijfilter2: MB5000 series, MB5300 series, iP110 series, E450 series, MX490
 cnijfilter2: series, E480 series.
 cnijfilter2:
-cnijfilter2: Homepage: https://asia.canon/en/support/0101048401
+cnijfilter2: Homepage: https://asia.canon/en/support/0101092101