Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 303060 Details for
Bug 399541
liferea doesn't compile against XULRunner
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
building against xulrunner
liferea-1.4.15-xulrunner.patch (text/plain), 17.33 KB, created by
Arkady L. Shane
on 2008-04-20 17:23:57 UTC
(
hide
)
Description:
building against xulrunner
Filename:
MIME Type:
Creator:
Arkady L. Shane
Created:
2008-04-20 17:23:57 UTC
Size:
17.33 KB
patch
obsolete
>diff -urNad liferea-1.4.14~/configure liferea-1.4.14/configure >--- liferea-1.4.14~/configure 2008-03-12 00:43:44.000000000 +0100 >+++ liferea-1.4.14/configure 2008-03-31 17:42:29.000000000 +0200 >@@ -1619,7 +1619,7 @@ > --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") >+ "firefox", "xulrunner-1.9" 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 >@@ -25119,158 +25119,22 @@ > > if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then > gecko_provider=mozilla >- >-pkg_failed=no >-{ echo "$as_me:$LINENO: checking for MOZILLA" >&5 >-echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } >- >-if test -n "$PKG_CONFIG"; then >- if test -n "$MOZILLA_CFLAGS"; then >- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" >- else >- if test -n "$PKG_CONFIG" && \ >- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 >- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; then >- pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` >-else >- pkg_failed=yes > fi >- fi >-else >- pkg_failed=untried >-fi >-if test -n "$PKG_CONFIG"; then >- if test -n "$MOZILLA_LIBS"; then >- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" >- else >- if test -n "$PKG_CONFIG" && \ >- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 >- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; then >- pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` >-else >- pkg_failed=yes >-fi >- fi >-else >- pkg_failed=untried >-fi >- >- >- >-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 >- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` >- else >- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` >- fi >- # Put the nasty error message in config.log where it belongs >- echo "$MOZILLA_PKG_ERRORS" >&5 >- >- { echo "$as_me:$LINENO: result: no" >&5 >-echo "${ECHO_T}no" >&6; } >- enable_mozilla=no >-elif test $pkg_failed = untried; then >- enable_mozilla=no >-else >- MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS >- MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS >- { echo "$as_me:$LINENO: result: yes" >&5 >-echo "${ECHO_T}yes" >&6; } >- enable_mozilla=yes >-fi >- { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5 >-echo "${ECHO_T}$gecko_provider: $enable_mozilla" >&6; } >+if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then >+ gecko_provider=xulrunner-1.9 >+ gecko_provider_gtkmozembed=libxul-embedding > fi > if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then > gecko_provider=firefox >- >-pkg_failed=no >-{ echo "$as_me:$LINENO: checking for MOZILLA" >&5 >-echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; } >- >-if test -n "$PKG_CONFIG"; then >- if test -n "$MOZILLA_CFLAGS"; then >- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" >- else >- if test -n "$PKG_CONFIG" && \ >- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 >- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; then >- pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` >-else >- pkg_failed=yes >-fi >- fi >-else >- pkg_failed=untried >-fi >-if test -n "$PKG_CONFIG"; then >- if test -n "$MOZILLA_LIBS"; then >- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" >- else >- if test -n "$PKG_CONFIG" && \ >- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 >- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; then >- pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` >-else >- pkg_failed=yes >-fi >- fi >-else >- pkg_failed=untried >-fi >- >- >- >-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 >- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` >- else >- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` >- fi >- # Put the nasty error message in config.log where it belongs >- echo "$MOZILLA_PKG_ERRORS" >&5 >- >- { echo "$as_me:$LINENO: result: no" >&5 >-echo "${ECHO_T}no" >&6; } >- enable_mozilla=no >-elif test $pkg_failed = untried; then >- enable_mozilla=no >-else >- MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS >- MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS >- { echo "$as_me:$LINENO: result: yes" >&5 >-echo "${ECHO_T}yes" >&6; } >- enable_mozilla=yes >-fi >- { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5 >-echo "${ECHO_T}$gecko_provider: $enable_mozilla" >&6; } > fi > if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then > gecko_provider=seamonkey >+fi >+ >+if test "x$gecko_provider" != "x"; then >+ if test "$gecko_provider_gtkmozembed" = "x"; then >+ gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed >+ fi > > pkg_failed=no > { echo "$as_me:$LINENO: checking for MOZILLA" >&5 >@@ -25281,12 +25145,12 @@ > pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS" > else > if test -n "$PKG_CONFIG" && \ >- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 >- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 >+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 >+ ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 > ac_status=$? > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); }; then >- pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null` >+ pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider_gtkmozembed" 2>/dev/null` > else > pkg_failed=yes > fi >@@ -25299,12 +25163,12 @@ > pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS" > else > if test -n "$PKG_CONFIG" && \ >- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5 >- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5 >+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5 >+ ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5 > ac_status=$? > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); }; then >- pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null` >+ pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider_gtkmozembed" 2>/dev/null` > else > pkg_failed=yes > fi >@@ -25323,9 +25187,9 @@ > _pkg_short_errors_supported=no > fi > if test $_pkg_short_errors_supported = yes; then >- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` >+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` > else >- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"` >+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"` > fi > # Put the nasty error message in config.log where it belongs > echo "$MOZILLA_PKG_ERRORS" >&5 >@@ -25342,7 +25206,7 @@ > echo "${ECHO_T}yes" >&6; } > enable_mozilla=yes > fi >- { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5 >+ { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5 > echo "${ECHO_T}$gecko_provider: $enable_mozilla" >&6; } > fi > >@@ -25828,9 +25692,9 @@ > > > >- MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` >+ MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` > MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` >- MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` >+ MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` > > MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ > -I$MOZILLA_INCLUDE_ROOT \ >diff -urNad liferea-1.4.14~/configure.ac liferea-1.4.14/configure.ac >--- liferea-1.4.14~/configure.ac 2008-02-29 00:45:05.000000000 +0100 >+++ liferea-1.4.14/configure.ac 2008-03-31 17:42:29.000000000 +0200 >@@ -36,7 +36,7 @@ > AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes) > AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes) > AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes) >-AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox" or "seamonkey")]),,enable_gecko=yes) >+AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox", "xulrunner-1.9" or "seamonkey")]),,enable_gecko=yes) > AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes) > AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes) > AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes) >@@ -215,18 +215,24 @@ > > if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then > gecko_provider=mozilla >- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) >- AC_MSG_RESULT($gecko_provider: $enable_mozilla) >+fi >+if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then >+ gecko_provider=xulrunner-1.9 >+ gecko_provider_gtkmozembed=libxul-embedding > fi > if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then > gecko_provider=firefox >- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) >- AC_MSG_RESULT($gecko_provider: $enable_mozilla) > fi > if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then > gecko_provider=seamonkey >- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no) >- AC_MSG_RESULT($gecko_provider: $enable_mozilla) >+fi >+ >+if test "x$gecko_provider" != "x"; then >+ if test "$gecko_provider_gtkmozembed" = "x"; then >+ gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed >+ fi >+ PKG_CHECK_MODULES(MOZILLA, $gecko_provider_gtkmozembed, enable_mozilla=yes, enable_mozilla=no) >+ AC_MSG_RESULT($gecko_provider: $enable_mozilla) > fi > > AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes") >@@ -246,9 +252,9 @@ > dnl of macros to come around this. Which I would like to > dnl avoid. So this might be not very portable... > >- MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"` >+ MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"` > MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT` >- MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-` >+ MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-` > > dnl Maybe we don't need all of this... > MOZILLA_CFLAGS="$MOZILLA_CFLAGS \ >diff -urNad liferea-1.4.9~/src/mozilla/mozembed.c liferea-1.4.9/src/mozilla/mozembed.c >--- liferea-1.4.9~/src/mozilla/mozembed.c 2007-12-12 20:29:38.000000000 +0100 >+++ liferea-1.4.9/src/mozilla/mozembed.c 2007-12-12 20:29:41.000000000 +0100 >@@ -335,11 +335,17 @@ > mozembed_init (void) > { > gchar *profile; >- >+ >+ // if we use the glue we need to initialize the GRE >+ // explicitely. >+#ifdef XPCOM_GLUE >+ debug_enter ("mozembed_init (XPCOM_GLUE)"); >+ g_assert(mozsupport_xpcom_init()); >+#else > debug_enter ("mozembed_init"); >- >- /* some GtkMozEmbed initialization taken from embed.c from the Galeon sources */ >- >+#endif >+ /* some GtkMozEmbed initialization taken from embed.c from the Galeon sources */ >+ > /* init mozilla home */ > g_assert (g_thread_supported ()); > >@@ -374,6 +380,7 @@ > mozembed_deinit (void) > { > gtk_moz_embed_pop_startup (); >+ g_assert(mozsupport_xpcom_shutdown()); > } > > /* launches the specified URL */ >diff -urNad liferea-1.4.9~/src/mozilla/mozilla.c liferea-1.4.9/src/mozilla/mozilla.c >--- liferea-1.4.9~/src/mozilla/mozilla.c 2007-12-12 20:29:38.000000000 +0100 >+++ liferea-1.4.9/src/mozilla/mozilla.c 2007-12-12 20:29:41.000000000 +0100 >@@ -35,9 +35,10 @@ > static void mozilla_init(void) { > > /* Avoid influencing the component loading by $MOZILLA_FIVE_HOME */ >+#ifndef XPCOM_GLUE > g_unsetenv("MOZILLA_FIVE_HOME"); >- > gtk_moz_embed_set_comp_path(MOZILLA_LIB_ROOT); >+#endif > > mozembed_init(); > } >diff -urNad liferea-1.4.9~/src/mozilla/mozsupport.cpp liferea-1.4.9/src/mozilla/mozsupport.cpp >--- liferea-1.4.9~/src/mozilla/mozsupport.cpp 2007-12-12 20:29:38.000000000 +0100 >+++ liferea-1.4.9/src/mozilla/mozsupport.cpp 2007-12-12 20:29:53.000000000 +0100 >@@ -29,21 +29,33 @@ > # include <config.h> > #endif > >-#define MOZILLA_INTERNAL_API >+// for GLUE we _must_ not use MOZILLA_INTERNAL_API >+#ifndef XPCOM_GLUE >+# define MOZILLA_INTERNAL_API >+#endif > > #include "mozsupport.h" > #include <gtk/gtk.h> >+ > #include <gtkmozembed.h> > #include <gtkmozembed_internal.h> > >-#include "nsIWebBrowser.h" >-#include "nsIDOMMouseEvent.h" >-#include "dom/nsIDOMKeyEvent.h" >-#include "nsIDOMWindow.h" >-#include "nsIPrefService.h" >-#include "nsIServiceManager.h" >-#include "nsIIOService.h" >-#include "necko/nsNetCID.h" >+// if we use the glue (since 1.9), we must explicitly get the gtkmozembed symbols >+#ifdef XPCOM_GLUE >+# include <gtkmozembed_glue.cpp> >+#endif >+ >+#include <nsIWebBrowser.h> >+#include <nsIDOMMouseEvent.h> >+#include <nsIDOMKeyEvent.h> >+#include <nsIDOMWindow.h> >+#include <nsIPrefService.h> >+#include <nsIServiceManager.h> >+#include <nsIIOService.h> >+#include <nsCOMPtr.h> >+#include <nsNetCID.h> >+ >+#include <nsServiceManagerUtils.h> > > extern "C" { > #include "conf.h" >@@ -277,3 +289,48 @@ > //return FALSE; > } > >+ >+/* helpers for binaries linked against XPCOM_GLUE */ >+#ifdef XPCOM_GLUE >+ >+/** >+ * load xpcom through glue. >+ * When using the glue you have to call this method before doing >+ * anything else. It finds the GRE, loads the xpcom libs, >+ * maps the gtkmozbemd symbols and intializes xpcom by setting >+ * the path and component path. >+ * >+ * the caller still has to call gtk_moz_embed_push_startup() >+ */ >+extern "C" gboolean >+mozsupport_xpcom_init () >+{ >+ static const GREVersionRange greVersion = { >+ "1.9a", PR_TRUE, >+ "1.9.*", PR_TRUE >+ }; >+ char xpcomLocation[4096]; >+ nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); >+ NS_ENSURE_SUCCESS (rv, NS_SUCCEEDED(rv)); >+ // Startup the XPCOM Glue that links us up with XPCOM. >+ rv = XPCOMGlueStartup(xpcomLocation); >+ NS_ENSURE_SUCCESS (rv, NS_SUCCEEDED(rv)); >+ rv = GTKEmbedGlueStartup(); >+ NS_ENSURE_SUCCESS (rv, NS_SUCCEEDED(rv)); >+ rv = GTKEmbedGlueStartupInternal(); >+ NS_ENSURE_SUCCESS (rv, NS_SUCCEEDED(rv)); >+ char *lastSlash = strrchr(xpcomLocation, '/'); >+ if (lastSlash) >+ *lastSlash = '\0'; >+ gtk_moz_embed_set_path(xpcomLocation); >+ >+ return TRUE; >+} >+ >+extern "C" gboolean >+mozsupport_xpcom_shutdown () >+{ >+ return NS_SUCCEEDED(XPCOMGlueShutdown()); >+} >+#endif >+ >diff -urNad liferea-1.4.9~/src/mozilla/mozsupport.h liferea-1.4.9/src/mozilla/mozsupport.h >--- liferea-1.4.9~/src/mozilla/mozsupport.h 2007-12-12 20:29:38.000000000 +0100 >+++ liferea-1.4.9/src/mozilla/mozsupport.h 2007-12-12 20:29:41.000000000 +0100 >@@ -46,8 +46,15 @@ > gboolean mozsupport_preference_set_boolean (const char *preference_name, > gboolean new_boolean_value); > gboolean mozsupport_preference_set_int (const char *preference_name, >- int new_int_value); >+ int new_int_value); > void mozsupport_set_offline_mode (gboolean offline); >+ >+/* helpers for binaries linked against XPCOM_GLUE */ >+#ifdef XPCOM_GLUE >+gboolean mozsupport_xpcom_init (); >+gboolean mozsupport_xpcom_shutdown (); >+#endif >+ > #ifdef __cplusplus > } > #endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 399541
:
269181
| 303060 |
303952