Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: ChangeLog webkit-gtk-2.6.4.ebuild
Date: Wed, 31 Dec 2014 00:38:10
Message-Id: 20141231003804.747B1E86E@oystercatcher.gentoo.org
1 eva 14/12/31 00:38:04
2
3 Modified: ChangeLog webkit-gtk-2.6.4.ebuild
4 Log:
5 Drop gles2 & wayland support following up current upstream status, bug #533704. X useflag is now not an option anymore due to wayland being removed. Make gtk-doc optional in contradiction with teams policy because upstream did some hackery that does not use gtkdoc to manipulate gtk-doc (yay :/), bug #533622.
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)
8
9 Revision Changes Path
10 1.304 net-libs/webkit-gtk/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.304&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.304&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.303&r2=1.304
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
19 retrieving revision 1.303
20 retrieving revision 1.304
21 diff -u -r1.303 -r1.304
22 --- ChangeLog 22 Dec 2014 23:41:53 -0000 1.303
23 +++ ChangeLog 31 Dec 2014 00:38:04 -0000 1.304
24 @@ -1,6 +1,13 @@
25 # ChangeLog for net-libs/webkit-gtk
26 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.303 2014/12/22 23:41:53 eva Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.304 2014/12/31 00:38:04 eva Exp $
29 +
30 + 31 Dec 2014; Gilles Dartiguelongue <eva@g.o> webkit-gtk-2.6.4.ebuild:
31 + Drop gles2 & wayland support following up current upstream status, bug
32 + #533704. X useflag is now not an option anymore due to wayland being removed.
33 + Make gtk-doc optional in contradiction with teams policy because upstream did
34 + some hackery that does not use gtkdoc to manipulate gtk-doc (yay :/), bug
35 + #533622.
36
37 *webkit-gtk-2.6.4 (22 Dec 2014)
38
39
40
41
42 1.2 net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild?rev=1.2&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild?rev=1.2&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild?r1=1.1&r2=1.2
47
48 Index: webkit-gtk-2.6.4.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild,v
51 retrieving revision 1.1
52 retrieving revision 1.2
53 diff -u -r1.1 -r1.2
54 --- webkit-gtk-2.6.4.ebuild 22 Dec 2014 23:41:53 -0000 1.1
55 +++ webkit-gtk-2.6.4.ebuild 31 Dec 2014 00:38:04 -0000 1.2
56 @@ -1,6 +1,6 @@
57 # Copyright 1999-2014 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild,v 1.1 2014/12/22 23:41:53 eva Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild,v 1.2 2014/12/31 00:38:04 eva Exp $
61
62 EAPI="5"
63 GCONF_DEBUG="no"
64 @@ -16,16 +16,17 @@
65 LICENSE="LGPL-2+ BSD"
66 SLOT="4/37" # soname version of libwebkit2gtk-4.0
67 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
68 -IUSE="coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
69 +IUSE="coverage debug doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl"
70 +# gles2 wayland X
71 # bugs 372493, 416331
72 REQUIRED_USE="
73 geoloc? ( introspection )
74 introspection? ( gstreamer )
75 - gles2? ( egl )
76 - webgl? ( ^^ ( gles2 opengl ) )
77 - !webgl? ( ?? ( gles2 opengl ) )
78 - || ( wayland X )
79 "
80 +# gles2? ( egl )
81 +# webgl? ( ^^ ( gles2 opengl ) )
82 +# !webgl? ( ?? ( gles2 opengl ) )
83 +# || ( wayland X )
84
85 # use sqlite, svg by default
86 # Aqua support in gtk3 is untested
87 @@ -44,7 +45,7 @@
88 >=media-libs/freetype-2.4.2:2
89 >=net-libs/libsoup-2.42:2.4[introspection?]
90 >=x11-libs/cairo-1.10.2:=[X]
91 - >=x11-libs/gtk+-3.6.0:3[X?,introspection?]
92 + >=x11-libs/gtk+-3.6.0:3[X,introspection?]
93 dev-db/sqlite:3=
94 >=x11-libs/pango-1.30.0.0
95 x11-libs/libXrender
96 @@ -53,7 +54,6 @@
97
98 egl? ( media-libs/mesa[egl] )
99 geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
100 - gles2? ( media-libs/mesa[gles2] )
101 gstreamer? (
102 >=media-libs/gstreamer-1.2:1.0
103 >=media-libs/gst-plugins-base-1.2:1.0 )
104 @@ -61,12 +61,13 @@
105 libsecret? ( app-crypt/libsecret )
106 opengl? ( virtual/opengl )
107 spell? ( >=app-text/enchant-0.22:= )
108 - wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
109 webgl? (
110 x11-libs/cairo[opengl]
111 x11-libs/libXcomposite
112 x11-libs/libXdamage )
113 "
114 +# gles2? ( media-libs/mesa[gles2] )
115 +# wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
116
117 # paxctl needed for bug #407085
118 # Need real bison, not yacc
119 @@ -89,6 +90,7 @@
120 >=sys-devel/make-3.82-r4
121 virtual/pkgconfig
122
123 + doc? ( >=dev-util/gtk-doc-am-1.10 )
124 geoloc? ( dev-util/gdbus-codegen )
125 introspection? ( jit? ( sys-apps/paxctl ) )
126 test? (
127 @@ -174,8 +176,12 @@
128 # should somehow let user select between them?
129 #
130 # FTL_JIT requires llvm + libcxxabi
131 + # $(cmake-utils_use_enable wayland WAYLAND_TARGET)
132 + # $(cmake-utils_use_enable X X11_TARGET)
133 + # $(cmake-utils_use_find_package gles2 OpenGLES2)
134 local mycmakeargs=(
135 $(cmake-utils_use_enable test API_TESTS)
136 + $(cmake-utils_use_enable doc GTKDOC)
137 $(cmake-utils_use_enable geoloc GEOLOCATION)
138 $(cmake-utils_use_enable gstreamer VIDEO)
139 $(cmake-utils_use_enable gstreamer WEB_AUDIO)
140 @@ -183,13 +189,11 @@
141 $(cmake-utils_use_enable jit)
142 $(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
143 $(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
144 - $(cmake-utils_use_enable wayland WAYLANG_TARGET)
145 $(cmake-utils_use_enable webgl WEBGL)
146 - $(cmake-utils_use_enable X X11_TARGET)
147 $(cmake-utils_use_find_package egl EGL)
148 $(cmake-utils_use_find_package opengl OpenGL)
149 + -DENABLE_X11_TARGET=ON
150 -DPORT=GTK
151 - -DENABLE_GTKDOC=ON
152 -DENABLE_PLUGIN_PROCESS_GTK2=ON
153 ${ruby_interpreter}
154 )
Report Message
Find on MARC Find on Google Groups