Vendor version 3.40-1

7 files changed, 483 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..fde2c36130b3
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,31 @@
+pkgbase = cnijfilter-mg8100series
+	pkgdesc = Canon IJ Printer Driver (for mg8100 series)
+	pkgver = 3.40
+	pkgrel = 1
+	url = http://www.canon.co.uk/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg8150.aspx?type=drivers&os=LINUX
+	install = cnijfilter-mg8100.install
+	arch = i686
+	arch = x86_64
+	license = custom
+	makedepends = autoconf>=2.13
+	makedepends = automake>=1.6
+	makedepends = findutils
+	makedepends = gawk
+	depends = cups
+	depends = ghostscript
+	depends = popt
+	depends = gtk2
+	conflicts = cnijfilter-common
+	source = http://files.canon-europe.com/files/soft40245/Software/cnijfilter-source-3.40-1.tar.gz
+	source = build-fixes.patch
+	source = cups.patch
+	source = id.po.patch
+	source = libpng.patch
+	sha256sums = a95dd4ca491a9e8acc3e4ee35cc84904680e82d89ff04a23dda1b0ccffbb8a7a
+	sha256sums = 2fac6cca681320ea248abb73a5d17c7a1f69176b594aeb2cb5c67bd4ace1fd37
+	sha256sums = 28a1cb7495b0e0689c1629d57130bcb020413431d6ffd0c1057cef2f7f16f72e
+	sha256sums = df6ff8ef9d8bf825c170b3d5957a93eb7c20b6b4cc39a4944dc74d2852bef1a9
+	sha256sums = d4b52edbb4cc6a56d93b176341277935357acc0c52ac48abcf0e7e7e9d3c0a7c
+
+pkgname = cnijfilter-mg8100series
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..354056b8b449
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,121 @@
+# Maintainer: sourcesmith <sourcesmith 'at' homeport 'dot' org.uk> 
+# Original Contributors: Sonic-Y3k <sonic.y3k@googlemail.com>
+#                        Giancarlo Bianchi <giancarlobianchi76@gmail.com>
+#                        Fortunato Ventre (voRia) <vorione@gmail.com>
+#                        Custom Processing Unlimited (CPUnltd) <CPUnltd 'at' gmail 'dot' com>
+_model=mg8100
+pkgname=cnijfilter-${_model}series
+pkgver=3.40
+pkgrel=1
+_pkgver=3.40-1
+pkgdesc="Canon IJ Printer Driver (for ${_model} series)"
+url="http://www.canon.co.uk/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg8150.aspx?type=drivers&os=LINUX"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('cups' 'ghostscript' 'popt' 'gtk2')
+makedepends=('autoconf>=2.13' 'automake>=1.6' 'findutils' 'gawk')
+conflicts=('cnijfilter-common')
+install=cnijfilter-mg8100.install
+source=('http://files.canon-europe.com/files/soft40245/Software/cnijfilter-source-3.40-1.tar.gz'
+        'build-fixes.patch'
+        'cups.patch'
+	'id.po.patch'
+        'libpng.patch')
+sha256sums=('a95dd4ca491a9e8acc3e4ee35cc84904680e82d89ff04a23dda1b0ccffbb8a7a'
+            '2fac6cca681320ea248abb73a5d17c7a1f69176b594aeb2cb5c67bd4ace1fd37'
+            '28a1cb7495b0e0689c1629d57130bcb020413431d6ffd0c1057cef2f7f16f72e'
+            'df6ff8ef9d8bf825c170b3d5957a93eb7c20b6b4cc39a4944dc74d2852bef1a9'
+            'd4b52edbb4cc6a56d93b176341277935357acc0c52ac48abcf0e7e7e9d3c0a7c')
+
+if [ "$CARCH" == "x86_64" ]; then  
+	_libdir=libs_bin64
+else
+	_libdir=libs_bin32
+fi
+
+prepare() {
+    ## Patches
+	msg "Applying patches"
+	patch -p0 < build-fixes.patch
+	patch -p0 < cups.patch
+	patch -p0 < id.po.patch
+	patch -p0 < libpng.patch
+}
+
+build() {
+    CPPFLAGS="${CPPFLAGS} -O2"
+
+    ## Compile ${_model} stuff
+	# ppd file
+	msg Configuring and making ppd.
+	cd "${srcdir}/cnijfilter-source-${_pkgver}/ppd"
+	./autogen.sh --prefix=/usr --enable-ppdpath=/usr/share/cups/model --program-suffix=${_model}
+	make 
+	# cnijfilter
+	msg Configuring and making cnijfilter.
+	cd "${srcdir}/cnijfilter-source-${_pkgver}/cnijfilter"
+	./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib --enable-binpath=/usr/bin --program-suffix=${_model}
+	make 
+	# lgmon
+	msg Configuring and making lgmon.
+	cd "${srcdir}/cnijfilter-source-${_pkgver}/lgmon"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --program-suffix=${_model}
+	make 
+	# cngpijmon
+	msg Configuring and making cngpijmon.
+	cd "${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --datadir=/usr/share --program-suffix=${_model}
+	make 
+
+	## Compile common stuff
+	# libs
+	msg Configuring and making libs.
+	cd "${srcdir}/cnijfilter-source-${_pkgver}/libs"
+	./autogen.sh --prefix=/usr
+	make 
+	# cngpij, pstocanonij, backend
+	for _c in cngpij pstocanonij backend; do
+		echo "Configuring and making ${_c}."
+		cd "${srcdir}/cnijfilter-source-${_pkgver}/${_c}"
+		./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+		make 
+	done
+	# backendnet
+	msg Configuring and making backendnet.
+	cd "${srcdir}/cnijfilter-source-${_pkgver}/backendnet"
+	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/${_libdir}"
+	make 
+	# sm sub process
+	msg Configuring and making cngpijmon/cnijnpr.
+	cd "${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon/cnijnpr"
+	./autogen.sh --prefix=/usr LIBS="-ldl"
+	make 
+}
+
+package() {
+	# get id of printer model	
+	_cmd=$(find ${srcdir}/cnijfilter-source-${_pkgver} -type f -name cif${_model}.conf -path '*[\d]*' -printf '%P' \
+		| gawk -F/ '{print $1}')
+	_id=${_cmd}
+	echo ${pkgdir}
+	
+
+	for dir in ppd cnijfilter lgmon cngpijmon libs cngpij pstocanonij backend backendnet cngpijmon/cnijnpr; do
+		cd "${srcdir}/cnijfilter-source-${_pkgver}/${dir}"
+		make install DESTDIR="${pkgdir}" 
+	done
+
+	# Install ${_id} libraries
+	install -d ${pkgdir}/usr/lib/
+	cp -P ${srcdir}/cnijfilter-source-${_pkgver}/${_id}/${_libdir}/*so* ${pkgdir}/usr/lib/
+	install -d ${pkgdir}/usr/lib/bjlib/
+	install -m 644 ${srcdir}/cnijfilter-source-${_pkgver}/${_id}/database/* ${pkgdir}/usr/lib/bjlib/
+	# Install common libraries
+	cp -P ${srcdir}/cnijfilter-source-${_pkgver}/com/${_libdir}/*so* ${pkgdir}/usr/lib/
+	install -m 666 ${srcdir}/cnijfilter-source-${_pkgver}/com/ini/* ${pkgdir}/usr/lib/bjlib/
+
+	# Install license file
+	cd ${srcdir}/cnijfilter-source-${_pkgver}
+	install -d ${pkgdir}/usr/share/licenses/${pkgname}/
+	install -m 644 LICENSE-* ${pkgdir}/usr/share/licenses/${pkgname}/
+}
diff --git a/build-fixes.patch b/build-fixes.patch
new file mode 100644
index 000000000000..2a3a5e26e6dc
--- /dev/null
+++ b/build-fixes.patch
@@ -0,0 +1,248 @@
+--- cnijfilter-source-3.40-1/backend/autogen.sh	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/backend/autogen.sh	2017-03-28 23:04:58.827980740 +0100
+@@ -112,7 +112,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/backend/configure.in	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/backend/configure.in	2017-03-21 22:37:14.026563934 +0000
+@@ -1,8 +1,6 @@
+ AC_INIT(src/cnij_backend_common.c)
+ AM_INIT_AUTOMAKE(backend, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.40-1/backendnet/autogen.sh	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/backendnet/autogen.sh	2017-03-28 23:04:58.837980744 +0100
+@@ -112,7 +112,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/backendnet/configure.in	2010-03-10 02:16:28.000000000 +0000
++++ cnijfilter-source-3.40-1.new/backendnet/configure.in	2017-03-21 22:37:39.926553524 +0000
+@@ -1,8 +1,6 @@
+ AC_INIT(backend/cnijnetlm.c)
+ AM_INIT_AUTOMAKE(backendnet, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.40-1/cngpij/autogen.sh	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cngpij/autogen.sh	2017-03-28 23:04:58.837980744 +0100
+@@ -112,7 +112,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/cngpij/configure.in	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cngpij/configure.in	2017-03-21 22:38:45.733193733 +0000
+@@ -1,8 +1,6 @@
+ AC_INIT(cngpij/bjcups.c)
+ AM_INIT_AUTOMAKE(cngpij, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.40-1/cngpijmon/autogen.sh	2010-03-11 01:33:21.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cngpijmon/autogen.sh	2017-03-28 23:04:58.837980744 +0100
+@@ -122,7 +122,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/cngpijmon/cnijnpr/configure.in	2010-03-11 01:33:21.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cngpijmon/cnijnpr/configure.in	2017-03-29 21:36:47.574521135 +0100
+@@ -1,7 +1,7 @@
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(cnijnpr, 3.40-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ 
+ AC_ARG_ENABLE(libpath)
+--- cnijfilter-source-3.40-1/cngpijmon/configure.in	2010-03-11 01:33:21.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cngpijmon/configure.in	2017-03-22 23:16:15.825206223 +0000
+@@ -18,11 +18,10 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cngpijmon${program_suffix}, 3.40-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PATH_GTK_2_0(2.0.0, ,
+--- cnijfilter-source-3.40-1/cnijfilter/autogen.sh	2010-02-19 05:29:46.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cnijfilter/autogen.sh	2017-03-28 23:04:58.837980744 +0100
+@@ -125,7 +125,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/cnijfilter/configure.in	2010-03-09 10:51:24.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cnijfilter/configure.in	2017-03-22 18:57:23.057510854 +0000
+@@ -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.
+ 
+--- cnijfilter-source-3.40-1/lgmon/autogen.sh	2010-03-11 01:18:24.000000000 +0000
++++ cnijfilter-source-3.40-1.new/lgmon/autogen.sh	2017-03-28 23:04:58.837980744 +0100
+@@ -106,7 +106,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/lgmon/configure.in	2010-03-11 01:18:24.000000000 +0000
++++ cnijfilter-source-3.40-1.new/lgmon/configure.in	2017-03-22 18:58:14.077405562 +0000
+@@ -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
+ 
+--- cnijfilter-source-3.40-1/libs/autogen.sh	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/libs/autogen.sh	2017-03-28 23:04:58.837980744 +0100
+@@ -127,7 +127,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/libs/configure.in	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/libs/configure.in	2017-03-23 20:41:30.536371103 +0000
+@@ -1,8 +1,6 @@
+ AC_INIT(paramlist/paramlist.h)
+ AM_INIT_AUTOMAKE(buftool, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+--- cnijfilter-source-3.40-1/ppd/autogen.sh	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/ppd/autogen.sh	2017-03-28 23:04:58.841314079 +0100
+@@ -126,7 +126,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/printui/autogen.sh	2010-02-25 00:55:00.000000000 +0000
++++ cnijfilter-source-3.40-1.new/printui/autogen.sh	2017-03-28 23:04:58.841314079 +0100
+@@ -138,7 +138,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/printui/configure.in	2010-07-05 12:02:35.000000000 +0100
++++ cnijfilter-source-3.40-1.new/printui/configure.in	2017-03-22 18:59:41.477248465 +0000
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(printui${program_suffix}, 3.40-1)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(src/config.h)
+ AM_MAINTAINER_MODE
+ 
+ AC_DEFINE_UNQUOTED(PACKAGE_PRINTER_MODEL, "${program_suffix}")
+@@ -45,7 +45,6 @@
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
+ AM_PATH_GTK_2_0(2.6.0, ,
+--- cnijfilter-source-3.40-1/pstocanonij/autogen.sh	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/pstocanonij/autogen.sh	2017-03-28 23:04:58.841314079 +0100
+@@ -114,7 +114,7 @@
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+       aclocal $aclocalinclude
+-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
++      if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+ 	echo "Running autoheader..."
+ 	autoheader
+       fi
+--- cnijfilter-source-3.40-1/pstocanonij/configure.in	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/pstocanonij/configure.in	2017-03-21 23:14:36.699137329 +0000
+@@ -1,8 +1,6 @@
+ AC_INIT(filter/pstocanonij.c)
+ AM_INIT_AUTOMAKE(pstocanonij, 1.0.0)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
diff --git a/cnijfilter-mg8100.install b/cnijfilter-mg8100.install
new file mode 100644
index 000000000000..6b123c09e35a
--- /dev/null
+++ b/cnijfilter-mg8100.install
@@ -0,0 +1,15 @@
+post_install() {
+	if [ -x /usr/bin/ldconfig ]; then
+		/usr/bin/ldconfig
+	fi
+}
+post_upgrade() {
+	if [ -x /usr/bin/ldconfig ]; then
+                /usr/bin/ldconfig
+        fi
+}
+post_remove() {
+        if [ -x /usr/bin/ldconfig ]; then
+                /usr/bin/ldconfig
+        fi
+}
diff --git a/cups.patch b/cups.patch
new file mode 100644
index 000000000000..bb07f41d6db3
--- /dev/null
+++ b/cups.patch
@@ -0,0 +1,33 @@
+--- cnijfilter-source-3.40-1/backend/src/cnij_backend_common.c	2010-02-23 03:57:49.000000000 +0000
++++ cnijfilter-source-3.40-1.new/backend/src/cnij_backend_common.c	2017-03-21 21:20:59.335056912 +0000
+@@ -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"
+--- cnijfilter-source-3.40-1/cngpij/cngpij/bjcups.c	2010-03-15 08:48:58.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cngpij/cngpij/bjcups.c	2017-03-21 21:30:56.704821837 +0000
+@@ -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>
+--- cnijfilter-source-3.40-1/cngpijmon/src/bjcupsmon_cups.c	2010-05-11 09:49:30.000000000 +0100
++++ cnijfilter-source-3.40-1.new/cngpijmon/src/bjcupsmon_cups.c	2017-03-21 21:28:31.494876258 +0000
+@@ -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>
+ #include <pwd.h>
diff --git a/id.po.patch b/id.po.patch
new file mode 100644
index 000000000000..f868e8c53178
--- /dev/null
+++ b/id.po.patch
@@ -0,0 +1,13 @@
+--- cnijfilter-source-3.40-1/printui/po/id.po	2010-07-15 04:49:01.000000000 +0100
++++ cnijfilter-source-3.40-1.new/printui/po/id.po	2017-03-30 22:03:31.261596545 +0100
+@@ -1359,8 +1359,8 @@
+ "Paper Source: %s is not available for the selected Media Type.\n"
+ "Paper Source setting has been changed to %s."
+ msgstr ""
+-"Setelan Sumber Kertas saat ini tidak tersedia untuk Tipe Media yang dipilih.\n"
+-"Setelan Sumber Kertas telah diubah."
++"Setelan Sumber %s Kertas saat ini tidak tersedia untuk Tipe Media yang dipilih.\n"
++"Setelan Sumber Kertas telah diubah %s."
+ 
+ #. bkenh_enh
+ #: po/keystr.h:312
diff --git a/libpng.patch b/libpng.patch
new file mode 100644
index 000000000000..5c444220d2a1
--- /dev/null
+++ b/libpng.patch
@@ -0,0 +1,22 @@
+--- cnijfilter-source-3.40-1/cnijfilter/src/bjfimage.c	2010-02-19 05:29:46.000000000 +0000
++++ cnijfilter-source-3.40-1.new/cnijfilter/src/bjfimage.c	2017-03-21 19:36:48.440846803 +0000
+@@ -1520,8 +1520,8 @@
+ 	short			tmpformat;
+ 	short			retbyte = 0;
+ 	short			bpp = 3;
+-	long			width = 0;
+-	long			length = 0;
++	png_uint_32		width = 0;
++	png_uint_32		length = 0;
+ 	long			rstep = 0;
+ 	long			RasterLength = 0;
+ 	long			i;
+@@ -1574,7 +1574,7 @@
+ 		goto onErr;
+ 	}
+ 
+-	if (setjmp (png_p->jmpbuf))
++	if (setjmp (png_jmpbuf(png_p)))
+ 	{
+ 		png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
+ 		goto onErr;