Author: krejzi Date: Sun Jun 22 17:41:55 2014 New Revision: 13302 Log: Merge latest trunk.
Modified: branches/frameworks/general.ent branches/frameworks/general/sysutils/bluez.xml branches/frameworks/introduction/welcome/changelog.xml branches/frameworks/x/lib/qt5.xml branches/frameworks/xsoft/other/fontforge.xml Modified: branches/frameworks/general.ent ============================================================================== --- branches/frameworks/general.ent Sun Jun 22 17:39:08 2014 (r13301) +++ branches/frameworks/general.ent Sun Jun 22 17:41:55 2014 (r13302) @@ -338,7 +338,7 @@ <!ENTITY acpid-version "2.0.22"> <!ENTITY at-version "3.1.14"> <!ENTITY autofs-version "5.1.0"> -<!ENTITY bluez-version "5.19"> +<!ENTITY bluez-version "5.20"> <!ENTITY colord-version "1.2.1"> <!-- Even minors only --> <!ENTITY cpio-version "2.11"> <!ENTITY dbus-version "1.8.4"> <!-- Even minors only --> Modified: branches/frameworks/general/sysutils/bluez.xml ============================================================================== --- branches/frameworks/general/sysutils/bluez.xml Sun Jun 22 17:39:08 2014 (r13301) +++ branches/frameworks/general/sysutils/bluez.xml Sun Jun 22 17:41:55 2014 (r13302) @@ -6,9 +6,9 @@ <!ENTITY bluez-download-http "http://www.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz";> <!ENTITY bluez-download-ftp "ftp://ftp.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz";> - <!ENTITY bluez-md5sum "2d839c0bc9f8daaa6ca32e65d7701812"> + <!ENTITY bluez-md5sum "177d4551f76e5933cc467c3abc6d3796"> <!ENTITY bluez-size "1.3 MB"> - <!ENTITY bluez-buildsize "69 MB"> + <!ENTITY bluez-buildsize "68 MB"> <!ENTITY bluez-time "0.8 SBU"> ]> @@ -209,7 +209,7 @@ during the install. Additionally, there are three supplementary configuration files. /etc/sysconfig/bluetooth is installed as a part of the boot script below. In addition - you optionally cam install the following as the + you optionally can install the following as the <systemitem class="username">root</systemitem> user: </para> Modified: branches/frameworks/introduction/welcome/changelog.xml ============================================================================== --- branches/frameworks/introduction/welcome/changelog.xml Sun Jun 22 17:39:08 2014 (r13301) +++ branches/frameworks/introduction/welcome/changelog.xml Sun Jun 22 17:41:55 2014 (r13302) @@ -47,6 +47,10 @@ <para>June 23rd, 2014</para> <itemizedlist> <listitem> + <para>[bdubbs] - Update to bluez-5.20. Fixes + <ulink url="&blfs-ticket-root;5193">#5193</ulink>.</para> + </listitem> + <listitem> <para>[krejzi] - Added FontForge-2.0.20140101.</para> </listitem> </itemizedlist> Modified: branches/frameworks/x/lib/qt5.xml ============================================================================== --- branches/frameworks/x/lib/qt5.xml Sun Jun 22 17:39:08 2014 (r13301) +++ branches/frameworks/x/lib/qt5.xml Sun Jun 22 17:41:55 2014 (r13302) @@ -190,7 +190,6 @@ -system-sqlite \ -no-nis \ -nomake examples \ - -opengl es2 \ -optimized-qmake && make</userinput></screen> @@ -246,7 +245,6 @@ -system-sqlite \ -no-nis \ -nomake examples \ - -opengl es2 \ -optimized-qmake && make</userinput></screen> @@ -423,11 +421,6 @@ </para> <para> - <parameter>-opengl es2</parameter>: This switch enables OpenGL ES2 - support in <application>Qt5</application>. - </para> - - <para> <parameter>-optimized-qmake</parameter>: This switch enables building of the optimized <command>qmake</command> program. </para> Modified: branches/frameworks/xsoft/other/fontforge.xml ============================================================================== --- branches/frameworks/xsoft/other/fontforge.xml Sun Jun 22 17:39:08 2014 (r13301) +++ branches/frameworks/xsoft/other/fontforge.xml Sun Jun 22 17:41:55 2014 (r13302) @@ -72,6 +72,14 @@ </listitem> </itemizedlist> + <para> + <application>FontForge</application> tarball for this version was not + generated by the <application>FontForge</application> maintainers. The + source tarball shown above was created by the BLFS team by pulling a Git + version, then generating the autotools components and documentation. + BLFS team made no changes to the existing source files. + </para> + <bridgehead renderas="sect3">FontForge Dependencies</bridgehead> <bridgehead renderas="sect4">Recommended</bridgehead> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
