Attachment #146158 for bug #213361

View | Details | Raw Unified | Return to bug 213361
Collapse All | Expand All

Lines 117-122 libephyembedfactory_la_CPPFLAGS += -I$(G Link Here

(-)epiphany-2.21.92/embed/Makefile.am.xulrunner19 (+1 lines)
117	endif	117	endif
118		118
119	libephyembedfactory_la_CFLAGS = \	119	libephyembedfactory_la_CFLAGS = \
		120	$(GECKO_CFLAGS) \
120	$(DEPENDENCIES_CFLAGS) \	121	$(DEPENDENCIES_CFLAGS) \
121	$(AM_CFLAGS)	122	$(AM_CFLAGS)
122		123

Lines 33-38 Link Here

(-)epiphany-2.21.92/embed/mozilla/mozilla-embed-single.cpp.xulrunner19 (-2 / +57 lines)
33		33
34	#include <nsStringAPI.h>	34	#include <nsStringAPI.h>
35		35
		36	#ifdef XPCOM_GLUE
		37	#include <nsXPCOMGlue.h>
		38	#include <gtkmozembed_glue.cpp>
		39	#endif
		40
36	#include <gtkmozembed.h>	41	#include <gtkmozembed.h>
37	#include <gtkmozembed_internal.h>	42	#include <gtkmozembed_internal.h>
38	#include <nsComponentManagerUtils.h>	43	#include <nsComponentManagerUtils.h>
Lines 374-379 mozilla_init_profile (void) Link Here
374	profile_path = g_build_filename (ephy_dot_dir (),	379	profile_path = g_build_filename (ephy_dot_dir (),
375	MOZILLA_PROFILE_DIR,	380	MOZILLA_PROFILE_DIR,
376	(char *) NULL);	381	(char *) NULL);
		382	gtk_moz_embed_set_comp_path (profile_path);
377	gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);	383	gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
378	g_free (profile_path);	384	g_free (profile_path);
379	}	385	}
Lines 615-620 impl_init (EphyEmbedSingle *esingle) Link Here
615	NS_LogInit ();	621	NS_LogInit ();
616	#endif	622	#endif
617		623
		624	nsresult rv;
		625	#ifdef XPCOM_GLUE
		626	static const GREVersionRange greVersion = {
		627	"1.9a", PR_TRUE,
		628	"1.9.*", PR_TRUE
		629	};
		630	char xpcomLocation[4096];
		631	rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
		632	if (NS_FAILED (rv))
		633	{
		634	g_warning ("Could not get gre path!\n");
		635	return FALSE;
		636	}
		637
		638	// Startup the XPCOM Glue that links us up with XPCOM.
		639	rv = XPCOMGlueStartup(xpcomLocation);
		640	if (NS_FAILED (rv))
		641	{
		642	g_warning ("Could not determine locale!\n");
		643	return FALSE;
		644	}
		645
		646	rv = GTKEmbedGlueStartup();
		647	if (NS_FAILED (rv))
		648	{
		649	g_warning ("Could not startup glue!\n");
		650	return FALSE;
		651	}
		652
		653	rv = GTKEmbedGlueStartupInternal();
		654	if (NS_FAILED (rv))
		655	{
		656	g_warning ("Could not startup internal glue!\n");
		657	return FALSE;
		658	}
		659
		660	char *lastSlash = strrchr(xpcomLocation, '/');
		661	if (lastSlash)
		662	*lastSlash = '\0';
		663
		664	gtk_moz_embed_set_path(xpcomLocation);
		665	#else
		666	#ifdef HAVE_GECKO_1_9
		667	gtk_moz_embed_set_path (MOZILLA_HOME);
		668	#else
		669	gtk_moz_embed_set_comp_path (MOZILLA_HOME);
		670	#endif
		671	#endif // XPCOM_GLUE
		672	/* Fire up the beast */
		673	gtk_moz_embed_push_startup ();
		674
618	/* Pre initialization */	675	/* Pre initialization */
619	mozilla_init_plugin_path ();	676	mozilla_init_plugin_path ();
620		677
Lines 631-638 impl_init (EphyEmbedSingle *esingle) Link Here
631		688
632	gtk_moz_embed_set_directory_service_provider (dp);	689	gtk_moz_embed_set_directory_service_provider (dp);
633		690
634	/* Fire up the beast */
635	gtk_moz_embed_push_startup ();
636	/* FIXME check that it succeeded! */	691	/* FIXME check that it succeeded! */
637		692
638	mozilla_register_components ();	693	mozilla_register_components ();

Lines 159-164 libephymozillaembed_la_CPPFLAGS = \ Link Here

(-)epiphany-2.21.92/embed/mozilla/Makefile.am.xulrunner19 (+7 lines)
159	-DALLOW_PRIVATE_API \	159	-DALLOW_PRIVATE_API \
160	$(AM_CPPFLAGS)	160	$(AM_CPPFLAGS)
161		161
		162	if HAVE_GECKO_XPCOM_GLUE
		163	if HAVE_GECKO_1_9
		164	libephymozillaembed_la_CPPFLAGS += \
		165	-DXPCOM_GLUE_USE_NSPR
		166	endif
		167	endif
		168
162	libephymozillaembed_la_CXXFLAGS = \	169	libephymozillaembed_la_CXXFLAGS = \
163	$(GECKO_CFLAGS) \	170	$(GECKO_CFLAGS) \
164	$(DEPENDENCIES_CFLAGS) \	171	$(DEPENDENCIES_CFLAGS) \

Lines 35-40 Link Here

(-)epiphany-2.21.92/embed/mozilla/AutoModalDialog.cpp.xulrunner19 (+1 lines)
35	#include <nsIDOMDocument.h>	35	#include <nsIDOMDocument.h>
36	#include <nsIDOMEvent.h>	36	#include <nsIDOMEvent.h>
37	#include <nsIDOMEventTarget.h>	37	#include <nsIDOMEventTarget.h>
		38	#include <jspubtd.h>
38	#include <nsIJSContextStack.h>	39	#include <nsIJSContextStack.h>
39	#include <nsIPrivateDOMEvent.h>	40	#include <nsIPrivateDOMEvent.h>
40	#include <nsPIDOMWindow.h>	41	#include <nsPIDOMWindow.h>




libdesktopfileplugin_la_LDFLAGS = \
	-module -avoid-version \
	-export-symbols $(srcdir)/plugin.symbols \
	-R$(GECKO_HOME) \
	$(AM_LDFLAGS)

if !HAVE_GECKO_XPCOM_GLUE
	libdesktopfileplugin_la_LDFLAGS += \
		-R$(GECKO_HOME) \
		$(NULL)
endif

EXTRA_DIST = \
	plugin.symbols




# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
# VARIABLE_FLAVOUR: The flavour of the gecko that was found
# VARIABLE_HOME:
# VARIABLE_NSPR: set if nspr is provided by gecko flags
# VARIABLE_PREFIX:
# VARIABLE_INCLUDE_ROOT:
# VARIABLE_VERSION: The version of the gecko that was found

AC_MSG_CHECKING([which gecko to use])

AC_ARG_WITH([gecko],
	AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul@:>@],
		       [Which gecko engine to use (autodetected by default)]))

# Backward compat

gecko_cv_gecko=$with_gecko

# Autodetect gecko
_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
if test -z "$gecko_cv_gecko"; then
	for lizard in $_geckos; do
		if $PKG_CONFIG --exists $lizard-xpcom; then
			gecko_cv_gecko=$lizard
			break;
		elif $PKG_CONFIG --exists $lizard-unstable; then
			gecko_cv_gecko=$lizard
			break;
		fi
	done
fi

	gecko_cv_have_gecko=yes
fi

AC_MSG_CHECKING([manual gecko home set])

AC_ARG_WITH([gecko-home],
	AS_HELP_STRING([--with-gecko-home@<:@=[path]@:>@],
		       [Manually set MOZILLA_FIVE_HOME]))

gecko_cv_gecko_home=$with_gecko_home

# ****************
# Define variables
# ****************

seamonkey) gecko_cv_gecko_flavour=mozilla ;;
*firefox) gecko_cv_gecko_flavour=toolkit ;;
xulrunner) gecko_cv_gecko_flavour=toolkit ;;
libxul*) gecko_cv_gecko_flavour=toolkit ;;
esac

if $PKG_CONFIG --exists  ${gecko_cv_gecko}-xpcom; then
	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
	_GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT"
	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
	_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
else
	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
	_GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
	_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
	_GECKO_HOME=$with_gecko_home
	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
fi
fi # if gecko_cv_have_gecko

if test "$gecko_cv_gecko_flavour" = "toolkit"; then

$1[]=$gecko_cv_gecko
$1[]_FLAVOUR=$gecko_cv_gecko_flavour
$1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
$1[]_CFLAGS=$_GECKO_CFLAGS
$1[]_LIBDIR=$_GECKO_LIBDIR
$1[]_HOME=$_GECKO_HOME
$1[]_PREFIX=$_GECKO_PREFIX
$1[]_NSPR=$_GECKO_NSPR

# **************************************************************
# This is really gcc-only

AC_LANG_PUSH([C++])

_SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"

AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
AC_RUN_IFELSE(

	[gecko_cv_have_debug=no])
AC_MSG_RESULT([$gecko_cv_have_debug])

AC_MSG_CHECKING([[whether we have a xpcom glue]])
AC_COMPILE_IFELSE(
	[AC_LANG_SOURCE(
		[[
		  #ifndef XPCOM_GLUE
		  #error "no xpcom glue found"
		  #endif]]
	)],
	[gecko_cv_have_xpcom_glue=yes],
	[gecko_cv_have_xpcom_glue=no])
AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])

CPPFLAGS="$_SAVE_CPPFLAGS"

AC_LANG_POP([C++])

	AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])
fi

if test "$gecko_cv_have_xpcom_glue" = "yes"; then
	AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used])
fi

fi # if gecko_cv_have_gecko

AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])

# ***********************
# Check for gecko version

AC_LANG_PUSH([C++])

_SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"

AC_CACHE_CHECK([for gecko version],
	[gecko_cv_gecko_version],

gecko_cv_extra_pkg_dependencies=

if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
	if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
		gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
	else
		gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
	fi
else
	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
fi

AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"])
AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"])
])

# ***************************************************************************

_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
else
	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
fi
if test -n "$_GECKO_HOME"; then
	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
else
	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
fi

_GECKO_DISPATCH_INCLUDEDIRS="$2"


# Mind you, it's useful to be able to test against uninstalled mozilla builds...
_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"

# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
	fi
done

m4_indir([$1],m4_shiftn(2,$@))

#include <mozilla-config.h>
#include <stdlib.h>
#include <stdio.h>

#ifdef XPCOM_GLUE
#include <nsXPCOMGlue.h>
#else
#include <nsXPCOM.h>
#endif // XPCOM_GLUE

#include <nsCOMPtr.h>
#include <nsILocalFile.h>
#include <nsIServiceManager.h>
#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
#include <nsStringAPI.h>
#else
#include <nsString.h>

]]
[$1],
[[

nsresult rv;
#ifdef XPCOM_GLUE
    static const GREVersionRange greVersion = {
    "1.8", PR_TRUE,
    "1.9.*", PR_TRUE
    };
    char xpcomLocation[4096];
    rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
    if (NS_FAILED(rv)) {
        exit(123);
    }

    // Startup the XPCOM Glue that links us up with XPCOM.
    XPCOMGlueStartup(xpcomLocation);
    if (NS_FAILED(rv)) {
        exit(124);
    }
#endif // XPCOM_GLUE

// redirect unwanted mozilla debug output to the bit bucket
freopen ("/dev/null", "w", stdout);

nsCOMPtr<nsILocalFile> directory = nsnull;
#ifndef XPCOM_GLUE
rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,
			    getter_AddRefs (directory));
if (NS_FAILED (rv) || !directory) {
	exit (126);
}
#endif

rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
if (NS_FAILED (rv)) {

AC_DEFUN([GECKO_XPIDL],
[AC_REQUIRE([GECKO_INIT])dnl

if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
	_GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin"
else
	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
fi

AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])

if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`"
else
XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"

# Older geckos don't have this variable, see
# https://bugzilla.mozilla.org/show_bug.cgi?id=240473

if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
	XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`"
fi

# Some distributions (Gentoo) have it in unusual places

if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
	XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
fi





case "$gecko_cv_gecko" in
xulrunner) min_version=1.8 ;;
libxul*) min_version=1.9 ;;
*firefox) min_version=1.5 ;;
*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
esac

# Added $gecko_cv_gecko-js for debian xulrunner brokenness
if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then
	PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
else
	GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG"
	GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
fi

AC_MSG_CHECKING(nspr in gecko)
if test "$GECKO_NSPR" != yes; then
	AC_MSG_RESULT(no)
	AC_MSG_CHECKING(nspr in system)
	gecko_nspr=
	if $PKG_CONFIG --exists mozilla-nspr; then
		gecko_nspr=mozilla-nspr
	elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then
		gecko_nspr=${gecko_cv_gecko}-nspr
	fi
	if $PKG_CONFIG --exists nspr; then
		gecko_nspr=nspr
	fi
	if test -z "$gecko_nspr"; then
		AC_MSG_ERROR([no nspr available])
	fi

	GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`"
	GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`"
	_GECKO_CFLAGS="$GECKO_CFLAGS"
	AC_MSG_RESULT(yes)
else
	AC_MSG_RESULT(yes)
fi

AC_SUBST([GECKO_CFLAGS])
AC_SUBST([GECKO_LIBS])


AC_MSG_RESULT([$enable_desktop_file_plugin])

if test "$enable_desktop_file_plugin" = "yes"; then
	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0])
	else
		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
	fi
	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
fi

Lines 188-193 libpyphany_la_LIBADD = \ Link Here

(-)epiphany-2.21.92/src/Makefile.am.xulrunner19 (+15 lines)
188	$(PYGTK_LIBS)	188	$(PYGTK_LIBS)
189	endif	189	endif
190		190
		191
		192	# we do this to force c++ linkage if we are using the glue and
		193	# are running gecko 1.9 because standalone glue embedders that use
		194	# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp>
		195	if HAVE_GECKO_1_9
		196	if HAVE_GECKO_XPCOM_GLUE
		197	nodist_EXTRA_epiphany_SOURCES = dummy.cpp
		198	endif
		199	endif
		200
191	epiphany_SOURCES = ephy-main.c	201	epiphany_SOURCES = ephy-main.c
192		202
193	epiphany_CPPFLAGS = \	203	epiphany_CPPFLAGS = \
Lines 202-207 epiphany_CPPFLAGS = \ Link Here
202		212
203	epiphany_CFLAGS = \	213	epiphany_CFLAGS = \
204	$(DEPENDENCIES_CFLAGS) \	214	$(DEPENDENCIES_CFLAGS) \
		215	$(GECKO_CFLAGS) \
205	$(DBUS_CFLAGS) \	216	$(DBUS_CFLAGS) \
206	$(AM_CFLAGS)	217	$(AM_CFLAGS)
207		218
Lines 222-227 endif Link Here
222		233
223	if WITH_GECKO_ENGINE	234	if WITH_GECKO_ENGINE
224	epiphany_LDADD += \	235	epiphany_LDADD += \
		236	$(GECKO_LIBS) \
225	$(top_builddir)/embed/mozilla/libephymozillaembed.la	237	$(top_builddir)/embed/mozilla/libephymozillaembed.la
226	endif	238	endif
227		239
Lines 242-248 epiphany_LDADD += $(LIBXUL_LIBS) -lxpcom Link Here
242	endif	254	endif
243		255
244	if WITH_GECKO_ENGINE	256	if WITH_GECKO_ENGINE
		257	if !HAVE_GECKO_XPCOM_GLUE
245	epiphany_LDFLAGS += -R$(GECKO_HOME)	258	epiphany_LDFLAGS += -R$(GECKO_HOME)
		259	endif
246		260
247	epiphany_LDADD += \	261	epiphany_LDADD += \
248	$(GECKO_LIBS) \	262	$(GECKO_LIBS) \
Lines 256-261 epiphany_LDADD += \ Link Here
256	endif	270	endif
257		271
258	epiphany_LDADD += \	272	epiphany_LDADD += \
		273	$(GECKO_LIBS) \
259	$(DEPENDENCIES_LIBS) \	274	$(DEPENDENCIES_LIBS) \
260	$(DBUS_LIBS) \	275	$(DBUS_LIBS) \
261	$(LIBINTL)	276	$(LIBINTL)

Lines 207-216 DOC_OVERRIDES = Link Here

(-)epiphany-2.21.92/doc/reference/Makefile.am.xulrunner19 (-2 / +2 lines)
207		207
208	if GTK_DOC_USE_LIBTOOL	208	if GTK_DOC_USE_LIBTOOL
209	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	209	GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
210	GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	210	GTKDOC_LD = $(LIBTOOL) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
211	else	211	else
212	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)	212	GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
213	GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)	213	GTKDOC_LD = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
214	endif	214	endif
215		215
216	# We set GPATH here; this gives us semantics for GNU make	216	# We set GPATH here; this gives us semantics for GNU make





#include <nsCOMPtr.h>
#include <nsIDOMWindow.h>
#include <nsIFileURL.h>
#include <nsILocalFile.h>
#include <nsIPromptService.h>
#include <nsIServiceManager.h>
#include <nsIURI.h>
#include <nsNetUtil.h>
#include <nsComponentManagerUtils.h>
#include <nsServiceManagerUtils.h>
#include <nsXPCOMCID.h>

	return NS_OK;
}

/* readonly attribute nsIURI fileURL; */
NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL)
{
	NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);

	LOG ("GFilePicker::GetFileURI");

	nsCOMPtr<nsILocalFile> file;
	GetFile (getter_AddRefs(file));
	NS_ENSURE_TRUE (file, NS_ERROR_FAILURE);

	return NS_NewFileURI(aFileURL, file);
	fileURL->SetFile(file);
	NS_IF_ADDREF(*aFileURL = fileURL);

	return NS_OK;
}

/* readonly attribute nsISimpleEnumerator files; */

Return to bug 213361

Lines 25-32 libdesktopfileplugin_la_LIBADD = \ Link Here

(-)epiphany-2.21.92/plugins/desktop-file/Makefile.am.xulrunner19 (-1 / +6 lines)
25	libdesktopfileplugin_la_LDFLAGS = \	25	libdesktopfileplugin_la_LDFLAGS = \
26	-module -avoid-version \	26	-module -avoid-version \
27	-export-symbols $(srcdir)/plugin.symbols \	27	-export-symbols $(srcdir)/plugin.symbols \
28	-R$(GECKO_HOME) \
29	$(AM_LDFLAGS)	28	$(AM_LDFLAGS)
30		29
		30	if !HAVE_GECKO_XPCOM_GLUE
		31	libdesktopfileplugin_la_LDFLAGS += \
		32	-R$(GECKO_HOME) \
		33	$(NULL)
		34	endif
		35
31	EXTRA_DIST = \	36	EXTRA_DIST = \
32	plugin.symbols	37	plugin.symbols

Lines 32-37 Link Here

(-)epiphany-2.21.92/m4/gecko.m4.xulrunner19 (-27 / +114 lines)
32	# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)	32	# VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
33	# VARIABLE_FLAVOUR: The flavour of the gecko that was found	33	# VARIABLE_FLAVOUR: The flavour of the gecko that was found
34	# VARIABLE_HOME:	34	# VARIABLE_HOME:
		35	# VARIABLE_NSPR: set if nspr is provided by gecko flags
35	# VARIABLE_PREFIX:	36	# VARIABLE_PREFIX:
36	# VARIABLE_INCLUDE_ROOT:	37	# VARIABLE_INCLUDE_ROOT:
37	# VARIABLE_VERSION: The version of the gecko that was found	38	# VARIABLE_VERSION: The version of the gecko that was found
Lines 51-57 AC_PROG_AWK Link Here
51	AC_MSG_CHECKING([which gecko to use])	52	AC_MSG_CHECKING([which gecko to use])
52		53
53	AC_ARG_WITH([gecko],	54	AC_ARG_WITH([gecko],
54	AS_HELP_STRING([--with-gecko@<:@=mozilla\|firefox\|seamonkey\|xulrunner@:>@],	55	AS_HELP_STRING([--with-gecko@<:@=mozilla\|firefox\|seamonkey\|xulrunner\|libxul-embedding\|libxul@:>@],
55	[Which gecko engine to use (autodetected by default)]))	56	[Which gecko engine to use (autodetected by default)]))
56		57
57	# Backward compat	58	# Backward compat
Lines 60-71 AC_ARG_WITH([mozilla],[],[with_gecko=$wi Link Here
60	gecko_cv_gecko=$with_gecko	61	gecko_cv_gecko=$with_gecko
61		62
62	# Autodetect gecko	63	# Autodetect gecko
63	_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"	64	_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
64	if test -z "$gecko_cv_gecko"; then	65	if test -z "$gecko_cv_gecko"; then
65	for lizard in $_geckos; do	66	for lizard in $_geckos; do
66	if $PKG_CONFIG --exists $lizard-xpcom; then	67	if $PKG_CONFIG --exists $lizard-xpcom; then
67	gecko_cv_gecko=$lizard	68	gecko_cv_gecko=$lizard
68	break;	69	break;
		70	elif $PKG_CONFIG --exists $lizard-unstable; then
		71	gecko_cv_gecko=$lizard
		72	break;
69	fi	73	fi
70	done	74	done
71	fi	75	fi
Lines 82-87 else Link Here
82	gecko_cv_have_gecko=yes	86	gecko_cv_have_gecko=yes
83	fi	87	fi
84		88
		89	AC_MSG_CHECKING([manual gecko home set])
		90
		91	AC_ARG_WITH([gecko-home],
		92	AS_HELP_STRING([--with-gecko-home@<:@=[path]@:>@],
		93	[Manually set MOZILLA_FIVE_HOME]))
		94
		95	gecko_cv_gecko_home=$with_gecko_home
		96
85	# ****************	97	# ****************
86	# Define variables	98	# Define variables
87	# ****************	99	# ****************
Lines 93-105 mozilla) gecko_cv_gecko_flavour=mozilla Link Here
93	seamonkey) gecko_cv_gecko_flavour=mozilla ;;	105	seamonkey) gecko_cv_gecko_flavour=mozilla ;;
94	*firefox) gecko_cv_gecko_flavour=toolkit ;;	106	*firefox) gecko_cv_gecko_flavour=toolkit ;;
95	xulrunner) gecko_cv_gecko_flavour=toolkit ;;	107	xulrunner) gecko_cv_gecko_flavour=toolkit ;;
		108	libxul*) gecko_cv_gecko_flavour=toolkit ;;
96	esac	109	esac
97		110
98	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"	111	if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then
99	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"	112	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
100	_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"	113	_GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT"
101	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"	114	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
102		115	_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
		116	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
		117	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
		118	else
		119	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
		120	_GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
		121	_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
		122	_GECKO_HOME=$with_gecko_home
		123	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
		124	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
		125	fi
103	fi # if gecko_cv_have_gecko	126	fi # if gecko_cv_have_gecko
104		127
105	if test "$gecko_cv_gecko_flavour" = "toolkit"; then	128	if test "$gecko_cv_gecko_flavour" = "toolkit"; then
Lines 109-117 fi Link Here
109	$1[]=$gecko_cv_gecko	132	$1[]=$gecko_cv_gecko
110	$1[]_FLAVOUR=$gecko_cv_gecko_flavour	133	$1[]_FLAVOUR=$gecko_cv_gecko_flavour
111	$1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT	134	$1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
		135	$1[]_CFLAGS=$_GECKO_CFLAGS
112	$1[]_LIBDIR=$_GECKO_LIBDIR	136	$1[]_LIBDIR=$_GECKO_LIBDIR
113	$1[]_HOME=$_GECKO_HOME	137	$1[]_HOME=$_GECKO_HOME
114	$1[]_PREFIX=$_GECKO_PREFIX	138	$1[]_PREFIX=$_GECKO_PREFIX
		139	$1[]_NSPR=$_GECKO_NSPR
115		140
116	# **************************************************************	141	# **************************************************************
117	# This is really gcc-only	142	# This is really gcc-only
Lines 182-188 if test "$gecko_cv_have_gecko" = "yes"; Link Here
182	AC_LANG_PUSH([C++])	207	AC_LANG_PUSH([C++])
183		208
184	_SAVE_CPPFLAGS="$CPPFLAGS"	209	_SAVE_CPPFLAGS="$CPPFLAGS"
185	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT"	210	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
186		211
187	AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])	212	AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
188	AC_RUN_IFELSE(	213	AC_RUN_IFELSE(
Lines 215-220 AC_COMPILE_IFELSE( Link Here
215	[gecko_cv_have_debug=no])	240	[gecko_cv_have_debug=no])
216	AC_MSG_RESULT([$gecko_cv_have_debug])	241	AC_MSG_RESULT([$gecko_cv_have_debug])
217		242
		243	AC_MSG_CHECKING([[whether we have a xpcom glue]])
		244	AC_COMPILE_IFELSE(
		245	[AC_LANG_SOURCE(
		246	[[
		247	#ifndef XPCOM_GLUE
		248	#error "no xpcom glue found"
		249	#endif]]
		250	)],
		251	[gecko_cv_have_xpcom_glue=yes],
		252	[gecko_cv_have_xpcom_glue=no])
		253	AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
		254
218	CPPFLAGS="$_SAVE_CPPFLAGS"	255	CPPFLAGS="$_SAVE_CPPFLAGS"
219		256
220	AC_LANG_POP([C++])	257	AC_LANG_POP([C++])
Lines 226-233 if test "$gecko_cv_have_debug" = "yes"; Link Here
226	AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])	263	AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])
227	fi	264	fi
228		265
		266	if test "$gecko_cv_have_xpcom_glue" = "yes"; then
		267	AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used])
		268	fi
		269
229	fi # if gecko_cv_have_gecko	270	fi # if gecko_cv_have_gecko
230		271
		272	AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
		273	AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])
231		274
232	# ***********************	275	# ***********************
233	# Check for gecko version	276	# Check for gecko version
Lines 238-244 if test "$gecko_cv_have_gecko" = "yes"; Link Here
238	AC_LANG_PUSH([C++])	281	AC_LANG_PUSH([C++])
239		282
240	_SAVE_CPPFLAGS="$CPPFLAGS"	283	_SAVE_CPPFLAGS="$CPPFLAGS"
241	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT"	284	CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"
242		285
243	AC_CACHE_CHECK([for gecko version],	286	AC_CACHE_CHECK([for gecko version],
244	[gecko_cv_gecko_version],	287	[gecko_cv_gecko_version],
Lines 320-327 gecko_cv_glue_libs= Link Here
320	gecko_cv_extra_pkg_dependencies=	363	gecko_cv_extra_pkg_dependencies=
321		364
322	if test "$gecko_cv_gecko_version_int" -ge "1009000"; then	365	if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
323	gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"	366	if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
324	gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s"	367	gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
		368	else
		369	gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
		370	fi
325	else	371	else
326	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"	372	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
327	fi	373	fi
Lines 350-355 AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$ Link Here
350	AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"])	396	AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"])
351	AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])	397	AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
352	AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])	398	AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
		399	AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"])
353	])	400	])
354		401
355	# ***************************************************************************	402	# ***************************************************************************
Lines 371-380 _SAVE_CPPFLAGS="$CPPFLAGS" Link Here
371	_SAVE_CXXFLAGS="$CXXFLAGS"	418	_SAVE_CXXFLAGS="$CXXFLAGS"
372	_SAVE_LDFLAGS="$LDFLAGS"	419	_SAVE_LDFLAGS="$LDFLAGS"
373	_SAVE_LIBS="$LIBS"	420	_SAVE_LIBS="$LIBS"
374	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"	421	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
375	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"	422	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
376	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"	423	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
377	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"	424	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
		425	else
		426	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
		427	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
		428	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
		429	fi
		430	if test -n "$_GECKO_HOME"; then
		431	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
		432	else
		433	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
		434	fi
378		435
379	_GECKO_DISPATCH_INCLUDEDIRS="$2"	436	_GECKO_DISPATCH_INCLUDEDIRS="$2"
380		437
Lines 383-391 _GECKO_DISPATCH_INCLUDEDIRS="$2" Link Here
383	# Mind you, it's useful to be able to test against uninstalled mozilla builds...	440	# Mind you, it's useful to be able to test against uninstalled mozilla builds...
384	_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"	441	_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
385		442
386	# Now add them to CPPFLAGS	443	# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
387	for i in $_GECKO_DISPATCH_INCLUDEDIRS; do	444	for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
388	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"	445	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
		446	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
		447	fi
389	done	448	done
390		449
391	m4_indir([$1],m4_shiftn(2,$@))	450	m4_indir([$1],m4_shiftn(2,$@))
Lines 438-448 AC_DEFUN([GECKO_XPCOM_PROGRAM], Link Here
438	#include <mozilla-config.h>	497	#include <mozilla-config.h>
439	#include <stdlib.h>	498	#include <stdlib.h>
440	#include <stdio.h>	499	#include <stdio.h>
		500
		501	#ifdef XPCOM_GLUE
		502	#include <nsXPCOMGlue.h>
		503	#else
441	#include <nsXPCOM.h>	504	#include <nsXPCOM.h>
		505	#endif // XPCOM_GLUE
		506
442	#include <nsCOMPtr.h>	507	#include <nsCOMPtr.h>
443	#include <nsILocalFile.h>	508	#include <nsILocalFile.h>
444	#include <nsIServiceManager.h>	509	#include <nsIServiceManager.h>
445	#ifdef HAVE_GECKO_1_8	510	#if defined(HAVE_GECKO_1_8) \|\| defined(HAVE_GECKO_1_9)
446	#include <nsStringAPI.h>	511	#include <nsStringAPI.h>
447	#else	512	#else
448	#include <nsString.h>	513	#include <nsString.h>
Lines 450-465 AC_DEFUN([GECKO_XPCOM_PROGRAM], Link Here
450	]]	515	]]
451	[$1],	516	[$1],
452	[[	517	[[
		518
		519	nsresult rv;
		520	#ifdef XPCOM_GLUE
		521	static const GREVersionRange greVersion = {
		522	"1.8", PR_TRUE,
		523	"1.9.*", PR_TRUE
		524	};
		525	char xpcomLocation[4096];
		526	rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
		527	if (NS_FAILED(rv)) {
		528	exit(123);
		529	}
		530
		531	// Startup the XPCOM Glue that links us up with XPCOM.
		532	XPCOMGlueStartup(xpcomLocation);
		533	if (NS_FAILED(rv)) {
		534	exit(124);
		535	}
		536	#endif // XPCOM_GLUE
		537
453	// redirect unwanted mozilla debug output to the bit bucket	538	// redirect unwanted mozilla debug output to the bit bucket
454	freopen ("/dev/null", "w", stdout);	539	freopen ("/dev/null", "w", stdout);
455		540
456	nsresult rv;	541	nsCOMPtr<nsILocalFile> directory = nsnull;
457	nsCOMPtr<nsILocalFile> directory;	542	#ifndef XPCOM_GLUE
458	rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,	543	rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,
459	getter_AddRefs (directory));	544	getter_AddRefs (directory));
460	if (NS_FAILED (rv) \|\| !directory) {	545	if (NS_FAILED (rv) \|\| !directory) {
461	exit (126);	546	exit (126);
462	}	547	}
		548	#endif
463		549
464	rv = NS_InitXPCOM2 (nsnull, directory, nsnull);	550	rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
465	if (NS_FAILED (rv)) {	551	if (NS_FAILED (rv)) {
Lines 607-627 fi Link Here
607	AC_DEFUN([GECKO_XPIDL],	693	AC_DEFUN([GECKO_XPIDL],
608	[AC_REQUIRE([GECKO_INIT])dnl	694	[AC_REQUIRE([GECKO_INIT])dnl
609		695
610	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"	696	if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
		697	_GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin"
		698	else
		699	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
		700	fi
611		701
612	AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])	702	AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
613		703
		704	if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
		705	XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`"
		706	else
614	XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"	707	XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
615
616	# Older geckos don't have this variable, see
617	# https://bugzilla.mozilla.org/show_bug.cgi?id=240473
618
619	if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then	708	if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
620	XPIDL_IDLDIR="`echo $_GECKO_LIBDIR \| sed -e s!lib!share/idl!`"	709	XPIDL_IDLDIR="`echo $_GECKO_LIBDIR \| sed -e s!lib!share/idl!`"
621	fi	710	fi
622
623	# Some distributions (Gentoo) have it in unusual places	711	# Some distributions (Gentoo) have it in unusual places
624
625	if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then	712	if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
626	XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"	713	XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
627	fi	714	fi

Lines 238-249 fi Link Here

(-)epiphany-2.21.92/configure.ac.xulrunner19 (-2 / +38 lines)
238		238
239	case "$gecko_cv_gecko" in	239	case "$gecko_cv_gecko" in
240	xulrunner) min_version=1.8 ;;	240	xulrunner) min_version=1.8 ;;
		241	libxul*) min_version=1.9 ;;
241	*firefox) min_version=1.5 ;;	242	*firefox) min_version=1.5 ;;
242	*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;	243	*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
243	esac	244	esac
244		245
245	# Added $gecko_cv_gecko-js for debian xulrunner brokenness	246	# Added $gecko_cv_gecko-js for debian xulrunner brokenness
246	PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])	247	if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then
		248	PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
		249	else
		250	GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG"
		251	GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
		252	fi
		253
		254	AC_MSG_CHECKING(nspr in gecko)
		255	if test "$GECKO_NSPR" != yes; then
		256	AC_MSG_RESULT(no)
		257	AC_MSG_CHECKING(nspr in system)
		258	gecko_nspr=
		259	if $PKG_CONFIG --exists mozilla-nspr; then
		260	gecko_nspr=mozilla-nspr
		261	elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then
		262	gecko_nspr=${gecko_cv_gecko}-nspr
		263	fi
		264	if $PKG_CONFIG --exists nspr; then
		265	gecko_nspr=nspr
		266	fi
		267	if test -z "$gecko_nspr"; then
		268	AC_MSG_ERROR([no nspr available])
		269	fi
		270
		271	GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`"
		272	GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`"
		273	_GECKO_CFLAGS="$GECKO_CFLAGS"
		274	AC_MSG_RESULT(yes)
		275	else
		276	AC_MSG_RESULT(yes)
		277	fi
		278
247	AC_SUBST([GECKO_CFLAGS])	279	AC_SUBST([GECKO_CFLAGS])
248	AC_SUBST([GECKO_LIBS])	280	AC_SUBST([GECKO_LIBS])
249		281
Lines 533-539 AC_ARG_ENABLE([desktop-file-plugin], Link Here
533	AC_MSG_RESULT([$enable_desktop_file_plugin])	565	AC_MSG_RESULT([$enable_desktop_file_plugin])
534		566
535	if test "$enable_desktop_file_plugin" = "yes"; then	567	if test "$enable_desktop_file_plugin" = "yes"; then
536	PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])	568	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
		569	PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0])
		570	else
		571	PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
		572	fi
537	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])	573	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
538	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])	574	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
539	fi	575	fi

Lines 32-43 Link Here

(-)epiphany-2.21.92/embed/mozilla/FilePicker.cpp.xulrunner19 (-10 / +5 lines)
32		32
33	#include <nsCOMPtr.h>	33	#include <nsCOMPtr.h>
34	#include <nsIDOMWindow.h>	34	#include <nsIDOMWindow.h>
35	#include <nsIFileURL.h>
36	#include <nsILocalFile.h>	35	#include <nsILocalFile.h>
37	#include <nsIPromptService.h>	36	#include <nsIPromptService.h>
38	#include <nsIServiceManager.h>	37	#include <nsIServiceManager.h>
39	#include <nsIURI.h>	38	#include <nsIURI.h>
40	#include <nsNetCID.h>	39	#include <nsNetUtil.h>
41	#include <nsComponentManagerUtils.h>	40	#include <nsComponentManagerUtils.h>
42	#include <nsServiceManagerUtils.h>	41	#include <nsServiceManagerUtils.h>
43	#include <nsXPCOMCID.h>	42	#include <nsXPCOMCID.h>
Lines 357-378 Link Here
357	return NS_OK;	356	return NS_OK;
358	}	357	}
359		358
360	/* readonly attribute nsIFileURL fileURL; */	359	/* readonly attribute nsIURI fileURL; */
361	NS_IMETHODIMP GFilePicker::GetFileURL(nsIFileURL **aFileURL)	360	NS_IMETHODIMP GFilePicker::GetFileURL(nsIURI **aFileURL)
362	{	361	{
363	NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);	362	NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);
364		363
365	LOG ("GFilePicker::GetFileURL");	364	LOG ("GFilePicker::GetFileURI");
366		365
367	nsCOMPtr<nsILocalFile> file;	366	nsCOMPtr<nsILocalFile> file;
368	GetFile (getter_AddRefs(file));	367	GetFile (getter_AddRefs(file));
369	NS_ENSURE_TRUE (file, NS_ERROR_FAILURE);	368	NS_ENSURE_TRUE (file, NS_ERROR_FAILURE);
370		369
371	nsCOMPtr<nsIFileURL> fileURL = do_CreateInstance (NS_STANDARDURL_CONTRACTID);	370	return NS_NewFileURI(aFileURL, file);
372	fileURL->SetFile(file);
373	NS_IF_ADDREF(*aFileURL = fileURL);
374
375	return NS_OK;
376	}	371	}
377		372
378	/* readonly attribute nsISimpleEnumerator files; */	373	/* readonly attribute nsISimpleEnumerator files; */