From ca6a1c78745e042a4e2d8f180c9c0f758ef13095 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 18 Apr 2025 00:18:07 -0700 Subject: [PATCH] fix(lomiri-app-launch): Patch to use the correct standard for atomic builtins (#4272) (#4337) * fix(lomiri-app-launch): GCC15 currently doesn't support atomic builtins Signed-off-by: Gilver * This...might need Clang Signed-off-by: Gilver * Didn't help but ruled it out? Signed-off-by: Gilver * Of this is it I swear Signed-off-by: Gilver * C too? Signed-off-by: Gilver * Testing something... Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * ? Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Try GCC14 again but with libatomic present...? Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Oop Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Add files via upload Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * Remove local dir mistake fffffffffff Signed-off-by: Gilver * Update 2004-std-workaround.patch Signed-off-by: Gilver * Update 2004-std-workaround.patch Signed-off-by: Gilver * Update lomiri-app-launch.spec Signed-off-by: Gilver * So stupid but please God Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 3a8ed821a09cbd02b7859d946716052cd8f2d9c7) Co-authored-by: Gilver --- .../lomiri-app-launch/2004-std-workaround.patch | 11 +++++++++++ .../lomiri-app-launch/lomiri-app-launch.spec | 9 +++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch diff --git a/anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch b/anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch new file mode 100644 index 0000000000..7ae0684784 --- /dev/null +++ b/anda/desktops/lomiri-unity/lomiri-app-launch/2004-std-workaround.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2025-04-18 01:46:49.810910663 -0500 ++++ b/CMakeLists.txt 2025-04-18 02:07:05.663396088 -0500 +@@ -77,7 +77,7 @@ + -pthread + ) + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + + pkg_check_modules(GLIB2 REQUIRED glib-2.0) diff --git a/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec index 6775a051e4..e7cb74c9dd 100644 --- a/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec +++ b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec @@ -4,16 +4,19 @@ Name: lomiri-app-launch Version: 0.1.11 -Release: 1%?dist +Release: 2%?dist Summary: Provides the Lomiri App Launch user space daemon License: GPL-3.0 URL: https://gitlab.com/ubports/development/core/lomiri-app-launch Source0: %{url}/-/archive/%commit/lomiri-app-launch-%commit.tar.gz +Patch0: https://sources.debian.org/data/main/l/lomiri-app-launch/0.1.11-1/debian/patches/2003_remove-werror.patch +Patch1: 2004-std-workaround.patch BuildRequires: cmake BuildRequires: pkgconfig -BuildRequires: g++ BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libatomic BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(lttng-ust) @@ -49,8 +52,6 @@ This package contains development files needed for lomiri-app-launch. %autosetup -n lomiri-app-launch-%commit %build -sed -i 's/-Werror//' ./CMakeLists.txt - # For some reason the macro of cmake fails on both clang and gcc cmake -DLOMIRI_APP_LAUNCH_ARCH=%{_arch} -DENABLE_COVERAGE=OFF -DENABLE_TESTS=OFF -B redhat-linux-build -DCMAKE_INSTALL_PREFIX:PATH=/usr -DENABLE_MIRCLIENT=off -DUSE_SYSTEMD=ON %cmake_build