Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/inkscape: inkscape-0.48.4-r1.ebuild inkscape-0.48.4.ebuild ChangeLog
Date: Sat, 24 May 2014 00:07:20
Message-Id: 20140524000716.4D4672004E@flycatcher.gentoo.org
1 dilfridge 14/05/24 00:07:16
2
3 Modified: inkscape-0.48.4-r1.ebuild inkscape-0.48.4.ebuild
4 ChangeLog
5 Log:
6 Fix build with poppler-0.26, bug 509280
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
9
10 Revision Changes Path
11 1.11 media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild?rev=1.11&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild?rev=1.11&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild?r1=1.10&r2=1.11
16
17 Index: inkscape-0.48.4-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v
20 retrieving revision 1.10
21 retrieving revision 1.11
22 diff -u -r1.10 -r1.11
23 --- inkscape-0.48.4-r1.ebuild 5 Mar 2014 11:26:30 -0000 1.10
24 +++ inkscape-0.48.4-r1.ebuild 24 May 2014 00:07:15 -0000 1.11
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.10 2014/03/05 11:26:30 nimiux Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.11 2014/05/24 00:07:15 dilfridge Exp $
30
31 EAPI=5
32
33 @@ -86,7 +86,8 @@
34 "${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
35 "${FILESDIR}"/${P}-gc74-configure.patch \
36 "${FILESDIR}"/${P}-gc74.patch \
37 - "${DISTDIR}"/${P}-freetype251.patch
38 + "${DISTDIR}"/${P}-freetype251.patch \
39 + "${FILESDIR}"/${P}-poppler26.patch
40
41 sed -i \
42 -e "s#@EPYTHON@#${EPYTHON}#" \
43
44
45
46 1.9 media-gfx/inkscape/inkscape-0.48.4.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild?rev=1.9&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild?rev=1.9&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild?r1=1.8&r2=1.9
51
52 Index: inkscape-0.48.4.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v
55 retrieving revision 1.8
56 retrieving revision 1.9
57 diff -u -r1.8 -r1.9
58 --- inkscape-0.48.4.ebuild 22 Sep 2013 10:30:03 -0000 1.8
59 +++ inkscape-0.48.4.ebuild 24 May 2014 00:07:15 -0000 1.9
60 @@ -1,6 +1,6 @@
61 -# Copyright 1999-2013 Gentoo Foundation
62 +# Copyright 1999-2014 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.8 2013/09/22 10:30:03 dilfridge Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.9 2014/05/24 00:07:15 dilfridge Exp $
66
67 EAPI=5
68
69 @@ -79,7 +79,8 @@
70 "${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
71 "${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
72 "${FILESDIR}"/${P}-python2.patch \
73 - "${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch
74 + "${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch \
75 + "${FILESDIR}"/${P}-poppler26.patch
76
77 eautoreconf
78
79
80
81
82 1.206 media-gfx/inkscape/ChangeLog
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/ChangeLog?rev=1.206&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/ChangeLog?rev=1.206&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/ChangeLog?r1=1.205&r2=1.206
87
88 Index: ChangeLog
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v
91 retrieving revision 1.205
92 retrieving revision 1.206
93 diff -u -r1.205 -r1.206
94 --- ChangeLog 5 Mar 2014 11:26:30 -0000 1.205
95 +++ ChangeLog 24 May 2014 00:07:16 -0000 1.206
96 @@ -1,6 +1,11 @@
97 # ChangeLog for media-gfx/inkscape
98 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
99 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.205 2014/03/05 11:26:30 nimiux Exp $
100 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.206 2014/05/24 00:07:16 dilfridge Exp $
101 +
102 + 24 May 2014; Andreas K. Huettel <dilfridge@g.o>
103 + inkscape-0.48.4.ebuild, inkscape-0.48.4-r1.ebuild,
104 + +files/inkscape-0.48.4-poppler26.patch:
105 + Fix build with poppler-0.26, bug 509280
106
107 05 Mar 2014; Chema Alonso <nimiux@g.o> inkscape-0.48.4-r1.ebuild:
108 Stable for amd64 wrt bug #492244