Changeset 5acd8d2

Timestamp:

08/18/2014 10:44:52 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

7773ce16

Parents:

5a30edf

Message:

Merged trunk.

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

Files:

• general.ent (modified) (1 diff)
• general/genlib/libatasmart.xml (modified) (1 diff)
• general/genlib/libdaemon.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/libdriv/libcanberra-systemd.xml (modified) (1 diff)
• multimedia/libdriv/pulseaudio.xml (modified) (1 diff)
• networking/netutils/avahi-systemd.xml (modified) (1 diff)
• networking/netutils/mod_dnssd.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/lib/pango.xml (modified) (2 diffs)
• xsoft/other/fontforge.xml (modified) (1 diff)

general.ent

@@ -43 +43 @@
 <!ENTITY sourceforge-repo2    "http://sourceforge.net">
 <!ENTITY gentoo-ftp-repo      "ftp://mirror.ovh.net/gentoo-distfiles/distfiles">
+<!ENTITY fedora-http-repo     "http://pkgs.fedoraproject.org/repo/pkgs">
 <!ENTITY jaist-ftp-repo       "ftp://ftp.jaist.ac.jp/pub//sourceforge">
 <!ENTITY trinity-repo-ftp     "ftp://anduin.&lfs-domainname;/trinity">

general/genlib/libatasmart.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY libatasmart-download-http "http://0pointer.de/public/libatasmart-&libatasmart-version;.tar.xz">
+<!--  <!ENTITY libatasmart-download-http "http://0pointer.de/public/libatasmart-&libatasmart-version;.tar.xz">-->
+  <!ENTITY libatasmart-download-http "&fedora-http-repo;/libatasmart/libatasmart-&libatasmart-version;.tar.xz/&libatasmart-md5sum;/libatasmart-&libatasmart-version;.tar.xz">
   <!ENTITY libatasmart-download-ftp  " ">
   <!ENTITY libatasmart-md5sum        "53afe2b155c36f658e121fe6def33e77">

general/genlib/libdaemon.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY libdaemon-download-http "http://0pointer.de/lennart/projects/libdaemon/libdaemon-&libdaemon-version;.tar.gz">
+<!--  <!ENTITY libdaemon-download-http "http://0pointer.de/lennart/projects/libdaemon/libdaemon-&libdaemon-version;.tar.gz">-->
+  <!ENTITY libdaemon-download-http "&fedora-http-repo;/libdaemon/libdaemon-&libdaemon-version;.tar.gz/&libdaemon-md5sum;/libdaemon-&libdaemon-version;.tar.gz">
   <!ENTITY libdaemon-download-ftp  " ">
   <!ENTITY libdaemon-md5sum        "509dc27107c21bcd9fbf2f95f5669563">

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <para>August 17th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Fix URL: avahi, libasyncns (at pulseaudio page),
+          libatasmart, libcanberra, libdaemon and mod_dnssd.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - FontForge-2.0.20140101: reorder external/internal
+          optional requirements.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to pango-1.36.6. Fixes
+          <ulink url="&blfs-ticket-root;5393">#5393</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[rthomsen] - Update to akonadi-1.13.0. Fixes

multimedia/libdriv/libcanberra-systemd.xml

@@ -6 +6 @@
 
   <!ENTITY libcanberra-download-http
-           "http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.xz">
+           "&fedora-http-repo;/libcanberra/libcanberra-&libcanberra-version;.tar.xz/&libcanberra-md5sum;/libcanberra-&libcanberra-version;.tar.xz">
+           <!--"http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.xz">-->
   <!ENTITY libcanberra-download-ftp  " ">
   <!ENTITY libcanberra-md5sum        "34cb7e4430afaf6f447c4ebdb9b42072">

multimedia/libdriv/pulseaudio.xml

@@ -99 +99 @@
       <xref linkend="bluez"/> (runtime),
       <xref linkend="check"/>,
-      <ulink url="http://www.fftw.org/">FFTW</ulink>,
       <xref linkend="GConf"/>,
       <xref linkend="gtk3"/>,
+      <xref linkend="libsamplerate"/>,
+      <xref linkend="sbc"/> (Bluetooth support),
+      <xref linkend="valgrind"/>,
+      <ulink url="http://www.fftw.org/">FFTW</ulink>,
       <ulink url="http://www.jackaudio.org/">JACK</ulink>,
-      <ulink url="http://0pointer.de/lennart/projects/libasyncns/">libasyncns</ulink>,
-      <xref linkend="libsamplerate"/>,
+<!--      <ulink url="http://0pointer.de/lennart/projects/libasyncns/">libasyncns</ulink>,-->
+      <ulink url="&fedora-http-repo;/libasyncns/">libasyncns</ulink>,
       <ulink url="http://www.lirc.org/">LIRC</ulink>,
       <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-      <xref linkend="sbc"/> (Bluetooth support),
       <ulink url="http://tdb.samba.org/">TDB</ulink>,
-      <xref linkend="valgrind"/>
       <ulink url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/">
       WebRTC AudioProcessing</ulink> and

networking/netutils/avahi-systemd.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY avahi-download-http "http://avahi.org/download/avahi-&avahi-version;.tar.gz">
+<!--  <!ENTITY avahi-download-http "http://avahi.org/download/avahi-&avahi-version;.tar.gz">-->
+  <!ENTITY avahi-download-http "&fedora-http-repo;/avahi/avahi-&avahi-version;.tar.gz/&avahi-md5sum;/avahi-&avahi-version;.tar.gz">
   <!ENTITY avahi-download-ftp  " ">
   <!ENTITY avahi-md5sum        "2f22745b8f7368ad5a0a3fddac343f2d">

networking/netutils/mod_dnssd.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY mod_dnssd-download-http "http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz">
+<!--  <!ENTITY mod_dnssd-download-http "http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz">-->
+  <!ENTITY mod_dnssd-download-http "&fedora-http-repo;/mod_dnssd/mod_dnssd-&mod_dnssd-version;.tar.gz/&mod_dnssd-md5sum;/mod_dnssd-&mod_dnssd-version;.tar.gz">
   <!ENTITY mod_dnssd-download-ftp  " ">
   <!ENTITY mod_dnssd-md5sum        "bed3d95a98168bf0515922d1c05020c5">

packages.ent

@@ -441 +441 @@
 <!ENTITY libnotify-version            "0.7.6">
 <!ENTITY libxklavier-version          "5.3">
-<!ENTITY pango-version                "1.36.5">
+<!ENTITY pango-version                "1.36.6">
 <!ENTITY pangomm-version              "2.34.0">
 <!ENTITY qt4-version                  "4.8.6">

x/lib/pango.xml

@@ -7 +7 @@
   <!ENTITY pango-download-http "&gnome-download-http;/pango/1.36/pango-&pango-version;.tar.xz">
   <!ENTITY pango-download-ftp  "&gnome-download-ftp;/pango/1.36/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-md5sum        "2500930093c3ed38acb40e4255bce2f1">
-  <!ENTITY pango-size          "1000 KB">
+  <!ENTITY pango-md5sum        "1c27523c3f3a4efe4d9d303d0d240320">
+  <!ENTITY pango-size          "1004 KB">
   <!ENTITY pango-buildsize     "23 MB">
   <!ENTITY pango-time          "0.3 SBU">
@@ -190 +190 @@
         <seg>
           libpango-1.0.so, libpangocairo-1.0.so, libpangoft2-1.0.so,
-          and libpangoxft-1.0.so;
-          several modules under /usr/lib/pango/1.8.0/modules/
+          and libpangoxft-1.0.so
         </seg>
         <seg>

xsoft/other/fontforge.xml

@@ -96 +96 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="pango"/>,
+      <xref linkend="python2"/>,
       <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
-      <xref linkend="libtiff"/>,
       <ulink url="https://bitbucket.org/sortsmill/libunicodenames">
       libunicodenames</ulink>,
       <ulink url="https://github.com/fontforge/libuninameslist">
-      libuninameslist</ulink>,
+      libuninameslist</ulink>, and
       <ulink url="http://www.zeromq.org/">libzmq</ulink>,
-      <xref linkend="pango"/> and
-      <xref linkend="python2"/>
     </para>