Author: krejzi
Date: Sun Aug  3 06:43:15 2014
New Revision: 13814

Log:
Merged trunk, fixes to libdbusmenu-qt5.

Modified:
   branches/systemd/general/graphlib/harfbuzz.xml
   branches/systemd/introduction/welcome/changelog.xml
   branches/systemd/kde5/frameworks/libdbusmenu-qt.xml
   branches/systemd/networking/netutils/whois.xml
   branches/systemd/packages.ent
   branches/systemd/x/installing/mesalib-systemd.xml
   branches/systemd/x/installing/x7app.xml

Modified: branches/systemd/general/graphlib/harfbuzz.xml
==============================================================================
--- branches/systemd/general/graphlib/harfbuzz.xml      Sun Aug  3 05:43:49 
2014        (r13813)
+++ branches/systemd/general/graphlib/harfbuzz.xml      Sun Aug  3 06:43:15 
2014        (r13814)
@@ -7,9 +7,9 @@
   <!ENTITY harfbuzz-download-http
            
"http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2";>
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "baccea934fac603c8192adbcd096e28c">
-  <!ENTITY harfbuzz-size          "1.1 MB">
-  <!ENTITY harfbuzz-buildsize     "28 MB (additional 2 MB for the API 
documentation)">
+  <!ENTITY harfbuzz-md5sum        "7a94684e560d0857c9ef28b7746d1349">
+  <!ENTITY harfbuzz-size          "1.2 MB">
+  <!ENTITY harfbuzz-buildsize     "25 MB (additional 2 MB for the API 
documentation)">
   <!ENTITY harfbuzz-time          "0.3 SBU">
 ]>
 

Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sun Aug  3 05:43:49 
2014        (r13813)
+++ branches/systemd/introduction/welcome/changelog.xml Sun Aug  3 06:43:15 
2014        (r13814)
@@ -45,6 +45,28 @@
 -->
 
     <listitem>
+      <para>August 3rd, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to MesaLib-10.2.5. Fixes
+          <ulink url="&blfs-ticket-root;5330">#5330</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to xrandr-1.4.3. Fixes
+          <ulink url="&blfs-ticket-root;5329">#5329</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to whois_5.1.5. Fixes
+          <ulink url="&blfs-ticket-root;5328">#5328</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to harfbuzz-0.9.34. Fixes
+          <ulink url="&blfs-ticket-root;5327">#5327</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 2nd, 2014</para>
       <itemizedlist>
         <listitem>

Modified: branches/systemd/kde5/frameworks/libdbusmenu-qt.xml
==============================================================================
--- branches/systemd/kde5/frameworks/libdbusmenu-qt.xml Sun Aug  3 05:43:49 
2014        (r13813)
+++ branches/systemd/kde5/frameworks/libdbusmenu-qt.xml Sun Aug  3 06:43:15 
2014        (r13814)
@@ -73,7 +73,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="qjson"/>
+      <xref linkend="doxygen"/> (for building the API documentation) and
+      <xref linkend="qjson"/> (for building the test suite)
     </para>
 
     <para condition="html" role="usernotes">
@@ -96,6 +97,7 @@
       -DCMAKE_BUILD_TYPE=Release         \
       -DCMAKE_INSTALL_LIBDIR=lib         \
       -DUSE_QT5=TRUE                     \
+      -DWITH_DOC=OFF                     \
       .. &amp;&amp;
 make</userinput></screen>
 
@@ -130,6 +132,13 @@
       built even if <application>Qt4</application> is present.
     </para>
 
+    <para>
+      <parameter>-DWITH_DOC=OFF</parameter>: This switch is used to avoid
+      building the API documentation. Omit it if you have installed
+      <application>Doxygen</application> and want to build the
+      documentation.
+    </para>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/systemd/networking/netutils/whois.xml
==============================================================================
--- branches/systemd/networking/netutils/whois.xml      Sun Aug  3 05:43:49 
2014        (r13813)
+++ branches/systemd/networking/netutils/whois.xml      Sun Aug  3 06:43:15 
2014        (r13814)
@@ -6,7 +6,7 @@
 
   <!ENTITY whois-download-http 
"http://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz";>
   <!ENTITY whois-download-ftp  
"ftp://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.xz";>
-  <!ENTITY whois-md5sum        "02ad3adf1cb4f209f06f9c8266c79887">
+  <!ENTITY whois-md5sum        "2723e8916cb301999466fd0017d00def">
   <!ENTITY whois-size          "76 KB">
   <!ENTITY whois-buildsize     "1.4 MB">
   <!ENTITY whois-time          "less than 0.1 SBU">

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Sun Aug  3 05:43:49 2014        (r13813)
+++ branches/systemd/packages.ent       Sun Aug  3 06:43:15 2014        (r13814)
@@ -152,7 +152,7 @@
 <!ENTITY gegl-version                 "0.2.0">
 <!ENTITY giflib-version               "5.1.0">
 <!ENTITY graphite2-version            "1.2.4">
-<!ENTITY harfbuzz-version             "0.9.33">
+<!ENTITY harfbuzz-version             "0.9.34">
 <!ENTITY ijs-version                  "0.35">
 <!ENTITY imlib2-version               "1.4.6">
 <!ENTITY jasper-version               "1.900.1">
@@ -328,7 +328,7 @@
 <!ENTITY NetworkManager-version       "0.9.10.0">
 <!ENTITY nmap-version                 "6.46">
 <!ENTITY traceroute-version           "2.0.20">
-<!ENTITY whois-version                "5.1.4">
+<!ENTITY whois-version                "5.1.5">
 <!ENTITY wicd-version                 "1.7.2.4">
 <!ENTITY wireshark-version            "1.12.0">  <!-- even minors only -->
 
@@ -403,7 +403,7 @@
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.4">
 <!ENTITY xkeyboard-config-version     "2.12">
-<!ENTITY mesalib-version              "10.2.4">
+<!ENTITY mesalib-version              "10.2.5">
 <!ENTITY xcb-util-version             "0.3.9">
 <!ENTITY xcb-util-image-version       "0.3.9">
 <!ENTITY xcb-util-keysyms-version     "0.3.9">

Modified: branches/systemd/x/installing/mesalib-systemd.xml
==============================================================================
--- branches/systemd/x/installing/mesalib-systemd.xml   Sun Aug  3 05:43:49 
2014        (r13813)
+++ branches/systemd/x/installing/mesalib-systemd.xml   Sun Aug  3 06:43:15 
2014        (r13814)
@@ -7,7 +7,7 @@
   <!ENTITY mesalib-download-http " ">
   <!ENTITY mesalib-download-ftp
            
"ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2";>
-  <!ENTITY mesalib-md5sum        "11d3542da1b703618634be840a87b0b2">
+  <!ENTITY mesalib-md5sum        "f82b1c2b42f44073d8b889d2a7ee9292">
   <!ENTITY mesalib-size          "6.9 MB">
   <!ENTITY mesalib-buildsize     "313 MB (additional 1.6 MB for the docs)">
   <!ENTITY mesalib-time          "4.4 SBU">

Modified: branches/systemd/x/installing/x7app.xml
==============================================================================
--- branches/systemd/x/installing/x7app.xml     Sun Aug  3 05:43:49 2014        
(r13813)
+++ branches/systemd/x/installing/x7app.xml     Sun Aug  3 06:43:15 2014        
(r13814)
@@ -97,8 +97,8 @@
   <!ENTITY xprop-version                   "1.2.2">
   <!ENTITY xprop-md5sum                    "fae3d2fda07684027a643ca783d595cc">
 
-  <!ENTITY xrandr-version                  "1.4.2">
-  <!ENTITY xrandr-md5sum                   "78fd973d9b532106f8777a3449176148">
+  <!ENTITY xrandr-version                  "1.4.3">
+  <!ENTITY xrandr-md5sum                   "441fdb98d2abc6051108b7075d948fc7">
 
   <!ENTITY xrdb-version                    "1.1.0">
   <!ENTITY xrdb-md5sum                     "b54c7e3e53b4f332d41ed435433fbda0">
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to