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

Gentoo Archives: gentoo-commits

From: "Davide Pesavento (pesa)" <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-qt/qtwebkit: metadata.xml qtwebkit-4.10.4.ebuild ChangeLog
Date: Thu, 23 Jul 2015 20:36:47
Message-Id: 20150723203644.95E9EBB@oystercatcher.gentoo.org
1 pesa 15/07/23 20:36:44
2
3 Modified: metadata.xml ChangeLog
4 Added: qtwebkit-4.10.4.ebuild
5 Log:
6 Import qtwebkit23-2.3.4 from qt overlay as qtwebkit-4.10.4 (version of the installed library). See bug 388207.
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
9
10 Revision Changes Path
11 1.11 dev-qt/qtwebkit/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.11&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?rev=1.11&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/metadata.xml?r1=1.10&r2=1.11
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/metadata.xml,v
20 retrieving revision 1.10
21 retrieving revision 1.11
22 diff -u -r1.10 -r1.11
23 --- metadata.xml 17 Jun 2015 15:24:04 -0000 1.10
24 +++ metadata.xml 23 Jul 2015 20:36:44 -0000 1.11
25 @@ -5,8 +5,8 @@
26 <use>
27 <flag name="exceptions">Add support for exceptions - like catching them
28 inside the event loop (recommended by upstream)</flag>
29 - <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
30 - <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
31 + <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
32 + <flag name="gstreamer010">Enable HTML5 audio/video support via legacy <pkg>media-libs/gstreamer:0.10</pkg></flag>
33 <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
34 <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
35 <flag name="qml">Build QML/QtQuick bindings</flag>
36
37
38
39 1.40 dev-qt/qtwebkit/ChangeLog
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.40&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?rev=1.40&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/ChangeLog?r1=1.39&r2=1.40
44
45 Index: ChangeLog
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v
48 retrieving revision 1.39
49 retrieving revision 1.40
50 diff -u -r1.39 -r1.40
51 --- ChangeLog 15 Jul 2015 01:37:03 -0000 1.39
52 +++ ChangeLog 23 Jul 2015 20:36:44 -0000 1.40
53 @@ -1,6 +1,14 @@
54 # ChangeLog for dev-qt/qtwebkit
55 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.39 2015/07/15 01:37:03 pesa Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.40 2015/07/23 20:36:44 pesa Exp $
58 +
59 +*qtwebkit-4.10.4 (23 Jul 2015)
60 +
61 + 23 Jul 2015; Davide Pesavento <pesa@g.o>
62 + +files/4.10.4-use-correct-icu-typedef.patch, +qtwebkit-4.10.4.ebuild,
63 + metadata.xml:
64 + Import qtwebkit23-2.3.4 from qt overlay as qtwebkit-4.10.4 (version of the
65 + installed library). See bug 388207.
66
67 15 Jul 2015; Davide Pesavento <pesa@g.o> qtwebkit-5.4.2.ebuild:
68 Disable rpath wrt bug 466216.
69
70
71
72 1.1 dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
73
74 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild?rev=1.1&view=markup
75 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild?rev=1.1&content-type=text/plain
76
77 Index: qtwebkit-4.10.4.ebuild
78 ===================================================================
79 # Copyright 1999-2015 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 # $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild,v 1.1 2015/07/23 20:36:44 pesa Exp $
82
83 EAPI=5
84 PYTHON_COMPAT=( python2_7 )
85 inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal
86
87 MY_PV=${PV/4.10/2.3}
88
89 DESCRIPTION="The WebKit module for the Qt toolkit"
90 HOMEPAGE="https://www.qt.io/ http://trac.webkit.org/wiki/QtWebKit"
91 SRC_URI="mirror://kde/stable/${PN}-2.3/${MY_PV}/src/${PN}-${MY_PV}.tar.gz"
92
93 LICENSE="|| ( LGPL-2.1 GPL-3 )"
94 SLOT="4"
95 KEYWORDS="~amd64"
96 IUSE="debug +gstreamer"
97
98 RDEPEND="
99 >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
100 dev-libs/libxml2:2[${MULTILIB_USEDEP}]
101 dev-libs/libxslt[${MULTILIB_USEDEP}]
102 >=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}]
103 >=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}]
104 >=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}]
105 >=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}]
106 >=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}]
107 >=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}]
108 >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
109 media-libs/libpng:0=[${MULTILIB_USEDEP}]
110 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
111 virtual/jpeg:0[${MULTILIB_USEDEP}]
112 virtual/libudev:=[${MULTILIB_USEDEP}]
113 >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
114 x11-libs/libX11[${MULTILIB_USEDEP}]
115 x11-libs/libXrender[${MULTILIB_USEDEP}]
116 gstreamer? (
117 dev-libs/glib:2[${MULTILIB_USEDEP}]
118 media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
119 media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
120 )
121 "
122 DEPEND="${RDEPEND}
123 ${PYTHON_DEPS}
124 dev-lang/perl
125 dev-lang/ruby
126 dev-util/gperf
127 sys-devel/bison
128 sys-devel/flex
129 virtual/perl-Digest-MD5
130 virtual/perl-File-Spec
131 virtual/perl-Getopt-Long
132 "
133
134 S=${WORKDIR}
135
136 PATCHES=(
137 "${FILESDIR}/${PV}-use-correct-icu-typedef.patch"
138 )
139
140 src_prepare() {
141 # examples cause a sandbox violation (bug 458222)
142 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
143
144 # respect CXXFLAGS
145 sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \
146 Source/WTF/WTF.pro \
147 Source/JavaScriptCore/Target.pri || die
148
149 # apply patches
150 [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
151 epatch_user
152 }
153
154 multilib_src_compile() {
155 local -x \
156 QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \
157 WEBKITOUTPUTDIR=${BUILD_DIR}
158
159 local myconf=(
160 "${S}"/Tools/Scripts/build-webkit
161 --qt
162 # tell the build system where to find the qmake binary for the current ABI
163 --qmake="$(qt4_get_bindir)"/qmake
164 --qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0"
165 --makeargs="${MAKEOPTS}"
166 --$(usex debug debug release)
167 --$(usex gstreamer video no-video)
168 # disable WebKit2 since it requires Qt5
169 --no-webkit2
170 # prevent automagic dependency on qt-mobility (bug 547350)
171 --no-geolocation
172 --no-device-orientation
173 --no-orientation-events
174 # copied from eqmake4
175 QMAKE_AR="'$(tc-getAR) cqs'"
176 QMAKE_CC="'$(tc-getCC)'"
177 QMAKE_CXX="'$(tc-getCXX)'"
178 QMAKE_LINK="'$(tc-getCXX)'"
179 QMAKE_LINK_C="'$(tc-getCC)'"
180 QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'"
181 QMAKE_RANLIB=
182 QMAKE_STRIP=
183 QMAKE_CFLAGS="'${CFLAGS}'"
184 QMAKE_CFLAGS_RELEASE=
185 QMAKE_CFLAGS_DEBUG=
186 QMAKE_CXXFLAGS="'${CXXFLAGS}'"
187 QMAKE_CXXFLAGS_RELEASE=
188 QMAKE_CXXFLAGS_DEBUG=
189 QMAKE_LFLAGS="'${LDFLAGS}'"
190 QMAKE_LFLAGS_RELEASE=
191 QMAKE_LFLAGS_DEBUG=
192 )
193 echo "${myconf[@]}"
194 "${myconf[@]}" || die
195 }
196
197 multilib_src_install() {
198 emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release)
199
200 # move pkgconfig file to the correct location
201 mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die
202 }
Report Message
Find on MARC Find on Google Groups