From 6bc18eebdbf5195f21cb16173847ecce464a9ea7 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 29 Jan 2015 13:07:28 -0500 Subject: [PATCH] Add patches to enable multicut modes in Gutenprint. --- misc-patches/README | 9 ++ misc-patches/multicut-5.2.10.diff | 129 +++++++++++++++++++++++++ misc-patches/multicut-5.2.11dev.diff | 135 +++++++++++++++++++++++++++ 3 files changed, 273 insertions(+) create mode 100644 misc-patches/README create mode 100644 misc-patches/multicut-5.2.10.diff create mode 100644 misc-patches/multicut-5.2.11dev.diff diff --git a/misc-patches/README b/misc-patches/README new file mode 100644 index 0000000..766201b --- /dev/null +++ b/misc-patches/README @@ -0,0 +1,9 @@ +Here you will find patches against Gutenprint that enables multicut support +for every model that I'm aware of. + +This code is not mainlined, and isn't likely to be in its current state. + +If you are going to patch gutenprint and compile it yourself, I highly +recommend using the latest code out of CVS, available here: + + http://sourceforge.net/p/gimp-print/code/ diff --git a/misc-patches/multicut-5.2.10.diff b/misc-patches/multicut-5.2.10.diff new file mode 100644 index 0000000..94ad5e2 --- /dev/null +++ b/misc-patches/multicut-5.2.10.diff @@ -0,0 +1,129 @@ +Index: src/main/print-olympus.c +=================================================================== +RCS file: /cvsroot/gimp-print/print/src/main/print-olympus.c,v +retrieving revision 1.165 +diff -u -r1.165 print-olympus.c +--- src/main/print-olympus.c 7 May 2014 11:16:56 -0000 1.165 ++++ src/main/print-olympus.c 21 May 2014 01:48:31 -0000 +@@ -29,6 +29,7 @@ + * compile on generic platforms that don't support glib, gimp, gtk, etc. + */ + ++#define DNPX2 + /* #define DNPX2 */ + + #ifdef HAVE_CONFIG_H +Index: src/xml/papers.xml +=================================================================== +RCS file: /cvsroot/gimp-print/print/src/xml/papers.xml,v +retrieving revision 1.16 +diff -u -r1.16 papers.xml +--- src/xml/papers.xml 22 Jan 2014 13:52:41 -0000 1.16 ++++ src/xml/papers.xml 21 May 2014 01:48:31 -0000 +@@ -140,6 +140,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -178,6 +184,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -202,6 +214,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -214,12 +232,42 @@ + + + ++ ++ ++ ++ ++ ++ + + + + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -269,6 +317,24 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/misc-patches/multicut-5.2.11dev.diff b/misc-patches/multicut-5.2.11dev.diff new file mode 100644 index 0000000..9ef5cbc --- /dev/null +++ b/misc-patches/multicut-5.2.11dev.diff @@ -0,0 +1,135 @@ +Index: src/main/print-olympus.c +=================================================================== +RCS file: /cvsroot/gimp-print/print/src/main/print-olympus.c,v +retrieving revision 1.180 +diff -u -r1.180 print-olympus.c +--- src/main/print-olympus.c 10 Jan 2015 14:37:07 -0000 1.180 ++++ src/main/print-olympus.c 10 Jan 2015 14:39:10 -0000 +@@ -46,6 +46,7 @@ + it. Be warned that you will also need a patch to papers.xml to define + the additional paper types. */ + /* #define MULTICUT */ ++#define MULTICUT + + #define DYESUB_FEATURE_NONE 0x00000000 + #define DYESUB_FEATURE_FULL_WIDTH 0x00000001 +Index: src/xml/papers.xml +=================================================================== +RCS file: /cvsroot/gimp-print/print/src/xml/papers.xml,v +retrieving revision 1.18 +diff -u -r1.18 papers.xml +--- src/xml/papers.xml 20 Oct 2014 03:27:40 -0000 1.18 ++++ src/xml/papers.xml 10 Jan 2015 14:39:10 -0000 +@@ -146,6 +146,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -190,6 +196,12 @@ + + + ++ ++ ++ ++ ++ ++ + + + +@@ -214,6 +226,18 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -226,12 +250,42 @@ + + + ++ ++ ++ ++ ++ ++ + + + + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -287,6 +341,24 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +