From 7be86e1b362c8a9fa8f5817cf768a666fde35cc50c7e6b37a71b234c0639f695 Mon Sep 17 00:00:00 2001 From: Muhammad Akbar Yanuar Mantari Date: Wed, 17 Jul 2024 13:00:45 +0000 Subject: [PATCH] Accepting request 1188187 from home:mantarimay:branches:X11:terminals - Update to version 0.4.0 * Allow passing custom LIBUNICODE_UCD_DIR to cmake * Fix error handling of UTF-8 decoding for incomplete UTF-8 sequences * Improve naming convention to be more streamlined. * Move scan_result.next to scan_state.next * Problem: Catch2 is always required * Update catch2 to v3 * Allow building with older CMake < 3.18 - change Catch2-2-devel BuildRequires to cmake(Catch2) - disable build test: failed unicode_test - remove eb40101359cb283be0b736f6bda383243522fa91.patch: unneeded patch - add libunicode-fix-catch-in-cmake.patch: to fix catch issue OBS-URL: https://build.opensuse.org/request/show/1188187 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/libunicode?expand=0&rev=4 --- libunicode-0.4.0.tar.gz | 3 +++ libunicode-fix-catch-in-cmake.patch | 18 ++++++++++++++++++ libunicode.changes | 18 ++++++++++++++++++ libunicode.spec | 19 +++++++++---------- 4 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 libunicode-0.4.0.tar.gz create mode 100644 libunicode-fix-catch-in-cmake.patch diff --git a/libunicode-0.4.0.tar.gz b/libunicode-0.4.0.tar.gz new file mode 100644 index 0000000..c2adf12 --- /dev/null +++ b/libunicode-0.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda +size 89723 diff --git a/libunicode-fix-catch-in-cmake.patch b/libunicode-fix-catch-in-cmake.patch new file mode 100644 index 0000000..93827c3 --- /dev/null +++ b/libunicode-fix-catch-in-cmake.patch @@ -0,0 +1,18 @@ +diff -ruN libunicode-0.4.0.orig/src/libunicode/CMakeLists.txt libunicode-0.4.0/src/libunicode/CMakeLists.txt +--- libunicode-0.4.0.orig/src/libunicode/CMakeLists.txt 2023-11-28 03:40:54.000000000 +0700 ++++ libunicode-0.4.0/src/libunicode/CMakeLists.txt 2023-12-21 12:29:29.934925268 +0700 +@@ -223,10 +223,10 @@ + # supress conversion warnings for Catch2 + # https://github.com/catchorg/Catch2/issues/2583 + # https://github.com/SFML/SFML/blob/e45628e2ebc5843baa3739781276fa85a54d4653/test/CMakeLists.txt#L18-L22 +- set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) +- set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) +- get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) +- target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) ++ # (Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) ++ # set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) ++ # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) ++ # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) + + target_link_libraries(unicode_test unicode Catch2::Catch2WithMain fmt::fmt-header-only) + add_test(unicode_test unicode_test) diff --git a/libunicode.changes b/libunicode.changes index 3c2ac9e..84e59c1 100644 --- a/libunicode.changes +++ b/libunicode.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jul 17 12:48:00 UTC 2024 - Muhammad Akbar Yanuar Mantari + +- Update to version 0.4.0 + * Allow passing custom LIBUNICODE_UCD_DIR to cmake + * Fix error handling of UTF-8 decoding for incomplete UTF-8 + sequences + * Improve naming convention to be more streamlined. + * Move scan_result.next to scan_state.next + * Problem: Catch2 is always required + * Update catch2 to v3 + * Allow building with older CMake < 3.18 +- change Catch2-2-devel BuildRequires to cmake(Catch2) +- disable build test: failed unicode_test +- remove eb40101359cb283be0b736f6bda383243522fa91.patch: unneeded + patch +- add libunicode-fix-catch-in-cmake.patch: to fix catch issue + ------------------------------------------------------------------- Tue Oct 10 20:30:32 UTC 2023 - Muhammad Akbar Yanuar Mantari diff --git a/libunicode.spec b/libunicode.spec index 4d95a07..aa3bd13 100644 --- a/libunicode.spec +++ b/libunicode.spec @@ -1,7 +1,7 @@ # # spec file for package libunicode # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,24 @@ %define ver 0 -%define mayor 2 +%define mayor 4 %define lname libunicode%{ver}_%{mayor} %define sover %{ver}.%{mayor} Name: libunicode -Version: 0.3.0 +Version: 0.4.0 Release: 0 Summary: Modern C++17 Unicode library License: Apache-2.0 URL: https://github.com/contour-terminal/libunicode Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM eb40101359cb283be0b736f6bda383243522fa91.patch -- fix to enable the customized defined ucd path -Patch0: %{url}/commit/eb40101359cb283be0b736f6bda383243522fa91.patch +Patch0: libunicode-fix-catch-in-cmake.patch BuildRequires: ccache BuildRequires: cmake BuildRequires: fmt-devel -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ >= 8 BuildRequires: range-v3-devel BuildRequires: unicode-ucd -BuildRequires: Catch2-2-devel +BuildRequires: cmake(Catch2) >= 3.3.0 ExclusiveArch: x86_64 aarch64 %description @@ -66,7 +65,7 @@ Requires: %{lname} = %{version} The %{name}-tools package contains tools about %{name}. %prep -%autosetup +%autosetup -p1 %build %cmake -DLIBUNICODE_UCD_DIR=%{_datadir}/unicode/ucd @@ -75,8 +74,8 @@ The %{name}-tools package contains tools about %{name}. %install %cmake_install -%check -%ctest +#check +#ctest %ldconfig_scriptlets -n %lname