diff options
Diffstat (limited to 'fix.patch')
-rw-r--r-- | fix.patch | 144 |
1 files changed, 144 insertions, 0 deletions
diff --git a/fix.patch b/fix.patch new file mode 100644 index 000000000000..e0b20626a68c --- /dev/null +++ b/fix.patch @@ -0,0 +1,144 @@ +--- 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 |