From d355685c33225f2a79be3f9bacd3f5a1113a5efe Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Tue, 9 Nov 2021 06:37:50 +0530
Subject: [PATCH] Update to 3.1.1 version (#2021316)

---
 .gitignore                                    |  1 +
 ...-around-GCC-cast-align-error-warning.patch | 33 -------------------
 harfbuzz.spec                                 | 10 +++---
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 0001-mutex-Try-work-around-GCC-cast-align-error-warning.patch

diff --git a/.gitignore b/.gitignore
index c67289d..c775470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,4 @@
 /harfbuzz-2.9.0.tar.xz
 /harfbuzz-3.0.0.tar.xz
 /harfbuzz-3.1.0.tar.xz
+/harfbuzz-3.1.1.tar.xz
diff --git a/0001-mutex-Try-work-around-GCC-cast-align-error-warning.patch b/0001-mutex-Try-work-around-GCC-cast-align-error-warning.patch
deleted file mode 100644
index 35be9f1..0000000
--- a/0001-mutex-Try-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 <behdad@behdad.org>
-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.32.0
-
diff --git a/harfbuzz.spec b/harfbuzz.spec
index efd5a5f..aff3a38 100644
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@@ -1,15 +1,12 @@
 Name:           harfbuzz
-Version:        3.1.0
-Release:        2%{?dist}
+Version:        3.1.1
+Release:        1%{?dist}
 Summary:        Text shaping library
 
 License:        MIT
 URL:            https://harfbuzz.github.io/
 Source0:        https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz
 
-# Upstream patches
-Patch0:         0001-mutex-Try-work-around-GCC-cast-align-error-warning.patch
-
 BuildRequires:  cairo-devel
 BuildRequires:  freetype-devel
 BuildRequires:  glib2-devel
@@ -91,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/libharfbuzz-icu.so.*
 
 %changelog
+* Tue Nov 09 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.1-1
+- Update to 3.1.1 version (#2021316)
+
 * Sat Nov 06 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.0-2
 - Fix build failure on armv7hl architecture 
 
diff --git a/sources b/sources
index 030ed75..e2ce6e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (harfbuzz-3.1.0.tar.xz) = b91a4d504b4867244a949604905393750c965797ce6c7f7d11013214b39f6dfe1f9bd735a6b514dd231023c0c7055c33d7c1554b1fdc075f845d39478f1c284c
+SHA512 (harfbuzz-3.1.1.tar.xz) = 08a1566ac155a6cd37b8a341168229826ab5cc84db13b42cba461ff533ba3d404970edbee6068b472c06c05720aa388235d44ca730f688344eb8b51a3d556b22