From 1c38792aa460893430c3c7bec7e71a88c2666626 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 6 Nov 2024 09:49:06 +0300 Subject: [PATCH] import libdex-0.8.1-1.el10 --- .gitignore | 2 +- .libdex.metadata | 2 +- SOURCES/avoid-asm.patch | 39 --------------------------------------- SPECS/libdex.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 SOURCES/avoid-asm.patch diff --git a/.gitignore b/.gitignore index 42e07a8..bf00326 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libdex-0.6.1.tar.xz +SOURCES/libdex-0.8.1.tar.xz diff --git a/.libdex.metadata b/.libdex.metadata index 1c93e3a..74599ed 100644 --- a/.libdex.metadata +++ b/.libdex.metadata @@ -1 +1 @@ -b3207d61ce0d7c81e62a5a4de927ba11b76fda59 SOURCES/libdex-0.6.1.tar.xz +d237a6d3fe78fd5a22cf8c114c53f2a2e4a00b02 SOURCES/libdex-0.8.1.tar.xz diff --git a/SOURCES/avoid-asm.patch b/SOURCES/avoid-asm.patch deleted file mode 100644 index 48f63b3..0000000 --- a/SOURCES/avoid-asm.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 95b957d5381ae6b313333f50bb941e9970d55127 Mon Sep 17 00:00:00 2001 -From: Christian Hergert -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 - diff --git a/SPECS/libdex.spec b/SPECS/libdex.spec index 718af38..245c37c 100644 --- a/SPECS/libdex.spec +++ b/SPECS/libdex.spec @@ -2,22 +2,20 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 4; + release_number = 1; 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.6.1 +Version: 0.8.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.6/%{name}-%{version}.tar.xz - -Patch0: avoid-asm.patch +Source0: https://download.gnome.org/sources/libdex/0.8/%{name}-%{version}.tar.xz BuildRequires: /usr/bin/vapigen BuildRequires: gcc @@ -89,6 +87,9 @@ libdex. %changelog ## START: Generated by rpmautospec +* Tue Nov 05 2024 Christian Hergert - 0.8.1-1 +- Update libdex to 0.8.1 + * Tue Oct 29 2024 Troy Dawson - 0.6.1-4 - Bump release for October 2024 mass rebuild: