use different source

5 files changed, 45 insertions, 380 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 756f5f8cc481..19e7dbfd2a5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,36 @@
 pkgbase = cnijfilter-mg6300
-	pkgdesc = Canon IJ Printer Driver (for mg6300 series)
+	pkgdesc = Canon MG6300 printer driver
 	pkgver = 3.80
-	pkgrel = 9
-	url = http://fr.canon.ch/Support/Consumer_Products/products/Fax__Multifunctionals/InkJet/PIXMA_MG_series/PIXMA_MG6350.aspx?DLtcmuri=tcm:109-994583&page=1&type=download
+	pkgrel = 1
+	url = http://support-sg.canon-asia.com/contents/SG/EN/0100468802.html
 	arch = i686
 	arch = x86_64
-	license = custom
-	makedepends = findutils
-	makedepends = gawk
-	depends = libpng<=1.7.0
-	depends = libtiff
+	license = unknown
+	makedepends = rpmextract
+	depends = atk
+	depends = glibc
+	depends = glib2
+	depends = cairo
+	depends = cups
+	depends = fontconfig
 	depends = gtk2
+	depends = pango
+	depends = libpng12
 	depends = popt
-	source = http://gdlp01.c-wss.com/gds/3/0100004693/01/cnijfilter-source-3.80-1.tar.gz
-	source = cups.patch
-	source = libpng15.patch
-	source = configures.patch
-	md5sums = b6b92717930021d24bd750d4197bdf3b
-	md5sums = 5d65e4f2a422fc36d12b50ff25eddc1c
-	md5sums = d1984de9df321ee5de075e3ea1208e0e
-	md5sums = 0c5d0bdee566b67464b8c3133a962666
+	depends = libtiff3
+	depends = libx11
+	depends = libxcursor
+	depends = libxext
+	depends = libxfixes
+	depends = libxi
+	depends = libxinerama
+	depends = libxml2
+	depends = libxrandr
+	depends = libxrender
+	depends = cnijfilter-common-mg5400
+	options = emptydirs
+	source = http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNDY4ODAx&cmp=ACB
+	md5sums = 531641498aa929e628c47e918d809571
 
 pkgname = cnijfilter-mg6300
 
diff --git a/PKGBUILD b/PKGBUILD
index 413161405e3b..2a6830fbc93e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,114 +1,24 @@
-# Maintainer: Bernhard Landauer <oberon@manjaro.org>
-# Maintainer: Tristelune  <tristelune at archlinux dot info>
-_model=mg6300
-pkgname=cnijfilter-${_model}
+pkgname=cnijfilter-mg6300
+_pkgname=cnijfilter-common
 pkgver=3.80
-pkgrel=9
-_pkgver=3.80-1
-pkgdesc="Canon IJ Printer Driver (for ${_model} series)"
-url="http://fr.canon.ch/Support/Consumer_Products/products/Fax__Multifunctionals/InkJet/PIXMA_MG_series/PIXMA_MG6350.aspx?DLtcmuri=tcm:109-994583&page=1&type=download"
+pkgrel=1
+pkgdesc="Canon MG6300 printer driver"
 arch=('i686' 'x86_64')
-license=('custom')
-depends=('libpng<=1.7.0' 'libtiff' 'gtk2' 'popt')
-makedepends=('findutils' 'gawk')
-source=("http://gdlp01.c-wss.com/gds/3/0100004693/01/cnijfilter-source-${_pkgver}.tar.gz"
-	'cups.patch'
-	'libpng15.patch'
-	'configures.patch')
-md5sums=('b6b92717930021d24bd750d4197bdf3b'
-         '5d65e4f2a422fc36d12b50ff25eddc1c'
-         'd1984de9df321ee5de075e3ea1208e0e'
-         '0c5d0bdee566b67464b8c3133a962666')
-
-
-if [ "$CARCH" == "x86_64" ]; then  
-	_libdir=libs_bin64
-else
-	_libdir=libs_bin32
-fi
-
-build() {
-
-	cd "${srcdir}/cnijfilter-source-${_pkgver}"
-	patch -p1 -i ${srcdir}/cups.patch
-	patch -p1 -i ${srcdir}/libpng15.patch
-	patch -p1 -i ${srcdir}/configures.patch
-	echo ${srcdir}
-
-	## Compile and install ${_model} stuff
-	# ppd file
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/ppd"
-	./autogen.sh --prefix=/usr --enable-ppdpath=/usr/share/cups/model --program-suffix=${_model}
-	make 
-	# 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
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/lgmon"
-	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --program-suffix=${_model}
-	make 
-	# cngpijmon
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon"
-	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --datadir=/usr/share --program-suffix=${_model}
-	make 
-
-	# cngpijmnt
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/cngpijmnt"
-	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --datadir=/usr/share --program-suffix=${_model}
-	make 
-
-	## Compile common stuff
-	# libs
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/libs"
-	./autogen.sh --prefix=/usr
-	make 
-	# cngpij, pstocanonij, backend
-	for _c in cngpij pstocanonij backend; do
-		cd "${srcdir}/cnijfilter-source-${_pkgver}/${_c}"
-		./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
-		make 
-	done
-	# backendnet
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/backendnet"
-	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/${_libdir}"
-	make 
-	# sm sub process
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon/cnijnpr"
-	./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LIBS="-ldl"
-	make 
-	# maintenance
-	cd "${srcdir}/cnijfilter-source-${_pkgver}/maintenance"
-	./autogen.sh --prefix=/usr --datadir=/usr/share --program-suffix=${_model}
-	make 
-
-}
+url="http://support-sg.canon-asia.com/contents/SG/EN/0100468802.html"
+license=('unknown')
+depends=('atk' 'glibc' 'glib2' 'cairo' 'cups' 'fontconfig' 'gtk2' 'pango' 'libpng12' 'popt' 'libtiff3' 'libx11' 'libxcursor' 'libxext' 'libxfixes' 'libxi' 'libxinerama' 'libxml2' 'libxrandr' 'libxrender' 'cnijfilter-common-mg5400')
+makedepends=('rpmextract')
+options=('emptydirs')
+source=("http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNDY4ODAx&cmp=ACB")
+md5sums=('531641498aa929e628c47e918d809571')
 
 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 cngpijmnt libs cngpij pstocanonij backend backendnet cngpijmon/cnijnpr maintenance; 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}/
+ if [ "${CARCH}" = 'x86_64' ]; then
+    rpmfile=$(find "$srcdir" -name $_pkgname-$pkgver*${CARCH}*.rpm)
+  elif [ "${CARCH}" = 'i686' ]; then
+    rpmfile=$(find "$srcdir" -name $_pkgname-$pkgver*i386*.rpm)
+  fi  
+  cd $pkgdir
+  rpmextract.sh $rpmfile
 }
 
diff --git a/configures.patch b/configures.patch
deleted file mode 100644
index e9053aca30de..000000000000
--- a/configures.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff -Naur cnijfilter-source-3.80_old/backend/configure.in cnijfilter-source-3.80_new/backend/configure.in
---- cnijfilter-source-3.80_old/backend/configure.in	2012-03-29 06:50:26.000000000 +0200
-+++ cnijfilter-source-3.80_new/backend/configure.in	2013-03-30 19:49:17.676110106 +0100
-@@ -1,8 +1,6 @@
- AC_INIT(src/cnij_backend_common.c)
- AM_INIT_AUTOMAKE(backend, 3.80-1)
- 
--AM_CONFIG_HEADER(config.h)
--
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
-    enable_progpath="${ac_default_prefix}/bin"
-diff -Naur cnijfilter-source-3.80_old/backendnet/configure.in cnijfilter-source-3.80_new/backendnet/configure.in
---- cnijfilter-source-3.80_old/backendnet/configure.in	2012-03-29 06:50:28.000000000 +0200
-+++ cnijfilter-source-3.80_new/backendnet/configure.in	2013-03-30 19:49:59.339445829 +0100
-@@ -1,8 +1,6 @@
- AC_INIT(backend/cnijnetlm.c)
- AM_INIT_AUTOMAKE(backendnet, 3.80-1)
- 
--AM_CONFIG_HEADER(config.h)
--
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
-    enable_progpath="${ac_default_prefix}/bin"
-diff -Naur cnijfilter-source-3.80_old/cngpij/configure.in cnijfilter-source-3.80_new/cngpij/configure.in
---- cnijfilter-source-3.80_old/cngpij/configure.in	2012-03-29 06:50:26.000000000 +0200
-+++ cnijfilter-source-3.80_new/cngpij/configure.in	2013-03-30 19:50:31.336114459 +0100
-@@ -1,8 +1,6 @@
- AC_INIT(cngpij/bjcups.c)
- AM_INIT_AUTOMAKE(cngpij, 3.80-1)
- 
--AM_CONFIG_HEADER(config.h)
--
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
-    enable_progpath="${ac_default_prefix}/bin"
-diff -Naur cnijfilter-source-3.80_old/cngpijmnt/configure.in cnijfilter-source-3.80_new/cngpijmnt/configure.in
---- cnijfilter-source-3.80_old/cngpijmnt/configure.in	2012-03-29 06:50:26.000000000 +0200
-+++ cnijfilter-source-3.80_new/cngpijmnt/configure.in	2013-03-30 20:00:17.019449626 +0100
-@@ -1,7 +1,7 @@
- AC_INIT(src/main.c)
- AM_INIT_AUTOMAKE(cngpijmnt, 3.80-1)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(src/config.h)
- 
- AC_ARG_ENABLE(progpath)
- if test "${enable_progpath}" = "" ; then
-diff -Naur cnijfilter-source-3.80_old/cngpijmnt/src/config.h.in cnijfilter-source-3.80_new/cngpijmnt/src/config.h.in
---- cnijfilter-source-3.80_old/cngpijmnt/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ cnijfilter-source-3.80_new/cngpijmnt/src/config.h.in	2013-03-30 20:00:39.726117465 +0100
-@@ -0,0 +1 @@
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-diff -Naur cnijfilter-source-3.80_old/cngpijmon/cnijnpr/config.h.in cnijfilter-source-3.80_new/cngpijmon/cnijnpr/config.h.in
---- cnijfilter-source-3.80_old/cngpijmon/cnijnpr/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ cnijfilter-source-3.80_new/cngpijmon/cnijnpr/config.h.in	2013-03-30 20:05:33.316118236 +0100
-@@ -0,0 +1 @@
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-diff -Naur cnijfilter-source-3.80_old/cngpijmon/cnijnpr/configure.in cnijfilter-source-3.80_new/cngpijmon/cnijnpr/configure.in
---- cnijfilter-source-3.80_old/cngpijmon/cnijnpr/configure.in	2012-03-27 03:36:03.000000000 +0200
-+++ cnijfilter-source-3.80_new/cngpijmon/cnijnpr/configure.in	2013-03-30 20:39:06.969468182 +0100
-@@ -1,7 +1,7 @@
- AC_INIT(configure.in)
- AM_INIT_AUTOMAKE(cnijnpr, 3.80-1)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- 
- AC_ARG_ENABLE(libpath)
-diff -Naur cnijfilter-source-3.80_old/cngpijmon/configure.in cnijfilter-source-3.80_new/cngpijmon/configure.in
---- cnijfilter-source-3.80_old/cngpijmon/configure.in	2012-03-27 03:36:01.000000000 +0200
-+++ cnijfilter-source-3.80_new/cngpijmon/configure.in	2013-03-30 20:01:29.616118397 +0100
-@@ -18,11 +18,10 @@
- 
- 
- AM_INIT_AUTOMAKE(cngpijmon${program_suffix}, 3.80-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, ,
-diff -Naur cnijfilter-source-3.80_old/cngpijmon/src/config.h.in cnijfilter-source-3.80_new/cngpijmon/src/config.h.in
---- cnijfilter-source-3.80_old/cngpijmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ cnijfilter-source-3.80_new/cngpijmon/src/config.h.in	2013-03-30 20:01:59.622786406 +0100
-@@ -0,0 +1 @@
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-diff -Naur cnijfilter-source-3.80_old/cnijfilter/configure.in cnijfilter-source-3.80_new/cnijfilter/configure.in
---- cnijfilter-source-3.80_old/cnijfilter/configure.in	2012-03-22 02:50:19.000000000 +0100
-+++ cnijfilter-source-3.80_new/cnijfilter/configure.in	2013-03-30 20:06:35.126120985 +0100
-@@ -25,7 +25,7 @@
- 
- 
- AM_INIT_AUTOMAKE(cif${program_suffix}, 3.80-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.
- 
-diff -Naur cnijfilter-source-3.80_old/lgmon/configure.in cnijfilter-source-3.80_new/lgmon/configure.in
---- cnijfilter-source-3.80_old/lgmon/configure.in	2012-03-27 03:47:22.000000000 +0200
-+++ cnijfilter-source-3.80_new/lgmon/configure.in	2013-03-30 20:09:18.259454784 +0100
-@@ -9,7 +9,7 @@
- fi
- 
- AM_INIT_AUTOMAKE(lgmon{program_suffix}, 3.80-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
- 
-diff -Naur cnijfilter-source-3.80_old/lgmon/src/config.h.in cnijfilter-source-3.80_new/lgmon/src/config.h.in
---- cnijfilter-source-3.80_old/lgmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ cnijfilter-source-3.80_new/lgmon/src/config.h.in	2013-03-30 20:09:39.996124099 +0100
-@@ -0,0 +1 @@
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-diff -Naur cnijfilter-source-3.80_old/libs/configure.in cnijfilter-source-3.80_new/libs/configure.in
---- cnijfilter-source-3.80_old/libs/configure.in	2012-03-29 06:50:28.000000000 +0200
-+++ cnijfilter-source-3.80_new/libs/configure.in	2013-03-30 20:10:09.992788214 +0100
-@@ -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
-diff -Naur cnijfilter-source-3.80_old/maintenance/configure.in cnijfilter-source-3.80_new/maintenance/configure.in
---- cnijfilter-source-3.80_old/maintenance/configure.in	2012-03-29 09:03:26.000000000 +0200
-+++ cnijfilter-source-3.80_new/maintenance/configure.in	2013-03-30 20:13:16.686122979 +0100
-@@ -9,7 +9,7 @@
- fi
- 
- AM_INIT_AUTOMAKE(maintenance${program_suffix}, 3.80-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, ,
-diff -Naur cnijfilter-source-3.80_old/maintenance/src/config.h.in cnijfilter-source-3.80_new/maintenance/src/config.h.in
---- cnijfilter-source-3.80_old/maintenance/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ cnijfilter-source-3.80_new/maintenance/src/config.h.in	2013-03-30 20:13:40.726123659 +0100
-@@ -0,0 +1 @@
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-diff -Naur cnijfilter-source-3.80_old/pstocanonij/configure.in cnijfilter-source-3.80_new/pstocanonij/configure.in
---- cnijfilter-source-3.80_old/pstocanonij/configure.in	2012-03-29 06:50:25.000000000 +0200
-+++ cnijfilter-source-3.80_new/pstocanonij/configure.in	2013-03-30 20:15:28.832790973 +0100
-@@ -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/cups.patch b/cups.patch
deleted file mode 100644
index ffe2900faf0a..000000000000
--- a/cups.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -aur cnijfilter-source-3.80_old/backend/src/cnij_backend_common.c cnijfilter-source-3.80_new/backend/src/cnij_backend_common.c
---- cnijfilter-source-3.80_old/backend/src/cnij_backend_common.c	2012-03-29 06:50:27.000000000 +0200
-+++ cnijfilter-source-3.80_new/backend/src/cnij_backend_common.c	2013-03-31 19:49:41.335034142 +0200
-@@ -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"
-diff -aur cnijfilter-source-3.80_old/cngpij/cngpij/bjcups.c cnijfilter-source-3.80_new/cngpij/cngpij/bjcups.c
---- cnijfilter-source-3.80_old/cngpij/cngpij/bjcups.c	2012-04-17 05:39:20.000000000 +0200
-+++ cnijfilter-source-3.80_new/cngpij/cngpij/bjcups.c	2013-03-31 19:46:55.918366202 +0200
-@@ -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 -aur cnijfilter-source-3.80_old/cngpijmnt/src/main.c cnijfilter-source-3.80_new/cngpijmnt/src/main.c
---- cnijfilter-source-3.80_old/cngpijmnt/src/main.c	2012-04-26 11:49:34.000000000 +0200
-+++ cnijfilter-source-3.80_new/cngpijmnt/src/main.c	2013-03-31 19:43:50.738364780 +0200
-@@ -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 -aur cnijfilter-source-3.80_old/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.80_new/cngpijmon/src/bjcupsmon_cups.c
---- cnijfilter-source-3.80_old/cngpijmon/src/bjcupsmon_cups.c	2012-05-22 11:49:27.000000000 +0200
-+++ cnijfilter-source-3.80_new/cngpijmon/src/bjcupsmon_cups.c	2013-03-31 19:37:24.238361808 +0200
-@@ -18,9 +18,11 @@
-  */
- 
- /*** Includes ***/
-+#define _IPP_PRIVATE_STRUCTURES 1
- #include <cups/cups.h>
- #include <cups/ppd.h>
- #include <cups/language.h>
-+#include <cups/ppd.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <pwd.h>
diff --git a/libpng15.patch b/libpng15.patch
deleted file mode 100644
index 84d00c2c4323..000000000000
--- a/libpng15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -aur cnijfilter-source-3.80_old/cnijfilter/src/bjfimage.c cnijfilter-source-3.80_new/cnijfilter/src/bjfimage.c
---- cnijfilter-source-3.80_old/cnijfilter/src/bjfimage.c	2012-03-22 02:50:19.000000000 +0100
-+++ cnijfilter-source-3.80_new/cnijfilter/src/bjfimage.c	2013-03-31 19:27:17.768357145 +0200
-@@ -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;