Mailinglist Archive: opensuse-commit (1417 mails)
| < Previous | Next > |
commit devhelp
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 21 May 2008 22:53:09 +0200
- Message-id: <20080521205310.0F761678183@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package devhelp
checked in at Wed May 21 22:53:09 CEST 2008.
--------
--- GNOME/devhelp/devhelp.changes 2008-03-21 19:49:50.000000000 +0100
+++ devhelp/devhelp.changes 2008-05-21 20:46:16.200569000 +0200
@@ -1,0 +2,5 @@
+Wed May 21 20:51:45 CEST 2008 - maw@xxxxxxx
+
+- Add devhelp-xul19.patch (bnc#391839).
+
+-------------------------------------------------------------------
New:
----
devhelp-xul19.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ devhelp.spec ++++++
--- /var/tmp/diff_new_pack.r18303/_old 2008-05-21 22:50:26.000000000 +0200
+++ /var/tmp/diff_new_pack.r18303/_new 2008-05-21 22:50:26.000000000 +0200
@@ -12,16 +12,18 @@
Name: devhelp
-%define xulrunner_version 181
+%define xulrunner_version 190
BuildRequires: fdupes gcc-c++ gconf2-devel gtk2-devel intltool
libglade2-devel libwnck-devel perl-XML-Parser shared-mime-info
update-desktop-files
Summary: Developer's Help Program for GNOME
#'
Version: 0.19
-Release: 7
+Release: 30
License: GPL v2 or later
Group: Development/Tools/Other
Url: http://developer.imendio.com/wiki/Devhelp
Source: %{name}-%{version}.tar.bz2
+# PATCH-FEATURE-UPSTREAM devhelp-xul19.patch bgo499050 -- build with xulrunner
1.9
+Patch: devhelp-xul19.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1010 || 0%{?opensuse_bs}
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
@@ -60,6 +62,7 @@
Richard Hult <rhult@xxxxxxxxxxxxxx>
%package devel
+License: GPL v2 or later
Summary: Developer's Help Program For GNOME
#'
Group: Development/Tools/Other
@@ -93,10 +96,12 @@
%lang_package
%prep
%setup -q
+%patch0 -p0
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+autoreconf -fi
%configure\
--disable-static
%__make %{?jobs:-j%jobs}
@@ -147,6 +152,8 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed May 21 2008 maw@xxxxxxx
+- Add devhelp-xul19.patch (bnc#391839).
* Fri Mar 21 2008 jpr@xxxxxxx
- Remove obsolete -devel requires
- Remove obsolete version check
@@ -160,7 +167,7 @@
* Thu Feb 28 2008 ro@xxxxxxx
- do not buildrequire gedit, add needed directories to filelist
instead (caused a buildcycle across all of GNOME)
-* Tue Jan 29 2008 maw@xxxxxxx
+* Wed Jan 30 2008 maw@xxxxxxx
- Update to version 0.17:
+ Dont run new instance on new display (bgo#354895)
+ New icons from Andreas Nilsson (bgo#463131)
@@ -226,7 +233,7 @@
- Cleanup BuildRequires.
* Fri Jul 07 2006 lrupp@xxxxxxx
- Fixed mozilla/xulrunner/xulrunner180 dependencies
-* Thu Apr 13 2006 jpr@xxxxxxx
+* Fri Apr 14 2006 jpr@xxxxxxx
- Guard against initializing threads twice (#165486)
* Fri Feb 17 2006 sreeves@xxxxxxx
- Update .desktop file (Name, GenericName, Comment, DocPath)
++++++ devhelp-xul19.patch ++++++
=== modified file 'configure.in'
--- configure.in 2008-05-19 20:15:51 +0000
+++ configure.in 2008-05-21 17:57:20 +0000
@@ -80,9 +80,11 @@
*firefox) gecko_min_version=1.0 ;;
*thunderbird) gecko_min_version=1.0 ;;
xulrunner) gecko_min_version=1.8 ;;
+libxul*) gecko_min_version=1.9 ;;
esac
-PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >=
$gecko_min_version])
+PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >=
$gecko_min_version],
+ [],[PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >=
$gecko_min_version])])
AC_SUBST([GECKO_CFLAGS])
AC_SUBST([GECKO_LIBS])
@@ -113,6 +115,11 @@
GECKO_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align
-Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
AC_SUBST(GECKO_WARN_CXXFLAGS)
+PKG_CHECK_MODULES([NSPR], nspr)
+AC_SUBST([NSPR_CFLAGS])
+AC_SUBST([NSPR_LIBS])
+
+
dnl Checks for zlib library.
AC_LANG_PUSH([C])
_SAVE_CPPFLAGS="$CPPFLAGS"
=== modified file 'm4/gecko.m4'
--- m4/gecko.m4 2008-05-19 20:15:51 +0000
+++ m4/gecko.m4 2008-05-20 17:21:56 +0000
@@ -51,7 +51,7 @@
AC_MSG_CHECKING([which gecko to use])
AC_ARG_WITH([gecko],
-
AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
+
AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding@:>@],
[Which gecko engine to use (autodetected by default)]))
# Backward compat
@@ -60,12 +60,18 @@
gecko_cv_gecko=$with_gecko
# Autodetect gecko
-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
+_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding"
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
+ elif $PKG_CONFIG --exists $lizard; then
+# gecko_cv_gecko=$lizard-unstable
+ gecko_cv_gecko=$lizard
+ # gecko_cv_gecko=$lizard
+ break;
fi
done
fi
@@ -76,6 +82,9 @@
ifelse([$3],,[AC_MSG_ERROR([No gecko found; you may need to adjust
PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package])],[$3])
gecko_cv_have_gecko=no
elif ! ( echo "$_geckos" | egrep "(^| )$gecko_cv_gecko(\$| )" > /dev/null);
then
+ echo "gecko_cv_gecko is $gecko_cv_gecko"
+ echo "_geckos is $_geckos"
+ echo we are be grepping "(^| )$gecko_cv_gecko(\$| )"
AC_MSG_ERROR([Unknown gecko "$gecko_cv_gecko" specified])
else
ifelse([$2],,[],[$2])
@@ -93,13 +102,22 @@
seamonkey) gecko_cv_gecko_flavour=mozilla ;;
*firefox) gecko_cv_gecko_flavour=toolkit ;;
xulrunner) gecko_cv_gecko_flavour=toolkit ;;
+libxul-embedding) gecko_cv_gecko_flavour=toolkit ;;
esac
-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir
${gecko_cv_gecko}-xpcom`"
-_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`"
-
+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`"
+else
+ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir
${gecko_cv_gecko}`/unstable"
+ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG
--define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
+ _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
+ _GECKO_HOME=
+ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
+fi
fi # if gecko_cv_have_gecko
if test "$gecko_cv_gecko_flavour" = "toolkit"; then
@@ -111,6 +129,7 @@
$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
@@ -184,7 +203,7 @@
AC_LANG_PUSH([C++])
_SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
AC_RUN_IFELSE(
@@ -209,8 +228,10 @@
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE(
[[#include <mozilla-config.h>
+ #if !defined(MOZ_STORAGE)
#if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP)
#error No
+ #endif
#endif]]
)],
[gecko_cv_have_debug=yes],
@@ -241,7 +262,7 @@
AC_LANG_PUSH([C++])
_SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
+CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"
AC_CACHE_CHECK([for gecko version],
[gecko_cv_gecko_version],
@@ -328,8 +349,8 @@
gecko_cv_extra_pkg_dependencies=
if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
- gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
- gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s"
+# gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
+ gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
else
gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
fi
@@ -359,10 +380,20 @@
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT
$($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other
${gecko_cv_gecko}-xpcom)"
-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
+if test "${gecko_cv_gecko}" = "libxul-embedding"; then
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG
--define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG
--define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
+ 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}-xapcom)"
+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG
--cflags-only-other ${gecko_cv_gecko}-xapcom)"
+ 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"
@@ -371,9 +402,11 @@
# 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
+# Now add them to CPPFLAGS - well ... not anymore since 1.9 -> test whether
they exist before adding.
for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
+ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
+ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
+ fi
done
m4_indir([$1],m4_shiftn(2,$@))
@@ -426,11 +459,17 @@
#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>
-#ifdef HAVE_GECKO_1_8
+#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
#include <nsStringAPI.h>
#else
#include <nsString.h>
@@ -438,16 +477,37 @@
]]
[$1],
[[
+
+nsresult rv;
+#ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
+ "1.8", PR_TRUE,
+ "2", 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);
-nsresult rv;
-nsCOMPtr<nsILocalFile> directory;
+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)) {
@@ -595,23 +655,31 @@
AC_DEFUN([GECKO_XPIDL],
[AC_REQUIRE([GECKO_INIT])dnl
-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+if test ${gecko_cv_gecko} = "libxul-embedding"; 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"; then
+XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`"
+else
XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
+fi
# 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"
+if test ${gecko_cv_gecko} != "libxul-embedding"; then
+ 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
fi
if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f
"$XPIDL_IDLDIR/nsISupports.idl"; then
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2008-05-19 20:15:51 +0000
+++ src/Makefile.am 2008-05-21 17:59:54 +0000
@@ -25,7 +25,7 @@
$(DEVHELP_LIBS) \
libdevhelp-1.la
-devhelp_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS)
+devhelp_LDFLAGS = $(AM_LDFLAGS)
# Build the C++ code in a separate library so we can use our warning
# flags for the C code.
@@ -64,10 +64,12 @@
libcppwrapper_la_CXXFLAGS = \
$(GECKO_CFLAGS) \
+ $(NSPR_CFLAGS) \
$(AM_CXXFLAGS)
libcppwrapper_la_LIBADD = \
$(GECKO_LIBS) \
+ $(NSPR_LIBS) \
$(GECKO_EXTRA_LIBS)
lib_LTLIBRARIES = libdevhelp-1.la
@@ -87,6 +89,9 @@
dh-window.h \
eggfindbar.h
+nodist_libdevhelp_1_la_SOURCES = \
+ dummy.cpp
+
libdevhelp_1_la_SOURCES = \
bacon-message-connection.c \
bacon-message-connection.h \
@@ -113,15 +118,17 @@
$(WARN_CFLAGS) \
$(LIBDEVHELP_CFLAGS) \
$(GECKO_CFLAGS) \
+ $(NSPR_CFLAGS) \
$(AM_CFLAGS)
libdevhelp_1_la_LIBADD = \
libcppwrapper.la \
$(LIBDEVHELP_LIBS) \
$(GECKO_LIBS) \
+ $(NSPR_LIBS) \
$(GECKO_EXTRA_LIBS)
-libdevhelp_1_la_LDFLAGS = -R$(GECKO_HOME) $(AM_LDFLAGS)
+libdevhelp_1_la_LDFLAGS = $(AM_LDFLAGS)
dh-marshal.h: dh-marshal.list
(cd $(srcdir) && \
@@ -171,4 +178,8 @@
$(devhelpinclude_HEADERS) \
$(default_prefs_in_FILES)
-CLEANFILES = $(BUILT_SOURCES) $(default_prefs_DATA)
+dummy.cpp:
+ echo 'static void __YYYY_dummy();' > $@
+
+CLEANFILES = $(BUILT_SOURCES) $(default_prefs_DATA) dummy.cpp
+
=== modified file 'src/default-prefs-gecko-1-9.js'
--- src/default-prefs-gecko-1-9.js 2008-05-19 20:15:51 +0000
+++ src/default-prefs-gecko-1-9.js 2008-05-19 20:21:47 +0000
@@ -1,2 +1,2 @@
-pref("browser.display.use_document_colors", false);
+pref("browser.display.use_document_colors", true);
=== modified file 'src/dh-gecko-utils.cpp'
--- src/dh-gecko-utils.cpp 2008-05-19 20:15:51 +0000
+++ src/dh-gecko-utils.cpp 2008-05-19 20:21:47 +0000
@@ -21,6 +21,9 @@
*/
#include <config.h>
+#ifdef XPCOM_GLUE
+# include <gtkmozembed_glue.cpp>
+#endif
#include <gtkmozembed.h>
#include <gtkmozembed_internal.h>
@@ -41,7 +44,7 @@
#include <stdlib.h>
-#ifndef HAVE_GECKO_1_8
+#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9)
#if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
#include <chrome/nsIChromeRegistrySea.h>
#elif defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN)
@@ -226,7 +229,7 @@
g_free (name);
}
-#ifndef HAVE_GECKO_1_8
+#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9)
static nsresult
getUILang (nsAString& aUILang)
@@ -286,7 +289,7 @@
#endif
}
-#endif /* !HAVE_GECKO_1_8 */
+#endif /* !HAVE_GECKO_1_8 && !HAVE_GECKO_1_9 */
static nsresult
gecko_utils_init_prefs (void)
@@ -318,11 +321,57 @@
NS_LogInit ();
#endif
+nsresult rv;
+#ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
+ "1.9a", PR_TRUE,
+ "1.9.*", PR_TRUE
+ };
+ char xpcomLocation[4096];
+ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0,
xpcomLocation, 4096);
+ if (NS_FAILED (rv))
+ {
+ g_warning ("Could not determine locale!\n");
+ return;
+ }
+
+ // Startup the XPCOM Glue that links us up with XPCOM.
+ rv = XPCOMGlueStartup(xpcomLocation);
+ if (NS_FAILED (rv))
+ {
+ g_warning ("Could not determine locale!\n");
+ return;
+ }
+
+ rv = GTKEmbedGlueStartup();
+ if (NS_FAILED (rv))
+ {
+ g_warning ("Could not startup embed glue!\n");
+ return;
+ }
+
+ #ifdef GTKEmbedGlueStartupInternal
+ rv = GTKEmbedGlueStartupInternal();
+ if (NS_FAILED (rv))
+ {
+ g_warning ("Could not startup embed glue (internal)!\n");
+ return;
+ }
+ #endif
+
+ char *lastSlash = strrchr(xpcomLocation, '/');
+ if (lastSlash)
+ *lastSlash = '\0';
+
+ gtk_moz_embed_set_path(xpcomLocation);
+
+#else
#ifdef HAVE_GECKO_1_9
gtk_moz_embed_set_path (GECKO_HOME);
#else
gtk_moz_embed_set_comp_path (GECKO_HOME);
#endif
+#endif // XPCOM_GLUE
gchar *profile_dir = g_build_filename (g_get_home_dir (),
".gnome2",
@@ -336,7 +385,7 @@
gecko_utils_init_prefs ();
-#ifndef HAVE_GECKO_1_8
+#if !defined(HAVE_GECKO_1_8) && !defined(HAVE_GECKO_1_9)
gecko_utils_init_chrome ();
#endif
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |