New commits:
commit 68ea0fb80ef76c38f7a3fc0df8b91737c18fe7ea
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
xulrunner: Major update of spell. Probably still some clean up to
be done, but replaces non-working spell. Updated to version 1.9.0.3.
#
# Only strip if the user wants us to
@@ -8,48 +10,22 @@ if echo $LDFLAGS | grep -q -- '-s'; then
OPTS="$OPTS --enable-strip"
fi &&
-if [[ $XULRUNNER_FONTS == xft ]]
-then
- OPTS="--enable-xft --disable-freetype2 $OPTS"
-fi &&
#
# No fast optimization for Mozilla, bit us so many times...
#
CFLAGS="${CFLAGS//-O3/-O2}" &&
CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
-# remove broken .mozconfig shipped with 1.0b
-rm -f .mozconfig
+if [[ $FIREFOX_OFFICIAL == y ]]; then
+ sed -i '24iac_add_options --enable-official-branding' .mozconfig
+fi
diff --git a/http/xulrunner/mozconfig3 b/http/xulrunner/mozconfig3
new file mode 100644
index 0000000..097b5cc
--- /dev/null
+++ b/http/xulrunner/mozconfig3
@@ -0,0 +1,44 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+#mk_add_options MOZ_CO_PROJECT=xulrunner
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --with-pthreads
+
+# These cause breakage when building apps
+#ac_add_options --with-system-nspr
+#ac_add_options --with-system-nss
+
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --enable-image-encoder=all
+ac_add_options --enable-js-binary
+ac_add_options --with-system-jpeg=/usr/lib
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --with-system-png=/usr/lib
+ac_add_options --enable-application=xulrunner
+ac_add_options --enable-system-cairo
+ac_add_options --enable-storage
+ac_add_options --with-system-sqlite3
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-svg-renderer=cairo
+ac_add_options --enable-pango
+ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner
+ac_add_options --enable-webservices
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-lcms
+ac_add_options --disable-mailnews
+ac_add_options --disable-freetype2
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-javaxpcom
+ac_add_option --disable-crashreporter
diff --git a/http/xulrunner/nsiPermission.patch
b/http/xulrunner/nsiPermission.patch
deleted file mode 100644
index 2decaee..0000000
--- a/http/xulrunner/nsiPermission.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From: Robert O'Callahan <rocallahan AT novell.com>
-Subject: move nsIPermission to xulrunner
-References:
-https://bugzilla.mozilla.org/show_bug.cgi?id=315345
-
-Index: netwerk/base/public/nsIPermission.idl
-===================================================================
-RCS file: netwerk/base/public/nsIPermission.idl
-diff -N netwerk/base/public/nsIPermission.idl
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ netwerk/base/public/nsIPermission.idl 10 Feb 2005 16:06:39 -0000
-@@ -0,0 +1,69 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ *
-+ * ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License
Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS"
basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications, Inc.
-+ * Portions created by the Initial Developer are Copyright (C) 2001
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable
instead
-+ * of those above. If you wish to allow use of your version of this file
only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the
notice
-+ * and other provisions required by the GPL or the LGPL. If you do not
delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include "nsISupports.idl"
-+
-+[scriptable, uuid(28F16D80-157B-11d5-A542-0010A401EB10)]
-+
-+/**
-+ * This interface defines a "permission" object,
-+ * used to specify allowed/blocked objects from
-+ * user-specified sites (cookies, images etc).
-+ */
-+
-+interface nsIPermission : nsISupports
-+{
-+ /**
-+ * The name of the host for which the permission is set
-+ */
-+ readonly attribute AUTF8String host;
-+
-+ /**
-+ * a case-sensitive ASCII string, indicating the type of permission
-+ * (e.g., "cookie", "image", etc).
-+ * This string is specified by the consumer when adding a permission
-+ * via nsIPermissionManager.
-+ * @see nsIPermissionManager
-+ */
-+ readonly attribute ACString type;
-+
-+ /**
-+ * The permission (see nsIPermissionManager.idl for allowed values)
-+ */
-+ readonly attribute PRUint32 capability;
-+};
-Index: netwerk/base/public/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/netwerk/base/public/Makefile.in,v
-retrieving revision 1.106
-diff -u -p -r1.106 Makefile.in
---- netwerk/base/public/Makefile.in 25 Jul 2005 20:27:01 -0000 1.106
-+++ netwerk/base/public/Makefile.in 7 Nov 2005 08:37:59 -0000
-@@ -75,6 +75,7 @@ XPIDLSRCS = \
- nsIMIMEInputStream.idl \
- nsIPasswordManager.idl \
- nsIPasswordManagerInternal.idl \
-+ nsIPermission.idl \
- nsIPermissionManager.idl \
- nsIProgressEventSink.idl \
- nsIPrompt.idl \
diff --git a/http/xulrunner/nsiSidebar.patch b/http/xulrunner/nsiSidebar.patch
deleted file mode 100644
index ab42d6d..0000000
--- a/http/xulrunner/nsiSidebar.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From: Robert O'Callahan <rocallahan AT novell.com>
-Subject: add nsISideBar to xulrunner
-References:
-https://bugzilla.mozilla.org/show_bug.cgi?id=315346
-
-Index: dom/public/idl/sidebar/Makefile.in
-===================================================================
-RCS file: dom/public/idl/sidebar/Makefile.in
-diff -N dom/public/idl/sidebar/Makefile.in
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ dom/public/idl/sidebar/Makefile.in 4 Nov 2005 02:35:53 -0000
-@@ -0,0 +1,53 @@
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License
Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is Sidebar IDL Makefile code.
-+#
-+# The Initial Developer of the Original Code is
-+# Robert O'Callahan (rocallahan AT novell.com)
-+# Portions created by the Initial Developer are Copyright (C) 2005
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either of the GNU General Public License Version 2 or later (the "GPL"),
-+# or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+DEPTH = ../../../..
-+topsrcdir = @top_srcdir@
-+srcdir = @srcdir@
-+VPATH = @srcdir@
-+
-+include $(DEPTH)/config/autoconf.mk
-+
-+MODULE = dom
-+XPIDL_MODULE = dom_sidebar
-+GRE_MODULE = 1
-+
-+XPIDLSRCS = \
-+ nsISidebar.idl \
-+ $(NULL)
-+
-+include $(topsrcdir)/config/rules.mk
-Index: dom/public/idl/sidebar/nsISidebar.idl
-===================================================================
-RCS file: dom/public/idl/sidebar/nsISidebar.idl
-diff -N dom/public/idl/sidebar/nsISidebar.idl
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ dom/public/idl/sidebar/nsISidebar.idl 10 Feb 2005 15:58:02 -0000
-@@ -0,0 +1,70 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ *
-+ * ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License
Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS"
basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org Code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable
instead
-+ * of those above. If you wish to allow use of your version of this file
only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the
notice
-+ * and other provisions required by the GPL or the LGPL. If you do not
delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/*
-+
-+ The Sidebar API for 3rd parties
-+
-+*/
-+
-+#include "nsISupports.idl"
-+
-+[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)]
-+interface nsISidebar : nsISupports
-+{
-+ void addPanel(in wstring aTitle, in string aContentURL,
-+ in string aCustomizeURL);
-+ void addPersistentPanel(in wstring aTitle, in string aContentURL,
-+ in string aCustomizeURL);
-+ void addSearchEngine(in string engineURL, in string iconURL,
-+ in wstring suggestedTitle, in wstring
suggestedCategory);
-+};
-+
-+%{ C++
-+// {577CB744-8CAF-11d3-AAEF-00805F8A4905}
-+#define NS_SIDEBAR_CID \
-+{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49,
0x5 } }
-+
-+#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1"
-+%}
-+
-+/*
-+ var isidebar = Components.interfaces.nsISidebar;
-+ var csidebar = Components.classes['@mozilla.org/sidebar;1'];
-+ var sidebar = csidebar.createInstance(isidebar);
-+*/
-Index: xpinstall/packager/packages-static-unix
-===================================================================
-RCS file:
/home/rocallahan/mozilla-cvs-mirror/mozilla/xpinstall/packager/packages-static-unix,v
-retrieving revision 1.87
-diff -u -t -p -1 -2 -r1.87 packages-static-unix
---- xpinstall/packager/packages-static-unix 19 Aug 2005 23:09:31 -0000
1.87
-+++ xpinstall/packager/packages-static-unix 4 Nov 2005 02:39:13 -0000
-@@ -89,24 +89,25 @@ bin/components/caps.xpt
- bin/components/cookie.xpt
- bin/components/jsdservice.xpt
- bin/components/libjsd.so
- bin/components/dom.xpt
- bin/components/dom_base.xpt
- bin/components/dom_canvas.xpt
- bin/components/dom_core.xpt
- bin/components/dom_css.xpt
- bin/components/dom_events.xpt
- bin/components/dom_loadsave.xpt
- bin/components/dom_html.xpt
- bin/components/dom_range.xpt
-+bin/components/dom_sidebar.xpt
- bin/components/dom_stylesheets.xpt
- bin/components/dom_traversal.xpt
- bin/components/dom_views.xpt
- bin/components/dom_xbl.xpt
- bin/components/dom_xpath.xpt
- bin/components/dom_xul.xpt
- bin/components/editor.xpt
- bin/components/find.xpt
- bin/components/gfx.xpt
- bin/components/gfx2.xpt
- bin/components/gksvgrenderer.xpt
- bin/components/intl.xpt
-Index: xpinstall/packager/packages-unix
-===================================================================
-RCS file:
/home/rocallahan/mozilla-cvs-mirror/mozilla/xpinstall/packager/packages-unix,v
-retrieving revision 1.314
-diff -u -t -p -1 -2 -r1.314 packages-unix
---- xpinstall/packager/packages-unix 31 Oct 2005 13:21:31 -0000 1.314
-+++ xpinstall/packager/packages-unix 4 Nov 2005 02:38:56 -0000
-@@ -105,24 +105,25 @@ bin/components/nsComposerCmdLineHandler.
- bin/components/cookie.xpt
- bin/components/libjsd.so
- bin/components/jsdservice.xpt
- bin/components/dom.xpt
- bin/components/dom_base.xpt
- bin/components/dom_canvas.xpt
- bin/components/dom_core.xpt
- bin/components/dom_css.xpt
- bin/components/dom_events.xpt
- bin/components/dom_html.xpt
- bin/components/dom_loadsave.xpt
- bin/components/dom_range.xpt
-+bin/components/dom_sidebar.xpt
- bin/components/dom_stylesheets.xpt
- bin/components/dom_traversal.xpt
- bin/components/dom_views.xpt
- bin/components/dom_xbl.xpt
- bin/components/dom_xpath.xpt
- bin/components/dom_xul.xpt
- bin/components/editor.xpt
- bin/components/find.xpt
- bin/components/gfx.xpt
- bin/components/gksvgrenderer.xpt
- bin/components/intl.xpt
- bin/components/imglib2.xpt
-Index: dom/public/idl/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/dom/public/idl/Makefile.in,v
-retrieving revision 1.13
-diff -u -p -r1.13 Makefile.in
---- dom/public/idl/Makefile.in 18 Apr 2005 06:33:17 -0000 1.13
-+++ dom/public/idl/Makefile.in 7 Nov 2005 08:39:01 -0000
-@@ -51,6 +51,7 @@ DIRS = \
- stylesheets \
- views \
- css \
-+ sidebar \
- traversal \
- range \
- xbl \
diff --git a/http/xulrunner/security_manager_makefile.diff
b/http/xulrunner/security_manager_makefile.diff
deleted file mode 100644
index 8fe6345..0000000
--- a/http/xulrunner/security_manager_makefile.diff
+++ /dev/null
@@ -1,141 +0,0 @@
---- mozilla/security/manager/Makefile.in~ 2006-01-05 16:40:17.000000000
+0100
-+++ mozilla/security/manager/Makefile.in 2006-02-08 09:41:15.000000000
+0100
-@@ -46,35 +46,6 @@
- MODULE = psm
-
- PACKAGE_FILE = psm.pkg
--PACKAGE_VARS += \
-- NSS3_LIB \
-- SMIME3_LIB \
-- SSL3_LIB \
-- SOFTOKEN3_LIB \
-- SOFTOKEN3_CHK \
-- LOADABLE_ROOT_MODULE \
-- HAVE_FREEBL_MODULES \
-- $(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
--ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
--ifeq (,$(filter i86pc ia64,$(OS_TEST)))
--ifndef HAVE_64BIT_OS
--HAVE_FREEBL_MODULES = 1
--FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
--FREEBL_PURE32_CHK = libfreebl_pure32_3.chk
--FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
--FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
--endif
--endif
--endif
-
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-@@ -147,19 +118,7 @@
- include $(topsrcdir)/config/rules.mk
-
- # Attempt to properly handle NSS' refusal to implement a dependency system
--export:: .nss.cleaned
--
--.nss.cleaned: .nss.checkout
-- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
--endif
-- touch $@
--
--.nss.checkout:
-- touch $(srcdir)/$@
-+export::
-
- dependclean export packages chrome::
- $(MAKE) -C boot $@
-@@ -171,48 +130,6 @@
-
- libs::
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--ifeq ($(OS_ARCH),WINNT)
-- cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
-- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX)
$(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
-- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
-- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
--endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
- $(MAKE) -C locales $@
-@@ -221,20 +138,6 @@
- endif
-
- install::
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE)
$(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK)
$(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK)
$(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE)
$(DESTDIR)$(mozappdir)
--endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
- $(MAKE) -C locales $@
-@@ -250,11 +153,6 @@
- $(MAKE) -C pki $@
- endif
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign
$(DEFAULT_GMAKE_FLAGS) clean
--endif
-
- echo-requires-recursive::
- $(MAKE) -C boot $@
diff --git a/http/xulrunner/xulrunner-install-paths.patch
b/http/xulrunner/xulrunner-install-paths.patch
new file mode 100644
index 0000000..8095eaa
--- /dev/null
+++ b/http/xulrunner/xulrunner-install-paths.patch
@@ -0,0 +1,21 @@
+--- config/autoconf.mk.in.orig 2007-08-03 22:02:32.000000000 +0200
++++ config/autoconf.mk.in 2007-08-03 22:07:00.000000000 +0200
+@@ -58,14 +58,14 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@/$(MOZ_APP_NAME)-1.9
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(includedir)/idl
+
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)-1.9
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-1.9
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
diff --git a/http/xulrunner/xulrunner-visibility.diff
b/http/xulrunner/xulrunner-visibility.diff
deleted file mode 100644
index 0ad6e6e..0000000
--- a/http/xulrunner/xulrunner-visibility.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure~ 2006-01-11 06:43:03.000000000 +0100
-+++ configure 2006-02-08 09:29:20.000000000 +0100
-@@ -7626,7 +7626,7 @@
- if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
- if grep '\.hidden.*foo_hidden' conftest.s
>/dev/null; then
- if ! grep '\.hidden.*foo_default' conftest.s >
/dev/null; then
-- ac_cv_visibility_pragma=yes
-+ ac_cv_visibility_pragma=no
- fi
- fi
- fi
diff --git a/http/xulrunner/xulrunner.sh b/http/xulrunner/xulrunner.sh
index a5656e2..5fc4579 100644
--- a/http/xulrunner/xulrunner.sh
+++ b/http/xulrunner/xulrunner.sh
@@ -7,6 +7,6 @@
#
if [ -z "$MOZILLA_FIVE_HOME" ] ; then
- MOZILLA_FIVE_HOME=/usr/lib/seamonkey
+ MOZILLA_FIVE_HOME=/usr/lib/xulrunner-1.9
fi
export MOZILLA_FIVE_HOME
[SM-Commit] GIT changes to master grimoire by George Sherwood (68ea0fb80ef76c38f7a3fc0df8b91737c18fe7ea),
George Sherwood, 10/07/2008