Changeset 77460d7d

Timestamp:

08/04/2014 01:24:55 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

e19b210

Parents:

2032404

Message:

Revert r13821, minor fixes to Qt5 deps, merged trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13826 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• general/graphlib/freetype2.xml (modified) (1 diff)
• general/sysutils/which.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/ffmpeg.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/lib/qt5-systemd.xml (modified) (2 diffs)

general.ent

@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 3rd, &year;">
+<!ENTITY releasedate  "August 4th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">              <!-- svn|[release #] -->

general/graphlib/freetype2.xml

@@ -121 +121 @@
   <sect2 role="installation">
     <title>Installation of FreeType2</title>
-
-    <note>
-    <para>When building the first time you must add
-      <parameter>--without-harfbuzz</parameter> to 
-      the below configure line.</para>
-    </note>
 
     <para>

general/sysutils/which.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY which-download-http "http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz">
+<!--  <!ENTITY which-download-http "http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz">-->
+
+  <!ENTITY which-download-http "http:/ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
   <!ENTITY which-download-ftp  "ftp://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
   <!ENTITY which-md5sum        "95be0501a466e515422cde4af46b2744">

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
-          <para>[cjg] - Added note to freetype page. Fixes 
-          <ulink url="&blfs-ticket-root;5331">#5331</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
+          <para>[igor] - Update to ffmpeg-2.3.1. Fixes
+          <ulink url="&blfs-ticket-root;5312">#5312</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

multimedia/videoutils/ffmpeg.xml

@@ -7 +7 @@
   <!ENTITY ffmpeg-download-http "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "00f98a030d21366b6583875d57d98c27">
+  <!ENTITY ffmpeg-md5sum        "bb02e99c39941d7f3dc56658b9324a2b">
   <!ENTITY ffmpeg-size          "7.1 MB">
   <!ENTITY ffmpeg-buildsize     "119 MB (additional 764 MB for docs and 1813 MB to run the FATE tests)">

packages.ent

@@ -656 +656 @@
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.3">
+<!ENTITY ffmpeg-version               "2.3.1">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.8">

x/lib/qt5-systemd.xml

@@ -103 +103 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
+      <xref linkend="libxkbcommon"/>,
       <xref linkend="mtdev"/>,
       <xref linkend="openssl"/>,
@@ -115 +116 @@
       <xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
       <xref linkend="gtk2"/> (GTK+ Theme Support),
-      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
-      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="ibus"/>,
+      <xref linkend="mariadb"/>,
       <xref linkend="postgresql"/>,
       <xref linkend="pulseaudio"/>, and