diff --git a/general.ent b/general.ent
index 81ca532dd1..cda5b764e2 100644
--- a/general.ent
+++ b/general.ent
@@ -3,13 +3,13 @@ $LastChangedBy$
$Date$
-->
-
+
-
+
@@ -576,7 +576,7 @@ export -f as_root
-
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5324e548eb..3cade8874b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,15 @@
-->
+
+ July 6th, 2013
+
+
+ [ken] - firefox- and xulrunner-22.0.
+
+
+
+
July 5th, 2013
diff --git a/x/lib/xulrunner.xml b/x/lib/xulrunner.xml
index 7de2b43750..8850d2d9a7 100644
--- a/x/lib/xulrunner.xml
+++ b/x/lib/xulrunner.xml
@@ -5,13 +5,13 @@
%general-entities;
+ "http://www.sourceforge.net/projects/portableapps/files/Source/Firefox/firefox-&firefox-version;.source.tar.bz2">
-
-
-
-
+
+
+
+
]>
@@ -138,10 +138,10 @@
cat > mozconfig << "EOF"
-# If you have a multicore machine you can speed up the build by running
-# several jobs at once by uncommenting the following line and setting the
-# value to number of CPU cores:
-#mk_add_options MOZ_MAKE_FLAGS="-j4"
+# If you have a multicore machine, firefox will now use all the cores by
+# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
+# by uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
# If you have installed DBus-Glib comment out this line:
ac_add_options --disable-dbus
@@ -217,10 +217,9 @@ mkdir -pv /usr/lib/mozilla/plugins &&
rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &&
ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &&
-chmod -v 755 /usr/lib/xulrunner-&xulrunner-version;/libxpcom.so \
- /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &&
+chmod -v 755 /usr/lib/xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell &&
-for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so; do
+for library in libmozalloc.so libmozjs.so libxul.so; do
ln -sfv ../../../xulrunner-&xulrunner-version;/$library \
/usr/lib/xulrunner-devel-&xulrunner-version;/sdk/lib/$library
ln -sfv xulrunner-&xulrunner-version;/$library /usr/lib/$library
@@ -253,7 +252,7 @@ ln -sfv ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
- for library in libmozalloc.so libmozjs.so libxpcom.so libxul.so ...
+ for library in libmozalloc.so libmozjs.so libxul.so ...
: The libraries shipped with this package are installed into
/usr/lib/xulrunner-&xulrunner-version;
which means they will not be found at runtime. These commands make
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index a735aa5553..bb592c0d91 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -5,13 +5,13 @@
%general-entities;
+ "http://www.sourceforge.net/projects/portableapps/files/Source/Firefox/firefox-&firefox-version;.source.tar.bz2">
-
-
-
-
+
+
+
+
]>
@@ -144,18 +144,15 @@
below. To see the entire list of available configuration options (and an
abbreviated description of each one), issue ./configure
--help. You may also wish to review the entire file and
- uncomment any other desired options. The commented line for
- --with-libxul-sdk has an escaped dollar sign - if you
- have chosed to paste the entries into a mozconfig file
- in your editor, you do not need the escape, it is only necessary when invoking
- a subshell in a HERE document. Create the file by issuing the following command:
+ uncomment any other desired options.
+ Create the file by issuing the following command:
cat > mozconfig << "EOF"
-# If you have a multicore machine you can speed up the build by running
-# several jobs at once by uncommenting the following line and setting the
-# value to number of CPU cores:
-#mk_add_options MOZ_MAKE_FLAGS="-j4"
+# If you have a multicore machine, firefox will now use all the cores by
+# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
+# by uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
# If you have installed DBus-Glib comment out this line:
ac_add_options --disable-dbus
@@ -173,9 +170,11 @@ ac_add_options --disable-libnotify
# If you have not installed Yasm then uncomment this line:
#ac_add_options --disable-webm
-# If you have installed xulrunner uncomment following two lines:
+# If you have installed xulrunner uncomment the next two ac_add_options lines
+# and check that the sdk will be set by running pkg-config in a subshell
+# and has not become hardcoded or empty when you created this file
#ac_add_options --with-system-libxul
-#ac_add_options --with-libxul-sdk=\$(pkg-config --variable=sdkdir libxul)
+#ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
# Comment out following options if you have not installed
# recommended dependencies:
@@ -251,7 +250,6 @@ mkdir /usr/lib/firefox-&firefox-version; &&
tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2 \
-C /usr/lib/firefox-&firefox-version; --strip-components=1 &&
chown -R -v root:root /usr/lib/firefox-&firefox-version; &&
-chmod -v 755 /usr/lib/firefox-&firefox-version;/libxpcom.so &&
ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &&