Bug#488531: devhelper FTBFS with gp-relative relocation against dynamic symbol

[Mike Hommey]

tag 488531 + patch
thanks

> There is a global
> gtk_moz_embed_get_nsIWebBrowserType gtk_moz_embed_get_nsIWebBrowser;
> defined right before (likewise for other members of this array), and
> even before, there is the same definition as for Yelper.cpp (see above).

Actually, the definitions were not the same, and the reason for that is
that some #includes were setting definitions for NS_EXPORT_ and
NS_IMPORT_ (namely, nscore.h, being #included by one of the #includes
in Yelper.cpp.

The disparity between these definitions in Yelper.cpp and in
dh-gecko-utils.cpp caused the problem. It is interesting to see this is
only a problem on alpha.

Anyways, this simple patch makes devhelp build on albeniz.

Mike
-------------- next part --------------
diff -u devhelp-0.19.1/debian/patches/02_gecko_1.9.patch devhelp-0.19.1/debian/patches/02_gecko_1.9.patch
--- devhelp-0.19.1/debian/patches/02_gecko_1.9.patch
+++ devhelp-0.19.1/debian/patches/02_gecko_1.9.patch
@@ -487,18 +487,23 @@
 Index: devhelp-0.19.1/src/dh-gecko-utils.cpp
 ===================================================================
 --- devhelp-0.19.1.orig/src/dh-gecko-utils.cpp	2008-05-25 18:55:37.000000000 +0200
-+++ devhelp-0.19.1/src/dh-gecko-utils.cpp	2008-05-27 12:20:50.001150076 +0200
-@@ -21,6 +21,9 @@
++++ devhelp-0.19.1/src/dh-gecko-utils.cpp	2008-07-05 11:17:56.304672802 +0200
+@@ -21,6 +21,10 @@
   */
  
  #include <config.h>
++#include <nsStringAPI.h>
 +#ifdef XPCOM_GLUE
 +#	include <gtkmozembed_glue.cpp>
 +#endif
  #include <gtkmozembed.h>
  #include <gtkmozembed_internal.h>
  
-@@ -41,7 +44,7 @@
+@@ -37,11 +41,10 @@
+ #include <nsILocalFile.h>
+ #include <nsIDOMMouseEvent.h>
+ #include <nsIWebBrowserFind.h>
+-#include <nsStringAPI.h>
  
  #include <stdlib.h>