--- liferea-1.4.16b/debian/changelog 2008-08-20 00:20:29.000000000 +0200 +++ liferea-1.4.18/debian/changelog 2008-08-20 00:20:30.000000000 +0200 @@ -1,3 +1,13 @@ +liferea (1.4.18-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #259578) + * Fixes ugly CPU spikes caused by broken expiring mechanism + * debian/patches/xulrunner-1.9: don't die on missing XULRUNNER_HOME when + -DXPCOM_GLUE is found. + * debian/patches/99_autoconf: updated to reflect changes. + + -- Fabien Tassin Mon, 18 Aug 2008 22:24:30 +0200 + liferea (1.4.16b-0.1ubuntu1) intrepid; urgency=low * Merge from Debian unstable. --- liferea-1.4.16b/debian/patches/99_autoconf 2008-08-20 00:20:29.000000000 +0200 +++ liferea-1.4.18/debian/patches/99_autoconf 2008-08-20 00:20:30.000000000 +0200 @@ -1,8 +1,35 @@ -Index: liferea-1.4.16b/Makefile.in +--- + Makefile.in | 6 + + configure | 199 ++++++++++++++++++++++++++++++++++--------- + doc/Makefile.in | 4 + doc/html/Makefile.in | 4 + man/Makefile.in | 4 + man/pl/Makefile.in | 4 + opml/Makefile.in | 4 + pixmaps/Makefile.in | 4 + src/Makefile.in | 6 + + src/fl_sources/Makefile.in | 4 + src/gtkhtml2/Makefile.in | 4 + src/mozilla/Makefile.in | 4 + src/net/Makefile.in | 4 + src/notification/Makefile.in | 4 + src/parsers/Makefile.in | 4 + src/scripting/Makefile.in | 4 + src/ui/Makefile.in | 6 + + src/webkit/Makefile.in | 4 + xslt/Makefile.in | 4 + 19 files changed, 233 insertions(+), 44 deletions(-) + +Index: liferea-1.4.18/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/Makefile.in 2008-07-04 11:17:08.000000000 +1000 -+++ liferea-1.4.16b/Makefile.in 2008-07-04 11:17:21.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/Makefile.in ++++ liferea-1.4.18/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -11,7 +38,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -20,7 +57,17 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -@@ -253,7 +257,7 @@ + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +@@ -248,17 +252,17 @@ + + SUBDIRS = doc man opml pixmaps po src xslt + + desktop_in_files = liferea.desktop.in + desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) gladedir = $(pkgdatadir) @@ -29,11 +76,21 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@ schema_DATA = liferea.schemas -Index: liferea-1.4.16b/configure + + cssdir = $(pkgdatadir)/css + css_DATA = \ + css/liferea.css \ + css/adblock.css +Index: liferea-1.4.18/configure =================================================================== ---- liferea-1.4.16b.orig/configure 2008-07-04 11:16:38.000000000 +1000 -+++ liferea-1.4.16b/configure 2008-07-04 11:16:44.000000000 +1000 -@@ -939,6 +939,10 @@ +--- liferea-1.4.18.orig/configure ++++ liferea-1.4.18/configure +@@ -934,16 +934,20 @@ + WEBKIT_CFLAGS + WEBKIT_LIBS + WITH_WEBKIT_TRUE + WITH_WEBKIT_FALSE + GTKHTML2_CFLAGS GTKHTML2_LIBS WITH_GTKHTML2_TRUE WITH_GTKHTML2_FALSE @@ -44,7 +101,17 @@ MOZILLA_CFLAGS MOZILLA_LIBS WITH_MOZILLA_TRUE -@@ -1009,6 +1013,8 @@ + WITH_MOZILLA_FALSE + MOZILLA_LIB_ROOT + GCONFTOOL + GCONF_SCHEMA_CONFIG_SOURCE + GCONF_SCHEMA_FILE_DIR +@@ -1004,16 +1008,18 @@ + LUA51_CFLAGS + LUA51_LIBS + XULRUNNER_CFLAGS + XULRUNNER_LIBS + WEBKIT_CFLAGS WEBKIT_LIBS GTKHTML2_CFLAGS GTKHTML2_LIBS @@ -53,7 +120,17 @@ MOZILLA_CFLAGS MOZILLA_LIBS PACKAGE_CFLAGS -@@ -1623,6 +1629,7 @@ + PACKAGE_LIBS + DBUS_CFLAGS + DBUS_LIBS + NM_CFLAGS + NM_LIBS' +@@ -1618,16 +1624,17 @@ + --disable-webkit don't compile the webkit backend + --disable-xulrunner don't compile the xulrunner backend + --disable-gecko don't compile the Gecko backend + --enable-gecko=ARG specify which Gecko provider to use ("mozilla", + "firefox" or "seamonkey") --enable-gnutls Attempt to use GNUTLS for SSL support [default=yes] --disable-libnotify don't compile the libnotify plugin --disable-lua don't compile with LUA scripting support @@ -61,7 +138,17 @@ --disable-schemas-install Disable the schemas installation Optional Packages: -@@ -1675,6 +1682,9 @@ + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-pic try to use only PIC/non-PIC objects [default=use + both] +@@ -1670,16 +1677,19 @@ + linker flags for XULRUNNER, overriding pkg-config + WEBKIT_CFLAGS + C compiler flags for WEBKIT, overriding pkg-config + WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config + GTKHTML2_CFLAGS C compiler flags for GTKHTML2, overriding pkg-config GTKHTML2_LIBS linker flags for GTKHTML2, overriding pkg-config @@ -71,7 +158,17 @@ MOZILLA_CFLAGS C compiler flags for MOZILLA, overriding pkg-config MOZILLA_LIBS -@@ -4518,7 +4528,7 @@ + linker flags for MOZILLA, overriding pkg-config + PACKAGE_CFLAGS + C compiler flags for PACKAGE, overriding pkg-config + PACKAGE_LIBS + linker flags for PACKAGE, overriding pkg-config +@@ -4513,17 +4523,17 @@ + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* ;; *-*-irix6*) # Find out which ABI we are using. @@ -80,7 +177,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -7569,11 +7579,11 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -7564,21 +7574,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -94,7 +201,17 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -7859,11 +7869,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi +@@ -7854,21 +7864,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -108,7 +225,17 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -7963,11 +7973,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi +@@ -7958,21 +7968,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -122,7 +249,17 @@ if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -10340,7 +10350,7 @@ + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes +@@ -10335,17 +10345,17 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross + else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < + #endif + + #include + +@@ -10435,17 +10445,17 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross + else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < + #endif + + #include + +@@ -12836,21 +12846,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -154,7 +311,17 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -12945,11 +12955,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_CXX=yes + fi +@@ -12940,21 +12950,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -168,7 +335,17 @@ if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -14543,11 +14553,11 @@ + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes +@@ -14538,21 +14548,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -182,7 +359,17 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -14647,11 +14657,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_F77=yes + fi +@@ -14642,21 +14652,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -196,7 +383,17 @@ if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -16867,11 +16877,11 @@ + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_F77=yes +@@ -16862,21 +16872,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -210,7 +407,17 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -17157,11 +17167,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi +@@ -17152,21 +17162,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -224,7 +431,17 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -17261,11 +17271,11 @@ + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_GCJ=yes + fi +@@ -17256,21 +17266,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` @@ -238,7 +455,17 @@ if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -22195,6 +22205,13 @@ + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_GCJ=yes +@@ -22304,16 +22314,23 @@ + + # Check whether --enable-lua was given. + if test "${enable_lua+set}" = set; then + enableval=$enable_lua; + else enable_lua=yes fi @@ -252,7 +479,17 @@ { echo "$as_me:$LINENO: checking for 64bit platform" >&5 echo $ECHO_N "checking for 64bit platform... $ECHO_C" >&6; } -@@ -24290,7 +24307,7 @@ + case "$target" in + x86_64-*-*) + enable_gtkhtml2=no + { echo "$as_me:$LINENO: result: yes -> disabling GtkHTML2" >&5 + echo "${ECHO_T}yes -> disabling GtkHTML2" >&6; } +@@ -24399,17 +24416,17 @@ + { echo "$as_me:$LINENO: checking for LUA51" >&5 + echo $ECHO_N "checking for LUA51... $ECHO_C" >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$LUA51_CFLAGS"; then pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS" else if test -n "$PKG_CONFIG" && \ @@ -261,7 +498,17 @@ ($PKG_CONFIG --exists --print-errors "lua5.1 ") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -24394,12 +24411,12 @@ + (exit $ac_status); }; then + pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 " 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24503,40 +24520,40 @@ + { echo "$as_me:$LINENO: checking for XULRUNNER" >&5 + echo $ECHO_N "checking for XULRUNNER... $ECHO_C" >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$XULRUNNER_CFLAGS"; then pkg_cv_XULRUNNER_CFLAGS="$XULRUNNER_CFLAGS" else if test -n "$PKG_CONFIG" && \ @@ -277,7 +524,12 @@ else pkg_failed=yes fi -@@ -24412,12 +24429,12 @@ + fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then + if test -n "$XULRUNNER_LIBS"; then pkg_cv_XULRUNNER_LIBS="$XULRUNNER_LIBS" else if test -n "$PKG_CONFIG" && \ @@ -293,7 +545,17 @@ else pkg_failed=yes fi -@@ -24436,9 +24453,9 @@ + fi + else + pkg_failed=untried + fi + +@@ -24545,34 +24562,34 @@ + if test $pkg_failed = yes; then + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes + else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -305,7 +567,14 @@ fi # Put the nasty error message in config.log where it belongs echo "$XULRUNNER_PKG_ERRORS" >&5 -@@ -24453,7 +24470,7 @@ + + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + XULRUNNER_PROVIDER= + elif test $pkg_failed = untried; then + XULRUNNER_PROVIDER= + else + XULRUNNER_CFLAGS=$pkg_cv_XULRUNNER_CFLAGS XULRUNNER_LIBS=$pkg_cv_XULRUNNER_LIBS { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } @@ -314,7 +583,40 @@ fi if test "x$XULRUNNER_PROVIDER" = "x" ; then -@@ -25203,6 +25220,94 @@ + { echo "$as_me:$LINENO: checking for XulRunner 1.8 support" >&5 + echo $ECHO_N "checking for XulRunner 1.8 support... $ECHO_C" >&6; } + + pkg_failed=no + { echo "$as_me:$LINENO: checking for XULRUNNER" >&5 +@@ -24651,19 +24668,19 @@ + else + enable_xulrunner=yes + + XULRUNNER_HOME="`$PKG_CONFIG --variable=libdir $XULRUNNER_PROVIDER`" + + + + +- if test "x$XULRUNNER_HOME" = "x" ; then +- { echo "$as_me:$LINENO: result: Fatal: XulRunner enabled, but XULRUNNER_HOME is empty!" >&5 +-echo "${ECHO_T}Fatal: XulRunner enabled, but XULRUNNER_HOME is empty!" >&6; } ++ if test "x`echo $XULRUNNER_CFLAGS | grep -e '-DXPCOM_GLUE'`" = "x" && test "x$XULRUNNER_HOME" = "x" ; then ++ { echo "$as_me:$LINENO: result: Fatal: XulRunner enabled without XPCOM_GLUE, but XULRUNNER_HOME is empty!" >&5 ++echo "${ECHO_T}Fatal: XulRunner enabled without XPCOM_GLUE, but XULRUNNER_HOME is empty!" >&6; } + exit 1 + fi + + MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' | cut -c 3-` + + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -25318,16 +25335,104 @@ + WITH_GTKHTML2_FALSE='#' + else + WITH_GTKHTML2_TRUE='#' + WITH_GTKHTML2_FALSE= + fi @@ -409,7 +711,17 @@ if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then gecko_provider=mozilla { echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5 -@@ -28490,6 +28595,13 @@ + echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; } + + pkg_failed=no + { echo "$as_me:$LINENO: checking for MOZILLA" >&5 + echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } +@@ -28605,16 +28710,23 @@ + fi + if test -z "${WITH_GTKHTML2_TRUE}" && test -z "${WITH_GTKHTML2_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_GTKHTML2\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"WITH_GTKHTML2\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -423,7 +735,17 @@ if test -z "${WITH_MOZILLA_TRUE}" && test -z "${WITH_MOZILLA_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"WITH_MOZILLA\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -29308,6 +29420,10 @@ + echo "$as_me: error: conditional \"WITH_MOZILLA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +@@ -29419,16 +29531,20 @@ + WEBKIT_CFLAGS!$WEBKIT_CFLAGS$ac_delim + WEBKIT_LIBS!$WEBKIT_LIBS$ac_delim + WITH_WEBKIT_TRUE!$WITH_WEBKIT_TRUE$ac_delim + WITH_WEBKIT_FALSE!$WITH_WEBKIT_FALSE$ac_delim + GTKHTML2_CFLAGS!$GTKHTML2_CFLAGS$ac_delim GTKHTML2_LIBS!$GTKHTML2_LIBS$ac_delim WITH_GTKHTML2_TRUE!$WITH_GTKHTML2_TRUE$ac_delim WITH_GTKHTML2_FALSE!$WITH_GTKHTML2_FALSE$ac_delim @@ -434,7 +756,17 @@ MOZILLA_CFLAGS!$MOZILLA_CFLAGS$ac_delim MOZILLA_LIBS!$MOZILLA_LIBS$ac_delim WITH_MOZILLA_TRUE!$WITH_MOZILLA_TRUE$ac_delim -@@ -29328,10 +29444,6 @@ + WITH_MOZILLA_FALSE!$WITH_MOZILLA_FALSE$ac_delim + MOZILLA_LIB_ROOT!$MOZILLA_LIB_ROOT$ac_delim + GCONFTOOL!$GCONFTOOL$ac_delim + GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim + GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim +@@ -29439,20 +29555,16 @@ + OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim + OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim + USE_NLS!$USE_NLS$ac_delim + MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim CATALOGS!$CATALOGS$ac_delim CATOBJEXT!$CATOBJEXT$ac_delim GMOFILES!$GMOFILES$ac_delim @@ -445,7 +777,17 @@ _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -29373,6 +29485,10 @@ + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 + echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +@@ -29484,16 +29596,20 @@ + cat >>$CONFIG_STATUS <<_ACEOF + CEOF$ac_eof + _ACEOF + + ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -456,7 +798,17 @@ POFILES!$POFILES$ac_delim POSUB!$POSUB$ac_delim MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -@@ -29391,7 +29507,7 @@ + GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim + DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim + DBUS_LIBS!$DBUS_LIBS$ac_delim + WITH_DBUS_TRUE!$WITH_DBUS_TRUE$ac_delim + WITH_DBUS_FALSE!$WITH_DBUS_FALSE$ac_delim +@@ -29502,17 +29618,17 @@ + GNUTLS_CFLAGS!$GNUTLS_CFLAGS$ac_delim + GNUTLS_LIBS!$GNUTLS_LIBS$ac_delim + USE_GNUTLS_TRUE!$USE_GNUTLS_TRUE$ac_delim + USE_GNUTLS_FALSE!$USE_GNUTLS_FALSE$ac_delim + LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF @@ -465,7 +817,17 @@ break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -30043,6 +30159,7 @@ + echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -30137,16 +30253,17 @@ + if test "x$enable_mozilla" = "xyes"; then + echo "Build Mozilla Plugin............ : $enable_mozilla ($gecko_provider)" + else + echo "Build Mozilla Plugin............ : $enable_mozilla" + fi echo "Build XulRunner Plugin.......... : $enable_xulrunner" echo "Build WebKit Plugin............. : $enable_webkit" echo "Build GtkHTML Plugin............ : $enable_gtkhtml2" @@ -473,11 +835,21 @@ echo echo "Build libnotify Plugin.......... : $enable_libnotify" echo "Build LUA scripting Plugin ..... : $enable_lua" -Index: liferea-1.4.16b/doc/Makefile.in + echo + echo "Use X Session Management........ : $enable_sm" + echo "Use DBUS........................ : $enable_dbus" + echo "Use NetworkManager.............. : $enable_nm" + echo "GNUTLS SSL/HTTPS Support........ : $enable_gnutls" +Index: liferea-1.4.18/doc/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/doc/Makefile.in 2008-07-04 11:17:08.000000000 +1000 -+++ liferea-1.4.16b/doc/Makefile.in 2008-07-04 11:17:22.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/doc/Makefile.in ++++ liferea-1.4.18/doc/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -486,7 +858,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -495,11 +877,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/doc/html/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/doc/html/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/doc/html/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/doc/html/Makefile.in 2008-07-04 11:17:22.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/doc/html/Makefile.in ++++ liferea-1.4.18/doc/html/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -508,7 +900,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -517,11 +919,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/man/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/man/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/man/Makefile.in 2008-07-04 11:17:08.000000000 +1000 -+++ liferea-1.4.16b/man/Makefile.in 2008-07-04 11:17:22.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/man/Makefile.in ++++ liferea-1.4.18/man/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -530,7 +942,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -539,11 +961,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/man/pl/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/man/pl/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/man/pl/Makefile.in 2008-07-04 11:17:08.000000000 +1000 -+++ liferea-1.4.16b/man/pl/Makefile.in 2008-07-04 11:17:22.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/man/pl/Makefile.in ++++ liferea-1.4.18/man/pl/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -552,7 +984,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -561,11 +1003,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/opml/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/opml/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/opml/Makefile.in 2008-07-04 11:17:10.000000000 +1000 -+++ liferea-1.4.16b/opml/Makefile.in 2008-07-04 11:17:22.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/opml/Makefile.in ++++ liferea-1.4.18/opml/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -574,7 +1026,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -583,11 +1045,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/pixmaps/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/pixmaps/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/pixmaps/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/pixmaps/Makefile.in 2008-07-04 11:17:22.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/pixmaps/Makefile.in ++++ liferea-1.4.18/pixmaps/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -596,7 +1068,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -605,11 +1087,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/src/Makefile.in 2008-07-04 11:17:23.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/Makefile.in ++++ liferea-1.4.18/src/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -618,7 +1110,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -627,20 +1129,40 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -@@ -313,7 +317,7 @@ + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +@@ -308,17 +312,17 @@ + xml.c xml.h + + + liferea_bin_LDADD = net/liblinet.a \ + parsers/libliparsers.a \ fl_sources/libliflsources.a \ notification/liblinotification.a \ ui/libliui.a \ - $(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) -+ $(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) $(HILDON_LIBS) ++ $(PACKAGE_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(DBUS_LIBS) $(NM_LIBS) $(INTLLIBS) $(GNUTLS_LIBS) $(HILDON_LIBS) @WITH_DBUS_TRUE@EXTRA_DIST = $(srcdir)/liferea_dbus.xml -Index: liferea-1.4.16b/src/fl_sources/Makefile.in + @WITH_DBUS_TRUE@BUILT_SOURCES = dbus_wrap.c + @WITH_DBUS_TRUE@CLEANFILES = $(BUILT_SOURCES) + + @PLATFORM_WIN32_TRUE@liferea_bin_LDFLAGS = -Wl,--export-all-symbols,--out-implib,liferea-bin.a + subdir = src +Index: liferea-1.4.18/src/fl_sources/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/fl_sources/Makefile.in 2008-07-04 11:17:10.000000000 +1000 -+++ liferea-1.4.16b/src/fl_sources/Makefile.in 2008-07-04 11:17:23.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/fl_sources/Makefile.in ++++ liferea-1.4.18/src/fl_sources/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -649,7 +1171,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -658,11 +1190,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/gtkhtml2/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/gtkhtml2/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/gtkhtml2/Makefile.in 2008-07-04 11:17:10.000000000 +1000 -+++ liferea-1.4.16b/src/gtkhtml2/Makefile.in 2008-07-04 11:17:23.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/gtkhtml2/Makefile.in ++++ liferea-1.4.18/src/gtkhtml2/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -671,7 +1213,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -680,11 +1232,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/mozilla/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/mozilla/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/mozilla/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/src/mozilla/Makefile.in 2008-07-04 11:17:23.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/mozilla/Makefile.in ++++ liferea-1.4.18/src/mozilla/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -693,7 +1255,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -702,11 +1274,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/net/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/net/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/net/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/src/net/Makefile.in 2008-07-04 11:17:24.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/net/Makefile.in ++++ liferea-1.4.18/src/net/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -715,7 +1297,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -724,11 +1316,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/notification/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/notification/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/notification/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/src/notification/Makefile.in 2008-07-04 11:17:24.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/notification/Makefile.in ++++ liferea-1.4.18/src/notification/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -737,7 +1339,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -746,11 +1358,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/parsers/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/parsers/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/parsers/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/src/parsers/Makefile.in 2008-07-04 11:17:24.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/parsers/Makefile.in ++++ liferea-1.4.18/src/parsers/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -759,7 +1381,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -768,11 +1400,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/scripting/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/scripting/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/scripting/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/src/scripting/Makefile.in 2008-07-04 11:17:24.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/scripting/Makefile.in ++++ liferea-1.4.18/src/scripting/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -781,7 +1423,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -790,11 +1442,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/src/ui/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/src/ui/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/ui/Makefile.in 2008-07-04 11:17:09.000000000 +1000 -+++ liferea-1.4.16b/src/ui/Makefile.in 2008-07-04 11:17:25.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/ui/Makefile.in ++++ liferea-1.4.18/src/ui/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -803,7 +1465,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -812,7 +1484,17 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -@@ -255,7 +259,7 @@ + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +@@ -250,17 +254,17 @@ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -I$(top_srcdir)/src + noinst_LIBRARIES = libliui.a @@ -821,11 +1503,21 @@ libliui_a_SOURCES = \ eggtrayicon.c eggtrayicon.h \ ui_auth.c ui_auth.h \ -Index: liferea-1.4.16b/src/webkit/Makefile.in + ui_dialog.c ui_dialog.h \ + ui_dnd.c ui_dnd.h \ + ui_enclosure.c ui_enclosure.h \ + ui_feedlist.c ui_feedlist.h \ + ui_folder.c ui_folder.h \ +Index: liferea-1.4.18/src/webkit/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/src/webkit/Makefile.in 2008-07-04 11:17:10.000000000 +1000 -+++ liferea-1.4.16b/src/webkit/Makefile.in 2008-07-04 11:17:25.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/src/webkit/Makefile.in ++++ liferea-1.4.18/src/webkit/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -834,7 +1526,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -843,11 +1545,21 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ -Index: liferea-1.4.16b/xslt/Makefile.in + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ +Index: liferea-1.4.18/xslt/Makefile.in =================================================================== ---- liferea-1.4.16b.orig/xslt/Makefile.in 2008-07-04 11:17:08.000000000 +1000 -+++ liferea-1.4.16b/xslt/Makefile.in 2008-07-04 11:17:25.000000000 +1000 -@@ -85,6 +85,8 @@ +--- liferea-1.4.18.orig/xslt/Makefile.in ++++ liferea-1.4.18/xslt/Makefile.in +@@ -80,16 +80,18 @@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ + GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@ GTKHTML2_LIBS = @GTKHTML2_LIBS@ @@ -856,7 +1568,17 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -178,6 +180,8 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ + INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +@@ -173,16 +175,18 @@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WEBKIT_CFLAGS = @WEBKIT_CFLAGS@ + WEBKIT_LIBS = @WEBKIT_LIBS@ + WITH_DBUS_FALSE = @WITH_DBUS_FALSE@ WITH_DBUS_TRUE = @WITH_DBUS_TRUE@ WITH_GTKHTML2_FALSE = @WITH_GTKHTML2_FALSE@ WITH_GTKHTML2_TRUE = @WITH_GTKHTML2_TRUE@ @@ -865,3 +1587,8 @@ WITH_LIBNOTIFY_FALSE = @WITH_LIBNOTIFY_FALSE@ WITH_LIBNOTIFY_TRUE = @WITH_LIBNOTIFY_TRUE@ WITH_LUA_FALSE = @WITH_LUA_FALSE@ + WITH_LUA_TRUE = @WITH_LUA_TRUE@ + WITH_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@ + WITH_MOZILLA_TRUE = @WITH_MOZILLA_TRUE@ + WITH_WEBKIT_FALSE = @WITH_WEBKIT_FALSE@ + WITH_WEBKIT_TRUE = @WITH_WEBKIT_TRUE@ --- liferea-1.4.16b/debian/patches/xulrunner-1.9 2008-08-20 00:20:29.000000000 +0200 +++ liferea-1.4.18/debian/patches/xulrunner-1.9 2008-08-20 00:20:30.000000000 +0200 @@ -1,8 +1,18 @@ -Index: liferea-1.4.16b/configure.ac +--- + configure.ac | 6 +++--- + src/mozilla/xulrunner.c | 2 ++ + 2 files changed, 5 insertions(+), 3 deletions(-) + +Index: liferea-1.4.18/configure.ac =================================================================== ---- liferea-1.4.16b.orig/configure.ac 2008-06-22 19:08:13.238446219 +0200 -+++ liferea-1.4.16b/configure.ac 2008-06-22 19:08:13.270457592 +0200 -@@ -168,7 +168,7 @@ +--- liferea-1.4.18.orig/configure.ac ++++ liferea-1.4.18/configure.ac +@@ -163,35 +163,35 @@ + + dnl ********* + dnl XulRunner + dnl ********* + if test "x$enable_xulrunner" = "xyes" ; then AC_MSG_CHECKING([for XulRunner 1.9+ support]) @@ -11,11 +21,41 @@ if test "x$XULRUNNER_PROVIDER" = "x" ; then AC_MSG_CHECKING([for XulRunner 1.8 support]) -Index: liferea-1.4.16b/src/mozilla/xulrunner.c + PKG_CHECK_MODULES(XULRUNNER, xulrunner-gtkmozembed, XULRUNNER_PROVIDER=xulrunner-gtkmozembed, XULRUNNER_PROVIDER=) + fi + + if test "x$XULRUNNER_PROVIDER" = "x" ; then + enable_xulrunner=no + else + enable_xulrunner=yes + + XULRUNNER_HOME="`$PKG_CONFIG --variable=libdir $XULRUNNER_PROVIDER`" + AC_SUBST([XULRUNNER_HOME]) + AC_SUBST(XULRUNNER_CFLAGS) + AC_SUBST(XULRUNNER_LIBS) + +- if test "x$XULRUNNER_HOME" = "x" ; then +- AC_MSG_RESULT([Fatal: XulRunner enabled, but XULRUNNER_HOME is empty!]) ++ if test "x`echo $XULRUNNER_CFLAGS | grep -e '-DXPCOM_GLUE'`" = "x" && test "x$XULRUNNER_HOME" = "x" ; then ++ AC_MSG_RESULT([Fatal: XulRunner enabled without XPCOM_GLUE, but XULRUNNER_HOME is empty!]) + exit 1 + fi + + MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' | cut -c 3-` + + dnl the Mozilla XPCOM access means C++ + AC_PROG_CXX + fi +Index: liferea-1.4.18/src/mozilla/xulrunner.c =================================================================== ---- liferea-1.4.16b.orig/src/mozilla/xulrunner.c 2008-06-22 19:08:48.423447966 +0200 -+++ liferea-1.4.16b/src/mozilla/xulrunner.c 2008-06-22 19:09:07.458448245 +0200 -@@ -30,10 +30,12 @@ +--- liferea-1.4.18.orig/src/mozilla/xulrunner.c ++++ liferea-1.4.18/src/mozilla/xulrunner.c +@@ -25,20 +25,22 @@ + + #include + #include "ui/ui_htmlview.h" + #include "mozembed.h" + #include "plugin.h" static void xulrunner_init(void) { @@ -28,3 +68,8 @@ mozembed_init(); } + + static struct htmlviewPlugin xulrunnerInfo = { + .api_version = HTMLVIEW_PLUGIN_API_VERSION, + .name = "XulRunner", + .priority = 11,