Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/pixie/files/
Date: Mon, 02 Oct 2017 12:50:15
Message-Id: 1506948591.5d8af6d2771c41fd058200ce29237425da7923d0.dilfridge@gentoo
1 commit: 5d8af6d2771c41fd058200ce29237425da7923d0
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 2 12:49:30 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 2 12:49:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8af6d2
7
8 media-gfx/pixie: Make patches eapply-compatible
9
10 Package-Manager: Portage-2.3.10, Repoman-2.3.3
11
12 media-gfx/pixie/files/pixie-2.2.6-autotools.patch | 8 ++++----
13 media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch | 16 ++++++++--------
14 2 files changed, 12 insertions(+), 12 deletions(-)
15
16 diff --git a/media-gfx/pixie/files/pixie-2.2.6-autotools.patch b/media-gfx/pixie/files/pixie-2.2.6-autotools.patch
17 index d12de70a67c..7fd9f0ce76b 100644
18 --- a/media-gfx/pixie/files/pixie-2.2.6-autotools.patch
19 +++ b/media-gfx/pixie/files/pixie-2.2.6-autotools.patch
20 @@ -1,5 +1,5 @@
21 ---- src/ri/Makefile.in 2009-09-23 18:10:13.414866323 +0200
22 -+++ src/ri/Makefile.in 2009-09-23 18:11:15.629864395 +0200
23 +--- a/src/ri/Makefile.in 2009-09-23 18:10:13.414866323 +0200
24 ++++ b/src/ri/Makefile.in 2009-09-23 18:11:15.629864395 +0200
25 @@ -214,7 +214,7 @@
26 host_os = @host_os@
27 host_vendor = @host_vendor@
28 @@ -9,8 +9,8 @@
29 infodir = @infodir@
30 install_sh = @install_sh@
31 libdir = @libdir@
32 ---- src/sdr/Makefile.in 2009-09-23 18:14:54.194865868 +0200
33 -+++ src/sdr/Makefile.in 2009-09-23 18:15:18.297863856 +0200
34 +--- a/src/sdr/Makefile.in 2009-09-23 18:14:54.194865868 +0200
35 ++++ b/src/sdr/Makefile.in 2009-09-23 18:15:18.297863856 +0200
36 @@ -199,7 +199,7 @@
37 host_os = @host_os@
38 host_vendor = @host_vendor@
39
40 diff --git a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch b/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
41 index 6d022f02fdb..7e0afe3a7c2 100644
42 --- a/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
43 +++ b/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
44 @@ -1,7 +1,7 @@
45 http://bugs.gentoo.org/406899
46
47 ---- src/ri/rib.l
48 -+++ src/ri/rib.l
49 +--- a/src/ri/rib.l
50 ++++ b/src/ri/rib.l
51 @@ -17,7 +17,7 @@
52
53 // Overwrite the YYinput so that it uses libz
54 @@ -29,8 +29,8 @@ http://bugs.gentoo.org/406899
55 #else
56 fclose(ribin);
57 #endif
58 ---- src/ri/ribOut.cpp
59 -+++ src/ri/ribOut.cpp
60 +--- a/src/ri/ribOut.cpp
61 ++++ b/src/ri/ribOut.cpp
62 @@ -162,7 +162,7 @@
63
64 #ifdef HAVE_ZLIB
65 @@ -40,8 +40,8 @@ http://bugs.gentoo.org/406899
66 } else {
67 fclose(outFile);
68 }
69 ---- src/ri/ribOut.h
70 -+++ src/ri/ribOut.h
71 +--- a/src/ri/ribOut.h
72 ++++ b/src/ri/ribOut.h
73 @@ -237,7 +237,7 @@
74 const int l = vsprintf(scratch,mes,args);
75
76 @@ -60,8 +60,8 @@ http://bugs.gentoo.org/406899
77 else fwrite(scratch,1,l,outFile);
78 #else
79 fwrite(scratch,1,l,outFile);
80 ---- src/ri/rib.y
81 -+++ src/ri/rib.y
82 +--- a/src/ri/rib.y
83 ++++ b/src/ri/rib.y
84 @@ -2940,7 +2940,7 @@
85
86 if (ribin != NULL) {