Bug#669059: Reopening Bug #669059

2012-05-25 Thread Gustavo Noronha Silva 
On Sex, 2012-05-25 at 11:04 +0200, Samuel Thibault wrote:
 I can make an 0-day NMU of webkit, if that can help the maintainer. It
 would be the attached patch.

Sure, please feel free, I'll acknowledge the NMU ASAP, thanks =)

-- 
Gustavo Noronha Silva k...@debian.org
Debian


signature.asc
Description: This is a digitally signed message part

Bug#669059: Reopening Bug #669059 (minor correction)

2012-05-25 Thread Svante Signell 
Of course the diff header lines below should read:

--- a/Source/ThirdParty/ANGLE/src/compiler/osinclude.h  2012-05-25
00:16:36.0 +0200
+++ b/Source/ThirdParty/ANGLE/src/compiler/osinclude.h  2012-05-25
00:20:48.0 +0200

and

--- a/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp
2012-05-25 00:16:35.0 +0200
+++ b/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp
2012-05-25 00:18:26.0 +0200

nothing else.
On Fri, 2012-05-25 at 01:01 +0200, Svante Signell wrote:
 reopen 669059
 found 669059 1.8.1-3
 thanks
 
 Hello,
 
 10_kfreebsd_support.patch needs to to add a __GNU__ statement to take
 effect for GNU/Hurd. It seems that __GLIBC__ is not automatically
 defined. Additionally, due to some misunderstanding the
 11_hurd_support.patch was not correct, one line of code was missing.
 Unfortunately this caused build problems on kFreeBSD too, not only Hurd.
 
 I'm inlining the update for 10_kfreebsd_support.patch and a correct
 11_hurd_support.patch patch below. Thanks!
 
 To add to 10_kfreebsd_support.patch:
 --- ../Source_ThirdParty_ANGLE_src_compiler_osinclude.h.orig
 2012-05-25 00:16:36.0 +0200
 +++ Source/ThirdParty/ANGLE/src/compiler/osinclude.h2012-05-25
 00:20:48.0 +0200
 @@ -16,7 +16,7 @@
  #define ANGLE_OS_WIN
  #elif defined(__APPLE__) || defined(__linux__) || \
defined(__FreeBSD__) || defined(__OpenBSD__) || \
 -  defined(__sun) || defined(ANDROID)
 +  defined(__sun) || defined(ANDROID) || defined(__GNU__)
  #define ANGLE_OS_POSIX
  #else
  #error Unsupported platform.
 
 Correct 11_hurd_support.patch:
 --- ../Source_JavaScriptCore_wtf_gobject_GlibUtilities.cpp.orig
 2012-05-25 00:16:35.0 +0200
 +++ Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp 2012-05-25
 00:18:26.0 +0200
 @@ -37,6 +37,11 @@
  return CString();
  return CString(readLinkBuffer, result);
  }
 +#elif OS(HURD)
 +CString getCurrentExecutablePath()
 +{
 +return CString();
 +}
  #elif OS(UNIX)
  CString getCurrentExecutablePath()
  {
 
 





-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#669059: Reopening Bug #669059

2012-05-25 Thread Samuel Thibault 
I can make an 0-day NMU of webkit, if that can help the maintainer. It
would be the attached patch.

Samuel
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.0 +0200
+++ webkit-1.8.1/debian/changelog   2012-05-25 11:02:55.0 +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 sthiba...@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.0 +0200
+++ webkit-1.8.1/debian/patches/10_kfreebsd_support.patch   2012-05-25 
11:02:47.0 +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.0 +0200
+++ webkit-1.8.1/debian/patches/11_hurd_support.patch   2012-05-25 
11:02:47.0 +0200
@@ -1,6 +1,6 @@
 --- a/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp  2012-02-19 
18:45:45.0 +0100
 +++ b/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp  2012-04-23 
10:24:41.0 +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);

Bug#669059: Reopening Bug #669059

2012-05-25 Thread Samuel Thibault 
Samuel Thibault, le Fri 25 May 2012 11:04:10 +0200, a écrit :
 I can make an 0-day NMU of webkit, if that can help the maintainer. It
 would be the attached patch.

I have tested it successfully on linux and kfreebsd.

Samuel

 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.0 +0200
 +++ webkit-1.8.1/debian/changelog 2012-05-25 11:02:55.0 +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 sthiba...@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.0 +0200
 +++ webkit-1.8.1/debian/patches/10_kfreebsd_support.patch 2012-05-25 
 11:02:47.0 +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.0 +0200
 +++ webkit-1.8.1/debian/patches/11_hurd_support.patch 2012-05-25 
 11:02:47.0 +0200
 @@ -1,6 +1,6 @@
  --- a/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp2012-02-19 
 18:45:45.0 +0100
  +++ b/Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp2012-04-23 
 10:24:41.0 +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);


-- 
Samuel
 Je suis maintenant possesseur d'un ordinateur portable Compaq Armada
 1592DT avec port infra-rouge. Auriez-vous connaissance de programmes
 suceptibles d'utiliser ce port afin de servir de télécommande ?
 -+- JN in NPC : ben quoi, c'est pas à ça que ça sert ?



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#669059: Reopening Bug #669059

2012-05-24 Thread Svante Signell 
reopen 669059
found 669059 1.8.1-3
thanks

Hello,

10_kfreebsd_support.patch needs to to add a __GNU__ statement to take
effect for GNU/Hurd. It seems that __GLIBC__ is not automatically
defined. Additionally, due to some misunderstanding the
11_hurd_support.patch was not correct, one line of code was missing.
Unfortunately this caused build problems on kFreeBSD too, not only Hurd.

I'm inlining the update for 10_kfreebsd_support.patch and a correct
11_hurd_support.patch patch below. Thanks!

To add to 10_kfreebsd_support.patch:
--- ../Source_ThirdParty_ANGLE_src_compiler_osinclude.h.orig
2012-05-25 00:16:36.0 +0200
+++ Source/ThirdParty/ANGLE/src/compiler/osinclude.h2012-05-25
00:20:48.0 +0200
@@ -16,7 +16,7 @@
 #define ANGLE_OS_WIN
 #elif defined(__APPLE__) || defined(__linux__) || \
   defined(__FreeBSD__) || defined(__OpenBSD__) || \
-  defined(__sun) || defined(ANDROID)
+  defined(__sun) || defined(ANDROID) || defined(__GNU__)
 #define ANGLE_OS_POSIX
 #else
 #error Unsupported platform.

Correct 11_hurd_support.patch:
--- ../Source_JavaScriptCore_wtf_gobject_GlibUtilities.cpp.orig
2012-05-25 00:16:35.0 +0200
+++ Source/JavaScriptCore/wtf/gobject/GlibUtilities.cpp 2012-05-25
00:18:26.0 +0200
@@ -37,6 +37,11 @@
 return CString();
 return CString(readLinkBuffer, result);
 }
+#elif OS(HURD)
+CString getCurrentExecutablePath()
+{
+return CString();
+}
 #elif OS(UNIX)
 CString getCurrentExecutablePath()
 {





-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org