Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| e5f753fa95 | |||
| 36eccfa24f | |||
| 992fb09a55 | |||
| 3cc7f0f98b |
29
graphite2-1.3.14-gcc15.patch
Normal file
29
graphite2-1.3.14-gcc15.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
https://github.com/silnrsi/graphite/pull/91
|
||||
|
||||
From fb5e7313802a32783cf0a3f1c28880f11e9588a5 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyich@gmail.com>
|
||||
Date: Fri, 2 Aug 2024 22:31:44 +0100
|
||||
Subject: [PATCH] tests/featuremap/featuremaptest.cpp: add missing <stdint.h>
|
||||
include
|
||||
|
||||
Without the change `graphite` build fails on upcoming `gcc-15` as:
|
||||
|
||||
tests/featuremap/featuremaptest.cpp:30:15: error: 'uint8_t' was not declared in this scope
|
||||
30 | std::vector<uint8_t> _ttf;
|
||||
| ^~~~~~~
|
||||
tests/featuremap/featuremaptest.cpp:16:1: note: 'uint8_t' is defined in header '<cstdint>';
|
||||
this is probably fixable by adding '#include <cstdint>'
|
||||
15 | #include "inc/Face.h"
|
||||
+++ |+#include <cstdint>
|
||||
16 | #include "inc/FeatureMap.h"
|
||||
--- a/tests/featuremap/featuremaptest.cpp
|
||||
+++ b/tests/featuremap/featuremaptest.cpp
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
+#include <stdint.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
||||
@@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 18 14:39:07 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Exclude nametabletest until fixed upstream
|
||||
https://github.com/silnrsi/graphite/issues/96
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 12 21:12:51 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
|
||||
|
||||
- add graphite2-1.3.14-gcc15.patch (from upstream PR) to fix
|
||||
gcc15 compile time error
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 25 12:22:23 UTC 2023 - pgajdos@suse.com
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ Source0: https://github.com/silnrsi/graphite/archive/%{version}.tar.gz#/%
|
||||
Source1: baselibs.conf
|
||||
Patch0: graphite2-1.2.0-cmakepath.patch
|
||||
Patch2: link-gcc-shared.diff
|
||||
Patch3: graphite2-1.3.14-gcc15.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: freetype2-devel
|
||||
@@ -96,9 +97,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%check
|
||||
# exclude tests based on fonttool
|
||||
# and also nametabletest - https://github.com/silnrsi/graphite/issues/96
|
||||
cd build
|
||||
ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \
|
||||
-E "padaukcmp1|chariscmp1|chariscmp2|annacmp1|schercmp1|awamicmp1|awamicmp2|awamicmp3"
|
||||
-E "padaukcmp1|chariscmp1|chariscmp2|annacmp1|schercmp1|awamicmp1|awamicmp2|awamicmp3|nametabletest"
|
||||
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
|
||||
Reference in New Issue
Block a user