| 1 |
commit: 2614e8ef420c2b177f429de41f0a4c7e5a2f0657 |
| 2 |
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 3 09:30:54 2012 +0000 |
| 4 |
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 3 09:30:54 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2614e8ef |
| 7 |
|
| 8 |
x11-libs/qt-webkit:Sync with portage ebuild |
| 9 |
|
| 10 |
--- |
| 11 |
x11-libs/qt-webkit/metadata.xml | 10 ++++++-- |
| 12 |
x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild | 31 +++++++++++++++----------- |
| 13 |
x11-libs/qt-webkit/qt-webkit-4.9999.ebuild | 31 +++++++++++++++----------- |
| 14 |
3 files changed, 43 insertions(+), 29 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml |
| 17 |
index 83269ba..411cdaa 100644 |
| 18 |
--- a/x11-libs/qt-webkit/metadata.xml |
| 19 |
+++ b/x11-libs/qt-webkit/metadata.xml |
| 20 |
@@ -3,8 +3,12 @@ |
| 21 |
<pkgmetadata> |
| 22 |
<herd>qt</herd> |
| 23 |
<use> |
| 24 |
- <flag name='exceptions'>Build with support for exceptions</flag> |
| 25 |
- <flag name='stable-branch'>Use the stable git branch - it is slightly behind |
| 26 |
- master but guaranteed by Nokia to compile</flag> |
| 27 |
+ <flag name="exceptions">Add support for exceptions - like catching them |
| 28 |
+ inside the event loop (recommended by Nokia)</flag> |
| 29 |
+ <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag> |
| 30 |
+ <flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde</flag> |
| 31 |
+ <flag name="jit">Enable JavaScriptCore just-in-time compiler for faster JavaScript execution</flag> |
| 32 |
+ <flag name="c++0x">Build Qt using the C++11 standard</flag> |
| 33 |
+ <flag name="qpa">Build a window system agnostic implementation of Qt</flag> |
| 34 |
</use> |
| 35 |
</pkgmetadata> |
| 36 |
|
| 37 |
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |
| 38 |
index 338ec4c..4f48c26 100644 |
| 39 |
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |
| 40 |
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild |
| 41 |
@@ -3,7 +3,10 @@ |
| 42 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.7.4.ebuild,v 1.1 2011/09/08 09:22:47 wired Exp $ |
| 43 |
|
| 44 |
EAPI="4" |
| 45 |
-inherit qt4-build-edge |
| 46 |
+if [[ ${PV} == 4*9999 ]]; then |
| 47 |
+ QT_ECLASS="-edge" |
| 48 |
+fi |
| 49 |
+inherit qt4-build${QT_ECLASS} |
| 50 |
|
| 51 |
DESCRIPTION="The Webkit module for the Qt toolkit" |
| 52 |
SLOT="4" |
| 53 |
@@ -12,17 +15,18 @@ if [[ ${PV} != 4*9999 ]]; then |
| 54 |
else |
| 55 |
KEYWORDS="" |
| 56 |
fi |
| 57 |
-IUSE="dbus +jit kde" |
| 58 |
+IUSE="+gstreamer +jit" |
| 59 |
|
| 60 |
DEPEND=" |
| 61 |
dev-db/sqlite:3 |
| 62 |
~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl] |
| 63 |
~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,dbus?,debug=] |
| 64 |
~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=] |
| 65 |
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] ) |
| 66 |
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,dbus=,debug=] |
| 67 |
- media-libs/phonon[aqua=] ) ) |
| 68 |
- kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=] ) )" |
| 69 |
+ gstreamer? ( |
| 70 |
+ dev-libs/glib:2 |
| 71 |
+ media-libs/gstreamer:0.10 |
| 72 |
+ media-libs/gst-plugins-base:0.10 |
| 73 |
+ )" |
| 74 |
RDEPEND="${DEPEND}" |
| 75 |
|
| 76 |
if [[ ${PV} != 4*9999 ]]; then |
| 77 |
@@ -45,22 +49,23 @@ pkg_setup() { |
| 78 |
QCONFIG_ADD="webkit" |
| 79 |
QCONFIG_DEFINE="QT_WEBKIT" |
| 80 |
|
| 81 |
- qt4-build-edge_pkg_setup |
| 82 |
+ qt4-build${QT_ECLASS}_pkg_setup |
| 83 |
} |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 |
| 87 |
use c++0x && append-flags -fpermissive |
| 88 |
- sed -i -e "/Werror/d" "${S}/src/3rdparty/webkit/Source/WebKit.pri" || die |
| 89 |
- qt4-build-edge_src_prepare |
| 90 |
+ sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \ |
| 91 |
+ src/3rdparty/webkit/Source/WebKit.pri || die |
| 92 |
+ qt4-build${QT_ECLASS}_src_prepare |
| 93 |
} |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
# won't build with gcc 4.6 without this for now |
| 97 |
myconf="${myconf} |
| 98 |
- -webkit -system-sqlite -no-gtkstyle |
| 99 |
- -D GST_DISABLE_DEPRECATED |
| 100 |
+ -webkit -system-sqlite |
| 101 |
$(qt_use jit javascript-jit) |
| 102 |
- $(qt_use dbus qdbus)" |
| 103 |
- qt4-build-edge_src_configure |
| 104 |
+ -DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0) |
| 105 |
+ -D GST_DISABLE_DEPRECATED" |
| 106 |
+ qt4-build${QT_ECLASS}_src_configure |
| 107 |
} |
| 108 |
|
| 109 |
diff --git a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild |
| 110 |
index 338ec4c..4f48c26 100644 |
| 111 |
--- a/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild |
| 112 |
+++ b/x11-libs/qt-webkit/qt-webkit-4.9999.ebuild |
| 113 |
@@ -3,7 +3,10 @@ |
| 114 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.7.4.ebuild,v 1.1 2011/09/08 09:22:47 wired Exp $ |
| 115 |
|
| 116 |
EAPI="4" |
| 117 |
-inherit qt4-build-edge |
| 118 |
+if [[ ${PV} == 4*9999 ]]; then |
| 119 |
+ QT_ECLASS="-edge" |
| 120 |
+fi |
| 121 |
+inherit qt4-build${QT_ECLASS} |
| 122 |
|
| 123 |
DESCRIPTION="The Webkit module for the Qt toolkit" |
| 124 |
SLOT="4" |
| 125 |
@@ -12,17 +15,18 @@ if [[ ${PV} != 4*9999 ]]; then |
| 126 |
else |
| 127 |
KEYWORDS="" |
| 128 |
fi |
| 129 |
-IUSE="dbus +jit kde" |
| 130 |
+IUSE="+gstreamer +jit" |
| 131 |
|
| 132 |
DEPEND=" |
| 133 |
dev-db/sqlite:3 |
| 134 |
~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl] |
| 135 |
~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,dbus?,debug=] |
| 136 |
~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=] |
| 137 |
- dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] ) |
| 138 |
- !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,dbus=,debug=] |
| 139 |
- media-libs/phonon[aqua=] ) ) |
| 140 |
- kde? ( || ( media-libs/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=] ) )" |
| 141 |
+ gstreamer? ( |
| 142 |
+ dev-libs/glib:2 |
| 143 |
+ media-libs/gstreamer:0.10 |
| 144 |
+ media-libs/gst-plugins-base:0.10 |
| 145 |
+ )" |
| 146 |
RDEPEND="${DEPEND}" |
| 147 |
|
| 148 |
if [[ ${PV} != 4*9999 ]]; then |
| 149 |
@@ -45,22 +49,23 @@ pkg_setup() { |
| 150 |
QCONFIG_ADD="webkit" |
| 151 |
QCONFIG_DEFINE="QT_WEBKIT" |
| 152 |
|
| 153 |
- qt4-build-edge_pkg_setup |
| 154 |
+ qt4-build${QT_ECLASS}_pkg_setup |
| 155 |
} |
| 156 |
|
| 157 |
src_prepare() { |
| 158 |
[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900 |
| 159 |
use c++0x && append-flags -fpermissive |
| 160 |
- sed -i -e "/Werror/d" "${S}/src/3rdparty/webkit/Source/WebKit.pri" || die |
| 161 |
- qt4-build-edge_src_prepare |
| 162 |
+ sed -i -e '/QMAKE_CXXFLAGS[[:blank:]]*+=/s:-Werror::g' \ |
| 163 |
+ src/3rdparty/webkit/Source/WebKit.pri || die |
| 164 |
+ qt4-build${QT_ECLASS}_src_prepare |
| 165 |
} |
| 166 |
|
| 167 |
src_configure() { |
| 168 |
# won't build with gcc 4.6 without this for now |
| 169 |
myconf="${myconf} |
| 170 |
- -webkit -system-sqlite -no-gtkstyle |
| 171 |
- -D GST_DISABLE_DEPRECATED |
| 172 |
+ -webkit -system-sqlite |
| 173 |
$(qt_use jit javascript-jit) |
| 174 |
- $(qt_use dbus qdbus)" |
| 175 |
- qt4-build-edge_src_configure |
| 176 |
+ -DENABLE_VIDEO=$(use gstreamer && echo 1 || echo 0) |
| 177 |
+ -D GST_DISABLE_DEPRECATED" |
| 178 |
+ qt4-build${QT_ECLASS}_src_configure |
| 179 |
} |
Archives