From 086a883015984993259a748137a66a3285ba9f59460c22ab069ede1a997017a2 Mon Sep 17 00:00:00 2001 From: Hans-Peter Jansen Date: Wed, 6 Aug 2025 16:44:29 +0200 Subject: [PATCH] Fix build on code 15 by forcing gcc 14 --- libwebp.changes | 5 +++++ libwebp.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/libwebp.changes b/libwebp.changes index 4e685c0..4b7107b 100644 --- a/libwebp.changes +++ b/libwebp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 6 13:43:09 UTC 2025 - Hans-Peter Jansen + +- Fix build on code 15 by forcing gcc 14 + ------------------------------------------------------------------- Sun Aug 3 13:23:37 UTC 2025 - anenasa diff --git a/libwebp.spec b/libwebp.spec index 078d64d..ddd6175 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -2,6 +2,7 @@ # spec file for package libwebp # # Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +17,10 @@ # +%if 0%{?suse_version} == 1500 +%global force_gcc_version 14 +%endif + Name: libwebp Version: 1.6.0 Release: 0 @@ -30,6 +35,8 @@ Source3: %name.keyring Source4: baselibs.conf BuildRequires: cmake +BuildRequires: gcc%{?force_gcc_version} +BuildRequires: gcc%{?force_gcc_version}-c++ BuildRequires: giflib-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(glut) @@ -140,6 +147,10 @@ images more efficiently. %autosetup -p1 %build +%if 0%{?force_gcc_version} +export CC="gcc-%{?force_gcc_version}" +export CXX="g++-%{?force_gcc_version}" +%endif %cmake %cmake_build -- 2.49.0