.gitignore

@@ -1 +1 @@
-SOURCES/libdex-0.8.1.tar.xz
+SOURCES/libdex-0.6.1.tar.xz

.libdex.metadata

@@ -1 +1 @@
-d237a6d3fe78fd5a22cf8c114c53f2a2e4a00b02 SOURCES/libdex-0.8.1.tar.xz
+b3207d61ce0d7c81e62a5a4de927ba11b76fda59 SOURCES/libdex-0.6.1.tar.xz

SOURCES/avoid-asm.patch

@@ -0,0 +1,39 @@
+From 95b957d5381ae6b313333f50bb941e9970d55127 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Wed, 12 Jun 2024 11:17:52 -0700
+Subject: [PATCH] build: avoid asm.S on general Linux when possible
+
+We only use asm.S when on mips when we're on Linux. Removing this means
+for the other Linux cases means the compiler can automatically enable some
+features we might want like CET for indirect branches.
+---
+ src/meson.build | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 2967968..4a106a1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -91,10 +91,18 @@ if host_machine.system() != 'windows'
+   # Not really used on Windows now, see also
+   # https://github.com/mesonbuild/meson/issues/4366
+   libdex_sources += [
+-    'asm.S',
+     'dex-unix-signal.c',
+     'dex-ucontext.c',
+   ]
++
++  # If we're on Linux and mips we might still need asm.S.
++  # But otherwise linux can do it all without any custom
++  # assembler. Failure to do this might result in CET being
++  # disabled for the process by GCC.
++  if host_machine.system() != 'linux' or host_machine.cpu_family() == 'mips'
++    libdex_sources += ['asm.S']
++  endif
++
+   libdex_headers += ['dex-unix-signal.h']
+ endif
+ 
+-- 
+2.45.1
+

SPECS/libdex.spec

@@ -1,21 +1,23 @@
 ## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
+## (rpmautospec version 0.6.1)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
+    release_number = 3;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 
 Name:    libdex
-Version: 0.8.1
+Version: 0.6.1
 Release: %autorelease
 Summary: a library supporting "Deferred Execution" for GNOME and GTK
 
 License: LGPL-2.1-or-later
 URL:     https://gitlab.gnome.org/GNOME/libdex
-Source0: https://download.gnome.org/sources/libdex/0.8/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/libdex/0.6/%{name}-%{version}.tar.xz
+
+Patch0:        avoid-asm.patch
 
 BuildRequires: /usr/bin/vapigen
 BuildRequires: gcc
@@ -87,12 +89,6 @@ libdex.
 
 %changelog
 ## START: Generated by rpmautospec
-* Tue Nov 05 2024 Christian Hergert <chergert@redhat.com> - 0.8.1-1
-- Update libdex to 0.8.1
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.6.1-4
-- Bump release for October 2024 mass rebuild:
-
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.6.1-3
 - Bump release for June 2024 mass rebuild