Update gutenprint patch.

master
Solomon Peachy 2015-06-22 19:04:31 -04:00
parent a2bd3946d1
commit e67628389e
1 changed files with 27 additions and 12 deletions

View File

@ -1,10 +1,10 @@
Index: src/main/print-olympus.c
===================================================================
RCS file: /cvsroot/gimp-print/print/src/main/print-olympus.c,v
retrieving revision 1.189
diff -u -r1.189 print-olympus.c
--- src/main/print-olympus.c 19 Jun 2015 03:24:45 -0000 1.189
+++ src/main/print-olympus.c 19 Jun 2015 03:25:12 -0000
retrieving revision 1.192
diff -u -r1.192 print-olympus.c
--- src/main/print-olympus.c 22 Jun 2015 23:02:43 -0000 1.192
+++ src/main/print-olympus.c 22 Jun 2015 23:04:08 -0000
@@ -46,6 +46,7 @@
it. Be warned that you will also need a patch to papers.xml to define
the additional paper types. */
@ -16,10 +16,19 @@ diff -u -r1.189 print-olympus.c
Index: src/xml/papers.xml
===================================================================
RCS file: /cvsroot/gimp-print/print/src/xml/papers.xml,v
retrieving revision 1.19
diff -u -r1.19 papers.xml
--- src/xml/papers.xml 5 May 2015 02:13:15 -0000 1.19
+++ src/xml/papers.xml 19 Jun 2015 03:25:12 -0000
retrieving revision 1.20
diff -u -r1.20 papers.xml
--- src/xml/papers.xml 22 Jun 2015 23:02:44 -0000 1.20
+++ src/xml/papers.xml 22 Jun 2015 23:04:08 -0000
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- "$Id: papers.xml,v 1.20 2015/06/22 23:02:44 speachy Exp $"
+ "$Id: papers.xml,v 1.19 2015/05/05 02:13:15 rlk Exp $"
XML description of papers known to libgutenprint.
You can add additional paper sizes here.
@@ -146,6 +146,12 @@
<height value="432"/>
<unit value="english"/>
@ -33,7 +42,7 @@ diff -u -r1.19 papers.xml
<paper name="w288h432J">
<description translate="value" value="KG"/>
<width value="288"/>
@@ -190,6 +196,12 @@
@@ -196,6 +202,12 @@
<height value="504"/>
<unit value="english-extended"/>
</paper>
@ -46,7 +55,7 @@ diff -u -r1.19 papers.xml
<paper name="w360h504J">
<description translate="value" value="2L"/>
<width value="360"/>
@@ -214,6 +226,30 @@
@@ -220,6 +232,30 @@
<height value="576"/>
<unit value="english-extended"/>
</paper>
@ -77,10 +86,16 @@ diff -u -r1.19 papers.xml
<paper name="w432h612">
<description translate="value" value="6x8.5"/>
<width value="432"/>
@@ -226,12 +262,42 @@
@@ -232,12 +268,48 @@
<height value="648"/>
<unit value="english-extended"/>
</paper>
+ <paper name="w324h432_x2">
+ <description translate="value" value="4.5x6*2"/>
+ <width value="432"/>
+ <height value="648"/>
+ <unit value="english"/>
+ </paper>
+ <paper name="8x4_x2">
+ <description translate="value" value="8x4*2"/>
+ <width value="576"/>
@ -120,7 +135,7 @@ diff -u -r1.19 papers.xml
<paper name="c8x10J">
<description translate="value" value="Rokukire"/>
<comment value="Same size as 8x10"/>
@@ -287,6 +353,24 @@
@@ -293,6 +365,24 @@
<height value="864"/>
<unit value="english-extended"/>
</paper>