public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2014-03-25 16:41 Davide Pesavento
  0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2014-03-25 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     b329efb084c05ffb8ba4ca65bf6ba2b2cb8190c8
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Fri Mar 21 12:45:03 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar 25 16:26:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b329efb0

[dev-qt/qtwebkit:5] Remove automagic dependencies.

Package-Manager: portage-2.2.8-r1

---
 .../files/qtwebkit-5.2.1-disable-gstreamer.patch   | 15 +++++++++++
 dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild              | 29 +++++++++++++++++-----
 dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild           | 29 +++++++++++++++++-----
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild             | 29 +++++++++++++++++-----
 4 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
new file mode 100644
index 0000000..05e41a1
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- Tools/qmake/mkspecs/features/features.prf	2014-03-19 18:35:47.795676444 +0000
++++ Tools/qmake/mkspecs/features/features.prf	2014-03-19 18:36:38.602433220 +0000
+@@ -99,12 +99,6 @@
+ 
+     # HTML5 Media Support for builds with GStreamer
+     unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+-        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
+-            WEBKIT_CONFIG += video use_gstreamer
+-        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+-            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+-        }
+-        use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+     }
+ 
+     !enable?(video):qtHaveModule(multimediawidgets) {

diff --git a/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,17 +17,16 @@ else
 fi
 
 # TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
-# FIXME: tons of automagic deps
 
 IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
 
 RDEPEND="
-	dev-db/sqlite
+	dev-db/sqlite:3
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 	>=dev-qt/qtsql-${PV}:5[debug=]
-	media-libs/fontconfig
+	media-libs/fontconfig:1.0
 	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg:0
@@ -40,12 +39,12 @@ RDEPEND="
 		>=media-libs/gstreamer-0.10.30:0.10
 		>=media-libs/gst-plugins-base-0.10.30:0.10
 	)
-	libxml2? ( dev-libs/libxml2 )
+	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
 	udev? ( virtual/udev )
-	webp? ( media-libs/libwebp:= )
+	webp? ( media-libs/libwebp:0= )
 	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
 	xslt? (
 		libxml2? ( dev-libs/libxslt )
@@ -65,6 +64,24 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use gstreamer  || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	use libxml2    || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use opengl     || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use qml        || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \
+		Source/QtWebKit.pro || die
+	use udev       || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use webp       || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use widgets    || sed -i -e '/SUBDIRS += webkitwidgets/d' \
+		Source/QtWebKit.pro || die
+	use xslt       || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+
 	# bug 458222
 	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,17 +17,16 @@ else
 fi
 
 # TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
-# FIXME: tons of automagic deps
 
 IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
 
 RDEPEND="
-	dev-db/sqlite
+	dev-db/sqlite:3
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 	>=dev-qt/qtsql-${PV}:5[debug=]
-	media-libs/fontconfig
+	media-libs/fontconfig:1.0
 	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg:0
@@ -40,12 +39,12 @@ RDEPEND="
 		>=media-libs/gstreamer-0.10.30:0.10
 		>=media-libs/gst-plugins-base-0.10.30:0.10
 	)
-	libxml2? ( dev-libs/libxml2 )
+	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
 	udev? ( virtual/udev )
-	webp? ( media-libs/libwebp:= )
+	webp? ( media-libs/libwebp:0= )
 	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
 	xslt? (
 		libxml2? ( dev-libs/libxslt )
@@ -65,6 +64,24 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use gstreamer  || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	use libxml2    || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use opengl     || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use qml        || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \
+		Source/QtWebKit.pro || die
+	use udev       || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use webp       || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use widgets    || sed -i -e '/SUBDIRS += webkitwidgets/d' \
+		Source/QtWebKit.pro || die
+	use xslt       || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+
 	# bug 458222
 	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index b32a7a1..80b12e7 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,17 +17,16 @@ else
 fi
 
 # TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
-# FIXME: tons of automagic deps
 
 IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
 
 RDEPEND="
-	dev-db/sqlite
+	dev-db/sqlite:3
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 	>=dev-qt/qtsql-${PV}:5[debug=]
-	media-libs/fontconfig
+	media-libs/fontconfig:1.0
 	media-libs/libpng:0=
 	sys-libs/zlib
 	virtual/jpeg:0
@@ -40,12 +39,12 @@ RDEPEND="
 		>=media-libs/gstreamer-0.10.30:0.10
 		>=media-libs/gst-plugins-base-0.10.30:0.10
 	)
-	libxml2? ( dev-libs/libxml2 )
+	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
 	udev? ( virtual/udev )
-	webp? ( media-libs/libwebp:= )
+	webp? ( media-libs/libwebp:0= )
 	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
 	xslt? (
 		libxml2? ( dev-libs/libxslt )
@@ -65,6 +64,24 @@ pkg_setup() {
 }
 
 src_prepare() {
+	use gstreamer  || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	use libxml2    || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use opengl     || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use qml        || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \
+		Source/QtWebKit.pro || die
+	use udev       || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use webp       || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use widgets    || sed -i -e '/SUBDIRS += webkitwidgets/d' \
+		Source/QtWebKit.pro || die
+	use xslt       || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+
 	# bug 458222
 	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2014-06-24 14:14 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2014-06-24 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     99df390c1aca00ed26be791bae90a5e10b727068
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 24 14:10:55 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 24 14:13:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=99df390c

[dev-qt/qtwebkit] Remove patch wrt bug #514924.

The code the patch removes has been removed upstream.

Package-Manager: portage-2.2.10

---
 .../qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch  | 17 -----------------
 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild                   |  1 -
 dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild                |  1 -
 3 files changed, 19 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
deleted file mode 100644
index d29d5da..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri
---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri	2012-04-28 12:39:16.884473572 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri	2012-04-28 12:41:14.245006363 +0200
-@@ -3,13 +3,6 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
- 
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
--    message(Using gold linker)
--    QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
--
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
- CONFIG += production

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index fcddbfe..d3719f0 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -35,7 +35,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
 	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
 )
 

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index fcddbfe..d3719f0 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -35,7 +35,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
 	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
 )
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2014-09-28 17:40 Davide Pesavento
  0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2014-09-28 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     3fd03fd010e224ebbdb1586e7d5ef70b5b525400
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Sat Sep 27 12:52:46 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep 28 15:57:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3fd03fd0

[dev-qt/qtwebkit] Rework HTML5 A/V backend

 * Fixes bug #523518
 * Instead of simply depending on gstreamer, add a separate USE for
   gstreamer:0.10 to clearly specify which slot should be linked to.
 * Specifying multimedia while having gstreamer* selected does not
   enable the use of qtmultimedia. It will only be selected if we build
   with neither of both gstreamer versions

---
 .../files/qtwebkit-5.3.2-use-gstreamer010.patch      | 18 ++++++++++++++++++
 dev-qt/qtwebkit/metadata.xml                         |  3 ++-
 dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild             | 20 +++++++++++++++-----
 dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild          | 20 +++++++++++++++-----
 dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild             | 20 +++++++++++++++-----
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild               | 20 +++++++++++++++-----
 6 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
new file mode 100644
index 0000000..1c02e45
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch
@@ -0,0 +1,18 @@
+--- Tools/qmake/mkspecs/features/features.prf	2014-09-27 11:09:50.010617142 +0100
++++ Tools/qmake/mkspecs/features/features.prf	2014-09-27 11:17:10.741678989 +0100
+@@ -96,14 +96,8 @@
+     use?(3d_graphics): WEBKIT_CONFIG += webgl
+ 
+     # HTML5 Media Support for builds with GStreamer
+-    unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+-        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
+-            WEBKIT_CONFIG += video use_gstreamer
+-        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+-            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+-        }
++        WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+         use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+-    }
+ 
+     !enable?(video):qtHaveModule(multimediawidgets) {
+         WEBKIT_CONFIG += video use_qt_multimedia

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 952e31f..5a4718c 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -5,7 +5,8 @@
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
-		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
+		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
+		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
 		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing</flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>

diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index 0238091..f59c599 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -18,7 +18,8 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -38,11 +39,16 @@ RDEPEND="
 	x11-libs/libXrender
 	gstreamer? (
 		dev-libs/glib:2
-		>=media-libs/gstreamer-0.10.30:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
 	)
 	libxml2? ( dev-libs/libxml2:2 )
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
@@ -61,7 +67,11 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	use gstreamer    || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
 	use libxml2      || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
 	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild
index 0238091..f59c599 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild
@@ -18,7 +18,8 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -38,11 +39,16 @@ RDEPEND="
 	x11-libs/libXrender
 	gstreamer? (
 		dev-libs/glib:2
-		>=media-libs/gstreamer-0.10.30:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
 	)
 	libxml2? ( dev-libs/libxml2:2 )
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
@@ -61,7 +67,11 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	use gstreamer    || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
 	use libxml2      || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
 	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
index 0238091..f59c599 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
@@ -18,7 +18,8 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -38,11 +39,16 @@ RDEPEND="
 	x11-libs/libXrender
 	gstreamer? (
 		dev-libs/glib:2
-		>=media-libs/gstreamer-0.10.30:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
 	)
 	libxml2? ( dev-libs/libxml2:2 )
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
@@ -61,7 +67,11 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	use gstreamer    || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
 	use libxml2      || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
 	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 0238091..f59c599 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -18,7 +18,8 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -38,11 +39,16 @@ RDEPEND="
 	x11-libs/libXrender
 	gstreamer? (
 		dev-libs/glib:2
-		>=media-libs/gstreamer-0.10.30:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
 	)
 	libxml2? ( dev-libs/libxml2:2 )
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
@@ -61,7 +67,11 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	use gstreamer    || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	if use gstreamer010; then
+		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
+	elif ! use gstreamer; then
+		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	fi
 	use libxml2      || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
 	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2015-03-14 18:21 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2015-03-14 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     fa9569964aba22b7849b2a91b38d4479e3a6293e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 18:20:44 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 18:20:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fa956996

[dev-qt/qtwebkit] Ensure system copy of dev-libs/leveldb is used wrt bug #519190.

Package-Manager: portage-2.2.17

 dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch | 25 ++++++++++++++++++++++
 dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild           |  3 +++
 dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild           |  3 +++
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild             |  3 +++
 4 files changed, 34 insertions(+)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch
new file mode 100644
index 0000000..0a476c6
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.1-leveldb.patch
@@ -0,0 +1,25 @@
+Correct header location so system dev-libs/leveldb can be detected.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ 
+ int main(int, char**)
+ {
+
+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+@@ -38,7 +38,7 @@
+ #include <leveldb/comparator.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ #include <leveldb/slice.h>
+ #include <string>
+ #include <wtf/PassOwnPtr.h>

diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
index 568f10e..48021cc 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	>=dev-libs/leveldb-1.18-r1
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
@@ -65,6 +66,8 @@ DEPEND="${RDEPEND}
 	virtual/rubygems
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" )
+
 src_prepare() {
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
index 568f10e..48021cc 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	>=dev-libs/leveldb-1.18-r1
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
@@ -65,6 +66,8 @@ DEPEND="${RDEPEND}
 	virtual/rubygems
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" )
+
 src_prepare() {
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 568f10e..48021cc 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	>=dev-libs/leveldb-1.18-r1
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
@@ -65,6 +66,8 @@ DEPEND="${RDEPEND}
 	virtual/rubygems
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" )
+
 src_prepare() {
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2015-07-15  1:14 Davide Pesavento
  0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2015-07-15  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     c1de4752dd98902b0116e040b487db93168070dc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 01:13:45 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 01:13:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c1de4752

[dev-qt/qtwebkit] Extend rpath fix wrt bug #466216 comment #14.

And use sed instead of a patch, should be easier to maintain.

Package-Manager: portage-2.2.20

 dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch | 11 -----------
 dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild            |  7 ++++++-
 dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild         |  7 ++++++-
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild           |  7 ++++++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
deleted file mode 100644
index 583ca6c..0000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.0-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Tools/qmake/mkspecs/features/unix/default_post.prf.bak	2015-06-23 14:45:57.255212841 +0200
-+++ Tools/qmake/mkspecs/features/unix/default_post.prf	2015-06-23 14:46:31.703211791 +0200
-@@ -61,8 +61,6 @@
-     }
- }
- 
--contains(TEMPLATE, app): CONFIG += rpath
--
- CONFIG(debug, debug|release)|force_debug_info {
-     # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
-     !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
index 8f4987c..954a3aa 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.0.ebuild
@@ -64,13 +64,18 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4.1-leveldb.patch"
-	"${FILESDIR}/${PN}-5.5.0-rpath.patch"
 )
 
 src_prepare() {
 	# ensure bundled library cannot be used
 	rm -r Source/ThirdParty/leveldb || die
 
+	# bug 466216
+	sed -i -e '/CONFIG +=/s/rpath//' \
+		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
+		|| die
+
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
 	elif ! use gstreamer; then

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
index 8f4987c..954a3aa 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild
@@ -64,13 +64,18 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4.1-leveldb.patch"
-	"${FILESDIR}/${PN}-5.5.0-rpath.patch"
 )
 
 src_prepare() {
 	# ensure bundled library cannot be used
 	rm -r Source/ThirdParty/leveldb || die
 
+	# bug 466216
+	sed -i -e '/CONFIG +=/s/rpath//' \
+		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
+		|| die
+
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
 	elif ! use gstreamer; then

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 8f4987c..954a3aa 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -64,13 +64,18 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4.1-leveldb.patch"
-	"${FILESDIR}/${PN}-5.5.0-rpath.patch"
 )
 
 src_prepare() {
 	# ensure bundled library cannot be used
 	rm -r Source/ThirdParty/leveldb || die
 
+	# bug 466216
+	sed -i -e '/CONFIG +=/s/rpath//' \
+		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
+		|| die
+
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
 	elif ! use gstreamer; then


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/
@ 2018-12-06 19:46 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-12-06 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     cda396ca2d422a89785b7abe1ac924339ff59d55
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 16:00:36 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 19:44:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=cda396ca

dev-qt/qtwebkit: Drop live ebuilds

Upstream repositories appear dead.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/qtwebkit-5.4.2-system-leveldb.patch      |  25 -----
 .../files/qtwebkit-5.5.1-disable-jit.patch         |  15 ---
 .../files/qtwebkit-5.8.0-disable-gstreamer.patch   |  15 ---
 dev-qt/qtwebkit/metadata.xml                       |  28 -----
 dev-qt/qtwebkit/qtwebkit-5.12.9999.ebuild          | 120 ---------------------
 dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild           | 120 ---------------------
 dev-qt/qtwebkit/qtwebkit-5.9999.ebuild             | 120 ---------------------
 7 files changed, 443 deletions(-)

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
deleted file mode 100644
index 265d5075..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Correct header location so system dev-libs/leveldb can be detected.
-
---- a/Tools/qmake/config.tests/leveldb/leveldb.cpp
-+++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp
-@@ -19,7 +19,7 @@
- 
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- 
- int main(int, char**)
- {
-
---- a/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-+++ b/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
-@@ -38,7 +38,7 @@
- #include <leveldb/comparator.h>
- #include <leveldb/db.h>
- #include <leveldb/env.h>
--#include <helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- #include <leveldb/slice.h>
- #include <string>
- #include <wtf/PassOwnPtr.h>

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
deleted file mode 100644
index 40e58f0d..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow disabling JIT for hardened.
-
-Author: Magnus Granberg <zorry@gentoo.org>
-Gentoo-bug: 562396
-
---- a/Tools/qmake/mkspecs/features/features.pri
-+++ b/Tools/qmake/mkspecs/features/features.pri
-@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
-     ENABLE_INPUT_TYPE_WEEK=0 \
-     ENABLE_INSPECTOR=1 \
-     ENABLE_INSPECTOR_SERVER=1 \
-+    ENABLE_JIT=0 \
-     ENABLE_JAVASCRIPT_DEBUGGER=1 \
-     ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
-     ENABLE_LEGACY_NOTIFICATIONS=1 \

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
deleted file mode 100644
index 867e8dcb..00000000
--- a/dev-qt/qtwebkit/files/qtwebkit-5.8.0-disable-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Tools/qmake/mkspecs/features/features.prf
-+++ b/Tools/qmake/mkspecs/features/features.prf
-@@ -101,12 +101,6 @@ defineTest(detectFeatures) {
- 
-     # HTML5 Media Support for builds with GStreamer
-     unix:!mac:qtConfig(pkg-config) {
--        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
--            WEBKIT_CONFIG += video use_gstreamer
--        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
--            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
--        }
--        use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
-     }
- 
-     !enable?(video):qtHaveModule(multimediawidgets) {

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
deleted file mode 100644
index a0aa5e42..00000000
--- a/dev-qt/qtwebkit/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
-		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
-		<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
-		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
-		<flag name="qml">Build QML/QtQuick bindings</flag>
-		<flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag>
-		<flag name="webp">Add support for WebP image format</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>https://doc.qt.io/</doc>
-	</upstream>
-	<slots>
-		<subslots>
-			Must only be used by packages that are known to use private parts of the Qt API.
-		</subslots>
-	</slots>
-</pkgmetadata>

diff --git a/dev-qt/qtwebkit/qtwebkit-5.12.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.12.9999.ebuild
deleted file mode 100644
index 8af05a19..00000000
--- a/dev-qt/qtwebkit/qtwebkit-5.12.9999.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1:5"
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp"
-REQUIRED_USE="?? ( gstreamer multimedia )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	>=dev-libs/leveldb-1.18-r1
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-qt/qtcore-${QT_MIN_VER}[icu]
-	>=dev-qt/qtgui-${QT_MIN_VER}
-	>=dev-qt/qtnetwork-${QT_MIN_VER}
-	>=dev-qt/qtsql-${QT_MIN_VER}
-	>=dev-qt/qtwidgets-${QT_MIN_VER}
-	media-libs/fontconfig:1.0
-	media-libs/libpng:0=
-	>=sys-libs/zlib-1.2.5
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
-	opengl? (
-		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-		>=dev-qt/qtopengl-${QT_MIN_VER}
-	)
-	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/ruby
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	virtual/rubygems
-	test? ( >=dev-qt/qttest-${QT_MIN_VER} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-)
-
-src_prepare() {
-	# ensure bundled library cannot be used
-	rm -r Source/ThirdParty/leveldb || die
-
-	# force using system library
-	sed -i -e 's/qtConfig(system-jpeg)/true/' \
-		-e 's/qtConfig(system-png)/true/' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 466216
-	sed -i -e '/CONFIG +=/s/rpath//' \
-		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
-		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
-		|| die
-
-	qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf
-
-	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod webchannel webchannel \
-		Source/WebKit2/Target.pri \
-		Source/WebKit2/WebKit2.pri
-
-	if ! use gstreamer; then
-		PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
-	fi
-
-	# bug 562396
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
-	use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 458222
-	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 572056
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
-		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
-		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
-	fi
-}

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
deleted file mode 100644
index 0123ea81..00000000
--- a/dev-qt/qtwebkit/qtwebkit-5.9.9999.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1:5"
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp"
-REQUIRED_USE="?? ( gstreamer multimedia )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	>=dev-libs/leveldb-1.18-r1:=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-qt/qtcore-${QT_MIN_VER}[icu]
-	>=dev-qt/qtgui-${QT_MIN_VER}
-	>=dev-qt/qtnetwork-${QT_MIN_VER}
-	>=dev-qt/qtsql-${QT_MIN_VER}
-	>=dev-qt/qtwidgets-${QT_MIN_VER}
-	media-libs/fontconfig:1.0
-	media-libs/libpng:0=
-	>=sys-libs/zlib-1.2.5
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
-	opengl? (
-		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-		>=dev-qt/qtopengl-${QT_MIN_VER}
-	)
-	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/ruby
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	virtual/rubygems
-	test? ( >=dev-qt/qttest-${QT_MIN_VER} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-)
-
-src_prepare() {
-	# ensure bundled library cannot be used
-	rm -r Source/ThirdParty/leveldb || die
-
-	# force using system library
-	sed -i -e 's/qtConfig(system-jpeg)/true/' \
-		-e 's/qtConfig(system-png)/true/' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 466216
-	sed -i -e '/CONFIG +=/s/rpath//' \
-		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
-		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
-		|| die
-
-	qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf
-
-	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod webchannel webchannel \
-		Source/WebKit2/Target.pri \
-		Source/WebKit2/WebKit2.pri
-
-	if ! use gstreamer; then
-		PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
-	fi
-
-	# bug 562396
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
-	use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 458222
-	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 572056
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
-		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
-		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
-	fi
-}

diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
deleted file mode 100644
index 8af05a19..00000000
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-QT_MIN_VER="5.9.1:5"
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-# TODO: qttestlib
-
-IUSE="geolocation gstreamer gles2 +jit multimedia opengl orientation printsupport qml test webchannel webp"
-REQUIRED_USE="?? ( gstreamer multimedia )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/icu:=
-	>=dev-libs/leveldb-1.18-r1
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-qt/qtcore-${QT_MIN_VER}[icu]
-	>=dev-qt/qtgui-${QT_MIN_VER}
-	>=dev-qt/qtnetwork-${QT_MIN_VER}
-	>=dev-qt/qtsql-${QT_MIN_VER}
-	>=dev-qt/qtwidgets-${QT_MIN_VER}
-	media-libs/fontconfig:1.0
-	media-libs/libpng:0=
-	>=sys-libs/zlib-1.2.5
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
-	opengl? (
-		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
-		>=dev-qt/qtopengl-${QT_MIN_VER}
-	)
-	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_MIN_VER} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/ruby
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	virtual/rubygems
-	test? ( >=dev-qt/qttest-${QT_MIN_VER} )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
-)
-
-src_prepare() {
-	# ensure bundled library cannot be used
-	rm -r Source/ThirdParty/leveldb || die
-
-	# force using system library
-	sed -i -e 's/qtConfig(system-jpeg)/true/' \
-		-e 's/qtConfig(system-png)/true/' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 466216
-	sed -i -e '/CONFIG +=/s/rpath//' \
-		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
-		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
-		|| die
-
-	qt_use_disable_config opengl opengl Tools/qmake/mkspecs/features/features.prf
-
-	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
-	qt_use_disable_mod webchannel webchannel \
-		Source/WebKit2/Target.pri \
-		Source/WebKit2/WebKit2.pri
-
-	if ! use gstreamer; then
-		PATCHES+=("${FILESDIR}/${PN}-5.8.0-disable-gstreamer.patch")
-	fi
-
-	# bug 562396
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch")
-
-	use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-
-	# bug 458222
-	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 572056
-	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebKit.so ]]; then
-		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
-		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
-	fi
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-12-06 19:47 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-25 16:41 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/files/, dev-qt/qtwebkit/ Davide Pesavento
  -- strict thread matches above, loose matches on Subject: below --
2014-06-24 14:14 Michael Palimaka
2014-09-28 17:40 Davide Pesavento
2015-03-14 18:21 Michael Palimaka
2015-07-15  1:14 Davide Pesavento
2018-12-06 19:46 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox