Changeset 0e466f67

Timestamp:

07/20/2014 04:31:08 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

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

Children:

1aab91a

Parents:

7abfb10

Message:

Remove remaining references to udev-extras, fix build, import gnome.ent change from trunk.

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

Files:

• general.ent (modified) (1 diff)
• general/genlib/genlib.xml (modified) (1 diff)
• general/genlib/libgusb-systemd.xml (moved) (moved from general/genlib/libgusb.xml ) (1 diff)
• general/sysutils/sysutils.xml (modified) (1 diff)
• gnome.ent (added)
• gnome/applications/cheese.xml (modified) (1 diff)
• gnome/platform/gvfs.xml (modified) (1 diff)
• multimedia/libdriv/alsa-utils-systemd.xml (moved) (moved from multimedia/libdriv/alsa-utils.xml )
• multimedia/libdriv/gst-plugins-base-systemd.xml (moved) (moved from multimedia/libdriv/gst-plugins-base.xml ) (1 diff)
• multimedia/libdriv/gst10-plugins-good-systemd.xml (moved) (moved from multimedia/libdriv/gst10-plugins-good.xml ) (1 diff)
• multimedia/libdriv/libdriv.xml (modified) (3 diffs)
• postlfs/config/config.xml (modified) (1 diff)
• xfce/core/core.xml (modified) (1 diff)
• xfce/core/thunar-systemd.xml (moved) (moved from xfce/core/thunar.xml ) (1 diff)
• xfce/core/thunar-volman-systemd.xml (moved) (moved from xfce/core/thunar-volman.xml ) (1 diff)

general.ent

@@ -619 +619 @@
 
 <!-- Part VIII -->
-<!-- Chapter 30 -->
-<!-- Platform -->
-<!ENTITY polkit-gnome-version         "0.105">
-<!ENTITY gsettings-desktop-schemas-version "3.12.2">
-<!ENTITY yelp-xsl-version             "3.12.0">
-<!ENTITY GConf-version                "3.2.6">
-<!ENTITY libsecret-version            "0.18">
-<!ENTITY gcr-version                  "3.12.2">
-<!ENTITY gnome-keyring-version        "3.12.2">
-<!ENTITY gvfs-version                 "1.20.2">
-<!ENTITY gjs-version                  "1.40.1">
-<!ENTITY gnome-desktop-version        "3.12.2">
-<!ENTITY gnome-video-effects-version  "0.4.1">
-<!ENTITY gtksourceview-version        "3.12.2">
-<!ENTITY libgtop-version              "2.30.0">
-<!ENTITY libpeas-version              "1.10.0">
-<!ENTITY libwnck-version              "3.4.7">
-<!ENTITY notification-daemon-version  "0.7.6">
-<!ENTITY totem-pl-parser-version      "3.10.2">
-<!ENTITY vte-version                  "0.36.3">
-
-<!-- Runtime -->
-<!ENTITY dconf-version                     "0.20.0">
-<!ENTITY gnome-icon-theme-version          "3.12.0">
-<!ENTITY gnome-icon-theme-extras-version   "3.12.0">
-<!ENTITY gnome-icon-theme-symbolic-version "3.12.0">
-<!ENTITY gnome-themes-standard-version     "3.12.0">
-<!ENTITY yelp-version                      "3.12.0">
-
-<!-- Chapter 31 -->
-<!-- Applications -->
-<!ENTITY baobab-version               "3.12.1">
-<!ENTITY brasero-version              "3.10.0">
-<!ENTITY cheese-version               "3.12.2">
-<!ENTITY eog-version                  "3.12.2">
-<!ENTITY epiphany-version             "3.12.1">
-<!ENTITY evince-version               "3.12.1">
-<!ENTITY file-roller-version          "3.12.2">
-<!ENTITY gedit-version                "3.12.2">
-<!ENTITY gnome-calculator-version     "3.12.3">
-<!ENTITY gnome-nettool-version        "3.8.1">
-<!ENTITY gnome-screenshot-version     "3.12.0">
-<!ENTITY gnome-system-monitor-version "3.12.2">
-<!ENTITY gnome-terminal-version       "3.12.3">
-<!ENTITY gucharmap-version            "3.12.1">
-<!ENTITY nautilus-version             "3.12.2">
-<!ENTITY network-manager-applet-version "0.9.10.0">  <!-- stable lt .90 micro version -->
-<!ENTITY seahorse-version             "3.12.2">
-<!ENTITY totem-version                "3.12.1">
+<!ENTITY % gnome-entities SYSTEM      "gnome.ent">
+%gnome-entities;
 
 <!-- Part IX -->

general/genlib/genlib.xml

@@ -77 +77 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>

general/genlib/libgusb-systemd.xml

@@ -78 +78 @@
     <para role="required">
       <xref linkend="libusb"/> and
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="systemd"/> (for GUdev)
     </para>
 

general/sysutils/sysutils.xml

@@ -46 +46 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev-extras.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2-systemd.xml"/>

gnome/applications/cheese.xml

@@ -83 +83 @@
       <xref linkend="libcanberra"/>,
       <xref linkend="librsvg"/>,
-      <xref linkend="udev-extras"/> (for GUdev), and
+      <xref linkend="systemd"/> (for GUdev), and
       <xref linkend="yelp-xsl"/>
     </para>

gnome/platform/gvfs.xml

@@ -85 +85 @@
       <xref linkend="libsecret"/>,
       <xref linkend="libsoup"/>,
-      <xref linkend="udev-extras"/> (for GUdev), and
+      <xref linkend="systemd"/> (for GUdev), and
       <xref linkend="udisks2"/>
     </para>

multimedia/libdriv/gst-plugins-base-systemd.xml

@@ -106 +106 @@
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="udev-extras"/> (for gudev), and
+      <xref linkend="systemd"/> (for GUdev), and
       <xref linkend="xorg7-lib"/>
     </para>

multimedia/libdriv/gst10-plugins-good-systemd.xml

@@ -111 +111 @@
       <xref linkend="speex"/>,
       <xref linkend="taglib"/>,
-      <xref linkend="udev-extras"/> (for GUdev),
+      <xref linkend="systemd"/> (for GUdev),
       <xref linkend="valgrind"/>,
       <ulink url="http://jackaudio.org/">JACK</ulink>,

multimedia/libdriv/libdriv.xml

@@ -25 +25 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-lib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-plugins.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-firmware.xml"/>
@@ -37 +37 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo-plugins.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-base.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-base-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-good.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-bad.xml"/>
@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer10.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-base.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-good.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-good-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-bad.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst10-plugins-ugly.xml"/>

postlfs/config/config.xml

@@ -40 +40 @@
 
   <para> The remaining topics, <xref linkend="postlfs-config-logon"/>,
-  <xref linkend="postlfs-config-shells"/>, <xref linkend="postlfs-config-random"/>,
-  <xref linkend="autofs"/>, and
-  <xref linkend="postlfs-config-netfs"/> are then addressed, in that order. They
+  <xref linkend="postlfs-config-shells"/>, and
+  <xref linkend="autofs"/>
+  are then addressed, in that order. They
   don't have much interaction with the other topics in this chapter.</para>
 

xfce/core/core.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxfcegui4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tumbler.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-appfinder.xml"/>

xfce/core/thunar-systemd.xml

@@ -85 +85 @@
       <xref linkend="libnotify"/>,
       <xref linkend="startup-notification"/>,
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="systemd"/> (for GUdev) and
       <xref linkend="xfce4-panel"/>
     </para>

xfce/core/thunar-volman-systemd.xml

@@ -79 +79 @@
       <xref linkend="exo"/>,
       <xref linkend="libxfce4ui"/> and
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="systemd"/> (for GUdev)
     </para>