gcompris, bump to bugfix version 26.1 (#13816)

This commit is contained in:
Schrijvers Luc
2026-03-12 07:48:02 +01:00
committed by GitHub
parent 8fc9e08132
commit e48ffa5cfc
2 changed files with 2 additions and 29 deletions

View File

@@ -17,9 +17,8 @@ COPYRIGHT="2014-2016 Bruno Coudoin
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-$portVersion.tar.xz"
CHECKSUM_SHA256="7d3df8be96dd6e883990abe14f9137900030d508d3a30e2b38e39d0eb31ef333"
CHECKSUM_SHA256="c389b863b29f012ccc1b3eef740982ff6c7654c13a2e343397ee466124f31339"
SOURCE_DIR="gcompris-qt-$portVersion"
PATCHES="gcompris-$portVersion.patchset"
ADDITIONAL_FILES="gcompris.rdef.in
gcompris-teachers.rdef.in"
@@ -72,7 +71,6 @@ REQUIRES_teachers="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix
# gcc_syslibs${secondaryArchSuffix}_devel
qml_box2d_qt6$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
devel:libcrypto$secondaryArchSuffix >= 3
@@ -90,8 +88,7 @@ BUILD_REQUIRES="
devel:libssl$secondaryArchSuffix >= 3
"
BUILD_PREREQUIRES="
# cmd:clang_tidy
# cmd:cppcheck
cmd:clang_tidy >= 20
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:make

View File

@@ -1,24 +0,0 @@
From 54e6fc6cd9976ddf0e1e86f1b22a80bad758f447 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Wed, 4 Feb 2026 12:45:16 +0100
Subject: Disable, CodeQualityUtils, building tests fails
error: 'stddef.h' file not found [clang-diagnostic-error]
https://github.com/haikuports/haikuports/issues/10708
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e14c5b..9721333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060500)
# add tools (cppcheck, clang-tidy...) if build on testing mode only
# (slower compilation)
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT HAIKU)
include(CodeQualityUtils)
endif()
--
2.52.0