liferea-xulrunner.patch

   1 diff -urN liferea-1.4.17/configure.ac liferea-1.4.17.new/configure.ac
   2 --- liferea-1.4.17/configure.ac 2008-07-22 21:30:09.000000000 +0200
   3 +++ liferea-1.4.17.new/configure.ac     2008-07-22 21:33:08.000000000 +0200
   4 @@ -184,11 +184,6 @@
   5        AC_SUBST([XULRUNNER_HOME])
   6        AC_SUBST(XULRUNNER_CFLAGS)
   7        AC_SUBST(XULRUNNER_LIBS)
   8 -
   9 -      if test "x$XULRUNNER_HOME" = "x" ; then
  10 -       AC_MSG_RESULT([Fatal: XulRunner enabled, but XULRUNNER_HOME is empty!])
  11 -       exit 1
  12 -      fi
  13
  14        MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' |  cut -c 3-`
  15
  16 diff -urN liferea-1.4.17/src/mozilla/Makefile.am liferea-1.4.17.new/src/mozilla/Makefile.am
  17 --- liferea-1.4.17/src/mozilla/Makefile.am      2007-07-23 19:56:53.000000000 +0200
  18 +++ liferea-1.4.17.new/src/mozilla/Makefile.am  2008-07-22 21:32:47.000000000 +0200
  19 @@ -37,14 +37,22 @@
  20
  21  ## the XulRunner support module
  22
  23 +XULRUNNER_EXTRA_CFLAGS = \
  24 +       -I/usr/include/xulrunner \
  25 +       -I/usr/include/xulrunner/dom \
  26 +       -I/usr/include/xulrunner/gtkembedmoz \
  27 +       -I/usr/include/xulrunner/necko \
  28 +       -I/usr/include/xulrunner/webbrwsr \
  29 +       -I/usr/include/xulrunner/xpcom
  30 +
  31  liblihtmlx_la_SOURCES = \
  32         mozembed.c mozembed.h \
  33         mozsupport.cpp mozsupport.h \
  34         xulrunner.c
  35
  36  liblihtmlx_la_LIBADD = $(PACKAGE_LIBS) $(XULRUNNER_LIBS) $(INTLLIBS)
  37 -liblihtmlx_la_CFLAGS = $(XULRUNNER_CFLAGS) $(PACKAGE_CFLAGS)  -DXULRUNNER_HOME=\""$(XULRUNNER_HOME)\""
  38 -liblihtmlx_la_CXXFLAGS = $(XULRUNNER_CFLAGS) $(PACKAGE_CFLAGS)
  39 +liblihtmlx_la_CFLAGS = $(XULRUNNER_CFLAGS) $(XULRUNNER_EXTRA_CFLAGS) $(PACKAGE_CFLAGS)  -DXULRUNNER_HOME=\""$(XULRUNNER_HOME)\""
  40 +liblihtmlx_la_CXXFLAGS = $(XULRUNNER_CFLAGS) $(XULRUNNER_EXTRA_CFLAGS) $(PACKAGE_CFLAGS)
  41
  42  if PLATFORM_WIN32
  43
  44 diff -urN liferea-1.4.17/src/mozilla/xulrunner.c liferea-1.4.17.new/src/mozilla/xulrunner.c
  45 --- liferea-1.4.17/src/mozilla/xulrunner.c      2008-07-01 19:04:55.000000000 +0200
  46 +++ liferea-1.4.17.new/src/mozilla/xulrunner.c  2008-07-22 21:32:47.000000000 +0200
  47 @@ -30,10 +30,12 @@
  48
  49  static void xulrunner_init(void) {
  50
  51 +#ifndef XPCOM_GLUE
  52         /* gtk_moz_embed_set_comp_path() must not be called
  53            without a component path for XulRunner. Passing
  54            NULL will crash Liferea. */
  55         gtk_moz_embed_set_comp_path(XULRUNNER_HOME);
  56 +#endif
  57
  58         mozembed_init();
  59  }