Changeset 7af46e6 for gnome/platform/gcr.xml

Timestamp:

03/28/2020 07:35:39 PM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2e4d847e

Parents:

5e35878c

Message:

Add mozjs-68.6.0
Update to gcr-3.36.0
Update to gnome-desktop-3.36.0
Update to gjs-1.64.1

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

File:

• gnome/platform/gcr.xml (modified) (8 diffs)

gnome/platform/gcr.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY gcr-download-http "&gnome-download-http;/gcr/&gnome-minor-34;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-download-ftp  "&gnome-download-ftp;/gcr/&gnome-minor-34;/gcr-&gcr-version;.tar.xz">
-  <!ENTITY gcr-md5sum        "4af28919fb1dd36d93603e8230283b6f">
-  <!ENTITY gcr-size          "1.4 MB">
-  <!ENTITY gcr-buildsize     "88 MB (with tests)">
-  <!ENTITY gcr-time          "0.6 SBU (with tests)">
+  <!ENTITY gcr-download-http "&gnome-download-http;/gcr/&gnome-minor-36;/gcr-&gcr-version;.tar.xz">
+  <!ENTITY gcr-download-ftp  "&gnome-download-ftp;/gcr/&gnome-minor-36;/gcr-&gcr-version;.tar.xz">
+  <!ENTITY gcr-md5sum        "adc65563b6b458507b9a578a8b68fb61">
+  <!ENTITY gcr-size          "1.0 MB">
+  <!ENTITY gcr-buildsize     "47 MB (with tests)">
+  <!ENTITY gcr-time          "0.5 SBU (with tests)">
 ]>
 
@@ -78 +78 @@
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libtasn1"/>, and
+      <xref linkend="libgcrypt"/>, and
       <xref linkend="p11-kit"/>
     </para>
@@ -106 +105 @@
     <title>Installation of Gcr</title>
 
+    <caution>
+      <para>
+        If you are upgrading from a version of gcr prior to 3.36.0, you must
+        run the <filename>remove-la-files.sh</filename> script from the
+        <xref linkend="la-files"/> after installing gcr.
+      </para>
+    </caution>
+
     <para>
       Install <application>Gcr</application> by running the following
@@ -113 +120 @@
 <screen><userinput>sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml &amp;&amp;
 
-./configure --prefix=/usr     \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
+mkdir gcr-build &amp;&amp;
+cd    gcr-build &amp;&amp;
+
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>.
       The tests must be run from an X Terminal or similar. <!-- One test,
       "test-openssl 3", is known to fail. -->
@@ -127 +136 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
@@ -139 +148 @@
 
     <para>
-      <option>--without-gtk</option>: Use this switch if you
+      <option>-Dgtk=false</option>: Use this switch if you
       haven't installed <xref linkend="gtk3"/>. Note that
       <application>gcr-viewer</application> will not be installed
@@ -145 +154 @@
     </para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+    <para>
+      <option>-Dgtk_doc=true</option>: Use this switch if you wish
+      to generate the API reference documentation. Note that you must
+      have <application>GTK-Doc</application>  installed.
+    </para>
+
+    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>-->
 
   </sect2>
@@ -167 +182 @@
         <seg>
           /usr/include/gck-1,
-          /usr/{include,share/gtk-doc/html}/gcr-3, and
-          /usr/share/gtk-doc/html/gck
+          /usr/include/gcr-3, and
+          /usr/share/gtk-doc/html/{gcr,gck}
         </seg>
       </seglistitem>