From 4bde8d3fb3b0980a3539222edbb200857c39292a Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 18 Nov 2024 09:36:23 +0800 Subject: [PATCH 1/5] Packaging: update debian stuff [ci skip] --- debian/changelog | 6 ++++++ debian/files | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7fac832e2..6ef906c91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fastfetch (2.30.0) jammy; urgency=medium + + * Update to 2.30.0 + + -- Carter Li Mon, 18 Nov 2024 09:30:58 +0800 + fastfetch (2.29.0) jammy; urgency=medium * Update to 2.29.0 diff --git a/debian/files b/debian/files index b90fea35f..a935a0912 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -fastfetch_2.29.0_source.buildinfo universe/utils optional +fastfetch_2.30.0_source.buildinfo universe/utils optional From 6cbbe334b5e85f02c87e6716ab3849559648751a Mon Sep 17 00:00:00 2001 From: Masato TOYOSHIMA <77603626+phoepsilonix@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:32:49 +0900 Subject: [PATCH 2/5] CMake: Fixed the destination where fastfetch.1 is generated. (#1403) * Fixed the destination where fastfetch.1 is generated. * Update CMakeLists.txt Reappend trailing new line --------- Co-authored-by: Carter Li --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec7725f46..d64c3d343 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,7 +282,7 @@ endif() if(Python_FOUND) message(STATUS "Generating 'fastfetch.1'") execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-man.py" - OUTPUT_FILE "fastfetch.1") + OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch.1") else() message(WARNING "Python3 is not found, use basic 'fastfetch.1.in' instead") string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y" UTC) From 7f63ec1315e7d8f4c0b81163bcbe2b8785205b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 18 Nov 2024 13:35:10 +0800 Subject: [PATCH 3/5] CMake: fix the destination where `fastfetch_pciids.c.inc` is generated --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d64c3d343..d50a249ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -268,11 +268,11 @@ else() file(READ "src/data/help.json" DATATEXT_JSON_HELP) endif() -if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "fastfetch_pciids.c.inc") +if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc") if(Python_FOUND) message(STATUS "Generating 'fastfetch_pciids.c.inc'") execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-pciids.py" - OUTPUT_FILE "fastfetch_pciids.c.inc") + OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc") else() message(WARNING "Python3 is not found, 'fastfetch_pciids.c.inc' will not be generated") set(ENABLE_EMBEDDED_PCIIDS OFF) From a9a08d8a80f40a6cad3500cc0dd21efb41e34e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 18 Nov 2024 13:40:08 +0800 Subject: [PATCH 4/5] Release: v2.30.1 --- CHANGELOG.md | 5 +++++ CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 379c12bcb..5391125bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.30.1 + +Bugfixes: +* Fix the destination where `fastfetch.1` is generated (#1403) + # 2.30.0 Changes: diff --git a/CMakeLists.txt b/CMakeLists.txt index d50a249ba..c4163c041 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url project(fastfetch - VERSION 2.30.0 + VERSION 2.30.1 LANGUAGES C DESCRIPTION "Fast neofetch-like system information tool" HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch" From efc85046072f7937f33ec24cfd88a2c973fe8941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 18 Nov 2024 14:08:53 +0800 Subject: [PATCH 5/5] CMake: check return code of python scripts --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4163c041..2a0cca18a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,11 @@ if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "${PROJECT_BINARY_DIR}/fastfetch_pciids if(Python_FOUND) message(STATUS "Generating 'fastfetch_pciids.c.inc'") execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-pciids.py" - OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc") + OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc" + RESULT_VARIABLE PYTHON_PCIIDS_RETCODE) + if(NOT PYTHON_PCIIDS_RETCODE EQUAL 0) + message(FATAL_ERROR "Failed to generate 'fastfetch_pciids.c.inc'") + endif() else() message(WARNING "Python3 is not found, 'fastfetch_pciids.c.inc' will not be generated") set(ENABLE_EMBEDDED_PCIIDS OFF) @@ -282,7 +286,11 @@ endif() if(Python_FOUND) message(STATUS "Generating 'fastfetch.1'") execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-man.py" - OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch.1") + OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch.1" + RESULT_VARIABLE PYTHON_MANPAGE_RETCODE) + if(NOT PYTHON_MANPAGE_RETCODE EQUAL 0) + message(FATAL_ERROR "Failed to generate 'fastfetch.1'") + endif() else() message(WARNING "Python3 is not found, use basic 'fastfetch.1.in' instead") string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y" UTC)