| 1 |
eva 12/12/25 23:45:45 |
| 2 |
|
| 3 |
Added: webkit-gtk-1.9.91-libdl.patch |
| 4 |
webkit-gtk-1.11.1-libdl.patch |
| 5 |
webkit-gtk-1.10.1-disable-backtrace-uclibc.patch |
| 6 |
Log: |
| 7 |
Version bump. Switch to EAPI=5 and python-single-r1.eclass. Uses gstreamer:1.0, webkit2 is always on. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: webkit-gtk-1.9.91-libdl.patch |
| 18 |
=================================================================== |
| 19 |
https://bugs.gentoo.org/show_bug.cgi?id=417523 |
| 20 |
https://bugs.webkit.org/show_bug.cgi?id=96602 |
| 21 |
|
| 22 |
Index: configure.ac |
| 23 |
=================================================================== |
| 24 |
--- configure.ac (revision 128397) |
| 25 |
+++ configure.ac (working copy) |
| 26 |
@@ -278,6 +278,10 @@ |
| 27 |
AC_SUBST([OLE32_LIBS]) |
| 28 |
|
| 29 |
|
| 30 |
+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])]) |
| 31 |
+AC_SUBST([DLOPEN_LIBS]) |
| 32 |
+ |
| 33 |
+ |
| 34 |
# determine the GTK+ version to use |
| 35 |
AC_MSG_CHECKING([the GTK+ version to use]) |
| 36 |
AC_ARG_WITH([gtk], |
| 37 |
@@ -1124,7 +1128,7 @@ |
| 38 |
fi |
| 39 |
|
| 40 |
if test "$with_acceleration_backend" = "opengl"; then |
| 41 |
- OPENGL_LIBS="-lGL -ldl" |
| 42 |
+ OPENGL_LIBS="-lGL $DLOPEN_LIBS" |
| 43 |
fi |
| 44 |
AC_SUBST([OPENGL_LIBS]) |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: webkit-gtk-1.11.1-libdl.patch |
| 55 |
=================================================================== |
| 56 |
https://bugs.webkit.org/show_bug.cgi?id=96602 |
| 57 |
|
| 58 |
--- configure.ac (revision 132329) |
| 59 |
+++ configure.ac (working copy) |
| 60 |
@@ -278,6 +278,10 @@ |
| 61 |
AC_SUBST([OLE32_LIBS]) |
| 62 |
|
| 63 |
|
| 64 |
+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])]) |
| 65 |
+AC_SUBST([DLOPEN_LIBS]) |
| 66 |
+ |
| 67 |
+ |
| 68 |
# determine the GTK+ version to use |
| 69 |
AC_MSG_CHECKING([the GTK+ version to use]) |
| 70 |
AC_ARG_WITH([gtk], |
| 71 |
@@ -1039,7 +1043,7 @@ |
| 72 |
if test "$enable_glx" = "yes"; then |
| 73 |
acceleration_backend_description+=", glx" |
| 74 |
fi |
| 75 |
- OPENGL_LIBS+=" -ldl" |
| 76 |
+ OPENGL_LIBS+=" $DLOPEN_LIBS" |
| 77 |
acceleration_backend_description+=")" |
| 78 |
fi |
| 79 |
AC_SUBST([OPENGL_LIBS]) |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch?rev=1.1&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch?rev=1.1&content-type=text/plain |
| 87 |
|
| 88 |
Index: webkit-gtk-1.10.1-disable-backtrace-uclibc.patch |
| 89 |
=================================================================== |
| 90 |
From: Anthony Basile <blueness@g.o> |
| 91 |
Date: Sun, 04 Nov 2012 01:51:27 +0000 |
| 92 |
|
| 93 |
webkit-gtk fails to build on a uclibc system because |
| 94 |
Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have |
| 95 |
/usr/include/execinfo.h and provide backtrace(). But uclibc does not. Its |
| 96 |
straightforward to extend the test to see if its also a uclibc system and not |
| 97 |
include execinfo.h or call backtrace() |
| 98 |
|
| 99 |
--- a/Source/WTF/wtf/Assertions.cpp |
| 100 |
+++ b/Source/WTF/wtf/Assertions.cpp |
| 101 |
@@ -58,7 +58,7 @@ |
| 102 |
#include <windows.h> |
| 103 |
#endif |
| 104 |
|
| 105 |
-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) |
| 106 |
+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID) |
| 107 |
#include <cxxabi.h> |
| 108 |
#include <dlfcn.h> |
| 109 |
#include <execinfo.h> |
| 110 |
@@ -268,7 +268,7 @@ |
| 111 |
|
| 112 |
void WTFGetBacktrace(void** stack, int* size) |
| 113 |
{ |
| 114 |
-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) |
| 115 |
+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID) |
| 116 |
*size = backtrace(stack, *size); |
| 117 |
#elif OS(WINDOWS) && !OS(WINCE) |
| 118 |
// The CaptureStackBackTrace function is available in XP, but it is not defined |
Archives