| 1 |
commit: 38ad4bd8a384837e1239c4d7032095eb89d3c0de |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Sun Mar 3 00:56:12 2013 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 00:56:12 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=38ad4bd8 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: 1.11.5 → 1.11.90 |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 10 ++++++++++ |
| 12 |
...-r300.ebuild => webkit-gtk-1.11.90-r300.ebuild} | 14 +++++--------- |
| 13 |
2 files changed, 15 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..8f56ab2 |
| 18 |
--- /dev/null |
| 19 |
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch |
| 20 |
@@ -0,0 +1,10 @@ |
| 21 |
+--- configure.ac.old 2013-03-02 09:22:53.791750644 +0200 |
| 22 |
++++ configure.ac 2013-03-02 09:24:56.725213764 +0200 |
| 23 |
+@@ -24,6 +24,7 @@ |
| 24 |
+ m4_include([Source/autotools/SetupLibtool.m4]) |
| 25 |
+ m4_include([Source/autotools/ReadCommandLineArguments.m4]) |
| 26 |
+ m4_include([Source/autotools/FindDependencies.m4]) |
| 27 |
++GTK_DOC_CHECK([1.10]) |
| 28 |
+ m4_include([Source/autotools/SetupCompilerFlags.m4]) |
| 29 |
+ m4_include([Source/autotools/SetupAutoconfHeader.m4]) |
| 30 |
+ |
| 31 |
|
| 32 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild |
| 33 |
similarity index 96% |
| 34 |
rename from net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild |
| 35 |
rename to net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild |
| 36 |
index 8e7f8a8..641baea 100644 |
| 37 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild |
| 38 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild |
| 39 |
@@ -27,7 +27,6 @@ RDEPEND=" |
| 40 |
app-crypt/libsecret |
| 41 |
dev-libs/libxml2:2 |
| 42 |
dev-libs/libxslt |
| 43 |
- media-libs/harfbuzz |
| 44 |
media-libs/libwebp |
| 45 |
virtual/jpeg:= |
| 46 |
>=media-libs/libpng-1.4:0= |
| 47 |
@@ -43,8 +42,8 @@ RDEPEND=" |
| 48 |
|
| 49 |
geoloc? ( app-misc/geoclue ) |
| 50 |
gstreamer? ( |
| 51 |
- media-libs/gstreamer:1.0 |
| 52 |
- media-libs/gst-plugins-base:1.0 ) |
| 53 |
+ >=media-libs/gstreamer-1.0.3:1.0 |
| 54 |
+ >=media-libs/gst-plugins-base-1.0.3:1.0 ) |
| 55 |
introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) |
| 56 |
spell? ( >=app-text/enchant-0.22:= ) |
| 57 |
webgl? ( |
| 58 |
@@ -113,11 +112,8 @@ src_prepare() { |
| 59 |
# https://bugs.webkit.org/show_bug.cgi?id=28727 |
| 60 |
use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch |
| 61 |
|
| 62 |
- # Drop DEPRECATED flags |
| 63 |
- LC_ALL=C sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die |
| 64 |
- |
| 65 |
# Don't force -O2 |
| 66 |
- sed -i 's/-O2//g' "${S}"/configure.ac || die |
| 67 |
+ sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die |
| 68 |
|
| 69 |
# Build-time segfaults under PaX with USE="introspection jit", bug #404215 |
| 70 |
if use introspection && use jit; then |
| 71 |
@@ -156,6 +152,8 @@ src_prepare() { |
| 72 |
# Respect CC, otherwise fails on prefix #395875 |
| 73 |
tc-export CC |
| 74 |
|
| 75 |
+ epatch "${FILESDIR}/${P}-gtk-docize-fix.patch" |
| 76 |
+ |
| 77 |
# Prevent maintainer mode from being triggered during make |
| 78 |
AT_M4DIR=Source/autotools eautoreconf |
| 79 |
|
| 80 |
@@ -183,7 +181,6 @@ src_configure() { |
| 81 |
myconf=" |
| 82 |
$(use_enable coverage) |
| 83 |
$(use_enable debug) |
| 84 |
- $(use_enable debug debug-features) |
| 85 |
$(use_enable geoloc geolocation) |
| 86 |
$(use_enable spell spellcheck) |
| 87 |
$(use_enable introspection) |
| 88 |
@@ -193,7 +190,6 @@ src_configure() { |
| 89 |
--disable-egl |
| 90 |
--disable-gles2 |
| 91 |
--with-gtk=3.0 |
| 92 |
- --with-gstreamer=1.0 |
| 93 |
--enable-accelerated-compositing |
| 94 |
--enable-dependency-tracking |
| 95 |
--disable-gtk-doc |
Archives