From: "Alexandre Rostovtsev" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date: Thu, 13 Sep 2012 05:35:39 +0000 (UTC) [thread overview]
Message-ID: <1347514504.ae7ab2b6095d5551eb548b41a316f1e0595ce46a.tetromino@gentoo> (raw)
commit: ae7ab2b6095d5551eb548b41a316f1e0595ce46a
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 05:35:04 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 05:35:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ae7ab2b6
net-libs/webkit-gtk: sync with gx86
Fix linking failure on freebsd.
---
.../webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch | 27 ++++++++++++++++++++
net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild | 3 ++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch
new file mode 100644
index 0000000..841d41c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=417523
+https://bugs.webkit.org/show_bug.cgi?id=96602
+
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 128397)
++++ configure.ac (working copy)
+@@ -278,6 +278,10 @@
+ AC_SUBST([OLE32_LIBS])
+
+
++AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
++AC_SUBST([DLOPEN_LIBS])
++
++
+ # determine the GTK+ version to use
+ AC_MSG_CHECKING([the GTK+ version to use])
+ AC_ARG_WITH([gtk],
+@@ -1124,7 +1128,7 @@
+ fi
+
+ if test "$with_acceleration_backend" = "opengl"; then
+- OPENGL_LIBS="-lGL -ldl"
++ OPENGL_LIBS="-lGL -$DLOPEN_LIBS"
+ fi
+ AC_SUBST([OPENGL_LIBS])
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild
index 338d8d6..4680564 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild
@@ -137,6 +137,9 @@ src_prepare() {
# https://bugs.webkit.org/show_bug.cgi?id=90098
epatch "${FILESDIR}/${PN}-1.9.4-llint-build-failure.patch"
+ # bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
+ epatch "${FILESDIR}/${PN}-1.9.91-libdl.patch"
+
# Respect CC, otherwise fails on prefix #395875
tc-export CC
next reply other threads:[~2012-09-13 5:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-13 5:35 Alexandre Rostovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-21 14:40 [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ Gilles Dartiguelongue
2013-11-27 23:32 Gilles Dartiguelongue
2013-03-03 0:57 Priit Laes
2013-02-13 14:05 Priit Laes
2013-01-15 9:39 Priit Laes
2012-11-04 6:25 Alexandre Rostovtsev
2012-10-27 8:43 Priit Laes
2012-10-10 17:34 Priit Laes
2012-07-12 12:33 Priit Laes
2012-04-14 6:10 Alexandre Restovtsev
2012-04-06 2:36 Alexandre Restovtsev
2012-03-04 21:11 Alexandre Restovtsev
2012-02-26 19:20 Alexandre Restovtsev
2012-01-17 9:08 Priit Laes
2011-12-20 17:37 Priit Laes
2011-11-28 5:35 Priit Laes
2011-11-26 8:43 Priit Laes
2011-10-30 0:13 Alexandre Restovtsev
2011-06-11 1:44 Nirbheek Chauhan
2011-06-05 20:12 Priit Laes
2011-05-07 19:18 Priit Laes
2011-03-22 13:22 Priit Laes
2011-03-04 10:23 Nirbheek Chauhan
2011-02-25 11:54 Priit Laes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347514504.ae7ab2b6095d5551eb548b41a316f1e0595ce46a.tetromino@gentoo \
--to=tetromino@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox