* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.0-r1.ebuild ChangeLog
@ 2012-03-07 15:02 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2012-03-07 15:02 UTC (permalink / raw
To: gentoo-commits
pesa 12/03/07 15:02:56
Modified: qt-webkit-4.8.0-r1.ebuild ChangeLog
Log:
Fix build with USE=gstreamer (bug 405701).
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?r1=1.1&r2=1.2
Index: qt-webkit-4.8.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-webkit-4.8.0-r1.ebuild 24 Feb 2012 19:02:42 -0000 1.1
+++ qt-webkit-4.8.0-r1.ebuild 7 Mar 2012 15:02:56 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.1 2012/02/24 19:02:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.2 2012/03/07 15:02:56 pesa Exp $
EAPI="3"
inherit qt4-build flag-o-matic toolchain-funcs
@@ -23,7 +23,9 @@
)"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-c++0x-fix.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-c++0x-fix.patch"
+)
pkg_setup() {
QT4_TARGET_DIRECTORIES="
@@ -55,10 +57,10 @@
src_configure() {
myconf+="
- -webkit -system-sqlite
+ -webkit
+ -system-sqlite
$(qt_use jit javascript-jit)
- -DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0)
- -DGST_DISABLE_DEPRECATED"
-
+ $(use gstreamer || echo -DENABLE_VIDEO=0)
+ "
qt4-build_src_configure
}
1.133 x11-libs/qt-webkit/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.132&r2=1.133
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- ChangeLog 24 Feb 2012 19:02:42 -0000 1.132
+++ ChangeLog 7 Mar 2012 15:02:56 -0000 1.133
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-webkit
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.132 2012/02/24 19:02:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.133 2012/03/07 15:02:56 pesa Exp $
+
+ 07 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild:
+ Fix build with USE=gstreamer (bug 405701).
*qt-webkit-4.8.0-r1 (24 Feb 2012)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.0-r1.ebuild ChangeLog
@ 2012-03-08 15:25 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2012-03-08 15:25 UTC (permalink / raw
To: gentoo-commits
pesa 12/03/08 15:25:07
Modified: qt-webkit-4.8.0-r1.ebuild ChangeLog
Log:
Forcefully enable text_breaking_with_icu to fix building with USE=gstreamer when dev-libs/libxml2[icu] is installed.
Fixes bug #407315 by Mark Nowiasz; thanks to Jouni Kosonen and Coacher for testing.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.3 x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?r1=1.2&r2=1.3
Index: qt-webkit-4.8.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-webkit-4.8.0-r1.ebuild 7 Mar 2012 15:02:56 -0000 1.2
+++ qt-webkit-4.8.0-r1.ebuild 8 Mar 2012 15:25:07 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.2 2012/03/07 15:02:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.3 2012/03/08 15:25:07 pesa Exp $
EAPI="3"
inherit qt4-build flag-o-matic toolchain-funcs
@@ -12,6 +12,7 @@
DEPEND="
dev-db/sqlite:3
+ dev-libs/icu
x11-libs/libXrender
~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
@@ -49,7 +50,11 @@
[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
use c++0x && append-cxxflags -fpermissive
- sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \
+ # Always enable icu to avoid build failure, bug 407315
+ sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
+ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
+
+ sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
src/3rdparty/webkit/Source/WebKit.pri || die
qt4-build_src_prepare
@@ -58,7 +63,7 @@
src_configure() {
myconf+="
-webkit
- -system-sqlite
+ -icu -system-sqlite
$(qt_use jit javascript-jit)
$(use gstreamer || echo -DENABLE_VIDEO=0)
"
1.134 x11-libs/qt-webkit/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.133&r2=1.134
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ChangeLog 7 Mar 2012 15:02:56 -0000 1.133
+++ ChangeLog 8 Mar 2012 15:25:07 -0000 1.134
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/qt-webkit
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.133 2012/03/07 15:02:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.134 2012/03/08 15:25:07 pesa Exp $
+
+ 08 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild:
+ Forcefully enable text_breaking_with_icu to fix building with USE=gstreamer
+ when dev-libs/libxml2[icu] is installed. Fixes bug #407315 by Mark Nowiasz;
+ thanks to Jouni Kosonen and Coacher for testing.
07 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild:
Fix build with USE=gstreamer (bug 405701).
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.0-r1.ebuild ChangeLog
@ 2012-03-08 15:34 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2012-03-08 15:34 UTC (permalink / raw
To: gentoo-commits
pesa 12/03/08 15:34:40
Modified: qt-webkit-4.8.0-r1.ebuild ChangeLog
Log:
No need to append -mminimal-toc for ppc64, it's already added by qt4-build.eclass.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.4 x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild?r1=1.3&r2=1.4
Index: qt-webkit-4.8.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-webkit-4.8.0-r1.ebuild 8 Mar 2012 15:25:07 -0000 1.3
+++ qt-webkit-4.8.0-r1.ebuild 8 Mar 2012 15:34:40 -0000 1.4
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.3 2012/03/08 15:25:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.0-r1.ebuild,v 1.4 2012/03/08 15:34:40 pesa Exp $
EAPI="3"
-inherit qt4-build flag-o-matic toolchain-funcs
+inherit qt4-build flag-o-matic
DESCRIPTION="The WebKit module for the Qt toolkit"
SLOT="4"
@@ -47,7 +47,6 @@
}
src_prepare() {
- [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
use c++0x && append-cxxflags -fpermissive
# Always enable icu to avoid build failure, bug 407315
1.135 x11-libs/qt-webkit/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.134&r2=1.135
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog 8 Mar 2012 15:25:07 -0000 1.134
+++ ChangeLog 8 Mar 2012 15:34:40 -0000 1.135
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt-webkit
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.134 2012/03/08 15:25:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.135 2012/03/08 15:34:40 pesa Exp $
+
+ 08 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild:
+ No need to append -mminimal-toc for ppc64, it's already added by
+ qt4-build.eclass.
08 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.0-r1.ebuild:
Forcefully enable text_breaking_with_icu to fix building with USE=gstreamer
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-08 15:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08 15:25 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.0-r1.ebuild ChangeLog Davide Pesavento (pesa)
-- strict thread matches above, loose matches on Subject: below --
2012-03-08 15:34 Davide Pesavento (pesa)
2012-03-07 15:02 Davide Pesavento (pesa)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox