Author: fernando Date: Tue Apr 22 10:10:26 2014 New Revision: 12990 Log: Update to bluefish-2.2.6. Fontsproto-2.1.3 breaks libXfont-1.4.7, thanks Miklos K. for reporting and fixing, and Armin K. for confirming.
Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/postlfs/editors/bluefish.xml trunk/BOOK/x/installing/x7lib.xml Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Mon Apr 21 19:10:35 2014 (r12989) +++ trunk/BOOK/general.ent Tue Apr 22 10:10:26 2014 (r12990) @@ -1,12 +1,12 @@ <!-- $LastChangedBy$ $Date$ --> -<!ENTITY day "21"> <!-- Always 2 digits --> +<!ENTITY day "22"> <!-- Always 2 digits --> <!ENTITY month "04"> <!-- Always 2 digits --> <!ENTITY year "2014"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "&year;-&month;-&day;"> -<!ENTITY releasedate "April 21th, &year;"> +<!ENTITY releasedate "April 22th, &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY lfs-version "development"> <!-- x.y|development] --> @@ -183,7 +183,7 @@ <!ENTITY xfsprogs-version "3.1.11"> <!-- Chapter 6 --> -<!ENTITY bluefish-version "2.2.5"> +<!ENTITY bluefish-version "2.2.6"> <!ENTITY ed-version "1.10"> <!ENTITY emacs-version "24.3"> <!ENTITY joe-version "3.7"> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Mon Apr 21 19:10:35 2014 (r12989) +++ trunk/BOOK/introduction/welcome/changelog.xml Tue Apr 22 10:10:26 2014 (r12990) @@ -45,6 +45,21 @@ --> <listitem> + <para>April 22th, 2014</para> + <itemizedlist> + <listitem> + <para>[fernando] - Fontsproto-2.1.3 breaks libXfont-1.4.7. + Thanks Miklos K. Fixes + <ulink url="&blfs-ticket-root;4982">#4982</ulink>.</para> + </listitem> + <listitem> + <para>[fernando] - bluefish-2.2.6. Fixes + <ulink url="&blfs-ticket-root;4983">#4983</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>April 21th, 2014</para> <itemizedlist> <listitem> Modified: trunk/BOOK/postlfs/editors/bluefish.xml ============================================================================== --- trunk/BOOK/postlfs/editors/bluefish.xml Mon Apr 21 19:10:35 2014 (r12989) +++ trunk/BOOK/postlfs/editors/bluefish.xml Tue Apr 22 10:10:26 2014 (r12990) @@ -6,9 +6,9 @@ <!ENTITY bluefish-download-http "http://www.bennewitz.com/bluefish/stable/source/bluefish-&bluefish-version;.tar.bz2"> <!ENTITY bluefish-download-ftp " "> - <!ENTITY bluefish-md5sum "1782883dcbc01faa856c162edd4c3b39"> - <!ENTITY bluefish-size "3.6 MB"> - <!ENTITY bluefish-buildsize "71 MB"> + <!ENTITY bluefish-md5sum "f15919e6a7b012a16e6b1f49d9db2b33"> + <!ENTITY bluefish-size "3.7 MB"> + <!ENTITY bluefish-buildsize "72 MB"> <!ENTITY bluefish-time "0.4 SBU"> ]> @@ -104,7 +104,7 @@ commands: </para> -<screen><userinput>./configure --prefix=/usr && +<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/bluefish-&bluefish-version; && make</userinput></screen> <para>This package does not come with a test suite.</para> @@ -135,7 +135,7 @@ <seg> /usr/lib/bluefish, /usr/share/bluefish, - /usr/share/doc/bluefish and + /usr/share/doc/bluefish-&bluefish-version;, and /usr/share/xml/bluefish </seg> </seglistitem> Modified: trunk/BOOK/x/installing/x7lib.xml ============================================================================== --- trunk/BOOK/x/installing/x7lib.xml Mon Apr 21 19:10:35 2014 (r12989) +++ trunk/BOOK/x/installing/x7lib.xml Tue Apr 22 10:10:26 2014 (r12990) @@ -153,6 +153,12 @@ <listitem> <para> Required patch: + <ulink url="&patch-root;/libXfont-&libXfont-version;-fontsproto_fix-1.patch"/> + </para> + </listitem> + <listitem> + <para> + Required patch: <ulink url="&patch-root;/libXft-&libXft-version;-freetype_fix-1.patch"/> </para> </listitem> @@ -250,6 +256,7 @@ pushd $packagedir case $packagedir in libXfont-[0-9]* ) + patch -Np1 -i ../../libXfont-&libXfont-version;-fontsproto_fix-1.patch ./configure $XORG_CONFIG --disable-devel-docs ;; libXft-[0-9]* ) -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page