[SVN-Commit] r1078 - in trunk: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Wed Oct 24 16:11:46 UTC 2012
Author: jbeich
Date: Wed Oct 24 16:11:39 2012
New Revision: 1078
Log:
better fix for missing nkgio issue
Added:
trunk/mail/thunderbird-esr/files/patch-bug799441
trunk/mail/thunderbird/files/patch-bug799441
trunk/www/firefox-esr/files/patch-bug799441
trunk/www/firefox/files/patch-bug799441
trunk/www/seamonkey/files/patch-bug799441
Modified:
trunk/www/firefox-esr/files/patch-bug713802
trunk/www/firefox/files/patch-bug713802
trunk/www/libxul/files/patch-bug713802
trunk/www/seamonkey/files/patch-bug713802
Added: trunk/mail/thunderbird-esr/files/patch-bug799441
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird-esr/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078)
@@ -0,0 +1,116 @@
+commit b9accdd
+Author: Mike Hommey <mh+mozilla at glandium.org>
+Date: Thu Oct 18 14:47:10 2012 +0200
+
+ Bug 799441 - Build GIO module in libxul. r=ted
+---
+ configure.in | 6 ++++++
+ extensions/gio/Makefile.in | 14 +++-----------
+ toolkit/library/Makefile.in | 5 +++++
+ toolkit/library/nsStaticXULComponents.cpp | 7 +++++++
+ toolkit/toolkit-tiers.mk | 4 ++++
+ 5 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git configure.in configure.in
+index a9fb5f1..37e6db8 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
+ fi
+
++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
++ MOZ_GIO_COMPONENT=1
++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
++fi
++AC_SUBST(MOZ_GIO_COMPONENT)
++
+ if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
+ AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
+diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in
+index ccf2846..79112a8 100644
+--- mozilla/extensions/gio/Makefile.in
++++ mozilla/extensions/gio/Makefile.in
+@@ -14,6 +14,9 @@ MODULE = nkgio
+ LIBRARY_NAME = nkgio
+ SHORT_LIBNAME = nkgio
+ IS_COMPONENT = 1
++EXPORT_LIBRARY = 1
++MODULE_NAME = nsGIOModule
++LIBXUL_LIBRARY = 1
+
+ CPPSRCS = \
+ nsGIOProtocolHandler.cpp \
+@@ -21,15 +24,4 @@ CPPSRCS = \
+
+ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS)
+
+-EXTRA_DSO_LDOPTS = \
+- $(XPCOM_GLUE_LDOPTS) \
+- $(NSPR_LIBS) \
+- $(MOZ_GIO_LIBS) \
+- $(NULL)
+-
+-# make sure this component is never statically linked into the main
+-# application. this is necessary since we don't want to force users
+-# to install gio in order to use the rest of mozilla ;-)
+-FORCE_SHARED_LIB= 1
+-
+ include $(topsrcdir)/config/rules.mk
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7f9046e..6499758 100644
+--- mozilla/toolkit/library/libxul-config.mk
++++ mozilla/toolkit/library/libxul-config.mk
+@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug
+ endif
+ endif
+
++ifdef MOZ_GIO_COMPONENT
++DEFINES += -DMOZ_GIO_COMPONENT
++COMPONENT_LIBS += nkgio
++endif
++
+ ifdef MOZ_APP_COMPONENT_LIBS
+ COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
+ endif
+diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp
+index e1d90f2..85b21a2 100644
+--- mozilla/toolkit/library/nsStaticXULComponents.cpp
++++ mozilla/toolkit/library/nsStaticXULComponents.cpp
+@@ -164,6 +164,12 @@
+ #define PROFILER_MODULE
+ #endif
+
++#if defined(MOZ_GIO_COMPONENT)
++#define GIO_MODULE MODULE(nsGIOModule)
++#else
++#define GIO_MODULE
++#endif
++
+ #define XUL_MODULES \
+ MODULE(nsUConvModule) \
+ MODULE(nsI18nModule) \
+@@ -220,6 +226,7 @@
+ MODULE(nsTelemetryModule) \
+ MODULE(jsinspector) \
+ MODULE(jsdebugger) \
++ GIO_MODULE \
+ /* end of list */
+
+ #define MODULE(_name) \
+diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk
+index e87d7af..4b16d23 100644
+--- mozilla/toolkit/toolkit-tiers.mk
++++ mozilla/toolkit/toolkit-tiers.mk
+@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger
+
+ tier_platform_dirs += other-licenses/snappy
+
++ifdef MOZ_GIO_COMPONENT
++tier_platform_dirs += extensions/gio
++endif
++
+ ifdef APP_LIBXUL_STATICDIRS
+ # Applications can cheat and ask for code to be
+ # built before libxul so libxul can be linked against it.
Added: trunk/mail/thunderbird/files/patch-bug799441
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078)
@@ -0,0 +1,116 @@
+commit b9accdd
+Author: Mike Hommey <mh+mozilla at glandium.org>
+Date: Thu Oct 18 14:47:10 2012 +0200
+
+ Bug 799441 - Build GIO module in libxul. r=ted
+---
+ configure.in | 6 ++++++
+ extensions/gio/Makefile.in | 14 +++-----------
+ toolkit/library/Makefile.in | 5 +++++
+ toolkit/library/nsStaticXULComponents.cpp | 7 +++++++
+ toolkit/toolkit-tiers.mk | 4 ++++
+ 5 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git configure.in configure.in
+index a9fb5f1..37e6db8 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
+ fi
+
++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
++ MOZ_GIO_COMPONENT=1
++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
++fi
++AC_SUBST(MOZ_GIO_COMPONENT)
++
+ if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
+ AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
+diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in
+index ccf2846..79112a8 100644
+--- mozilla/extensions/gio/Makefile.in
++++ mozilla/extensions/gio/Makefile.in
+@@ -14,6 +14,9 @@ MODULE = nkgio
+ LIBRARY_NAME = nkgio
+ SHORT_LIBNAME = nkgio
+ IS_COMPONENT = 1
++EXPORT_LIBRARY = 1
++MODULE_NAME = nsGIOModule
++LIBXUL_LIBRARY = 1
+
+ CPPSRCS = \
+ nsGIOProtocolHandler.cpp \
+@@ -21,15 +24,4 @@ CPPSRCS = \
+
+ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS)
+
+-EXTRA_DSO_LDOPTS = \
+- $(XPCOM_GLUE_LDOPTS) \
+- $(NSPR_LIBS) \
+- $(MOZ_GIO_LIBS) \
+- $(NULL)
+-
+-# make sure this component is never statically linked into the main
+-# application. this is necessary since we don't want to force users
+-# to install gio in order to use the rest of mozilla ;-)
+-FORCE_SHARED_LIB= 1
+-
+ include $(topsrcdir)/config/rules.mk
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7f9046e..6499758 100644
+--- mozilla/toolkit/library/Makefile.in
++++ mozilla/toolkit/library/Makefile.in
+@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug
+ endif
+ endif
+
++ifdef MOZ_GIO_COMPONENT
++DEFINES += -DMOZ_GIO_COMPONENT
++COMPONENT_LIBS += nkgio
++endif
++
+ ifdef MOZ_APP_COMPONENT_LIBS
+ COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
+ endif
+diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp
+index e1d90f2..85b21a2 100644
+--- mozilla/toolkit/library/nsStaticXULComponents.cpp
++++ mozilla/toolkit/library/nsStaticXULComponents.cpp
+@@ -164,6 +164,12 @@
+ #define PROFILER_MODULE
+ #endif
+
++#if defined(MOZ_GIO_COMPONENT)
++#define GIO_MODULE MODULE(nsGIOModule)
++#else
++#define GIO_MODULE
++#endif
++
+ #define XUL_MODULES \
+ MODULE(nsUConvModule) \
+ MODULE(nsI18nModule) \
+@@ -220,6 +226,7 @@
+ MODULE(nsTelemetryModule) \
+ MODULE(jsinspector) \
+ MODULE(jsdebugger) \
++ GIO_MODULE \
+ /* end of list */
+
+ #define MODULE(_name) \
+diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk
+index e87d7af..4b16d23 100644
+--- mozilla/toolkit/toolkit-tiers.mk
++++ mozilla/toolkit/toolkit-tiers.mk
+@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger
+
+ tier_platform_dirs += other-licenses/snappy
+
++ifdef MOZ_GIO_COMPONENT
++tier_platform_dirs += extensions/gio
++endif
++
+ ifdef APP_LIBXUL_STATICDIRS
+ # Applications can cheat and ask for code to be
+ # built before libxul so libxul can be linked against it.
Modified: trunk/www/firefox-esr/files/patch-bug713802
==============================================================================
--- trunk/www/firefox-esr/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077)
+++ trunk/www/firefox-esr/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078)
@@ -25,19 +25,6 @@
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
# Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
# because branding dependencies are broken.
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so
-
- ; [Extensions]
- ;
-+#ifdef MOZ_ENABLE_GIO
-+bin/components/@DLL_PREFIX at nkgio@DLL_SUFFIX@
-+#endif
-+
- #ifdef MOZ_ENABLE_GNOMEVFS
- bin/components/@DLL_PREFIX at nkgnomevfs@DLL_SUFFIX@
- #endif
diff --git configure.in configure.in
index 87a9391..2118651 100644
--- configure.in
Added: trunk/www/firefox-esr/files/patch-bug799441
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078)
@@ -0,0 +1,116 @@
+commit b9accdd
+Author: Mike Hommey <mh+mozilla at glandium.org>
+Date: Thu Oct 18 14:47:10 2012 +0200
+
+ Bug 799441 - Build GIO module in libxul. r=ted
+---
+ configure.in | 6 ++++++
+ extensions/gio/Makefile.in | 14 +++-----------
+ toolkit/library/Makefile.in | 5 +++++
+ toolkit/library/nsStaticXULComponents.cpp | 7 +++++++
+ toolkit/toolkit-tiers.mk | 4 ++++
+ 5 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git configure.in configure.in
+index a9fb5f1..37e6db8 100644
+--- configure.in
++++ configure.in
+@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
+ fi
+
++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
++ MOZ_GIO_COMPONENT=1
++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
++fi
++AC_SUBST(MOZ_GIO_COMPONENT)
++
+ if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
+ AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
+diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in
+index ccf2846..79112a8 100644
+--- extensions/gio/Makefile.in
++++ extensions/gio/Makefile.in
+@@ -14,6 +14,9 @@ MODULE = nkgio
+ LIBRARY_NAME = nkgio
+ SHORT_LIBNAME = nkgio
+ IS_COMPONENT = 1
++EXPORT_LIBRARY = 1
++MODULE_NAME = nsGIOModule
++LIBXUL_LIBRARY = 1
+
+ CPPSRCS = \
+ nsGIOProtocolHandler.cpp \
+@@ -21,15 +24,4 @@ CPPSRCS = \
+
+ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS)
+
+-EXTRA_DSO_LDOPTS = \
+- $(XPCOM_GLUE_LDOPTS) \
+- $(MOZ_COMPONENT_LIBS) \
+- $(MOZ_GIO_LIBS) \
+- $(NULL)
+-
+-# make sure this component is never statically linked into the main
+-# application. this is necessary since we don't want to force users
+-# to install gio in order to use the rest of mozilla ;-)
+-FORCE_SHARED_LIB= 1
+-
+ include $(topsrcdir)/config/rules.mk
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7f9046e..6499758 100644
+--- toolkit/library/libxul-config.mk
++++ toolkit/library/libxul-config.mk
+@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug
+ endif
+ endif
+
++ifdef MOZ_GIO_COMPONENT
++DEFINES += -DMOZ_GIO_COMPONENT
++COMPONENT_LIBS += nkgio
++endif
++
+ ifdef MOZ_APP_COMPONENT_LIBS
+ COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
+ endif
+diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp
+index e1d90f2..85b21a2 100644
+--- toolkit/library/nsStaticXULComponents.cpp
++++ toolkit/library/nsStaticXULComponents.cpp
+@@ -164,6 +164,12 @@
+ #define PROFILER_MODULE
+ #endif
+
++#if defined(MOZ_GIO_COMPONENT)
++#define GIO_MODULE MODULE(nsGIOModule)
++#else
++#define GIO_MODULE
++#endif
++
+ #define XUL_MODULES \
+ MODULE(nsUConvModule) \
+ MODULE(nsI18nModule) \
+@@ -220,6 +226,7 @@
+ MODULE(nsTelemetryModule) \
+ MODULE(jsinspector) \
+ MODULE(jsdebugger) \
++ GIO_MODULE \
+ /* end of list */
+
+ #define MODULE(_name) \
+diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk
+index e87d7af..4b16d23 100644
+--- toolkit/toolkit-tiers.mk
++++ toolkit/toolkit-tiers.mk
+@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger
+
+ tier_platform_dirs += other-licenses/snappy
+
++ifdef MOZ_GIO_COMPONENT
++tier_platform_dirs += extensions/gio
++endif
++
+ ifdef APP_LIBXUL_STATICDIRS
+ # Applications can cheat and ask for code to be
+ # built before libxul so libxul can be linked against it.
Modified: trunk/www/firefox/files/patch-bug713802
==============================================================================
--- trunk/www/firefox/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077)
+++ trunk/www/firefox/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078)
@@ -25,19 +25,6 @@
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
# Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
# because branding dependencies are broken.
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so
-
- ; [Extensions]
- ;
-+#ifdef MOZ_ENABLE_GIO
-+bin/components/@DLL_PREFIX at nkgio@DLL_SUFFIX@
-+#endif
-+
- #ifdef MOZ_ENABLE_GNOMEVFS
- bin/components/@DLL_PREFIX at nkgnomevfs@DLL_SUFFIX@
- #endif
diff --git configure.in configure.in
index 87a9391..2118651 100644
--- configure.in
Added: trunk/www/firefox/files/patch-bug799441
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078)
@@ -0,0 +1,116 @@
+commit b9accdd
+Author: Mike Hommey <mh+mozilla at glandium.org>
+Date: Thu Oct 18 14:47:10 2012 +0200
+
+ Bug 799441 - Build GIO module in libxul. r=ted
+---
+ configure.in | 6 ++++++
+ extensions/gio/Makefile.in | 14 +++-----------
+ toolkit/library/Makefile.in | 5 +++++
+ toolkit/library/nsStaticXULComponents.cpp | 7 +++++++
+ toolkit/toolkit-tiers.mk | 4 ++++
+ 5 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git configure.in configure.in
+index a9fb5f1..37e6db8 100644
+--- configure.in
++++ configure.in
+@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
+ fi
+
++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
++ MOZ_GIO_COMPONENT=1
++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
++fi
++AC_SUBST(MOZ_GIO_COMPONENT)
++
+ if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
+ AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
+diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in
+index ccf2846..79112a8 100644
+--- extensions/gio/Makefile.in
++++ extensions/gio/Makefile.in
+@@ -14,6 +14,9 @@ MODULE = nkgio
+ LIBRARY_NAME = nkgio
+ SHORT_LIBNAME = nkgio
+ IS_COMPONENT = 1
++EXPORT_LIBRARY = 1
++MODULE_NAME = nsGIOModule
++LIBXUL_LIBRARY = 1
+
+ CPPSRCS = \
+ nsGIOProtocolHandler.cpp \
+@@ -21,15 +24,4 @@ CPPSRCS = \
+
+ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS)
+
+-EXTRA_DSO_LDOPTS = \
+- $(XPCOM_GLUE_LDOPTS) \
+- $(MOZ_COMPONENT_LIBS) \
+- $(MOZ_GIO_LIBS) \
+- $(NULL)
+-
+-# make sure this component is never statically linked into the main
+-# application. this is necessary since we don't want to force users
+-# to install gio in order to use the rest of mozilla ;-)
+-FORCE_SHARED_LIB= 1
+-
+ include $(topsrcdir)/config/rules.mk
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7f9046e..6499758 100644
+--- toolkit/library/Makefile.in
++++ toolkit/library/Makefile.in
+@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug
+ endif
+ endif
+
++ifdef MOZ_GIO_COMPONENT
++DEFINES += -DMOZ_GIO_COMPONENT
++COMPONENT_LIBS += nkgio
++endif
++
+ ifdef MOZ_APP_COMPONENT_LIBS
+ COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
+ endif
+diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp
+index e1d90f2..85b21a2 100644
+--- toolkit/library/nsStaticXULComponents.cpp
++++ toolkit/library/nsStaticXULComponents.cpp
+@@ -164,6 +164,12 @@
+ #define PROFILER_MODULE
+ #endif
+
++#if defined(MOZ_GIO_COMPONENT)
++#define GIO_MODULE MODULE(nsGIOModule)
++#else
++#define GIO_MODULE
++#endif
++
+ #define XUL_MODULES \
+ MODULE(nsUConvModule) \
+ MODULE(nsI18nModule) \
+@@ -220,6 +226,7 @@
+ MODULE(nsTelemetryModule) \
+ MODULE(jsinspector) \
+ MODULE(jsdebugger) \
++ GIO_MODULE \
+ /* end of list */
+
+ #define MODULE(_name) \
+diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk
+index e87d7af..4b16d23 100644
+--- toolkit/toolkit-tiers.mk
++++ toolkit/toolkit-tiers.mk
+@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger
+
+ tier_platform_dirs += other-licenses/snappy
+
++ifdef MOZ_GIO_COMPONENT
++tier_platform_dirs += extensions/gio
++endif
++
+ ifdef APP_LIBXUL_STATICDIRS
+ # Applications can cheat and ask for code to be
+ # built before libxul so libxul can be linked against it.
Modified: trunk/www/libxul/files/patch-bug713802
==============================================================================
--- trunk/www/libxul/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077)
+++ trunk/www/libxul/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078)
@@ -25,19 +25,6 @@
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
# Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
# because branding dependencies are broken.
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so
-
- ; [Extensions]
- ;
-+#ifdef MOZ_ENABLE_GIO
-+bin/components/@DLL_PREFIX at nkgio@DLL_SUFFIX@
-+#endif
-+
- #ifdef MOZ_ENABLE_GNOMEVFS
- bin/components/@DLL_PREFIX at nkgnomevfs@DLL_SUFFIX@
- #endif
diff --git configure.in configure.in
index 87a9391..2118651 100644
--- configure.in
Modified: trunk/www/seamonkey/files/patch-bug713802
==============================================================================
--- trunk/www/seamonkey/files/patch-bug713802 Wed Oct 24 16:11:28 2012 (r1077)
+++ trunk/www/seamonkey/files/patch-bug713802 Wed Oct 24 16:11:39 2012 (r1078)
@@ -25,19 +25,6 @@
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
# Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
# because branding dependencies are broken.
---- mozilla/browser/installer/package-manifest.in~
-+++ mozilla/browser/installer/package-manifest.in
-@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so
-
- ; [Extensions]
- ;
-+#ifdef MOZ_ENABLE_GIO
-+bin/components/@DLL_PREFIX at nkgio@DLL_SUFFIX@
-+#endif
-+
- #ifdef MOZ_ENABLE_GNOMEVFS
- bin/components/@DLL_PREFIX at nkgnomevfs@DLL_SUFFIX@
- #endif
diff --git mozilla/configure.in mozilla/configure.in
index 87a9391..2118651 100644
--- mozilla/configure.in
@@ -109,18 +96,6 @@
MOZ_UPDATER=1
# This should usually be the same as the value MAR_CHANNEL_ID.
# If more than one ID is needed, then you should use a comma separated list
---- suite/installer/package-manifest.in~
-+++ suite/installer/package-manifest.in
-@@ -265,6 +265,9 @@
- @BINPATH@/components/necko_wifi.xpt
- #endif
- @BINPATH@/components/necko_wyciwyg.xpt
-+#ifdef MOZ_ENABLE_GIO
-+ at BINPATH@/components/@DLL_PREFIX at nkgio@DLL_SUFFIX@
-+#endif
- #ifdef MOZ_ENABLE_GNOMEVFS
- @BINPATH@/components/@DLL_PREFIX at nkgnomevfs@DLL_SUFFIX@
- #endif
commit d884d75
Author: Karl Tomlinson <karlt+ at karlt.net>
Added: trunk/www/seamonkey/files/patch-bug799441
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug799441 Wed Oct 24 16:11:39 2012 (r1078)
@@ -0,0 +1,116 @@
+commit b9accdd
+Author: Mike Hommey <mh+mozilla at glandium.org>
+Date: Thu Oct 18 14:47:10 2012 +0200
+
+ Bug 799441 - Build GIO module in libxul. r=ted
+---
+ configure.in | 6 ++++++
+ extensions/gio/Makefile.in | 14 +++-----------
+ toolkit/library/Makefile.in | 5 +++++
+ toolkit/library/nsStaticXULComponents.cpp | 7 +++++++
+ toolkit/toolkit-tiers.mk | 4 ++++
+ 5 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git configure.in configure.in
+index a9fb5f1..37e6db8 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -6086,6 +6086,12 @@ if test -n "$LIBXUL_SDK_DIR" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; th
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
+ fi
+
++if test `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then
++ MOZ_GIO_COMPONENT=1
++ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'`
++fi
++AC_SUBST(MOZ_GIO_COMPONENT)
++
+ if test -z "$MOZ_JSDEBUGGER" -a `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
+ AC_MSG_WARN([Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS.])
+ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
+diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in
+index ccf2846..79112a8 100644
+--- mozilla/extensions/gio/Makefile.in
++++ mozilla/extensions/gio/Makefile.in
+@@ -14,6 +14,9 @@ MODULE = nkgio
+ LIBRARY_NAME = nkgio
+ SHORT_LIBNAME = nkgio
+ IS_COMPONENT = 1
++EXPORT_LIBRARY = 1
++MODULE_NAME = nsGIOModule
++LIBXUL_LIBRARY = 1
+
+ CPPSRCS = \
+ nsGIOProtocolHandler.cpp \
+@@ -21,15 +24,4 @@ CPPSRCS = \
+
+ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS)
+
+-EXTRA_DSO_LDOPTS = \
+- $(XPCOM_GLUE_LDOPTS) \
+- $(MOZ_COMPONENT_LIBS) \
+- $(MOZ_GIO_LIBS) \
+- $(NULL)
+-
+-# make sure this component is never statically linked into the main
+-# application. this is necessary since we don't want to force users
+-# to install gio in order to use the rest of mozilla ;-)
+-FORCE_SHARED_LIB= 1
+-
+ include $(topsrcdir)/config/rules.mk
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7f9046e..6499758 100644
+--- mozilla/toolkit/library/Makefile.in
++++ mozilla/toolkit/library/Makefile.in
+@@ -333,6 +333,11 @@ COMPONENT_LIBS += gkdebug
+ endif
+ endif
+
++ifdef MOZ_GIO_COMPONENT
++DEFINES += -DMOZ_GIO_COMPONENT
++COMPONENT_LIBS += nkgio
++endif
++
+ ifdef MOZ_APP_COMPONENT_LIBS
+ COMPONENT_LIBS += $(MOZ_APP_COMPONENT_LIBS)
+ endif
+diff --git toolkit/library/nsStaticXULComponents.cpp toolkit/library/nsStaticXULComponents.cpp
+index e1d90f2..85b21a2 100644
+--- mozilla/toolkit/library/nsStaticXULComponents.cpp
++++ mozilla/toolkit/library/nsStaticXULComponents.cpp
+@@ -164,6 +164,12 @@
+ #define PROFILER_MODULE
+ #endif
+
++#if defined(MOZ_GIO_COMPONENT)
++#define GIO_MODULE MODULE(nsGIOModule)
++#else
++#define GIO_MODULE
++#endif
++
+ #define XUL_MODULES \
+ MODULE(nsUConvModule) \
+ MODULE(nsI18nModule) \
+@@ -220,6 +226,7 @@
+ MODULE(nsTelemetryModule) \
+ MODULE(jsinspector) \
+ MODULE(jsdebugger) \
++ GIO_MODULE \
+ /* end of list */
+
+ #define MODULE(_name) \
+diff --git toolkit/toolkit-tiers.mk toolkit/toolkit-tiers.mk
+index e87d7af..4b16d23 100644
+--- mozilla/toolkit/toolkit-tiers.mk
++++ mozilla/toolkit/toolkit-tiers.mk
+@@ -252,6 +252,10 @@ tier_platform_dirs += js/ductwork/debugger
+
+ tier_platform_dirs += other-licenses/snappy
+
++ifdef MOZ_GIO_COMPONENT
++tier_platform_dirs += extensions/gio
++endif
++
+ ifdef APP_LIBXUL_STATICDIRS
+ # Applications can cheat and ask for code to be
+ # built before libxul so libxul can be linked against it.
More information about the freebsd-gecko
mailing list