Skip to content

Commit

Permalink
Add 1.8.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
tronical committed Oct 15, 2024
1 parent cf6ae38 commit fe1e2b1
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 2b0450cd054aba179b1dd96da12b77c46f7b1546 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <[email protected]>
Date: Tue, 15 Oct 2024 20:33:01 +0200
Subject: [PATCH] Fix build on ARM host systems

Cherry-pick of https://github.com/slint-ui/slint/commit/11128809fb744a93af668082edb0790ef7421d86
---
api/cpp/CMakeLists.txt | 4 ----
1 file changed, 4 deletions(-)

diff --git a/api/cpp/CMakeLists.txt b/api/cpp/CMakeLists.txt
index 461e712d4..e5940a86f 100644
--- a/api/cpp/CMakeLists.txt
+++ b/api/cpp/CMakeLists.txt
@@ -374,10 +374,6 @@ if (SLINT_BUILD_RUNTIME)
include(${CMAKE_CURRENT_LIST_DIR}/cmake/SlintMacro.cmake)
endif()

- if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm)$")
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/slint-stm.h DESTINATION include/slint)
- endif()
-
export(TARGETS Slint slint_cpp
NAMESPACE Slint:: FILE "${CMAKE_BINARY_DIR}/lib/cmake/Slint/SlintTargets.cmake")
install(EXPORT SlintTargets NAMESPACE Slint:: DESTINATION lib/cmake/Slint)
14 changes: 14 additions & 0 deletions recipes-slint/slint/slint-cpp_1.8.0.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
require recipes-slint/slint/slint-cpp-v2.inc

# Either REMOVE or REPLACE this patch, but never change it, as it's also referenced
# from other releases
SRC_URI += "file://0001-WIP-v-1-6-0-Use-a-patched-gettext-to-avoid-cross-compiling-g.patch"
SRC_URI += " file://0001-Fix-build-on-ARM-host-systems.patch"

LIC_FILES_CHKSUM = "file://LICENSE.md;md5=47db5060638acc88cba176445dbd98b6"

# v1.8.0 tag
SLINT_REV = "ca66a6af4a4e9c4c78ff889ba447bcb460d07c91"

EXTRA_OECMAKE:append = " -DSLINT_FEATURE_GETTEXT=ON"

0 comments on commit fe1e2b1

Please sign in to comment.