[packages/otsanitizer] - updated to 9.2.0

Sun Aug 24 22:06:07 CEST 2025

commit 5eacec4573a498df251f035e596a040032a2e2ed
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Aug 24 22:08:46 2025 +0200

    - updated to 9.2.0

 ots-system-libs.patch | 115 +++++++-------------------------------------------
 otsanitizer.spec      |  22 ++++++----
 2 files changed, 30 insertions(+), 107 deletions(-)
---

diff --git a/otsanitizer.spec b/otsanitizer.spec
index 98f213f..95e08bd 100644
--- a/otsanitizer.spec
+++ b/otsanitizer.spec
@@ -8,17 +8,17 @@
 Summary:	OpenType Sanitizer
 Summary(pl.UTF-8):	OpenType Sanitizer - narzędzie poprawiające fonty OpenType
 Name:		otsanitizer
-Version:	8.0.0
+Version:	9.2.0
 Release:	1
 License:	BSD
 Group:		Libraries
 #Source0Download: https://github.com/khaledhosny/ots/releases
 Source0:	https://github.com/khaledhosny/ots/releases/download/v%{version}/ots-%{version}.tar.xz
-# Source0-md5:	6ee945656c3622b207edc676f9bb696c
+# Source0-md5:	a01326b37cd838b975c613036604a3ee
 Patch0:		ots-system-libs.patch
 URL:		https://github.com/khaledhosny/ots
 BuildRequires:	freetype-devel >= 2
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	libbrotli-devel
 BuildRequires:	lz4-devel
 BuildRequires:	meson
@@ -76,7 +76,7 @@ Statyczna biblioteka OpenType Sanitizer.
 
 %prep
 %setup -q -n ots-%{version}
-%patch -P0 -p1 -b .orig
+%patch -P0 -p1
 
 # extend blacklist by PLD supplied fonts known to cause test failures
 cat >>tests/BLACKLIST.txt <<EOF
@@ -87,12 +87,13 @@ DroidNaskh-Bold.ttf
 EOF
 
 %build
-%meson
+%meson \
+	%{!?with_static_libs:--default-library=shared}
 
 %meson_build
 
 %if %{with tests}
-ninja -C build -v test
+%meson_test -v
 %endif
 
 %install
@@ -115,11 +116,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ots-side-by-side
 %attr(755,root,root) %{_bindir}/ots-validator-checker
 %attr(755,root,root) %{_libdir}/libotsanitizer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libotsanitizer.so.0
+%ghost %{_libdir}/libotsanitizer.so.9
+%{_mandir}/man1/ots-idempotent.1*
+%{_mandir}/man1/ots-perf.1*
+%{_mandir}/man1/ots-sanitize.1*
+%{_mandir}/man1/ots-side-by-side.1*
+%{_mandir}/man1/ots-validator-checker.1*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libotsanitizer.so
+%{_libdir}/libotsanitizer.so
 %{_includedir}/ots
 
 %if %{with static_libs}
diff --git a/ots-system-libs.patch b/ots-system-libs.patch
index 831cca1..b3311d3 100644
--- a/ots-system-libs.patch
+++ b/ots-system-libs.patch
@@ -1,112 +1,29 @@
---- ots-8.0.0/meson.build.orig	2019-08-30 10:52:55.000000000 +0200
-+++ ots-8.0.0/meson.build	2019-10-09 19:45:16.139416093 +0200
-@@ -38,52 +38,13 @@
-                configuration: conf)
- 
- 
--brotli_includes = ['third_party/brotli/c/include']
--libbrotli = library('brotli',
--  'third_party/brotli/c/common/constants.h',
--  'third_party/brotli/c/common/dictionary.c',
--  'third_party/brotli/c/common/dictionary.h',
--  'third_party/brotli/c/common/transform.c',
--  'third_party/brotli/c/common/transform.h',
--  'third_party/brotli/c/common/version.h',
--  'third_party/brotli/c/dec/bit_reader.c',
--  'third_party/brotli/c/dec/bit_reader.h',
--  'third_party/brotli/c/dec/decode.c',
--  'third_party/brotli/c/dec/huffman.c',
--  'third_party/brotli/c/dec/huffman.h',
--  'third_party/brotli/c/dec/prefix.h',
--  'third_party/brotli/c/dec/state.c',
--  'third_party/brotli/c/dec/state.h',
--  'third_party/brotli/c/include/brotli/decode.h',
--  'third_party/brotli/c/include/brotli/port.h',
--  'third_party/brotli/c/include/brotli/types.h',
--  include_directories: include_directories(brotli_includes),
--)
--
-+libbrotli = dependency('libbrotlidec')
- 
--woff2_includes = ['third_party/brotli/c/include', 'third_party/woff2/include']
--libwoff2 = library('woff2',
--  'third_party/woff2/include/woff2/decode.h',
--  'third_party/woff2/include/woff2/output.h',
--  'third_party/woff2/src/buffer.h',
--  'third_party/woff2/src/port.h',
--  'third_party/woff2/src/round.h',
--  'third_party/woff2/src/store_bytes.h',
--  'third_party/woff2/src/table_tags.cc',
--  'third_party/woff2/src/table_tags.h',
--  'third_party/woff2/src/variable_length.cc',
--  'third_party/woff2/src/variable_length.h',
--  'third_party/woff2/src/woff2_common.cc',
--  'third_party/woff2/src/woff2_common.h',
--  'third_party/woff2/src/woff2_dec.cc',
--  'third_party/woff2/src/woff2_out.cc',
--  include_directories: include_directories(woff2_includes),
--)
-+libwoff2 = dependency('libwoff2dec')
- 
- 
- ots_includes = [
-   'include',
--  'third_party/woff2/include',
- ]
- 
- ots_sources = [
-@@ -167,10 +128,9 @@
-   'src/vvar.h',
- ]
- 
--ots_libs = [libbrotli, libwoff2]
-+deps = [libbrotli, libwoff2]
+--- ots-9.2.0/meson.build.orig	2024-10-02 21:02:14.000000000 +0200
++++ ots-9.2.0/meson.build	2025-08-24 21:38:05.090397252 +0200
+@@ -1,6 +1,6 @@
+ project('ots', 'c', 'cpp',
+   version: '9.2.0',
+-  default_options : ['cpp_std=c++11', 'default_library=static', 'warning_level=2'],
++  default_options : ['cpp_std=c++17', 'default_library=static', 'warning_level=2'],
+   meson_version : '>= 0.55.2',
+ )
  
- if get_option('graphite')
--  ots_includes += ['third_party/lz4/lib']
-   ots_sources += [
-     'src/feat.cc',
-     'src/feat.h',
-@@ -186,23 +146,25 @@
-     'src/sill.h',
-     'src/sill.cc',
-   ]
--  liblz4 = library('lz4',
--    'third_party/lz4/lib/lz4.c',
--    'third_party/lz4/lib/lz4.h',
--  )
--  ots_libs += [liblz4]
-+  liblz4 = dependency('liblz4')
-+  deps += [liblz4]
+@@ -161,13 +161,17 @@ if get_option('graphite')
+   ots_deps += [liblz4]
  endif
  
- zlib = dependency('zlib', fallback : ['zlib', 'zlib_dep'])
-+deps += [zlib]
- 
 -libots = library('ots',
 +libots = library('otsanitizer',
    ots_sources,
-   include_directories: include_directories(ots_includes),
--  link_with: ots_libs,
+   include_directories: include_directories('include'),
    cpp_args : '-DHAVE_CONFIG_H',
--  dependencies: zlib,
-+  dependencies: deps,
+   dependencies: ots_deps,
 +  install: true,
-+  version: '0.0.0',
-+  soversion: 0
++  version: '9.2.0',
++  soversion: 9
  )
  
 +install_headers(['include/opentype-sanitiser.h', 'include/ots-memory-stream.h'], subdir: 'ots')
-+
  
- executable('ots-sanitize',
+ ots_sanitize = executable('ots-sanitize',
    'util/ots-sanitize.cc',
-@@ -290,7 +252,7 @@
- endif
- 
- 
--gtest = dependency('gtest', fallback: ['gtest', 'gtest_main_dep'])
-+gtest = dependency('gtest gtest_main', fallback: ['gtest', 'gtest_main_dep'])
- 
- cff_charstring = executable('cff_charstring',
-   'tests/cff_charstring_test.cc',
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/otsanitizer.git/commitdiff/5eacec4573a498df251f035e596a040032a2e2ed

