Ignore:
Timestamp:
04/13/2021 09:31:15 PM (3 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
kde5-14269
Parents:
1ec0251
git-author:
Krejzi <krejzi@…> (09/13/2014 05:36:06 PM)
git-committer:
Xi Ruoyao <xry111@…> (04/13/2021 09:31:15 PM)
Message:

Begin manually (while modifying stuff) merging trunk and systemd branches since revision 14087.

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gnome/platform/gvfs.xml

    r1ec0251 r64135787  
    77  <!ENTITY gvfs-download-http "&gnome-download-http;/gvfs/1.20/gvfs-&gvfs-version;.tar.xz">
    88  <!ENTITY gvfs-download-ftp  "&gnome-download-ftp;/gvfs/1.20/gvfs-&gvfs-version;.tar.xz">
    9   <!ENTITY gvfs-md5sum        "da2a542ea68b5294e41c0e23216ffdf9">
     9  <!ENTITY gvfs-md5sum        "710f68730d6ad6708f0f1d47976bff58">
    1010  <!ENTITY gvfs-size          "1.5 MB">
    11   <!ENTITY gvfs-buildsize     "55 MB (additional 1 MB for the tests)">
    12   <!ENTITY gvfs-time          "0.7 SBU (additional less than 0.1 SBU for the tests)">
     11  <!ENTITY gvfs-buildsize     "56 MB (additional 1 MB for the tests)">
     12  <!ENTITY gvfs-time          "0.7 SBU (additional 0.1 SBU for the tests)">
    1313]>
    1414
     
    8585      <xref linkend="libsecret"/>,
    8686      <xref linkend="libsoup"/>,
    87       <xref linkend="systemd"/> (for GUdev), and
     87      <xref linkend="udev-extras"/> (for GUdev), and
    8888      <xref linkend="udisks2"/>
    8989    </para>
     
    9696      <xref linkend="dbus-glib"/>,
    9797      <xref linkend="fuse"/>,
     98      <!-- <xref linkend="gnome-keyring"/>, libsecret covers this -->
     99      <xref linkend="gtk-doc"/>,
     100      <xref linkend="libarchive"/>,
     101      <xref linkend="libgcrypt"/>,
     102      <xref linkend="libxml2"/>,
     103      <xref linkend="libxslt"/>,
     104      <xref linkend="openssh"/>,
     105      <xref linkend="samba"/>,
    98106      <!-- <ulink url="&gnome-download-http;/gnome-disk-utility">
    99       GNOME Disk Utility</ulink>, obsolete for linux
    100       <xref linkend="gnome-keyring"/>, libsecret covers this -->
     107      GNOME Disk Utility</ulink>, obsolete for linux -->
    101108      <ulink url="&gnome-download-http;/gnome-online-accounts">
    102109      GNOME Online Accounts</ulink>,
    103       <xref linkend="gtk-doc"/>,
    104       <xref linkend="libarchive"/>,
    105110      <ulink url="http://www.videolan.org/developers/libbluray.html">
    106111      libbluray</ulink>,
    107112      <ulink url="http://www.gnu.org/software/libcdio/">libcdio-paranoia</ulink>,
    108       <xref linkend="libgcrypt"/>,
    109113      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
    110114      <ulink url="http://www.libimobiledevice.org/">libimobiledevice</ulink>,
    111       <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>,
    112       <xref linkend="libxml2"/>,
    113       <xref linkend="libxslt"/>,
    114       <xref linkend="openssh"/>,
    115       <xref linkend="samba"/>, and
     115      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink>, and
    116116      <ulink url="http://twistedmatrix.com/trac/">Twisted</ulink>,
    117117    </para>
     
    180180      <seglistitem>
    181181        <seg>
    182           gvfs-cat, gvfs-copy, gvfs-goa-volume-monitor, gvfs-info,
    183           gvfs-less, gvfs-ls, gvfs-mime, gvfs-mkdir, gvfs-monitor-dir,
    184           gvfs-monitor-file, gvfs-mount, gvfs-move, gvfs-open,
    185           gvfs-rename, gvfs-rm, gvfs-save, gvfs-set-attribute,
    186           gvfs-trash, gvfs-tree, gvfs-udisks2-volume-monitor, gvfsd,
    187           gvfsd-afp, gvfsd-afp-browse, gvfsd-archive, gvfsd-burn,
    188           gvfsd-computer, gvfsd-dav, gvfsd-dnssd, gvfsd-ftp,
    189           gvfsd-fuse, gvfsd-http, gvfsd-localtest, gvfsd-metadata,
    190           gvfsd-network, gvfsd-recent, gvfsd-sftp, gvfsd-smb,
    191           gvfsd-smb-browse,  and gvfsd-trash
     182          gvfs-cat, gvfs-copy, gvfs-goa-volume-monitor, gvfs-info, gvfs-less,
     183          gvfs-ls, gvfs-mime, gvfs-mkdir, gvfs-monitor-dir, gvfs-monitor-file,
     184          gvfs-mount, gvfs-move, gvfs-open, gvfs-rename, gvfs-rm, gvfs-save,
     185          gvfs-set-attribute, gvfs-trash, gvfs-tree,
     186          gvfs-udisks2-volume-monitor, gvfsd, gvfsd-afp, gvfsd-afp-browse,
     187          gvfsd-archive, gvfsd-burn, gvfsd-computer, gvfsd-dav, gvfsd-dnssd,
     188          gvfsd-ftp, gvfsd-fuse, gvfsd-http, gvfsd-localtest, gvfsd-metadata,
     189          gvfsd-network, gvfsd-obexftp, gvfsd-recent, gvfsd-sftp, gvfsd-smb,
     190          gvfsd-smb-browse, and gvfsd-trash
    192191        </seg>
    193192        <seg>
Note: See TracChangeset for help on using the changeset viewer.