Author: bdubbs
Date: 2012-09-19 20:54:19 -0600 (Wed, 19 Sep 2012)
New Revision: 10675
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genutils/imagemagick.xml
trunk/BOOK/general/prog/perl-modules.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/xulrunner.xml
trunk/BOOK/xsoft/graphweb/firefox.xml
Log:
Update to firefox-15.0.1.
Fix some urls in perl-modules.
Modified: trunk/BOOK/general/genutils/imagemagick.xml
===================================================================
--- trunk/BOOK/general/genutils/imagemagick.xml 2012-09-20 00:58:47 UTC (rev
10674)
+++ trunk/BOOK/general/genutils/imagemagick.xml 2012-09-20 02:54:19 UTC (rev
10675)
@@ -12,6 +12,7 @@
after updates :-( Unfortunately, versions always roll on after patch
version 10, whether or not significant changes occur, and it takes
time before versions migrate to legacy/ -->
+
<!ENTITY imagemagick-download-http " ">
<!ENTITY imagemagick-download-ftp
"ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz";>
<!ENTITY imagemagick-md5sum "1dc4fb3febd1db7e0ab47c877f66eb09">
@@ -80,7 +81,7 @@
</listitem>
</itemizedlist>
- <para>The <application>ImageMagick</application> source releases are
+ <note><para>The <application>ImageMagick</application> source releases are
updated frequently and the version shown above may no longer be available
from the download locations. You can download a more recent version and use
the existing BLFS instructions to install it. Chances are that it will
@@ -91,7 +92,7 @@
from the BLFS package server at
<ulink
url="&sources-anduin-http;/i/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz"/>.
- </para>
+ </para></note>
<bridgehead renderas="sect3">ImageMagick Dependencies</bridgehead>
Modified: trunk/BOOK/general/prog/perl-modules.xml
===================================================================
--- trunk/BOOK/general/prog/perl-modules.xml 2012-09-20 00:58:47 UTC (rev
10674)
+++ trunk/BOOK/general/prog/perl-modules.xml 2012-09-20 02:54:19 UTC (rev
10675)
@@ -148,7 +148,7 @@
<itemizedlist spacing='compact'>
<listitem>
<para>
- <ulink
url="http://www.cpan.org/authors/id/T/TS/TSCH/ExtUtils-PkgConfig-&ExtUtils-PkgConfig-version;.tar.gz";>
+ <ulink
url="http://www.cpan.org/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-&ExtUtils-PkgConfig-version;.tar.gz";>
ExtUtils::PkgConfig-&ExtUtils-PkgConfig-version;</ulink>
(uses the standard <xref linkend="perl-standard-install"/>) Requires:
</para>
@@ -289,7 +289,7 @@
<itemizedlist spacing='compact'>
<listitem>
<para>
- <ulink
url="http://www.cpan.org/authors/id/X/XA/XAOC/Glib-&Glib-perl-version;.tar.gz";>
+ <ulink
url="http://www.cpan.org/authors/id/T/TS/TSCH/Glib-&Glib-perl-version;.tar.gz";>
Glib-&Glib-perl-version;</ulink>
(uses the standard <xref linkend="perl-standard-install"/>) Requires:
</para>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-09-20 00:58:47 UTC (rev 10674)
+++ trunk/BOOK/general.ent 2012-09-20 02:54:19 UTC (rev 10675)
@@ -738,7 +738,7 @@
<!ENTITY shared-mime-info-version "1.0">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk-version "1.8.2">
-<!ENTITY xulrunner-version "14.0.1">
+<!ENTITY xulrunner-version "15.0.1">
<!ENTITY gtk2-libdir "2.0/2.10.0">
<!ENTITY qt-dir "$QTDIR">
@@ -1004,7 +1004,7 @@
<!-- Chapter 36 -->
<!ENTITY seamonkey-version "2.12.1">
-<!ENTITY firefox-version "14.0.1">
+<!ENTITY firefox-version "&xulrunner-version;">
<!-- Obsolete
<!ENTITY dillo-version "0.8.5">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-09-20 00:58:47 UTC
(rev 10674)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-09-20 02:54:19 UTC
(rev 10675)
@@ -45,9 +45,13 @@
-->
<listitem>
- <para>September 16th, 2012</para>
+ <para>September 19th, 2012</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to firefox-15.0.1. Fixes
+ <ulink url="&blfs-ticket-root;3553">#3553</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[krejzi] - libxml2 2.9.0.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/x/lib/xulrunner.xml
===================================================================
--- trunk/BOOK/x/lib/xulrunner.xml 2012-09-20 00:58:47 UTC (rev 10674)
+++ trunk/BOOK/x/lib/xulrunner.xml 2012-09-20 02:54:19 UTC (rev 10675)
@@ -5,14 +5,13 @@
%general-entities;
<!ENTITY xulrunner-download-http " ">
- <!--
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
-->
<!ENTITY xulrunner-download-ftp
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
<!-- md5sum and size should match firefox, but the buildsize and time will
differ -->
- <!ENTITY xulrunner-md5sum "c2f884f0f6c41c65cf20f678a1ee7191">
- <!ENTITY xulrunner-size "79 MB">
- <!ENTITY xulrunner-buildsize "1 GB (100 MB installed)">
- <!ENTITY xulrunner-time "14 SBU">
+ <!ENTITY xulrunner-md5sum "743ba71fbce7b32023405db02d44143f">
+ <!ENTITY xulrunner-size "80 MB">
+ <!ENTITY xulrunner-buildsize "908 MB (87 MB installed)">
+ <!ENTITY xulrunner-time "26 SBU">
]>
<sect1 id="xulrunner" xreflabel="Xulrunner-&xulrunner-version;">
@@ -191,21 +190,19 @@
<!-- the end two symlinks for run-mozilla.sh and xpcshell might not be needed
in xulrunner-15 -->
-<screen role="root"><userinput>make -C xulrunner-build-dir install
&&
-mkdir -p /usr/lib/mozilla/plugins &&
-rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &&
-ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &&
+<screen role="root"><userinput>make -C xulrunner-build-dir install
&&
+mkdir -p /usr/lib/mozilla/plugins &&
+rm -rf /usr/lib/xulrunner-&xulrunner-version;/plugins &&
+ln -sv ../mozilla/plugins /usr/lib/xulrunner-&xulrunner-version; &&
-for library in /usr/lib/xulrunner-&xulrunner-version;/*.so
-do ln -sfv $library /usr/lib
+for library in /usr/lib/xulrunner-&xulrunner-version;/*.so; do
+ ln -sfv $library /usr/lib
done
ln -sv -f ../xulrunner-devel-&xulrunner-version;/sdk/bin/run-mozilla.sh \
/usr/lib/xulrunner-&xulrunner-version;
ln -sv -f ../xulrunner-devel-&xulrunner-version;/sdk/bin/xpcshell \
- /usr/lib/xulrunner-&xulrunner-version;
-
-</userinput></screen>
+ /usr/lib/xulrunner-&xulrunner-version;</userinput></screen>
</sect2>
<sect2 role="commands">
Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml 2012-09-20 00:58:47 UTC (rev
10674)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml 2012-09-20 02:54:19 UTC (rev
10675)
@@ -5,13 +5,12 @@
%general-entities;
<!ENTITY firefox-download-http " ">
- <!--
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
-->
<!ENTITY firefox-download-ftp
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2";>
- <!ENTITY firefox-md5sum "c2f884f0f6c41c65cf20f678a1ee7191">
- <!ENTITY firefox-size "79 MB">
- <!ENTITY firefox-buildsize "3.1 GB (36 MB installed) (or 582MB and 3.3MB
if using xulrunner)">
- <!ENTITY firefox-time "18 SBU (0.3 SBU if using xulrunner)">
+ <!ENTITY firefox-md5sum "743ba71fbce7b32023405db02d44143f">
+ <!ENTITY firefox-size "80 MB">
+ <!ENTITY firefox-buildsize "940 MB (34 MB installed) (or 582MB and 3.3MB
if using xulrunner)">
+ <!ENTITY firefox-time "26 SBU (0.3 SBU if using xulrunner)">
]>
<sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -229,12 +228,14 @@
</para>
<screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version;
&&
-mkdir /usr/lib/firefox-&firefox-version; &&
+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 &&
-ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &&
-mkdir -pv /usr/lib/mozilla/plugins &&
-ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &&
+ -C /usr/lib/firefox-&firefox-version; --strip-components=1 &&
+
+ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &&
+mkdir -pv /usr/lib/mozilla/plugins &&
+ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version; &&
chown -R -v root:root /usr/lib/firefox-&firefox-version;</userinput></screen>
<para>
@@ -245,13 +246,15 @@
<screen role="root"><userinput>make -C firefox-build-dir install &&
rm /usr/bin/firefox &&
+
cat > /usr/bin/firefox << "HERE_DOC" &&
#!/bin/bash
/usr/lib/xulrunner-&xulrunner-version;/xulrunner
/usr/lib/firefox-&firefox-version;/application.ini "${@}"
HERE_DOC
-chmod 755 /usr/bin/firefox &&
+
+chmod 755 /usr/bin/firefox &&
mkdir -pv /usr/lib/mozilla/plugins &&
-ln -sfv ../mozilla/plugins
/usr/lib/firefox-&firefox-version;</userinput></screen>
+ln -sfv ../mozilla/plugins
/usr/lib/firefox-&firefox-version;</userinput></screen>
<bridgehead renderas="sect3" id="npapi-firefox" xreflabel="Firefox">
NPAPI Headers
@@ -264,7 +267,7 @@
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>rm -rf /usr/include/npapi &&
+<screen role="root"><userinput>rm -rf /usr/include/npapi &&
mkdir -v /usr/include/npapi &&
cp -v dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
</sect2>
@@ -353,6 +356,7 @@
</para>
<screen role="root"><userinput>mkdir -pv /usr/share/applications &&
+
cat > /usr/share/applications/firefox.desktop << "EOF" &&
[Desktop Entry]
Encoding=UTF-8
@@ -365,6 +369,7 @@
StartupNotify=true
Terminal=false
EOF
+
ln -sfv /usr/lib/firefox-&firefox-version;/icons/mozicon128.png
/usr/share/pixmaps/firefox.png</userinput></screen>
</sect2>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
