liferea-xulrunner.patch

   1 diff -urN liferea-1.4.16b/src/mozilla/Makefile.am liferea-1.4.16b.new/src/mozilla/Makefile.am
   2 --- liferea-1.4.16b/src/mozilla/Makefile.am     2007-07-23 19:56:53.000000000 +0200
   3 +++ liferea-1.4.16b.new/src/mozilla/Makefile.am 2008-07-07 18:58:58.000000000 +0200
   4 @@ -37,14 +37,22 @@
   5
   6  ## the XulRunner support module
   7
   8 +XULRUNNER_EXTRA_CFLAGS = \
   9 +       -I/usr/include/xulrunner \
  10 +       -I/usr/include/xulrunner/dom \
  11 +       -I/usr/include/xulrunner/gtkembedmoz \
  12 +       -I/usr/include/xulrunner/necko \
  13 +       -I/usr/include/xulrunner/webbrwsr \
  14 +       -I/usr/include/xulrunner/xpcom
  15 +
  16  liblihtmlx_la_SOURCES = \
  17         mozembed.c mozembed.h \
  18         mozsupport.cpp mozsupport.h \
  19         xulrunner.c
  20
  21  liblihtmlx_la_LIBADD = $(PACKAGE_LIBS) $(XULRUNNER_LIBS) $(INTLLIBS)
  22 -liblihtmlx_la_CFLAGS = $(XULRUNNER_CFLAGS) $(PACKAGE_CFLAGS)  -DXULRUNNER_HOME=\""$(XULRUNNER_HOME)\""
  23 -liblihtmlx_la_CXXFLAGS = $(XULRUNNER_CFLAGS) $(PACKAGE_CFLAGS)
  24 +liblihtmlx_la_CFLAGS = $(XULRUNNER_CFLAGS) $(XULRUNNER_EXTRA_CFLAGS) $(PACKAGE_CFLAGS)  -DXULRUNNER_HOME=\""$(XULRUNNER_HOME)\""
  25 +liblihtmlx_la_CXXFLAGS = $(XULRUNNER_CFLAGS) $(XULRUNNER_EXTRA_CFLAGS) $(PACKAGE_CFLAGS)
  26
  27  if PLATFORM_WIN32
  28
  29 diff -urN liferea-1.4.16b/src/mozilla/xulrunner.c liferea-1.4.16b.new/src/mozilla/xulrunner.c
  30 --- liferea-1.4.16b/src/mozilla/xulrunner.c     2007-07-23 19:56:53.000000000 +0200
  31 +++ liferea-1.4.16b.new/src/mozilla/xulrunner.c 2008-07-07 18:54:44.000000000 +0200
  32 @@ -30,10 +30,12 @@
  33
  34  static void xulrunner_init(void) {
  35
  36 +#ifndef XPCOM_GLUE
  37         /* gtk_moz_embed_set_comp_path() must not be called
  38            without a component path for XulRunner. Passing
  39            NULL will crash Liferea. */
  40         gtk_moz_embed_set_comp_path(XULRUNNER_HOME);
  41 +#endif
  42
  43         mozembed_init();
  44  }