testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

Accepting request 1189971 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1189971
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=255
This commit is contained in:
Dominique Leuenberger 2024-07-30 09:53:11 +00:00 committed by Git OBS Bridge
commit 1a0272880a
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jul 27 05:49:03 UTC 2024 - Christoph G <foss@grueninger.de>
- Add curl-8.9.0-output.patch to fix test for different output
with cURL 8.9.0. Part of upstream and will be part of 3.31.0.
-------------------------------------------------------------------
Fri Jul 19 16:27:30 UTC 2024 - Christoph G <foss@grueninger.de>

2
cmake.spec
View File

@ -70,6 +70,8 @@ Patch0: cmake-fix-ruby-test.patch
# Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
Patch1: feature-suse-python-interp-search-order.patch
Patch2: cmake-zerojvm.patch
# upstream, adjust test to process output from cURL 8.9.0
Patch3: curl-8.9.0-output.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkgconfig

20
curl-8.9.0-output.patch Normal file
View File

@ -0,0 +1,20 @@
From 7bfe120c07f9fb571ed3e6e30db99d01da52bf60 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 25 Jul 2024 11:00:36 -0400
Subject: Tests/RunCMake/file-DOWNLOAD: Update bad host name
message for curl 8.9
---
Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt b/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt
index 12278e0fb4..4aa7e93a9c 100644
--- a/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt
+++ b/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt
@@ -1 +1 @@
--- status='6;"Couldn't resolve host name"'
+-- status='6;"(Could not resolve hostname|Couldn't resolve host name)"'
--
2.45.2