yelp-libxul.patch

   1 diff -urN yelp-2.30.1/m4/gecko.m4 yelp-2.30.1.new//m4/gecko.m4
   2 --- yelp-2.30.1/m4/gecko.m4     2010-03-19 15:11:01.000000000 +0100
   3 +++ yelp-2.30.1.new//m4/gecko.m4        2010-07-02 00:51:40.195866400 +0200
   4 @@ -119,7 +119,7 @@
   5         _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
   6         _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
   7  else
   8 -       _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
   9 +       _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`"
  10         _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
  11         _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
  12         _GECKO_HOME=$with_gecko_home
  13 diff -urN yelp-2.30.1/src/Makefile.am yelp-2.30.1.new//src/Makefile.am
  14 --- yelp-2.30.1/src/Makefile.am 2010-03-19 15:11:01.000000000 +0100
  15 +++ yelp-2.30.1.new//src/Makefile.am    2010-07-02 00:52:09.092511415 +0200
  16 @@ -61,7 +61,8 @@
  17         uriloader       \
  18         webbrwsr        \
  19         webshell        \
  20 -       widget
  21 +       widget          \
  22 +       xpcom
  23
  24  yelp_CPPFLAGS =                                                                        \
  25         -I$(top_srcdir)                                                         \
  26 @@ -84,16 +85,16 @@
  27         $(AM_CXXFLAGS)
  28
  29  yelp_LDADD =                           \
  30 +       $(MOZILLA_COMPONENT_LIBS)       \
  31 +       $(MOZILLA_EXTRA_LIBS)           \
  32 +       $(MOZILLA_GLUE_LIBS)            \
  33         $(YELP_LIBS)                    \
  34         $(YELP_SEARCH_LIBS)             \
  35         $(POPT_LIBS)                    \
  36         $(Z_LIBS)                       \
  37         $(BZ_LIBS)                      \
  38         $(LZMADEC_LIBS)                 \
  39 -       $(X_LIBS)                       \
  40 -       $(MOZILLA_COMPONENT_LIBS)       \
  41 -       $(MOZILLA_EXTRA_LIBS)           \
  42 -       $(MOZILLA_GLUE_LIBS)
  43 +       $(X_LIBS)
  44
  45  yelp_LDFLAGS = $(AM_LDFLAGS)
  46