Changeset d7d5feb1

Timestamp:

07/07/2016 09:18:06 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

9199306

Parents:

fa8e51cc

Message:

(systemd/gnome merge) Started adjusting and modifying GNOME build order to allow applications in trunk to function properly as well as the GNOME desktop in systemd to be built.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17566 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• gnome.ent (modified) (6 diffs)
• gnome/platform/platform.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

gnome.ent

@@ -12 +12 @@
 <!-- Platform -->
 <!ENTITY accountsservice-version      "0.6.42">
-<!ENTITY polkit-gnome-version         "0.105">
 <!ENTITY gsettings-desktop-schemas-version "3.20.0">
 <!ENTITY yelp-xsl-version             "3.20.1">
@@ -18 +17 @@
 <!ENTITY libsecret-version            "0.18.5">
 <!ENTITY gcr-version                  "3.20.0">
-<!ENTITY gnome-keyring-version        "3.20.0">
-<!ENTITY gvfs-version                 "1.28.2">
 <!ENTITY gjs-version                  "1.45.3">
 <!ENTITY gnome-desktop-version        "3.20.2">
@@ -26 +23 @@
 <!ENTITY libpeas-version              "1.18.0">
 <!ENTITY libwnck-version              "3.20.1">
-<!ENTITY notification-daemon-version  "3.20.0">
 <!ENTITY rest-version                 "0.8.0">
 <!ENTITY totem-pl-parser-version      "3.10.6">
@@ -33 +29 @@
 <!ENTITY gnome-online-accounts-version "3.20.1">
 <!ENTITY gnome-menus-version          "3.13.3">
-<!ENTITY telepathy-glib-version       "0.24.1">
 <!ENTITY grilo-version                "0.3.1">
 <!ENTITY gtkhtml-version              "4.10.0">
@@ -42 +37 @@
 <!ENTITY libwacom-version             "0.18">
 
-<!-- Runtime -->
+<!-- Telepathy Framework (systemd) -->
+<!ENTITY telepathy-glib-version       "0.24.1">
+
+<!-- Runtime (sysv) and Desktop (systemd) -->
 <!ENTITY dconf-version                     "0.26.0">
 <!ENTITY dconf-editor-version              "3.20.2">
+<!ENTITY gvfs-version                      "1.28.2">
+<!ENTITY gnome-keyring-version             "3.20.0">
 <!ENTITY adwaita-icon-theme-version        "3.20">
 <!ENTITY gnome-icon-theme-version          "3.12.0">
@@ -50 +50 @@
 <!ENTITY gnome-icon-theme-symbolic-version "3.12.0">
 <!ENTITY gnome-themes-standard-version     "3.20.2">
+<!ENTITY notification-daemon-version       "3.20.0">
+<!ENTITY polkit-gnome-version              "0.105">
 <!ENTITY yelp-version                      "3.20.1">
 

gnome/platform/platform.xml

@@ -36 +36 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="accountsservice.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsettings-desktop-schemas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yelp-xsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsecret.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gjs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-video-effects.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpeas.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rest.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="totem-pl-parser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yelp-xsl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="geocode-glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gjs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-desktop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-menus.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-runtime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-online-accounts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-video-effects.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkhtml.xml"/>
@@ -62 +55 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgdata.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgee.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgweather.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpeas.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck.xml"/>
 
+<!-- systemd: Telepathy Framework -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-tel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
+
+<!-- systemd: GNOME Desktop -->
+<!-- trunk: Required Runtime Dependencies -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-desktop.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-runtime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dconf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-keyring.xml"/>
+
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adwaita-icon-theme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-icon-theme.xml"/>
@@ -74 +81 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-gnome.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yelp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-tel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-desktop.xml"/>
 
 </chapter>

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <para>July 7th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Started adjusting GNOME build order.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to libwnck-3.20.1. Fixes