Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: webkit-gtk-1.6.1-r201.ebuild webkit-gtk-1.6.1-r300.ebuild webkit-gtk-1.6.1-r301.ebuild ChangeLog
Date: Tue, 29 Nov 2011 19:01:20
Message-Id: 20111129190102.C4FC02004B@flycatcher.gentoo.org
1 grobian 11/11/29 19:01:02
2
3 Modified: webkit-gtk-1.6.1-r201.ebuild
4 webkit-gtk-1.6.1-r300.ebuild
5 webkit-gtk-1.6.1-r301.ebuild ChangeLog
6 Log:
7 Fix darwin-quartz patch, drop darwin8 patch from ebuild, bug #392385
8
9 (Portage version: 2.2.01.19572-prefix/cvs/Darwin i386)
10
11 Revision Changes Path
12 1.2 net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild?r1=1.1&r2=1.2
17
18 Index: webkit-gtk-1.6.1-r201.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- webkit-gtk-1.6.1-r201.ebuild 29 Nov 2011 13:25:45 -0000 1.1
25 +++ webkit-gtk-1.6.1-r201.ebuild 29 Nov 2011 19:01:02 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2011 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.1 2011/11/29 13:25:45 pacho Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.2 2011/11/29 19:01:02 grobian Exp $
31
32 EAPI="4"
33
34 @@ -16,8 +16,7 @@
35
36 LICENSE="LGPL-2 LGPL-2.1 BSD"
37 SLOT="2"
38 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
39 -~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
40 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
41 # geoclue
42
43 IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
44 @@ -81,8 +80,7 @@
45
46 # intermediate MacPorts hack while upstream bug is not fixed properly
47 # https://bugs.webkit.org/show_bug.cgi?id=28727
48 - # TODO: FAILS TO APPLY!
49 - #use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
50 + use aqua && epatch "${FILESDIR}"/${P}-darwin-quartz.patch
51
52 # Skip tests phase: here we will place tests we need to skip, any
53 # skipped test needs to have an upstream report and needs to be
54
55
56
57 1.2 net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
58
59 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild?rev=1.2&view=markup
60 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild?rev=1.2&content-type=text/plain
61 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild?r1=1.1&r2=1.2
62
63 Index: webkit-gtk-1.6.1-r300.ebuild
64 ===================================================================
65 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild,v
66 retrieving revision 1.1
67 retrieving revision 1.2
68 diff -u -r1.1 -r1.2
69 --- webkit-gtk-1.6.1-r300.ebuild 30 Sep 2011 13:52:33 -0000 1.1
70 +++ webkit-gtk-1.6.1-r300.ebuild 29 Nov 2011 19:01:02 -0000 1.2
71 @@ -1,6 +1,6 @@
72 # Copyright 1999-2011 Gentoo Foundation
73 # Distributed under the terms of the GNU General Public License v2
74 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
75 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild,v 1.2 2011/11/29 19:01:02 grobian Exp $
76
77 EAPI="4"
78
79 @@ -70,14 +70,6 @@
80 # https://bugs.webkit.org/show_bug.cgi?id=19775
81 use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
82
83 - # intermediate MacPorts hack while upstream bug is not fixed properly
84 - # https://bugs.webkit.org/show_bug.cgi?id=28727
85 - use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
86 -
87 - # Fix build on Darwin8 (10.4 Tiger)
88 - # XXX: Fails to apply
89 - #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
90 -
91 # Don't force -O2
92 sed -i 's/-O2//g' "${S}"/configure.ac
93
94
95
96
97 1.2 net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild?rev=1.2&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild?rev=1.2&content-type=text/plain
101 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild?r1=1.1&r2=1.2
102
103 Index: webkit-gtk-1.6.1-r301.ebuild
104 ===================================================================
105 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v
106 retrieving revision 1.1
107 retrieving revision 1.2
108 diff -u -r1.1 -r1.2
109 --- webkit-gtk-1.6.1-r301.ebuild 29 Nov 2011 13:25:45 -0000 1.1
110 +++ webkit-gtk-1.6.1-r301.ebuild 29 Nov 2011 19:01:02 -0000 1.2
111 @@ -1,6 +1,6 @@
112 # Copyright 1999-2011 Gentoo Foundation
113 # Distributed under the terms of the GNU General Public License v2
114 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.1 2011/11/29 13:25:45 pacho Exp $
115 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.2 2011/11/29 19:01:02 grobian Exp $
116
117 EAPI="4"
118
119 @@ -16,8 +16,7 @@
120
121 LICENSE="LGPL-2 LGPL-2.1 BSD"
122 SLOT="3"
123 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
124 -~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
125 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
126 # geoclue
127 IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
128
129 @@ -83,8 +82,7 @@
130
131 # intermediate MacPorts hack while upstream bug is not fixed properly
132 # https://bugs.webkit.org/show_bug.cgi?id=28727
133 - # TODO: FAILS TO APPLY!
134 - #use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
135 + use aqua && epatch "${FILESDIR}"/${P}-darwin-quartz.patch
136
137 # Drop DEPRECATED flags
138 sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
139
140
141
142 1.132 net-libs/webkit-gtk/ChangeLog
143
144 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.132&view=markup
145 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.132&content-type=text/plain
146 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.131&r2=1.132
147
148 Index: ChangeLog
149 ===================================================================
150 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
151 retrieving revision 1.131
152 retrieving revision 1.132
153 diff -u -r1.131 -r1.132
154 --- ChangeLog 29 Nov 2011 13:25:45 -0000 1.131
155 +++ ChangeLog 29 Nov 2011 19:01:02 -0000 1.132
156 @@ -1,6 +1,12 @@
157 # ChangeLog for net-libs/webkit-gtk
158 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
159 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.131 2011/11/29 13:25:45 pacho Exp $
160 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.132 2011/11/29 19:01:02 grobian Exp $
161 +
162 + 29 Nov 2011; Fabian Groffen <grobian@g.o>
163 + +files/webkit-gtk-1.6.1-darwin-quartz.patch, webkit-gtk-1.6.1-r300.ebuild,
164 + webkit-gtk-1.6.1-r301.ebuild, webkit-gtk-1.6.1-r201.ebuild,
165 + files/webkit-gtk-1.2.5-darwin-quartz.patch:
166 + Fix darwin-quartz patch, drop darwin8 patch from ebuild, bug #392385
167
168 *webkit-gtk-1.6.1-r301 (29 Nov 2011)
169 *webkit-gtk-1.6.1-r201 (29 Nov 2011)