* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-02-19 17:28 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-02-19 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 9f265c3427d3c00735e43d6813aecf37b14f09c8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 17:27:53 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 17:27:53 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9f265c34
[dev-qt/qtwebkit23] New package for testing/review wrt bug #388207.
Package-Manager: portage-2.2.17
---
dev-qt/qtwebkit23/Manifest | 1 +
dev-qt/qtwebkit23/metadata.xml | 9 ++++
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 76 +++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/dev-qt/qtwebkit23/Manifest b/dev-qt/qtwebkit23/Manifest
new file mode 100644
index 0000000..ae72ee8
--- /dev/null
+++ b/dev-qt/qtwebkit23/Manifest
@@ -0,0 +1 @@
+DIST qtwebkit23-2.3.4.tar.xz 33793176 SHA256 b02e1e7d4e7e00f3d2e27702e7b023c54a64966ea2dc25f3eb5922eacdb9d7e1 SHA512 4fc99301afefaf900d951b4f4e56a5a5a94eaa92376bc0b73c0ced0c9046d8d911ad33c6ebf1e013573568140259ed733ee69bc87d81405f49b2e74e5fe556b5 WHIRLPOOL af7376d2ffdbc6caf824cbc0aad37253ca5ee744cf5849f1378e0a64e25441229b0e95e711bba1e030e08d0b313cdbfb97f2f7b13f96c4a7763cd5e5cf4b0d68
diff --git a/dev-qt/qtwebkit23/metadata.xml b/dev-qt/qtwebkit23/metadata.xml
new file mode 100644
index 0000000..39c6359
--- /dev/null
+++ b/dev-qt/qtwebkit23/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <upstream>
+ <bugs-to>https://bugreports.qt.io/</bugs-to>
+ <doc>http://qt-project.org/doc/</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
new file mode 100644
index 0000000..377a880
--- /dev/null
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib python-any-r1
+
+DESCRIPTION="The WebKit module for the Qt toolkit"
+HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
+SRC_URI="http://dev.gentoo.org/~kensington/distfiles/qtwebkit23-2.3.4.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="4"
+KEYWORDS="~amd64"
+
+IUSE="+gstreamer"
+# libxml2[!icu] is needed for bugs 407315 and 411091
+# https://bugs.webkit.org/show_bug.cgi?id=82824
+RDEPEND="
+ >=dev-db/sqlite-3.8.3:3
+ dev-libs/libxml2:2[-icu]
+ dev-libs/libxslt
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtdeclarative:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtscript:4
+ dev-qt/qtsql:4
+ dev-qt/qtsvg:4
+ dev-qt/qtxmlpatterns:4
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/libudev
+ virtual/opengl
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXrender
+ gstreamer? (
+ dev-libs/glib:2
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ dev-lang/ruby
+ dev-util/gperf
+ sys-devel/bison
+ sys-devel/flex
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+"
+
+src_prepare() {
+ # bug 458222
+ sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+}
+
+src_compile() {
+ export QTDIR=/usr/$(get_libdir)/qt4/
+ Tools/Scripts/build-webkit --qt --release --no-webkit2 \
+ $(use gstreamer || echo --no-video) \
+ --makeargs="${MAKEOPTS}" \
+ --qmakearg="CONFIG+=production_build CONFIG+=nostrip" || die
+}
+
+src_install() {
+ cd "WebKitBuild/Release" || die
+ emake INSTALL_ROOT="${D}" install
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-02-22 14:02 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-02-22 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 4343235ba4f9fad44e7fc064cce6b216d30f0471
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 14:01:24 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 14:01:24 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4343235b
[dev-qt/qtwebkit23] Respect *FLAGS etc.
Package-Manager: portage-2.2.17
---
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
index 377a880..10d51a26 100644
--- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -5,7 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1
+inherit eutils multilib python-any-r1 toolchain-funcs
DESCRIPTION="The WebKit module for the Qt toolkit"
HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
@@ -60,14 +60,26 @@ DEPEND="${RDEPEND}
src_prepare() {
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+
+ sed -i -e "/QMAKE_CXXFLAGS_RELEASE/d" Source/WTF/WTF.pro Source/JavaScriptCore/Target.pri || die
}
src_compile() {
export QTDIR=/usr/$(get_libdir)/qt4/
+ export CC=$(tc-getCC)
+ export CXX=$(tc-getCXX)
Tools/Scripts/build-webkit --qt --release --no-webkit2 \
$(use gstreamer || echo --no-video) \
--makeargs="${MAKEOPTS}" \
- --qmakearg="CONFIG+=production_build CONFIG+=nostrip" || die
+ --qmakearg="CONFIG+=production_build CONFIG+=nostrip" \
+ QMAKE_CC=\"$(tc-getCC)\" \
+ QMAKE_CXX=\"$(tc-getCXX)\" \
+ QMAKE_CFLAGS=\"${CFLAGS}\" \
+ QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \
+ QMAKE_CFLAGS_RELEASE=\"\" \
+ QMAKE_CXXFLAGS_RELEASE=\"\" \
+ QMAKE_LFLAGS+=\"${LDFLAGS}\" \
+ QMAKE_LINK=\"$(tc-getCXX)\" || die
}
src_install() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-05-03 19:51 Davide Pesavento
0 siblings, 0 replies; 8+ messages in thread
From: Davide Pesavento @ 2015-05-03 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 7ffc33f76072d7c68c4ea2449a317de77d1a3f77
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 19:50:40 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 3 19:50:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7ffc33f7
[dev-qt/qtwebkit23] Fix qttest automagic dep.
Thanks to Enrico Tagliavini in github pull request #94.
Package-Manager: portage-2.2.18
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
index e7b02ee..8712a77 100644
--- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -9,7 +9,7 @@ inherit eutils multilib python-any-r1 toolchain-funcs
DESCRIPTION="The WebKit module for the Qt toolkit"
HOMEPAGE="https://www.qt.io/"
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/qtwebkit23-2.3.4.tar.xz"
+SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 GPL-3 )"
SLOT="4"
@@ -65,24 +65,27 @@ src_prepare() {
}
src_compile() {
- export QTDIR=/usr/$(get_libdir)/qt4/
+ export QTDIR=/usr/$(get_libdir)/qt4
export CC=$(tc-getCC)
export CXX=$(tc-getCXX)
- Tools/Scripts/build-webkit --qt --release --no-webkit2 \
+
+ Tools/Scripts/build-webkit \
+ --qt --release --no-webkit2 \
$(use gstreamer || echo --no-video) \
--makeargs="${MAKEOPTS}" \
- --qmakearg="CONFIG+=production_build CONFIG+=nostrip" \
+ --qmakearg="CONFIG+=production_build CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" \
QMAKE_CC=\"$(tc-getCC)\" \
- QMAKE_CXX=\"$(tc-getCXX)\" \
QMAKE_CFLAGS=\"${CFLAGS}\" \
- QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \
QMAKE_CFLAGS_RELEASE=\"\" \
+ QMAKE_CXX=\"$(tc-getCXX)\" \
+ QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \
QMAKE_CXXFLAGS_RELEASE=\"\" \
+ QMAKE_LINK=\"$(tc-getCXX)\" \
QMAKE_LFLAGS+=\"${LDFLAGS}\" \
- QMAKE_LINK=\"$(tc-getCXX)\" || die
+ || die
}
src_install() {
- cd "WebKitBuild/Release" || die
+ cd WebKitBuild/Release || die
emake INSTALL_ROOT="${D}" install
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-05-23 16:52 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-05-23 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 37bc992dd1ea5edb176d35455afc483036d07edd
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Thu Apr 2 12:50:59 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 16:52:28 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=37bc992d
[dev-qt/qtwebkit23] enable multilib support
This change enables proper multilib support so that 32 bit programs
depending on this, such as skype. Deps are forced to be either EAPI=5 or
multilib. Versions choosen are the one I tested with, mostly stable
packages for amd64 with exception of Qt libraries.
This also moves the builddir out of the source tree so there is no need to copy the
entire source folder for each ABI we are going to compile for.
The trick about using WEBKITOUTPUTDIR comes from fedora 21 SRPM, credit
to the maintainers for it.
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 72 +++++++++++++++++--------------
1 file changed, 39 insertions(+), 33 deletions(-)
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
index 8712a77..3148278 100644
--- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -5,7 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1 toolchain-funcs
+inherit eutils multibuild multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal
DESCRIPTION="The WebKit module for the Qt toolkit"
HOMEPAGE="https://www.qt.io/"
@@ -17,31 +17,31 @@ KEYWORDS="~amd64"
IUSE="+gstreamer"
RDEPEND="
- >=dev-db/sqlite-3.8.3:3
- dev-libs/libxml2:2
- dev-libs/libxslt
- dev-qt/qtcore:4[ssl]
- dev-qt/qtdeclarative:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtscript:4
- dev-qt/qtsql:4
- dev-qt/qtsvg:4
- dev-qt/qtxmlpatterns:4
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/jpeg:0
- virtual/libudev
- virtual/opengl
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXrender
+ >=dev-db/sqlite-3.8.9:3[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.2-r1:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libxslt-1.1.28-r4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}]
+ >=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtgui-4.8.6-r2:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtsql-4.8.6-r1:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtsvg-4.8.6-r1:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtxmlpatterns-4.8.6-r1:4[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.11.1-r2[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.5[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.16:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ virtual/jpeg:0[${MULTILIB_USEDEP}]
+ virtual/libudev[${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.3[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
+ >=dev-libs/glib-2.42.2:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-1.4.5:1.0[${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-1.4.5:1.0[${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}
@@ -58,19 +58,26 @@ DEPEND="${RDEPEND}
src_prepare() {
# bug 458222
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
sed -i -e "/QMAKE_CXXFLAGS_RELEASE/d" Source/WTF/WTF.pro Source/JavaScriptCore/Target.pri || die
epatch "${FILESDIR}"/${PN}-2.3.4-use-correct-typedef.patch
}
-src_compile() {
- export QTDIR=/usr/$(get_libdir)/qt4
+multilib_src_compile() {
+ # Change the build dir
+ # Trick stolen from Fedora 21 SRPM
+ export WEBKITOUTPUTDIR="$PWD"
+
+ export QTDIR=/usr/$(get_libdir)/qt4/
export CC=$(tc-getCC)
export CXX=$(tc-getCXX)
-
- Tools/Scripts/build-webkit \
+ # --qmake is needed to force the build system to use the qmake
+ # compiled for the correct architecture. For example using the amd64
+ # qmake to compile the x86 qtwebkit will try to link it against
+ # amd64 qt libs, causing the build to fail
+ "${S}"/Tools/Scripts/build-webkit \
--qt --release --no-webkit2 \
+ --qmake=$(qt4_get_bindir)/qmake \
$(use gstreamer || echo --no-video) \
--makeargs="${MAKEOPTS}" \
--qmakearg="CONFIG+=production_build CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" \
@@ -85,7 +92,6 @@ src_compile() {
|| die
}
-src_install() {
- cd WebKitBuild/Release || die
- emake INSTALL_ROOT="${D}" install
+multilib_src_install() {
+ emake INSTALL_ROOT="${D}" install -C Release
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-05-30 2:24 Davide Pesavento
0 siblings, 0 replies; 8+ messages in thread
From: Davide Pesavento @ 2015-05-30 2:24 UTC (permalink / raw
To: gentoo-commits
commit: dc8ea6f65c04a593eb7cf79a760db237bcdf558c
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 02:23:55 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 30 02:23:55 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dc8ea6f6
[dev-qt/qtwebkit23] Prevent automagic dependency on qt-mobility.
Package-Manager: portage-2.2.20
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
index f375165..b1ddbdd 100644
--- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $
@@ -78,7 +78,12 @@ multilib_src_compile() {
--makeargs="${MAKEOPTS}"
--$(usex debug debug release)
--$(usex gstreamer video no-video)
+ # disable WebKit2 since it requires Qt5
--no-webkit2
+ # prevent automagic dependency on qt-mobility (bug 547350)
+ --no-geolocation
+ --no-device-orientation
+ --no-orientation-events
# copied from eqmake4
QMAKE_AR="'$(tc-getAR) cqs'"
QMAKE_CC="'$(tc-getCC)'"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-05-30 2:24 Davide Pesavento
0 siblings, 0 replies; 8+ messages in thread
From: Davide Pesavento @ 2015-05-30 2:24 UTC (permalink / raw
To: gentoo-commits
commit: f830be2016a1d4773032d7d821dea6c61c496937
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 01:57:31 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 30 01:57:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f830be20
[dev-qt/qtwebkit23] Several fixes and enhancements.
* Implement debug USE flag
* Relaxed and simplified some deps
* Drop qtsvg, qtxmlpatterns, freetype, libXext deps as they don't seem
to be used directly by this module
* USE=sqlite is required for qtsql
* Rewrite multilib_src_compile using a bash array so that we can print
the command before executing it
* Pass more QMAKE_* variables to the build system, similarly to eqmake4
* Other minor cleanups
Package-Manager: portage-2.2.20
dev-qt/qtwebkit23/metadata.xml | 3 +
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 106 ++++++++++++++++--------------
2 files changed, 61 insertions(+), 48 deletions(-)
diff --git a/dev-qt/qtwebkit23/metadata.xml b/dev-qt/qtwebkit23/metadata.xml
index afb3b43..37dc834 100644
--- a/dev-qt/qtwebkit23/metadata.xml
+++ b/dev-qt/qtwebkit23/metadata.xml
@@ -2,6 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>qt</herd>
+ <use>
+ <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
+ </use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
<doc>http://doc.qt.io/</doc>
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
index 3148278..f375165 100644
--- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -3,9 +3,8 @@
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $
EAPI=5
-
PYTHON_COMPAT=( python2_7 )
-inherit eutils multibuild multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal
+inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal
DESCRIPTION="The WebKit module for the Qt toolkit"
HOMEPAGE="https://www.qt.io/"
@@ -14,34 +13,30 @@ SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 GPL-3 )"
SLOT="4"
KEYWORDS="~amd64"
-IUSE="+gstreamer"
+IUSE="debug +gstreamer"
RDEPEND="
- >=dev-db/sqlite-3.8.9:3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.2-r1:2[${MULTILIB_USEDEP}]
- >=dev-libs/libxslt-1.1.28-r4[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
>=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}]
>=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtgui-4.8.6-r2:4[${MULTILIB_USEDEP}]
+ >=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}]
>=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}]
>=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtsql-4.8.6-r1:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtsvg-4.8.6-r1:4[${MULTILIB_USEDEP}]
- >=dev-qt/qtxmlpatterns-4.8.6-r1:4[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.11.1-r2[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.5[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.16:0=[${MULTILIB_USEDEP}]
+ >=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
virtual/jpeg:0[${MULTILIB_USEDEP}]
- virtual/libudev[${MULTILIB_USEDEP}]
+ virtual/libudev:=[${MULTILIB_USEDEP}]
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.3[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
gstreamer? (
- >=dev-libs/glib-2.42.2:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-1.4.5:1.0[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-1.4.5:1.0[${MULTILIB_USEDEP}]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}
@@ -51,47 +46,62 @@ DEPEND="${RDEPEND}
dev-util/gperf
sys-devel/bison
sys-devel/flex
+ virtual/perl-Digest-MD5
virtual/perl-File-Spec
virtual/perl-Getopt-Long
"
src_prepare() {
- # bug 458222
+ # examples cause a sandbox violation (bug 458222)
sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
- sed -i -e "/QMAKE_CXXFLAGS_RELEASE/d" Source/WTF/WTF.pro Source/JavaScriptCore/Target.pri || die
+
+ # respect CXXFLAGS
+ sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \
+ Source/WTF/WTF.pro \
+ Source/JavaScriptCore/Target.pri || die
epatch "${FILESDIR}"/${PN}-2.3.4-use-correct-typedef.patch
+ epatch_user
}
multilib_src_compile() {
- # Change the build dir
- # Trick stolen from Fedora 21 SRPM
- export WEBKITOUTPUTDIR="$PWD"
+ local -x \
+ QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \
+ WEBKITOUTPUTDIR=${BUILD_DIR}
- export QTDIR=/usr/$(get_libdir)/qt4/
- export CC=$(tc-getCC)
- export CXX=$(tc-getCXX)
- # --qmake is needed to force the build system to use the qmake
- # compiled for the correct architecture. For example using the amd64
- # qmake to compile the x86 qtwebkit will try to link it against
- # amd64 qt libs, causing the build to fail
- "${S}"/Tools/Scripts/build-webkit \
- --qt --release --no-webkit2 \
- --qmake=$(qt4_get_bindir)/qmake \
- $(use gstreamer || echo --no-video) \
- --makeargs="${MAKEOPTS}" \
- --qmakearg="CONFIG+=production_build CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" \
- QMAKE_CC=\"$(tc-getCC)\" \
- QMAKE_CFLAGS=\"${CFLAGS}\" \
- QMAKE_CFLAGS_RELEASE=\"\" \
- QMAKE_CXX=\"$(tc-getCXX)\" \
- QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \
- QMAKE_CXXFLAGS_RELEASE=\"\" \
- QMAKE_LINK=\"$(tc-getCXX)\" \
- QMAKE_LFLAGS+=\"${LDFLAGS}\" \
- || die
+ local myconf=(
+ "${S}"/Tools/Scripts/build-webkit
+ --qt
+ # tell the build system where to find the qmake binary for the current ABI
+ --qmake="$(qt4_get_bindir)"/qmake
+ --qmakearg="CONFIG+=nostrip CONFIG+=production_build DEFINES+=HAVE_QTTESTLIB=0"
+ --makeargs="${MAKEOPTS}"
+ --$(usex debug debug release)
+ --$(usex gstreamer video no-video)
+ --no-webkit2
+ # copied from eqmake4
+ QMAKE_AR="'$(tc-getAR) cqs'"
+ QMAKE_CC="'$(tc-getCC)'"
+ QMAKE_CXX="'$(tc-getCXX)'"
+ QMAKE_LINK="'$(tc-getCXX)'"
+ QMAKE_LINK_C="'$(tc-getCC)'"
+ QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'"
+ QMAKE_RANLIB=
+ QMAKE_STRIP=
+ QMAKE_CFLAGS="'${CFLAGS}'"
+ QMAKE_CFLAGS_RELEASE=
+ QMAKE_CFLAGS_DEBUG=
+ QMAKE_CXXFLAGS="'${CXXFLAGS}'"
+ QMAKE_CXXFLAGS_RELEASE=
+ QMAKE_CXXFLAGS_DEBUG=
+ QMAKE_LFLAGS="'${LDFLAGS}'"
+ QMAKE_LFLAGS_RELEASE=
+ QMAKE_LFLAGS_DEBUG=
+ )
+ echo "${myconf[@]}"
+ "${myconf[@]}" || die
}
multilib_src_install() {
- emake INSTALL_ROOT="${D}" install -C Release
+ emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release)
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-06-10 0:41 Davide Pesavento
0 siblings, 0 replies; 8+ messages in thread
From: Davide Pesavento @ 2015-06-10 0:41 UTC (permalink / raw
To: gentoo-commits
commit: def2954ad6ab6ce195e2ecc01724d683f1adc449
Author: Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Mon Jun 8 18:37:42 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 00:37:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=def2954a
[dev-qt/qtwebkit23] Move pkgconfig file to the correct location.
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
index b1ddbdd..b338975 100644
--- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -109,4 +109,7 @@ multilib_src_compile() {
multilib_src_install() {
emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release)
+
+ # move pkgconfig file to the correct location
+ mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/
@ 2015-07-23 18:12 Davide Pesavento
0 siblings, 0 replies; 8+ messages in thread
From: Davide Pesavento @ 2015-07-23 18:12 UTC (permalink / raw
To: gentoo-commits
commit: 9398fba8f6896774467337d3edac6b9a006b05e8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 18:12:00 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 18:12:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9398fba8
[dev-qt/qtwebkit23] production_build is already added by the build-webkit script.
Package-Manager: portage-2.2.20
dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
index d2ada80..bd9d57b 100644
--- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
+++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild
@@ -79,7 +79,7 @@ multilib_src_compile() {
--qt
# tell the build system where to find the qmake binary for the current ABI
--qmake="$(qt4_get_bindir)"/qmake
- --qmakearg="CONFIG+=nostrip CONFIG+=production_build DEFINES+=HAVE_QTTESTLIB=0"
+ --qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0"
--makeargs="${MAKEOPTS}"
--$(usex debug debug release)
--$(usex gstreamer video no-video)
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-07-23 18:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-30 2:24 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit23/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2015-07-23 18:12 Davide Pesavento
2015-06-10 0:41 Davide Pesavento
2015-05-30 2:24 Davide Pesavento
2015-05-23 16:52 Michael Palimaka
2015-05-03 19:51 Davide Pesavento
2015-02-22 14:02 Michael Palimaka
2015-02-19 17:28 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox