Accepting request 1255233 from M17N

OBS-URL: https://build.opensuse.org/request/show/1255233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/woff2?expand=0&rev=6

woff2-gcc15.patch

@@ -0,0 +1,14 @@
+diff --git a/include/woff2/output.h b/include/woff2/output.h
+index dc78ccf..b12d538 100644
+--- a/include/woff2/output.h
++++ b/include/woff2/output.h
+@@ -9,6 +9,8 @@
+ #ifndef WOFF2_WOFF2_OUT_H_
+ #define WOFF2_WOFF2_OUT_H_
+ 
++#include <stdint.h>
++
+ #include <algorithm>
+ #include <cstring>
+ #include <memory>
+

woff2.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sat Mar 22 09:39:43 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Use ldconfig_scriptlets macro for post(un) handling.
+- Use cmake_build macro.
+
+-------------------------------------------------------------------
+Fri Mar 21 23:04:42 UTC 2025 - Shawn Dunn <sfalken@opensuse.org>
+
+- Add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to fix FTBFS with cmake4
+- Add %check section
+- Remove Group: entries, no longer used
+
+-------------------------------------------------------------------
+Mon Feb 17 12:06:09 UTC 2025 - pgajdos@suse.com
+
+- Add patch to fix build with gcc15:
+  + woff2-gcc15.patch
+
 -------------------------------------------------------------------
 Fri Jan  6 11:21:56 UTC 2023 - Ferdinand Thiessen <rpm@fthiessen.de>
 

woff2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package woff2
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,15 +23,18 @@ Version:        1.0.2
 Release:        0
 Summary:        Web Open Font Format 2.0 library
 License:        MIT
-Group:          Development/Libraries/C and C++
 URL:            https://github.com/google/woff2
 Source0:        https://github.com/google/woff2/archive/v%{version}/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
+
 # PATCH-FIX-UPSTREAM woff2-fix-overflow-when-decoding-glyf.patch -- Check for overflow when decoding glyf
 Patch0:         woff2-fix-overflow-when-decoding-glyf.patch
 # PATCH-FIX-OPENSUSE install-executables.patch -- Install woff tools
 Patch1:         install-executables.patch
-BuildRequires:  cmake
+# PATCH-FIX-UPSTREAM woff2-gcc15.patch -- Fix build with gcc15 https://github.com/google/woff2/pull/176
+Patch2:         woff2-gcc15.patch
+
+BuildRequires:  cmake >= 3.5
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libbrotlidec) >= 1.0
@@ -46,7 +49,6 @@ efficiently package fonts linked to Web documents by means of CSS
 
 %package -n     libwoff2common%{soname}
 Summary:        Shared library for %{name}
-Group:          System/Libraries
 
 %description -n libwoff2common%{soname}
 Web Open Font Format (WOFF) 2.0 is an update to the existing WOFF
@@ -59,7 +61,6 @@ This package contains the shared library for %{name}.
 
 %package -n     libwoff2dec%{soname}
 Summary:        Shared library for %{name}
-Group:          System/Libraries
 
 %description -n libwoff2dec%{soname}
 Web Open Font Format (WOFF) 2.0 is an update to the existing WOFF
@@ -72,7 +73,6 @@ This package contains the shared library for %{name}.
 
 %package -n     libwoff2enc%{soname}
 Summary:        Shared library for %{name}
-Group:          System/Libraries
 
 %description -n libwoff2enc%{soname}
 Web Open Font Format (WOFF) 2.0 is an update to the existing WOFF
@@ -85,7 +85,6 @@ This package contains the shared library for %{name}.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries/C and C++
 Requires:       libwoff2common%{soname} = %{version}
 Requires:       libwoff2dec%{soname} = %{version}
 Requires:       libwoff2enc%{soname} = %{version}
@@ -108,20 +107,19 @@ This package contains development files for %{name}.
 	-DBUILD_STATIC_LIBS=OFF \
 	-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
 	-DCMAKE_INSTALL_LIBDIR="%{_libdir}" \
+	-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
 	%{nil}
-%make_build
+%cmake_build
 
 %install
 %cmake_install
 
-%post -n libwoff2common%{soname} -p /sbin/ldconfig
-%postun -n libwoff2common%{soname} -p /sbin/ldconfig
+%check
+%ctest
 
-%post -n libwoff2dec%{soname} -p /sbin/ldconfig
-%postun -n libwoff2dec%{soname} -p /sbin/ldconfig
-
-%post -n libwoff2enc%{soname} -p /sbin/ldconfig
-%postun -n libwoff2enc%{soname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libwoff2common%{soname}
+%ldconfig_scriptlets -n libwoff2dec%{soname}
+%ldconfig_scriptlets -n libwoff2enc%{soname}
 
 %files
 %license LICENSE