summarylogtreecommitdiffstats
path: root/cups.patch
diff options
context:
space:
mode:
Diffstat (limited to 'cups.patch')
-rw-r--r--cups.patch33
1 files changed, 23 insertions, 10 deletions
diff --git a/cups.patch b/cups.patch
index 1480fc00e0f6..ffe2900faf0a 100644
--- a/cups.patch
+++ b/cups.patch
@@ -1,6 +1,6 @@
-diff -Nur cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c cnijfilter-source-3.20-1/backend/src/cnij_backend_common.c
---- cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c 2009-05-27 07:46:41.000000000 +0200
-+++ cnijfilter-source-3.20-1/backend/src/cnij_backend_common.c 2012-08-15 15:28:06.172143834 +0200
+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>
@@ -9,9 +9,9 @@ diff -Nur cnijfilter-source-3.20-1.orig/backend/src/cnij_backend_common.c cnijfi
// Header file for CANON
#include "cnij_backend_common.h"
-diff -Nur cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c
---- cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c 2009-06-11 06:10:32.000000000 +0200
-+++ cnijfilter-source-3.20-1/cngpij/cngpij/bjcups.c 2012-08-15 15:28:06.173143833 +0200
+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
@@ -20,10 +20,21 @@ diff -Nur cnijfilter-source-3.20-1.orig/cngpij/cngpij/bjcups.c cnijfilter-source
#include <cups/cups.h>
#include <cups/language.h>
#include <cups/ppd.h>
-diff -Nur cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_cups.c
---- cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c 2009-04-24 08:12:49.000000000 +0200
-+++ cnijfilter-source-3.20-1/cngpijmon/src/bjcupsmon_cups.c 2012-08-15 15:28:54.618141976 +0200
-@@ -18,8 +18,9 @@
+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 ***/
@@ -31,5 +42,7 @@ diff -Nur cnijfilter-source-3.20-1.orig/cngpijmon/src/bjcupsmon_cups.c cnijfilte
#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>