From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 08C8E138010 for ; Thu, 13 Sep 2012 05:35:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48EF821C009; Thu, 13 Sep 2012 05:35:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 156AC21C009 for ; Thu, 13 Sep 2012 05:35:41 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 538A633C4CC for ; Thu, 13 Sep 2012 05:35:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 07291E543C for ; Thu, 13 Sep 2012 05:35:39 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1347514504.ae7ab2b6095d5551eb548b41a316f1e0595ce46a.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: ae7ab2b6095d5551eb548b41a316f1e0595ce46a X-VCS-Branch: master Date: Thu, 13 Sep 2012 05:35:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2a1ce42e-7122-4ff4-b953-c5f3a721ddea X-Archives-Hash: bc81f049f7659c5d486fbaec42bee0e4 commit: ae7ab2b6095d5551eb548b41a316f1e0595ce46a Author: Alexandre Rostovtsev gentoo org> AuthorDate: Thu Sep 13 05:35:04 2012 +0000 Commit: Alexandre Rostovtsev gentoo 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