diff mbox series

package/pango: bump to version 1.52.2

Message ID 20240403084005.512267-1-francois.perrad@gadz.org
State Accepted
Headers show
Series package/pango: bump to version 1.52.2 | expand

Commit Message

Francois Perrad April 3, 2024, 8:40 a.m. UTC 
remove merged patch

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 .../pango/0001-Drop-Werror-array-bounds.patch | 40 -------------------
 package/pango/pango.hash                      |  4 +-
 package/pango/pango.mk                        |  4 +-
 3 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 package/pango/0001-Drop-Werror-array-bounds.patch

Comments

Thomas Petazzoni April 8, 2024, 8:50 p.m. UTC | #1 
On Wed,  3 Apr 2024 10:40:05 +0200
Francois Perrad <francois.perrad@gadz.org> wrote:

> remove merged patch
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  .../pango/0001-Drop-Werror-array-bounds.patch | 40 -------------------
>  package/pango/pango.hash                      |  4 +-
>  package/pango/pango.mk                        |  4 +-
>  3 files changed, 4 insertions(+), 44 deletions(-)
>  delete mode 100644 package/pango/0001-Drop-Werror-array-bounds.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/pango/0001-Drop-Werror-array-bounds.patch b/package/pango/0001-Drop-Werror-array-bounds.patch
deleted file mode 100644
index 45821e853..000000000
--- a/package/pango/0001-Drop-Werror-array-bounds.patch
+++ /dev/null
@@ -1,40 +0,0 @@ 
-From e93dbd66973040f1e0afcba0dc7c712c27d75d59 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Mon, 1 May 2023 23:27:52 -0400
-Subject: [PATCH] Drop -Werror=array-bounds
-
-gcc has strange issues with this and produces false
-positives that recently started breaking the build of
-pango as a subproject in gtk.
-
-See e.g. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
-
-Upstream: https://gitlab.gnome.org/GNOME/pango/-/commit/e93dbd66973040f1e0afcba0dc7c712c27d75d59
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 930f41082..2d30c0141 100644
---- a/meson.build
-+++ b/meson.build
-@@ -89,7 +89,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
-     '-Wuninitialized',
-     '-Wunused',
-     '-Werror=address',
--    '-Werror=array-bounds',
-     '-Werror=empty-body',
-     '-Werror=implicit',
-     '-Werror=implicit-fallthrough',
-@@ -132,7 +131,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
-     '-Werror=sequence-point',
-     '-Werror=return-type',
-     '-Werror=trigraphs',
--    '-Werror=array-bounds',
-     '-Werror=write-strings',
-     '-Werror=address',
-     '-Werror=int-to-pointer-cast',
--- 
-GitLab
-
diff --git a/package/pango/pango.hash b/package/pango/pango.hash
index 3e609e6e0..69b6b0adf 100644
--- a/package/pango/pango.hash
+++ b/package/pango/pango.hash
@@ -1,5 +1,5 @@ 
-# From https://download.gnome.org/sources/pango/1.50/pango-1.50.14.sha256sum
-sha256  1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8  pango-1.50.14.tar.xz
+# From https://download.gnome.org/sources/pango/1.52/pango-1.52.2.sha256sum
+sha256  d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b  pango-1.52.2.tar.xz
 
 # Locally computed
 sha256  d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 723e6d228..ec0f5127e 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-PANGO_VERSION_MAJOR = 1.50
-PANGO_VERSION = $(PANGO_VERSION_MAJOR).14
+PANGO_VERSION_MAJOR = 1.52
+PANGO_VERSION = $(PANGO_VERSION_MAJOR).2
 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz
 PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR)
 PANGO_INSTALL_STAGING = YES