Bug#669059: Reopening Bug #669059

[Samuel Thibault]

I can make an 0-day NMU of webkit, if that can help the maintainer. It
would be the attached patch.

Samuel
-------------- next part --------------
diff -Nru webkit-1.8.1/debian/changelog webkit-1.8.1/debian/changelog
--- webkit-1.8.1/debian/changelog	2012-05-24 03:55:35.000000000 +0200
+++ webkit-1.8.1/debian/changelog	2012-05-25 11:02:55.000000000 +0200
@@ -1,3 +1,12 @@
+webkit (1.8.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix debian/patches/10_kfreebsd_support.patch
+  debian/patches/11_hurd_support.patch patches for kfreebsd and hurd build
+  (Closes: #669059).
+
+ -- Samuel Thibault <sthibault at debian.org>  Fri, 25 May 2012 11:00:30 +0200
+
 webkit (1.8.1-3) unstable; urgency=low
 
   [ Samuel Thibault ]
diff -Nru webkit-1.8.1/debian/patches/10_kfreebsd_support.patch webkit-1.8.1/debian/patches/10_kfreebsd_support.patch
--- webkit-1.8.1/debian/patches/10_kfreebsd_support.patch	2012-05-24 03:55:35.000000000 +0200
+++ webkit-1.8.1/debian/patches/10_kfreebsd_support.patch	2012-05-25 11:02:47.000000000 +0200
@@ -7,7 +7,7 @@
  #define ANGLE_OS_WIN
  #elif defined(__APPLE__) || defined(__linux__) || \
 -      defined(__FreeBSD__) || defined(__OpenBSD__) || \
-+      defined(__FreeBSD__) || defined(__GLIBC__) || defined(__OpenBSD__) || \
++      defined(__FreeBSD__) || defined(__GLIBC__) || defined(__GNU__) || defined(__OpenBSD__) || \
        defined(__sun) || defined(ANDROID)
  #define ANGLE_OS_POSIX
  #else
diff -Nru webkit-1.8.1/debian/patches/11_hurd_support.patch webkit-1.8.1/debian/patches/11_hurd_support.patch
--- webkit-1.8.1/debian/patches/11_hurd_support.patch	2012-05-24 03:55:35.000000000 +0200
+++ webkit-1.8.1/debian/patches/11_hurd_support.patch	2012-05-25 11:02:47.000000000 +0200
@@ -1,6 +1,6 @@
 --- a/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp	2012-02-19 18:45:45.000000000 +0100
 +++ b/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp	2012-04-23 10:24:41.000000000 +0200
-@@ -37,9 +37,13 @@
+@@ -37,9 +37,14 @@
          return CString();
      return CString(readLinkBuffer, result);
  }
@@ -11,6 +11,7 @@
 +  return CString();
 +}
 +#elif OS(UNIX)
++CString getCurrentExecutablePath()
 +{
      static char readLinkBuffer[PATH_MAX];
      ssize_t result = readlink("/proc/curproc/file", readLinkBuffer, PATH_MAX);