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 297137 Details for
Bug 434126
gnome-web-photo failed massrebuild attempt for GCC 4.3
[?]
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]
First batch of build changes
xulrunner.patch (text/plain), 14.35 KB, created by
Marco Pesenti Gritti
on 2008-03-07 03:50:56 UTC
(
hide
)
Description:
First batch of build changes
Filename:
MIME Type:
Creator:
Marco Pesenti Gritti
Created:
2008-03-07 03:50:56 UTC
Size:
14.35 KB
patch
obsolete
>Index: m4/gecko.m4 >=================================================================== >--- m4/gecko.m4 (revision 105) >+++ m4/gecko.m4 (working copy) >@@ -32,6 +32,7 @@ > # 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 >@@ -51,7 +52,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|libxul@:>@], > [Which gecko engine to use (autodetected by default)])) > > # Backward compat >@@ -60,12 +61,15 @@ > gecko_cv_gecko=$with_gecko > > # Autodetect gecko >-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" >+_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 >@@ -82,6 +86,14 @@ > 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 > # **************** >@@ -93,13 +105,24 @@ > 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 > >-_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`" >+ _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 >@@ -109,9 +132,11 @@ > $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 >@@ -182,7 +207,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( >@@ -215,6 +240,18 @@ > [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++]) >@@ -226,8 +263,14 @@ > 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 >@@ -238,7 +281,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], >@@ -320,8 +363,11 @@ > 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" >+ 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 >@@ -350,6 +396,7 @@ > 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"]) > ]) > > # *************************************************************************** >@@ -371,10 +418,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" -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" > >@@ -383,9 +440,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 - asac: 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,$@)) >@@ -438,11 +497,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> >@@ -450,16 +515,37 @@ > ]] > [$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); > >-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)) { >@@ -607,21 +693,22 @@ > 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" -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 >Index: src/Printer.cpp >=================================================================== >--- src/Printer.cpp (revision 105) >+++ src/Printer.cpp (working copy) >@@ -100,7 +100,9 @@ > { > aSettings->SetPrinterName (NS_LITERAL_STRING("PostScript/default").get()); > aSettings->SetPrintRange (nsIPrintSettings::kRangeAllPages); >+#ifndef HAVE_GECKO_1_9 > aSettings->SetPaperSize (nsIPrintSettings::kPaperSizeDefined); >+#endif > aSettings->SetPaperSizeUnit (nsIPrintSettings::kPaperSizeMillimeters); > aSettings->SetPaperWidth (210.0); > aSettings->SetPaperHeight (297.0); >Index: src/Components.cpp >=================================================================== >--- src/Components.cpp (revision 105) >+++ src/Components.cpp (working copy) >@@ -137,6 +137,7 @@ > return NS_OK; > } > >+#ifndef HAVE_GECKO_1_9 > #ifdef HAVE_PSM > > #include <nsIBadCertListener.h> >@@ -203,14 +204,17 @@ > } > > #endif /* HAVE_PSM */ >+#endif /* HAVE_GECKO_1_9 */ > > /* -------------------------------------------------------------------------- */ > > NS_GENERIC_FACTORY_CONSTRUCTOR(Prompter) > >+#ifndef HAVE_GECKO_1_9 > #ifdef HAVE_PSM > NS_GENERIC_FACTORY_CONSTRUCTOR(NSSDialogs) > #endif >+#endif /* HAVE_GECKO_1_9 */ > > static const nsModuleComponentInfo sAppComps[] = > { >@@ -220,6 +224,7 @@ > NS_PROMPTSERVICE_CONTRACTID, > PrompterConstructor > }, >+#ifndef HAVE_GECKO_1_9 > #ifdef HAVE_PSM > { > NSSDIALOGS_CLASSNAME, >@@ -228,6 +233,7 @@ > NSSDialogsConstructor > }, > #endif /* HAVE_PSM */ >+#endif /* HAVE_GECKO_1_9 */ > }; > > PRBool >Index: src/Makefile.am >=================================================================== >--- src/Makefile.am (revision 105) >+++ src/Makefile.am (working copy) >@@ -43,6 +43,13 @@ > -DGECKO_PREFIX=\"$(GECKO_PREFIX)\" \ > $(AM_CPPFLAGS) > >+if HAVE_GECKO_XPCOM_GLUE >+if HAVE_GECKO_1_9 >+gnome_web_photo_CPPFLAGS += \ >+ -DXPCOM_GLUE_USE_NSPR >+endif >+endif >+ > gnome_web_photo_CXXFLAGS = \ > $(DEPENDENCY_CFLAGS) \ > $(GECKO_CFLAGS) \ >Index: configure.ac >=================================================================== >--- configure.ac (revision 105) >+++ configure.ac (working copy) >@@ -1,5 +1,5 @@ > # Copyright © 2000-2004 Marco Pesenti Gritti >-# Copyright © 2003, 2004, 2005, 2006, 2007 Christian Persch >+# Copyright © 2003, 2004, 2005 Christian Persch > # > # This program is free software; you can redistribute it and/or modify it > # under the terms of the GNU General Public License as published by the >@@ -136,7 +136,6 @@ > # ******* > > GECKO_INIT([GECKO]) >-GECKO_DEFINES > > AC_SUBST([GECKO]) > AC_SUBST([GECKO_FLAVOUR]) >@@ -144,13 +143,44 @@ > AC_SUBST([GECKO_HOME]) > AC_SUBST([GECKO_PREFIX]) > >-case "$GECKO" in >-seamonkey) min_version=1.0 ;; >-*firefox) min_version=1.4 ;; >+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 > >-PKG_CHECK_MODULES([GECKO], [${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_extra_pkg_dependencies}]) >+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]) > >@@ -176,6 +206,7 @@ > [have_psm=no]) > AC_MSG_RESULT([$have_psm]) > >+GECKO_DEFINES > AM_CONDITIONAL([HAVE_PSM],[test "x$have_psm" = "xyes"]) > > # Needed since 1.8b2
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 434126
:
297137
|
297215
|
297224