Changeset 6ddb21a

Timestamp:

07/20/2022 11:52:19 PM (21 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

7d5d3d4

Parents:

75f4fc65

Message:

Two updates and a tweak

Update to gcr-3.41.1
Update to blfs-systemd-units-20220720
lightdm: Adjust spacing to standard

Files:

• general.ent (modified) (1 diff)
• gnome.ent (modified) (1 diff)
• gnome/platform/gcr.xml (modified) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/dm/lightdm.xml (modified) (2 diffs)

general.ent

@@ -116 +116 @@
 
 <!ENTITY blfs-bootscripts-version     "20220506">
-<!ENTITY systemd-units-version        "20220506">
+<!ENTITY systemd-units-version        "20220720">
 
 <!ENTITY blfs-wiki                    "https://wiki.&lfs-domainname;/blfs/wiki">

gnome.ent

@@ -22 +22 @@
 <!-- Platform -->
 <!ENTITY gcr-minor                         "3.41">
-<!ENTITY gcr-version                       "&gcr-minor;.0">
+<!ENTITY gcr-version                       "&gcr-minor;.1">
 <!ENTITY gsettings-desktop-schemas-version "42.0">
 <!ENTITY libsecret-version                 "0.20.5">

gnome/platform/gcr.xml

@@ -7 +7 @@
   <!ENTITY gcr-download-http "&gnome-download-http;/gcr/&gcr-minor;/gcr-&gcr-version;.tar.xz">
   <!ENTITY gcr-download-ftp  "&gnome-download-ftp;/gcr/&gcr-minor;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-md5sum        "6b6d52de90d4ae95be7d36abf66626fa">
-  <!ENTITY gcr-size          "1.0 MB">
-  <!ENTITY gcr-buildsize     "28 MB (with tests)">
+  <!ENTITY gcr-md5sum        "c1e98af977236255006e11e8f8cfbaca">
+  <!ENTITY gcr-size          "1008 KB">
+  <!ENTITY gcr-buildsize     "33 MB (with tests)">
   <!ENTITY gcr-time          "0.2 SBU (with tests; both using parallelism=4)">
 ]>
@@ -93 +93 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/>
+      <!--<xref linkend="gtk-doc"/> and-->
+      <xref linkend="valgrind"/> and
+      <ulink url="https://gnome.pages.gitlab.gnome.org/gi-docgen/">gi-docgen</ulink>
     </para>
 
@@ -115 +116 @@
     -->
 
+<!--
     <para>
       First apply a fix for building with newer versions of
@@ -121 +123 @@
 
 <screen><userinput>find . -name meson.build | xargs sed -i /packages.\*deps/d</userinput></screen>
+-->
 
     <para>
@@ -128 +131 @@
 
 <screen><userinput>sed -i 's:"/desktop:"/org:' schema/*.xml &amp;&amp;
-
-sed -e '208 s/@BASENAME@/gcr-viewer.desktop/'   \
-    -e '231 s/@BASENAME@/gcr-prompter.desktop/' \
-    -i ui/meson.build                           &amp;&amp;
 
 mkdir build &amp;&amp;
@@ -158 +157 @@
       href="../../xincludes/meson-buildtype-release.xml"/>
 
+<!--
     <para>
       <command>sed ... schema/*.xml</command>:  This command fixes a
@@ -167 +167 @@
       problem when building with meson-0.59.0.
     </para>
+-->
 
     <!--

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
     -->
+    <listitem>
+      <para>July 20th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gcr-3.41.1. Fixes
+          <ulink url="&blfs-ticket-root;16801">#16801</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update blfs-systemd-units to 20220720, fixing a bug
+          where lightdm.service could get enabled alongside lxdm.service.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>July 19th, 2022</para>

x/dm/lightdm.xml

@@ -188 +188 @@
     </para>
 
-<screen><userinput>./configure                          \
-       --prefix=/usr                 \
-       --libexecdir=/usr/lib/lightdm \
-       --localstatedir=/var          \
-       --sbindir=/usr/bin            \
-       --sysconfdir=/etc             \
-       --disable-static              \
-       --disable-tests               \
-       --with-greeter-user=lightdm   \
-       --with-greeter-session=lightdm-gtk-greeter \
-       --docdir=/usr/share/doc/lightdm-&lightdm-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr                 \
+            --libexecdir=/usr/lib/lightdm \
+            --localstatedir=/var          \
+            --sbindir=/usr/bin            \
+            --sysconfdir=/etc             \
+            --disable-static              \
+            --disable-tests               \
+            --with-greeter-user=lightdm   \
+            --with-greeter-session=lightdm-gtk-greeter \
+            --docdir=/usr/share/doc/lightdm-&lightdm-version; &amp;&amp;
 make</userinput></screen>
 
@@ -225 +224 @@
 cd lightdm-gtk-greeter-&lightdm-gtk-greeter-version; &amp;&amp;
 
-./configure                      \
-   --prefix=/usr                 \
-   --libexecdir=/usr/lib/lightdm \
-   --sbindir=/usr/bin            \
-   --sysconfdir=/etc             \
-   --with-libxklavier            \
-   --enable-kill-on-sigterm      \
-   --disable-libido              \
-   --disable-libindicator        \
-   --disable-static              \
-   --disable-maintainer-mode     \
-   --docdir=/usr/share/doc/lightdm-gtk-greeter-&lightdm-gtk-greeter-version; &amp;&amp;
-
+./configure --prefix=/usr                 \
+            --libexecdir=/usr/lib/lightdm \
+            --sbindir=/usr/bin            \
+            --sysconfdir=/etc             \
+            --with-libxklavier            \
+            --enable-kill-on-sigterm      \
+            --disable-libido              \
+            --disable-libindicator        \
+            --disable-static              \
+            --disable-maintainer-mode     \
+            --docdir=/usr/share/doc/lightdm-gtk-greeter-&lightdm-gtk-greeter-version; &amp;&amp;
 make</userinput></screen>