diff --git a/harfbuzz-3.1.0-work-around-GCC-cast-align-error-warning.patch b/harfbuzz-3.1.0-work-around-GCC-cast-align-error-warning.patch deleted file mode 100644 index 281e0b7..0000000 --- a/harfbuzz-3.1.0-work-around-GCC-cast-align-error-warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 07dc34bdaf977a3be97ab5a68455ed7a67f80a06 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Fri, 5 Nov 2021 14:45:20 -0700 -Subject: [PATCH] [mutex] Try work around GCC cast-align error/warning - -Shouldn't be needed because of the alignas(). Oh well... - -Might fix https://github.com/harfbuzz/harfbuzz/issues/3283 ---- - src/hb-mutex.hh | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/hb-mutex.hh b/src/hb-mutex.hh -index 4e135027f..6914b2245 100644 ---- a/src/hb-mutex.hh -+++ b/src/hb-mutex.hh -@@ -97,10 +97,13 @@ struct hb_mutex_t - /* Create space for, but do not initialize m. */ - alignas(hb_mutex_impl_t) char m[sizeof (hb_mutex_impl_t)]; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wcast-align" - void init () { hb_mutex_impl_init ((hb_mutex_impl_t *) m); } - void lock () { hb_mutex_impl_lock ((hb_mutex_impl_t *) m); } - void unlock () { hb_mutex_impl_unlock ((hb_mutex_impl_t *) m); } - void fini () { hb_mutex_impl_finish ((hb_mutex_impl_t *) m); } -+#pragma GCC diagnostic pop - }; - - struct hb_lock_t --- -2.33.1 - diff --git a/harfbuzz-3.1.0.tar.xz b/harfbuzz-3.1.0.tar.xz deleted file mode 100644 index 58fbc9d..0000000 --- a/harfbuzz-3.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2359390944a74a933d2b1bd214754a5b3f817916a09c6d4ca3d263473cf19b8e -size 13252932 diff --git a/harfbuzz-3.1.1.tar.xz b/harfbuzz-3.1.1.tar.xz new file mode 100644 index 0000000..99231e0 --- /dev/null +++ b/harfbuzz-3.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3f3247bdeabf36765acc237a5f651e651e4e9706582b9cc2cf6c9b8102dfa93 +size 13256100 diff --git a/harfbuzz.changes b/harfbuzz.changes index a954f72..0fd31e2 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 9 15:51:45 UTC 2021 - Bjørn Lie + +- Update to version 3.1.1: + + Work around GCC cast-align error/warning on some platforms. + + Documentation improvements. +- Drop patch fixed upstream: + + harfbuzz-3.1.0-work-around-GCC-cast-align-error-warning.patch + ------------------------------------------------------------------- Sat Nov 6 05:48:26 UTC 2021 - Andreas Stieger diff --git a/harfbuzz.spec b/harfbuzz.spec index 63006c1..edd3376 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -17,14 +17,14 @@ Name: harfbuzz -Version: 3.1.0 +Version: 3.1.1 Release: 0 Summary: An OpenType text shaping engine License: MIT URL: https://www.freedesktop.org/wiki/Software/HarfBuzz Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/%{name}-%{version}.tar.xz Source99: baselibs.conf -Patch0: harfbuzz-3.1.0-work-around-GCC-cast-align-error-warning.patch + BuildRequires: c++_compiler BuildRequires: meson BuildRequires: pkgconfig >= 0.28