new

7 files changed, 430 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..82e0fd0a570d
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,41 @@
+pkgbase = cnijfilter-mg3100
+	pkgdesc = Canon IJ Printer Driver (for MG3100 series)
+	pkgver = 3.60
+	pkgrel = 5
+	url = http://support-au.canon.com.au/contents/AU/EN/0100392802.html
+	install = cnijfilter-mg3100.install
+	arch = i686
+	arch = x86_64
+	license = custom
+	makedepends = autoconf>=2.13
+	makedepends = automake>=1.6
+	makedepends = tar
+	makedepends = make
+	makedepends = gcc
+	depends = libcups
+	depends = cups
+	depends = popt
+	depends = ghostscript
+	depends = gsfonts
+	depends = atk>=1.9.0
+	depends = gtk2>=2.8.0
+	depends = pango>=1.12.3
+	depends = libpng>=1.5
+	depends = libtiff
+	depends = cairo>=1.0.2
+	depends = libxml2>=2.6.24
+	depends = fontconfig>=2.3.0
+	depends = libxinerama
+	conflicts = cnijfilter-common
+	source = http://gdlp01.c-wss.com/gds/8/0100003928/01/cnijfilter-source-3.60-1.tar.gz
+	source = build-fixes.patch
+	source = cups.patch
+	source = id.po.patch
+	source = libpng15.patch
+	md5sums = 70e412331a21f4b573b4e901c89cee18
+	md5sums = 5f4b3523f6542f0a90886e7e6264f19a
+	md5sums = e406c2629159b9608c4552a5343471f0
+	md5sums = e228560529d46e1f03617ba7bc9aa657
+	md5sums = 0eb3e6f17c090b07490f4a5d01de49da
+
+pkgname = cnijfilter-mg3100
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..9cab83f608fb
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,148 @@
+# Maintainer: Bernhard Landauer <oberon@manjaro.org>
+# Maintainer: Doktor Schliemann <doktor.schliemann@gmail.com>
+# Original Contributors: Fortunato Ventre (voRia) <vorione@gmail.com>
+#			 Custom Processing Unlimited (CPUnltd) <CPUnltd@gmail.com>
+#			 Giancarlo Bianchi <giancarlobianchi76@gmail.com>
+#			 Nopsty <michi@nicce.at>
+#			 Michael Unterkalmsteiner (mun) <miciu@gmx.de>
+#			 Giancarlo Bianchi <giancarlobianchi76@gmail.com>
+pkgname=cnijfilter-mg3100
+pkgver=3.60
+pkgrel=5
+_pkgver=3.60-1
+pkgdesc="Canon IJ Printer Driver (for MG3100 series)"
+url="http://support-au.canon.com.au/contents/AU/EN/0100392802.html"
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('libcups' 'cups' 'popt' 'ghostscript' 'gsfonts' 'atk>=1.9.0' 'gtk2>=2.8.0' 'pango>=1.12.3' 'libpng>=1.5' 'libtiff' 'cairo>=1.0.2' 'libxml2>=2.6.24' 'fontconfig>=2.3.0' 'libxinerama')
+makedepends=('autoconf>=2.13' 'automake>=1.6' 'tar' 'make' 'gcc')
+conflicts=('cnijfilter-common')
+install=cnijfilter-mg3100.install
+source=(http://gdlp01.c-wss.com/gds/8/0100003928/01/cnijfilter-source-${_pkgver}.tar.gz
+	'build-fixes.patch'
+	'cups.patch'
+	'id.po.patch'
+	'libpng15.patch')
+
+package() {
+  if [ "$CARCH" == "x86_64" ]; then  
+    libdir=libs_bin64
+  else
+    libdir=libs_bin32
+  fi
+
+  ## Patches
+  patch -p0 < build-fixes.patch
+  patch -p0 < cups.patch
+  patch -p0 < id.po.patch
+  patch -p0 < libpng15.patch
+
+  ## Compile and install mg3100 stuff
+  # ppd file
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/ppd
+  ./autogen.sh --prefix=/usr --enable-ppdpath=/usr/share/cups/model --program-suffix=mg3100
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # cnijfilter
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/cnijfilter
+  autoreconf -i
+  ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib --enable-binpath=/usr/bin --program-suffix=mg3100
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # printui
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/printui
+  ./autogen.sh --prefix=/usr --datadir=/usr/share --program-suffix=mg3100
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # lgmon
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/lgmon
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --program-suffix=mg3100
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # cngpijmon
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin --datadir=/usr/share --program-suffix=mg3100
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+  
+  ## Compile and install common stuff
+  # libs
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/libs
+  ./autogen.sh --prefix=/usr
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # cngpij
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpij
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # pstocanonij
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/pstocanonij
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # backend
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/backend
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # backendnet
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/backendnet
+  ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/${libdir}"
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # sm sub process
+  cd ${srcdir}/cnijfilter-source-${_pkgver}/cngpijmon/cnijnpr
+  ./autogen.sh --prefix=/usr LDFLAGS="-ldl"
+  make clean
+  make
+  make DESTDIR=${pkgdir} install
+
+  # Install mg3100 libraries
+  install -d ${pkgdir}/usr/lib/
+  install -m 755 ${srcdir}/cnijfilter-source-${_pkgver}/387/${libdir}/*so.* ${pkgdir}/usr/lib/
+  install -d ${pkgdir}/usr/lib/bjlib/
+  install -m 644 ${srcdir}/cnijfilter-source-${_pkgver}/387/database/* ${pkgdir}/usr/lib/bjlib/
+
+  # Install common libraries
+  install -m 755 ${srcdir}/cnijfilter-source-${_pkgver}/com/${libdir}/*so.* ${pkgdir}/usr/lib/
+  install -m 666 ${srcdir}/cnijfilter-source-${_pkgver}/com/ini/* ${pkgdir}/usr/lib/bjlib/
+
+  # Make symbolic links for libraries
+  cd ${pkgdir}/usr/lib/
+  ln -s libcnnet.so.1.2.2 libcnnet.so
+  ln -s libcnbpcmcm387.so.8.10.1 libcnbpcmcm387.so
+  ln -s libcnbpcnclapi387.so.3.6.1 libcnbpcnclapi387.so
+  ln -s libcnbpcnclbjcmd387.so.3.3.0 libcnbpcnclbjcmd387.so
+  ln -s libcnbpcnclui387.so.3.6.1 libcnbpcnclui387.so
+  ln -s libcnbpess387.so.4.1.3 libcnbpess387.so
+  ln -s libcnbpo387.so.1.0.2 libcnbpo387.so
+
+  # Install license file
+  cd ${srcdir}/cnijfilter-source-${_pkgver}
+  install -D LICENSE-cnijfilter-${pkgver}EN.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-cnijfilter-${pkgver}EN.txt
+}
+md5sums=('70e412331a21f4b573b4e901c89cee18'
+         '5f4b3523f6542f0a90886e7e6264f19a'
+         'e406c2629159b9608c4552a5343471f0'
+         'e228560529d46e1f03617ba7bc9aa657'
+         '0eb3e6f17c090b07490f4a5d01de49da')
diff --git a/build-fixes.patch b/build-fixes.patch
new file mode 100644
index 000000000000..0435cf2f7be0
--- /dev/null
+++ b/build-fixes.patch
@@ -0,0 +1,154 @@
+--- cnijfilter-source-3.60-1/backend/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/backend/configure.in	2013-04-10 22:18:48.924841978 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(src/cnij_backend_common.c)
+ AM_INIT_AUTOMAKE(backend, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.60-1/backendnet/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/backendnet/configure.in	2013-04-10 22:18:38.547941017 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(backend/cnijnetlm.c)
+ AM_INIT_AUTOMAKE(backendnet, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.60-1/cngpij/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpij/configure.in	2013-04-10 22:19:32.479158480 +0200
+@@ -1,8 +1,6 @@
+ AC_INIT(cngpij/bjcups.c)
+ AM_INIT_AUTOMAKE(cngpij, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
+-
+ AC_ARG_ENABLE(progpath)
+ if test "${enable_progpath}" = "" ; then
+    enable_progpath="${ac_default_prefix}/bin"
+--- cnijfilter-source-3.60-1/cngpijmon/cnijnpr/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/cnijnpr/config.h.in	2013-04-10 22:21:59.625810894 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/cngpijmon/cnijnpr/configure.in	2011-03-01 06:52:18.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/cnijnpr/configure.in	2013-04-10 22:28:07.344088947 +0200
+@@ -1,7 +1,7 @@
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(cnijnpr, 3.60-1)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ 
+ AC_ARG_ENABLE(libpath)
+--- cnijfilter-source-3.60-1/cngpijmon/configure.in	2011-03-01 06:52:18.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/configure.in	2013-04-10 22:29:26.062524835 +0200
+@@ -18,11 +18,10 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cngpijmon${program_suffix}, 3.60-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.60-1/cngpijmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/src/config.h.in	2013-04-10 22:30:19.813732349 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/cnijfilter/configure.in	2011-03-29 12:49:28.000000000 +0200
++++ cnijfilter-source-3.60-1.new/cnijfilter/configure.in	2013-04-10 22:32:13.622954256 +0200
+@@ -25,7 +25,7 @@
+ 
+ 
+ AM_INIT_AUTOMAKE(cif${program_suffix}, 3.60-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.60-1/lgmon/configure.in	2011-03-01 06:43:25.000000000 +0100
++++ cnijfilter-source-3.60-1.new/lgmon/configure.in	2013-04-10 22:33:52.585174559 +0200
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(lgmon{program_suffix}, 3.60-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.60-1/lgmon/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/lgmon/src/config.h.in	2013-04-10 22:34:24.545891318 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/libs/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/libs/configure.in	2013-04-10 22:36:09.078234543 +0200
+@@ -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.60-1/printui/configure.in	2011-02-15 10:10:31.000000000 +0100
++++ cnijfilter-source-3.60-1.new/printui/configure.in	2013-04-10 22:37:23.159894236 +0200
+@@ -9,7 +9,7 @@
+ fi
+ 
+ AM_INIT_AUTOMAKE(printui${program_suffix}, 3.60-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.60-1/printui/src/config.h.in	1970-01-01 01:00:00.000000000 +0100
++++ cnijfilter-source-3.60-1.new/printui/src/config.h.in	2013-04-10 22:38:03.497464283 +0200
+@@ -0,0 +1 @@
++/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+--- cnijfilter-source-3.60-1/pstocanonij/configure.in	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/pstocanonij/configure.in	2013-04-10 22:38:55.801968666 +0200
+@@ -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-mg3100.install b/cnijfilter-mg3100.install
new file mode 100644
index 000000000000..a684cda2fd7a
--- /dev/null
+++ b/cnijfilter-mg3100.install
@@ -0,0 +1,15 @@
+post_install() {
+	if [ -x /sbin/ldconfig ]; then
+		/sbin/ldconfig
+	fi
+}
+post_upgrade() {
+	if [ -x /sbin/ldconfig ]; then
+                /sbin/ldconfig
+        fi
+}
+post_remove() {
+        if [ -x /sbin/ldconfig ]; then
+                /sbin/ldconfig
+        fi
+}
diff --git a/cups.patch b/cups.patch
new file mode 100644
index 000000000000..0087adf0c294
--- /dev/null
+++ b/cups.patch
@@ -0,0 +1,36 @@
+diff -aur cnijfilter-source-3.60-1/backend/src/cnij_backend_common.c cnijfilter-source-3.60-1.new/backend/src/cnij_backend_common.c
+--- cnijfilter-source-3.60-1/backend/src/cnij_backend_common.c	2011-02-14 08:27:08.000000000 +0100
++++ cnijfilter-source-3.60-1.new/backend/src/cnij_backend_common.c	2012-09-30 23:52:06.206881717 +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.60-1/cngpij/cngpij/bjcups.c cnijfilter-source-3.60-1.new/cngpij/cngpij/bjcups.c
+--- cnijfilter-source-3.60-1/cngpij/cngpij/bjcups.c	2011-03-22 10:57:29.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpij/cngpij/bjcups.c	2012-09-30 23:54:44.102915510 +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.60-1/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.60-1.new/cngpijmon/src/bjcupsmon_cups.c
+--- cnijfilter-source-3.60-1/cngpijmon/src/bjcupsmon_cups.c	2011-03-01 06:52:18.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cngpijmon/src/bjcupsmon_cups.c	2012-09-30 23:47:04.334402618 +0200
+@@ -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..cfebdd074aad
--- /dev/null
+++ b/id.po.patch
@@ -0,0 +1,13 @@
+--- cnijfilter-source-3.60-1/printui/po/id.po	2011-05-31 02:57:34.000000000 +0200
++++ cnijfilter-source-3.60-1.new/printui/po/id.po	2013-04-10 22:02:28.789284020 +0200
+@@ -1447,8 +1447,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:342
diff --git a/libpng15.patch b/libpng15.patch
new file mode 100644
index 000000000000..8f1060aa52d5
--- /dev/null
+++ b/libpng15.patch
@@ -0,0 +1,23 @@
+diff -aur cnijfilter-source-3.60-1/cnijfilter/src/bjfimage.c cnijfilter-source-3.60-1.new/cnijfilter/src/bjfimage.c
+--- cnijfilter-source-3.60-1/cnijfilter/src/bjfimage.c	2009-03-26 06:11:05.000000000 +0100
++++ cnijfilter-source-3.60-1.new/cnijfilter/src/bjfimage.c	2012-02-10 09:33:52.512334139 +0100
+@@ -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;
\ No newline at end of file