Loading cnijfilter-mx880/PKGBUILD +63 Changes for cnijfilter-mx880/PKGBUILD: 63 added lines, 0 removed lines. Original line number Diff line number Diff line # Maintainer: Sébastien Luttringer pkgname=cnijfilter-mx880 pkgver=3.50_1 pkgrel=1 pkgdesc='Canon IJ Printer Driver for Pixma MX885' arch=('i686' 'x86_64') url='http://software.canon-europe.com/software/0040869.asp' license=('custom') depends=('libglade' 'cups' 'ghostscript' 'popt') source=("http://files.canon-europe.com/files/soft40869/software/cnijfilter-source-${pkgver//_/-}.tar.gz" 'cups.patch' 'id.po.patch' 'png.patch') md5sums=('a900a47246c3d17d1ed5ed801ee29787' 'f0b3e72bbf0b0426aa31f52eac755f49' '8440dbf3edd142e746d0b3043d6307b2' 'da5fcef8eef444ea1d049bc75323611a') prepare() { patch -Np0 -i cups.patch patch -Np0 -i id.po.patch patch -Np0 -i png.patch } build() { cd cnijfilter-source-${pkgver//_/-} for _d in backend libs pstocanonij cngpij ppd cnijfilter printui lgmon cngpijmon; do msg2 "$_d" pushd "$_d" ./autogen.sh \ --prefix=/usr \ --program-suffix=mx880 \ --enable-progpath=/usr/bin \ --enable-binpath=/usr/bin \ --enable-libpath=/usr/lib/bjlib \ --datadir=/usr/share make popd done } package() { cd cnijfilter-source-${pkgver//_/-} for _d in backend libs pstocanonij cngpij ppd cnijfilter printui lgmon cngpijmon; do msg2 "$_d" pushd "$_d" make install DESTDIR="$pkgdir" popd done install -Dm644 LICENSE-cnijfilter-${pkgver%_*}EN.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" ln -s pstocanonijmx880 "$pkgdir/usr/lib/cups/filter/pstocanonij" install -dm755 "$pkgdir/usr/lib/bjlib" install -m 755 383/database/* "$pkgdir/usr/lib/bjlib" case $CARCH in i686) install -m 755 383/libs_bin32/*.so.* "$pkgdir/usr/lib";; x86_64) install -m 755 383/libs_bin64/*.so.* "$pkgdir/usr/lib";; esac } # vim:set ts=2 sw=2 et: cnijfilter-mx880/cups.patch +36 Changes for cnijfilter-mx880/cups.patch: 36 added lines, 0 removed lines. Original line number Diff line number Diff line diff -ur cnijfilter-source-3.50-1/backend/src/cnij_backend_common.c cnijfilter-source-3.50-1_patched/backend/src/cnij_backend_common.c --- cnijfilter-source-3.50-1/backend/src/cnij_backend_common.c 2010-08-30 03:04:39.000000000 +0200 +++ cnijfilter-source-3.50-1_patched/backend/src/cnij_backend_common.c 2012-09-02 13:30:26.520357899 +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 -ur cnijfilter-source-3.50-1/cngpij/cngpij/bjcups.c cnijfilter-source-3.50-1_patched/cngpij/cngpij/bjcups.c --- cnijfilter-source-3.50-1/cngpij/cngpij/bjcups.c 2010-10-12 08:36:19.000000000 +0200 +++ cnijfilter-source-3.50-1_patched/cngpij/cngpij/bjcups.c 2012-09-02 13:52:42.310349005 +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 -ur cnijfilter-source-3.50-1/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.50-1_patched/cngpijmon/src/bjcupsmon_cups.c --- cnijfilter-source-3.50-1/cngpijmon/src/bjcupsmon_cups.c 2012-09-02 14:40:56.953663063 +0200 +++ cnijfilter-source-3.50-1_patched/cngpijmon/src/bjcupsmon_cups.c 2012-09-02 14:40:37.653663194 +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> cnijfilter-mx880/id.po.patch +13 Changes for cnijfilter-mx880/id.po.patch: 13 added lines, 0 removed lines. Original line number Diff line number Diff line --- cnijfilter-source-3.50-1/printui/po/id.po 2011-01-14 06:44:07.000000000 +0100 +++ cnijfilter-source-3.50-1/printui/po/id.po_patched 2012-09-02 14:18:26.257005393 +0200 @@ -1389,8 +1389,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:324 cnijfilter-mx880/png.patch +11 Changes for cnijfilter-mx880/png.patch: 11 added lines, 0 removed lines. Original line number Diff line number Diff line --- cnijfilter-source-3.50-1/cnijfilter/src/bjfimage.c 2010-10-12 05:09:22.000000000 +0200 +++ cnijfilter-source-3.50-1/cnijfilter/src/bjfimage.c_patched 2012-09-02 14:34:01.886999162 +0200 @@ -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; Loading
cnijfilter-mx880/PKGBUILD +63 Changes for cnijfilter-mx880/PKGBUILD: 63 added lines, 0 removed lines. Original line number Diff line number Diff line # Maintainer: Sébastien Luttringer pkgname=cnijfilter-mx880 pkgver=3.50_1 pkgrel=1 pkgdesc='Canon IJ Printer Driver for Pixma MX885' arch=('i686' 'x86_64') url='http://software.canon-europe.com/software/0040869.asp' license=('custom') depends=('libglade' 'cups' 'ghostscript' 'popt') source=("http://files.canon-europe.com/files/soft40869/software/cnijfilter-source-${pkgver//_/-}.tar.gz" 'cups.patch' 'id.po.patch' 'png.patch') md5sums=('a900a47246c3d17d1ed5ed801ee29787' 'f0b3e72bbf0b0426aa31f52eac755f49' '8440dbf3edd142e746d0b3043d6307b2' 'da5fcef8eef444ea1d049bc75323611a') prepare() { patch -Np0 -i cups.patch patch -Np0 -i id.po.patch patch -Np0 -i png.patch } build() { cd cnijfilter-source-${pkgver//_/-} for _d in backend libs pstocanonij cngpij ppd cnijfilter printui lgmon cngpijmon; do msg2 "$_d" pushd "$_d" ./autogen.sh \ --prefix=/usr \ --program-suffix=mx880 \ --enable-progpath=/usr/bin \ --enable-binpath=/usr/bin \ --enable-libpath=/usr/lib/bjlib \ --datadir=/usr/share make popd done } package() { cd cnijfilter-source-${pkgver//_/-} for _d in backend libs pstocanonij cngpij ppd cnijfilter printui lgmon cngpijmon; do msg2 "$_d" pushd "$_d" make install DESTDIR="$pkgdir" popd done install -Dm644 LICENSE-cnijfilter-${pkgver%_*}EN.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" ln -s pstocanonijmx880 "$pkgdir/usr/lib/cups/filter/pstocanonij" install -dm755 "$pkgdir/usr/lib/bjlib" install -m 755 383/database/* "$pkgdir/usr/lib/bjlib" case $CARCH in i686) install -m 755 383/libs_bin32/*.so.* "$pkgdir/usr/lib";; x86_64) install -m 755 383/libs_bin64/*.so.* "$pkgdir/usr/lib";; esac } # vim:set ts=2 sw=2 et:
cnijfilter-mx880/cups.patch +36 Changes for cnijfilter-mx880/cups.patch: 36 added lines, 0 removed lines. Original line number Diff line number Diff line diff -ur cnijfilter-source-3.50-1/backend/src/cnij_backend_common.c cnijfilter-source-3.50-1_patched/backend/src/cnij_backend_common.c --- cnijfilter-source-3.50-1/backend/src/cnij_backend_common.c 2010-08-30 03:04:39.000000000 +0200 +++ cnijfilter-source-3.50-1_patched/backend/src/cnij_backend_common.c 2012-09-02 13:30:26.520357899 +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 -ur cnijfilter-source-3.50-1/cngpij/cngpij/bjcups.c cnijfilter-source-3.50-1_patched/cngpij/cngpij/bjcups.c --- cnijfilter-source-3.50-1/cngpij/cngpij/bjcups.c 2010-10-12 08:36:19.000000000 +0200 +++ cnijfilter-source-3.50-1_patched/cngpij/cngpij/bjcups.c 2012-09-02 13:52:42.310349005 +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 -ur cnijfilter-source-3.50-1/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.50-1_patched/cngpijmon/src/bjcupsmon_cups.c --- cnijfilter-source-3.50-1/cngpijmon/src/bjcupsmon_cups.c 2012-09-02 14:40:56.953663063 +0200 +++ cnijfilter-source-3.50-1_patched/cngpijmon/src/bjcupsmon_cups.c 2012-09-02 14:40:37.653663194 +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>
cnijfilter-mx880/id.po.patch +13 Changes for cnijfilter-mx880/id.po.patch: 13 added lines, 0 removed lines. Original line number Diff line number Diff line --- cnijfilter-source-3.50-1/printui/po/id.po 2011-01-14 06:44:07.000000000 +0100 +++ cnijfilter-source-3.50-1/printui/po/id.po_patched 2012-09-02 14:18:26.257005393 +0200 @@ -1389,8 +1389,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:324
cnijfilter-mx880/png.patch +11 Changes for cnijfilter-mx880/png.patch: 11 added lines, 0 removed lines. Original line number Diff line number Diff line --- cnijfilter-source-3.50-1/cnijfilter/src/bjfimage.c 2010-10-12 05:09:22.000000000 +0200 +++ cnijfilter-source-3.50-1/cnijfilter/src/bjfimage.c_patched 2012-09-02 14:34:01.886999162 +0200 @@ -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;