Changeset e92c98e7

Timestamp:

05/22/2022 10:06:18 AM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

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:

6e490f46

Parents:

4dc416f

Message:

gnome-keyring: switch to Git snapshot for 42.0

The maintainer did not pay enough attention using "make dist" to
generate the release tarball. See:
​https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/109

bdubbs has partially worked around the issue, but on systemd we still
get:

make[2]: * No rule to make target
'daemon/gnome-keyring-daemon.socket', needed by 'all-am'. Stop.

Instead of fetching this .socket file separately, it's easier to just
download a clean tarball and regenrate the configure script ourselves.
I'd prefer them to switch to meson and avoid this kind of problem
forever.

File:

• gnome/platform/gnome-keyring.xml (modified) (2 diffs)

gnome/platform/gnome-keyring.xml

@@ -5 +5 @@
   %general-entities;
 
+  <!-- Use Git snapshot for now because of various "make dist" issues in
+       42.0.  We may switch back to download.gnome.org at 42.1.  -->
   <!ENTITY gnome-keyring-download-http
-           "&gnome-download-http;/gnome-keyring/&gnome-42;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-download-ftp
-           "&gnome-download-ftp;/gnome-keyring/&gnome-42;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-md5sum        "dd3a191a2f61a14ca67ad6e2a3e6287e">
-  <!ENTITY gnome-keyring-size          "1.3 MB">
+           "https://gitlab.gnome.org/GNOME/gnome-keyring/-/archive/&gnome-keyring-version;gnome-keyring-&gnome-keyring-version;.tar.gz">
+  <!ENTITY gnome-keyring-download-ftp  " ">
+  <!ENTITY gnome-keyring-md5sum        "91b14cbf19c39fa0c3f114f7310ccade">
+  <!ENTITY gnome-keyring-size          "1.0 MB">
   <!ENTITY gnome-keyring-buildsize     "116 MB">
   <!ENTITY gnome-keyring-time          "0.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
@@ -104 +105 @@
 
     <para>
-      First, fix a packaging error:
+      First, prepare the configure script:
     </para>
 
-<!-- This could be shortened to sed -i 's:/home.*dbus/::' daemon/dbus/*generated.c
-     but I expect a release of 42.1 soon to fix the problem.  -->
-
-<screen><userinput>sed -e 's:/home/niels/jhbuild/checkout/gnome-keyring/daemon/dbus/::' \
-    -i daemon/dbus/*generated.c</userinput></screen>
+<screen><userinput>./autogen.sh</userinput></screen>
 
     <para>