Update gutenprint 5.2.11-dev patch

This commit is contained in:
Solomon Peachy 2015-06-18 23:27:12 -04:00
parent 3e08415a81
commit b51beff824
1 changed files with 24 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.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
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
@@ -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,10 @@ diff -u -r1.180 print-olympus.c
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
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
@@ -146,6 +146,12 @@
<height value="432"/>
<unit value="english"/>
@ -46,7 +46,7 @@ diff -u -r1.18 papers.xml
<paper name="w360h504J">
<description translate="value" value="2L"/>
<width value="360"/>
@@ -214,6 +226,18 @@
@@ -214,6 +226,30 @@
<height value="576"/>
<unit value="english-extended"/>
</paper>
@ -56,16 +56,28 @@ diff -u -r1.18 papers.xml
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="2x6_x4">
+ <description translate="value" value="2x6*4"/>
+ <width value="432"/>
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="6x6_2x6">
+ <description translate="value" value="6x6+2x6"/>
+ <width value="432"/>
+ <height value="576"/>
+ <unit value="english-extended"/>
+ </paper>
+ <paper name="4x6_2x6">
+ <description translate="value" value="4x6+2x6"/>
+ <width value="432"/>
+ <height value="576"/>
+ <height value="432"/>
+ <unit value="english-extended"/>
+ </paper>
<paper name="w432h612">
<description translate="value" value="6x8.5"/>
<width value="432"/>
@@ -226,12 +250,42 @@
@@ -226,12 +262,42 @@
<height value="648"/>
<unit value="english-extended"/>
</paper>
@ -108,7 +120,7 @@ diff -u -r1.18 papers.xml
<paper name="c8x10J">
<description translate="value" value="Rokukire"/>
<comment value="Same size as 8x10"/>
@@ -287,6 +341,24 @@
@@ -287,6 +353,24 @@
<height value="864"/>
<unit value="english-extended"/>
</paper>