* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.3.ebuild ChangeLog
@ 2012-09-14 8:31 Ben de Groot (yngwin)
0 siblings, 0 replies; 3+ messages in thread
From: Ben de Groot (yngwin) @ 2012-09-14 8:31 UTC (permalink / raw
To: gentoo-commits
yngwin 12/09/14 08:31:58
Modified: ChangeLog
Added: qt-webkit-4.8.3.ebuild
Log:
Version bump. Drop qatomic-x32 patch applied upstream. Drop qpa useflag.
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Revision Changes Path
1.167 x11-libs/qt-webkit/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.166&r2=1.167
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog 30 Jul 2012 05:20:09 -0000 1.166
+++ ChangeLog 14 Sep 2012 08:31:58 -0000 1.167
@@ -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.166 2012/07/30 05:20:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.167 2012/09/14 08:31:58 yngwin Exp $
+
+*qt-webkit-4.8.3 (14 Sep 2012)
+
+ 14 Sep 2012; Ben de Groot <yngwin@gentoo.org> +qt-webkit-4.8.3.ebuild:
+ Version bump. Drop qatomic-x32 patch applied upstream. Drop qpa useflag.
30 Jul 2012; Davide Pesavento <pesa@gentoo.org>
+files/4.8.2-javascriptcore-x32.patch, qt-webkit-4.8.2.ebuild:
1.1 x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild?rev=1.1&content-type=text/plain
Index: qt-webkit-4.8.3.ebuild
===================================================================
# 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.3.ebuild,v 1.1 2012/09/14 08:31:58 yngwin Exp $
EAPI=4
inherit qt4-build flag-o-matic
DESCRIPTION="The WebKit module for the Qt toolkit"
SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+gstreamer icu +jit"
# libxml2[!icu?] is needed for bugs 407315 and 411091
DEPEND="
dev-db/sqlite:3
x11-libs/libX11
x11-libs/libXrender
~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
~x11-libs/qt-gui-${PV}[aqua=,debug=]
~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
gstreamer? (
dev-libs/glib:2
dev-libs/libxml2:2[!icu?]
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10
)
icu? ( dev-libs/icu )
"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
"${FILESDIR}/${PN}-4.8.1+glib-2.31.patch"
"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
"${FILESDIR}/${PV}-javascriptcore-x32.patch"
)
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/3rdparty/webkit/Source/JavaScriptCore
src/3rdparty/webkit/Source/WebCore
src/3rdparty/webkit/Source/WebKit/qt
tools/designer/src/plugins/qwebview"
QT4_EXTRACT_DIRECTORIES="
include
src
tools"
QCONFIG_ADD="webkit"
QCONFIG_DEFINE="QT_WEBKIT"
qt4-build_pkg_setup
}
src_prepare() {
use c++0x && append-cxxflags -fpermissive
# Fix version number in generated pkgconfig file, bug 406443
sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
# Remove -Werror from CXXFLAGS
sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
src/3rdparty/webkit/Source/WebKit.pri || die
if use icu; then
sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
fi
qt4-build_src_prepare
}
src_configure() {
myconf+="
-webkit
-system-sqlite
$(qt_use icu)
$(qt_use jit javascript-jit)
$(use gstreamer || echo -DENABLE_VIDEO=0)"
qt4-build_src_configure
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.3.ebuild ChangeLog
@ 2012-09-14 12:11 Ben de Groot (yngwin)
0 siblings, 0 replies; 3+ messages in thread
From: Ben de Groot (yngwin) @ 2012-09-14 12:11 UTC (permalink / raw
To: gentoo-commits
yngwin 12/09/14 12:11:45
Modified: qt-webkit-4.8.3.ebuild ChangeLog
Log:
Fix patches
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.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.3.ebuild?r1=1.1&r2=1.2
Index: qt-webkit-4.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-webkit-4.8.3.ebuild 14 Sep 2012 08:31:58 -0000 1.1
+++ qt-webkit-4.8.3.ebuild 14 Sep 2012 12:11:45 -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.3.ebuild,v 1.1 2012/09/14 08:31:58 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild,v 1.2 2012/09/14 12:11:45 yngwin Exp $
EAPI=4
@@ -35,9 +35,9 @@
PATCHES=(
"${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
- "${FILESDIR}/${PN}-4.8.1+glib-2.31.patch"
+ "${FILESDIR}/${PN}-4.8.3+glib-2.31.patch"
"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
- "${FILESDIR}/${PV}-javascriptcore-x32.patch"
+ "${FILESDIR}/4.8.2-javascriptcore-x32.patch"
)
pkg_setup() {
1.168 x11-libs/qt-webkit/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.167&r2=1.168
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- ChangeLog 14 Sep 2012 08:31:58 -0000 1.167
+++ ChangeLog 14 Sep 2012 12:11:45 -0000 1.168
@@ -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.167 2012/09/14 08:31:58 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.168 2012/09/14 12:11:45 yngwin Exp $
+
+ 14 Sep 2012; Ben de Groot <yngwin@gentoo.org>
+ +files/qt-webkit-4.8.3+glib-2.31.patch, qt-webkit-4.8.3.ebuild:
+ Fix patches
*qt-webkit-4.8.3 (14 Sep 2012)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.3.ebuild ChangeLog
@ 2012-09-16 4:54 Ben de Groot (yngwin)
0 siblings, 0 replies; 3+ messages in thread
From: Ben de Groot (yngwin) @ 2012-09-16 4:54 UTC (permalink / raw
To: gentoo-commits
yngwin 12/09/16 04:54:09
Modified: qt-webkit-4.8.3.ebuild ChangeLog
Log:
Add overlay changes (c++0x useflag)
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
Revision Changes Path
1.3 x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.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.3.ebuild?r1=1.2&r2=1.3
Index: qt-webkit-4.8.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-webkit-4.8.3.ebuild 14 Sep 2012 12:11:45 -0000 1.2
+++ qt-webkit-4.8.3.ebuild 16 Sep 2012 04:54:09 -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.3.ebuild,v 1.2 2012/09/14 12:11:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.3.ebuild,v 1.3 2012/09/16 04:54:09 yngwin Exp $
EAPI=4
@@ -34,7 +34,6 @@
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
"${FILESDIR}/${PN}-4.8.3+glib-2.31.patch"
"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
@@ -59,8 +58,6 @@
}
src_prepare() {
- use c++0x && append-cxxflags -fpermissive
-
# Fix version number in generated pkgconfig file, bug 406443
sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
1.169 x11-libs/qt-webkit/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.168&r2=1.169
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- ChangeLog 14 Sep 2012 12:11:45 -0000 1.168
+++ ChangeLog 16 Sep 2012 04:54:09 -0000 1.169
@@ -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.168 2012/09/14 12:11:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.169 2012/09/16 04:54:09 yngwin Exp $
+
+ 16 Sep 2012; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.8.3.ebuild:
+ Add overlay changes (c++0x useflag)
14 Sep 2012; Ben de Groot <yngwin@gentoo.org>
+files/qt-webkit-4.8.3+glib-2.31.patch, qt-webkit-4.8.3.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-16 4:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-16 4:54 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: qt-webkit-4.8.3.ebuild ChangeLog Ben de Groot (yngwin)
-- strict thread matches above, loose matches on Subject: below --
2012-09-14 12:11 Ben de Groot (yngwin)
2012-09-14 8:31 Ben de Groot (yngwin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox