Actualize package

6 files changed, 178 insertions, 157 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45ae829963b6..22436b19ba9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,15 +14,17 @@ pkgbase = cnijfilter-mp280
 	depends = glibc
 	depends = libpng>=1.0.9
 	depends = libtiff>=3.4
+	depends = gtk2
 	conflicts = cnijfilter-common
 	source = http://gdlp01.c-wss.com/gds/0/0100003020/01/cnijfilter-source-3.40-1.tar.gz
-	source = fix.patch
+	source = configure-fixes.patch
 	source = cups-fixes.patch
 	source = cn-ppd-support-mp280.patch
+	source = glibc-deprecated-fix.patch
 	md5sums = 609975a05d6050fcca88f312d3f35c6a
-	md5sums = 1f4f7aa58be271e2d60b5f9615b1104d
-	md5sums = 55a10cc83b072c12ba50ea6864d3b18f
+	md5sums = d1c346d063e7fc54dc74dc72bc5615ad
+	md5sums = 10e68bf7d29a6206171be05893e826e1
 	md5sums = 1b76cb2d4a46f6a10e6aced051729bb7
+	md5sums = 494a454cc2e91a3e8f14a6fb81131c10
 
 pkgname = cnijfilter-mp280
-
diff --git a/PKGBUILD b/PKGBUILD
index cac044e413d9..78838c3fa85a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Jakub Klinkovský <j.l.k@gmx.com>
+# Maintainer: zvova7890 <zvova7890.gmail.com>
 # Contributor: Alireza Savand <alireza.savand@gmail.com>
 # Special thanks to: olive, mirrr, GUiHKX, alessiofachechi, jeremy33,
 #		     jstitch, plv, lahwaacz
@@ -13,11 +13,12 @@ url="http://support-au.canon.com.au/contents/AU/EN/0100302002.html"
 arch=('i686' 'x86_64')
 license=('custom')
 depends=(
-	'libcups'
-	'popt'
+    'libcups'
+    'popt'
     'glibc'
     'libpng>=1.0.9'
     'libtiff>=3.4'
+    'gtk2'
 )
 makedepends=(
 	'autoconf>=2.59'
@@ -27,27 +28,33 @@ conflicts=('cnijfilter-common')
 install=cnijfilter-mp280.install
 source=(
     'http://gdlp01.c-wss.com/gds/0/0100003020/01/cnijfilter-source-3.40-1.tar.gz'
-    'fix.patch'
+    'configure-fixes.patch'
     'cups-fixes.patch'
     'cn-ppd-support-mp280.patch'
+    'glibc-deprecated-fix.patch'
 )
 md5sums=(
     '609975a05d6050fcca88f312d3f35c6a'
-    '1f4f7aa58be271e2d60b5f9615b1104d'
-    '55a10cc83b072c12ba50ea6864d3b18f'
+    'd1c346d063e7fc54dc74dc72bc5615ad'
+    '10e68bf7d29a6206171be05893e826e1'
     '1b76cb2d4a46f6a10e6aced051729bb7'
+    '494a454cc2e91a3e8f14a6fb81131c10'
 )
 
-build() {
+
+prepare() {
     cd "$srcdir/cnijfilter-source-$_pkgrealver-$_pkgrealrel"
-    patch -p0 < "$startdir/fix.patch"
+    patch -p1 < "$startdir/configure-fixes.patch"
     patch -p1 < "$startdir/cups-fixes.patch"
     patch -p1 < "$startdir/cn-ppd-support-mp280.patch"
+    patch -p1 < "$startdir/glibc-deprecated-fix.patch"
     
     sed -i -e 's/png_p->jmpbuf/png_jmpbuf(png_p)/' cnijfilter/src/bjfimage.c
     cp cnijfilter/src/config* lgmon/src/
     cp cnijfilter/src/config* cngpijmon/cnijnpr/cnijnpr/
-  
+}
+
+build() {
     cd "$srcdir/cnijfilter-source-$_pkgrealver-$_pkgrealrel/libs"
     ./autogen.sh --prefix=/usr --program-suffix=mp280
     make
diff --git a/configure-fixes.patch b/configure-fixes.patch
new file mode 100644
index 000000000000..5aef3545df28
--- /dev/null
+++ b/configure-fixes.patch
@@ -0,0 +1,109 @@
+--- a/backend/configure.in	2010-02-23 07:57:49.000000000 +0400
++++ b/backend/configure.in	2013-01-12 17:57:23.186495527 +0400
+@@ -1,7 +1,7 @@
+ AC_INIT(src/cnij_backend_common.c)
+ AM_INIT_AUTOMAKE(backend, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++#AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+ 
+--- a/backendnet/configure.in	2010-03-10 06:16:28.000000000 +0400
++++ b/backendnet/configure.in	2013-01-12 17:57:36.019761830 +0400
+@@ -1,7 +1,7 @@
+ AC_INIT(backend/cnijnetlm.c)
+ AM_INIT_AUTOMAKE(backendnet, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++#AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+ 
+--- a/cngpij/configure.in	2010-02-23 07:57:49.000000000 +0400
++++ b/cngpij/configure.in	2013-01-12 17:55:19.960473398 +0400
+@@ -1,7 +1,7 @@
+ AC_INIT(cngpij/bjcups.c)
+ AM_INIT_AUTOMAKE(cngpij, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++#AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+ 
+--- a/cngpijmon/cnijnpr/configure.in	2010-03-11 05:33:21.000000000 +0400
++++ b/cngpijmon/cnijnpr/configure.in	2013-01-12 17:56:57.729961931 +0400
+@@ -1,7 +1,7 @@
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(cnijnpr, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(cnijnpr/config.h)
+ 
+ 
+ AC_ARG_ENABLE(libpath)
+ 
+--- a/cnijfilter/configure.in	2010-03-09 14:51:24.000000000 +0400
++++ b/cnijfilter/configure.in	2013-01-12 17:55:42.657021362 +0400
+@@ -25,7 +25,7 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cif${program_suffix}, 3.40-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ dnl Checks for programs.
+ AC_ISC_POSIX
+@@ -47,7 +47,6 @@
+ AC_SUBST(ARC)
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ 
+ dnl Checks for libraries.
+ 
+--- a/lgmon/configure.in	2010-03-11 05:18:24.000000000 +0400
++++ b/lgmon/configure.in	2013-01-12 17:56:21.380152122 +0400
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(lgmon{program_suffix}, 3.40-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ dnl AM_MAINTAINER_MODE
+ 
+ AC_DEFINE_UNQUOTED(PACKAGE_PRINTER_MODEL, "${program_suffix}")
+@@ -41,7 +41,6 @@
+ AC_SUBST(ARC)
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PROG_RANLIB
+ 
+--- a/libs/configure.in	2010-02-23 07:57:49.000000000 +0400
++++ b/libs/configure.in	2013-01-12 17:54:56.233930669 +0400
+@@ -1,7 +1,7 @@
+ AC_INIT(paramlist/paramlist.h)
+ AM_INIT_AUTOMAKE(buftool, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
++#AC_CONFIG_HEADERS(config.h)
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+ 
+--- a/pstocanonij/configure.in	2010-02-23 07:57:49.000000000 +0400
++++ b/pstocanonij/configure.in	2013-01-12 17:56:03.480245771 +0400
+@@ -1,7 +1,7 @@
+ AC_INIT(filter/pstocanonij.c)
+ AM_INIT_AUTOMAKE(pstocanonij, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
++#AC_CONFIG_HEADERS(config.h)
+ 
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
diff --git a/cups-fixes.patch b/cups-fixes.patch
index ae8a0d2c45b1..674254c761fc 100644
--- a/cups-fixes.patch
+++ b/cups-fixes.patch
@@ -1,3 +1,38 @@
+diff -Naur a/backend/src/cnij_backend_common.c b/backend/src/cnij_backend_common.c
+--- a/backend/src/cnij_backend_common.c	2010-02-23 04:57:49.000000000 +0100
++++ b/backend/src/cnij_backend_common.c	2011-11-17 12:59:27.482025762 +0100
+@@ -38,6 +38,7 @@
+ // CUPS Header
+ #include <cups/cups.h>
+ #include <cups/ipp.h>
++#include <cups/ppd.h>
+ 
+ // Header file for CANON
+ #include "cnij_backend_common.h"
+
+--- a/cngpijmon/src/bjcupsmon_cups.c	2012-03-17 12:32:43.230805896 +0100
++++ b/cngpijmon/src/bjcupsmon_cups.c	2012-03-17 12:34:23.179018171 +0100
+@@ -18,8 +18,10 @@
+ */
+ 
+ /*** Includes ***/
++#define _IPP_PRIVATE_STRUCTURES 1
+ #include <cups/cups.h>
+ #include <cups/language.h>
++#include <cups/ppd.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+
+--- a/cngpij/cngpij/bjcups.c	2012-07-31 05:22:51.613991808 -0400
++++ b/cngpij/cngpij/bjcups.c	 2012-07-31 05:23:14.780658321 -0400
+@@ -21,6 +21,7 @@
+ #include	<config.h>
+ #endif	// HAVE_CONFIG_H
+ 
++#define _IPP_PRIVATE_STRUCTURES 1
+ #include <cups/cups.h>
+ #include <cups/language.h>
+ #include <cups/ppd.h>
 diff -Naur a/cngpij/cngpij/bjcups.c b/cngpij/cngpij/bjcups.c
 --- a/cngpij/cngpij/bjcups.c	2019-10-31 15:00:19.000000000 +0200
 +++ b/cngpij/cngpij/bjcups.c	2019-10-31 15:14:44.505666529 +0200
diff --git a/fix.patch b/fix.patch
deleted file mode 100644
index e0b20626a68c..000000000000
--- a/fix.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- backend/src/cnij_backend_common.c	2010-02-23 04:57:49.000000000 +0100
-+++ cnij_backend_common.c	2011-11-17 12:59:27.482025762 +0100
-@@ -38,6 +38,7 @@
- // CUPS Header
- #include <cups/cups.h>
- #include <cups/ipp.h>
-+#include <cups/ppd.h>
- 
- // Header file for CANON
- #include "cnij_backend_common.h"
-
---- cngpijmon/src/bjcupsmon_cups.c	2012-03-17 12:32:43.230805896 +0100
-+++ bjcupsmon_cups.c	2012-03-17 12:34:23.179018171 +0100
-@@ -18,8 +18,10 @@
- */
- 
- /*** Includes ***/
-+#define _IPP_PRIVATE_STRUCTURES 1
- #include <cups/cups.h>
- #include <cups/language.h>
-+#include <cups/ppd.h>
- #include <sys/types.h>
- #include <unistd.h>
-
---- cngpij/cngpij/bjcups.c	2012-07-31 05:22:51.613991808 -0400
-+++ bjcups.c	 2012-07-31 05:23:14.780658321 -0400
-@@ -21,6 +21,7 @@
- #include	<config.h>
- #endif	// HAVE_CONFIG_H
- 
-+#define _IPP_PRIVATE_STRUCTURES 1
- #include <cups/cups.h>
- #include <cups/language.h>
- #include <cups/ppd.h>
- 
- --- backend/configure.in	2010-02-23 07:57:49.000000000 +0400
-+++ configure.in	2013-01-12 17:57:23.186495527 +0400
-@@ -1,7 +1,7 @@
- AC_INIT(src/cnij_backend_common.c)
- AM_INIT_AUTOMAKE(backend, 3.40-1)
- 
--AM_CONFIG_HEADER(config.h)
-+#AC_CONFIG_HEADERS(config.h)
- 
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
- 
---- backendnet/configure.in	2010-03-10 06:16:28.000000000 +0400
-+++ configure.in	2013-01-12 17:57:36.019761830 +0400
-@@ -1,7 +1,7 @@
- AC_INIT(backend/cnijnetlm.c)
- AM_INIT_AUTOMAKE(backendnet, 3.40-1)
- 
--AM_CONFIG_HEADER(config.h)
-+#AC_CONFIG_HEADERS(config.h)
- 
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
- 
---- cngpij/configure.in	2010-02-23 07:57:49.000000000 +0400
-+++ configure.in	2013-01-12 17:55:19.960473398 +0400
-@@ -1,7 +1,7 @@
- AC_INIT(cngpij/bjcups.c)
- AM_INIT_AUTOMAKE(cngpij, 3.40-1)
- 
--AM_CONFIG_HEADER(config.h)
-+#AC_CONFIG_HEADERS(config.h)
- 
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
- 
---- cngpijmon/cnijnpr/configure.in	2010-03-11 05:33:21.000000000 +0400
-+++ configure.in	2013-01-12 17:56:57.729961931 +0400
-@@ -1,7 +1,7 @@
- AC_INIT(configure.in)
- AM_INIT_AUTOMAKE(cnijnpr, 3.40-1)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(cnijnpr/config.h)
- 
- 
- AC_ARG_ENABLE(libpath)
- 
---- cnijfilter/configure.in	2010-03-09 14:51:24.000000000 +0400
-+++ configure.in	2013-01-12 17:55:42.657021362 +0400
-@@ -25,7 +25,7 @@
- 
- 
- AM_INIT_AUTOMAKE(cif${program_suffix}, 3.40-1)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- dnl Checks for programs.
- AC_ISC_POSIX
-@@ -47,7 +47,6 @@
- AC_SUBST(ARC)
- 
- AC_PROG_CC
--AM_PROG_CC_STDC
- 
- dnl Checks for libraries.
- 
---- lgmon/configure.in	2010-03-11 05:18:24.000000000 +0400
-+++ configure.in	2013-01-12 17:56:21.380152122 +0400
-@@ -9,7 +9,7 @@
- fi
- 
- AM_INIT_AUTOMAKE(lgmon{program_suffix}, 3.40-1)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- dnl AM_MAINTAINER_MODE
- 
- AC_DEFINE_UNQUOTED(PACKAGE_PRINTER_MODEL, "${program_suffix}")
-@@ -41,7 +41,6 @@
- AC_SUBST(ARC)
- 
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_HEADER_STDC
- AC_PROG_RANLIB
- 
---- libs/configure.in	2010-02-23 07:57:49.000000000 +0400
-+++ configure.in	2013-01-12 17:54:56.233930669 +0400
-@@ -1,7 +1,7 @@
- AC_INIT(paramlist/paramlist.h)
- AM_INIT_AUTOMAKE(buftool, 1.0.0)
- 
--AM_CONFIG_HEADER(config.h)
-+#AC_CONFIG_HEADERS(config.h)
- 
- # Checks for programs.
- AC_PROG_CXX
- 
---- pstocanonij/configure.in	2010-02-23 07:57:49.000000000 +0400
-+++ configure.in	2013-01-12 17:56:03.480245771 +0400
-@@ -1,7 +1,7 @@
- AC_INIT(filter/pstocanonij.c)
- AM_INIT_AUTOMAKE(pstocanonij, 1.0.0)
- 
--AM_CONFIG_HEADER(config.h)
-+#AC_CONFIG_HEADERS(config.h)
- 
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
diff --git a/glibc-deprecated-fix.patch b/glibc-deprecated-fix.patch
new file mode 100644
index 000000000000..95642dd628e5
--- /dev/null
+++ b/glibc-deprecated-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur a/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c b/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c
+--- a/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c	2021-10-18 14:36:56.794504642 +0300
++++ b/cngpijmon/cnijnpr/cnijnpr/cnijnpr.c	2021-10-18 14:31:39.904508312 +0300
+@@ -33,7 +33,7 @@
+ #include <signal.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
+-#include <sys/sysctl.h>
++#include <unistd.h>
+ #include <config.h>
+ 
+ #include <dlfcn.h>