All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/pango: bump to version 1.50.7
@ 2022-04-20  7:26 Francois Perrad
  2022-05-26  8:17 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Francois Perrad @ 2022-04-20  7:26 UTC (permalink / raw)
  To: buildroot

remove merged patch

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 ...-utils-viewer-cairo-c-fix-empty-body.patch | 40 -------------------
 package/pango/pango.hash                      |  4 +-
 package/pango/pango.mk                        |  2 +-
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch

diff --git a/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch b/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch
deleted file mode 100644
index 4b7b5f9b1..000000000
--- a/package/pango/0001-utils-viewer-cairo-c-fix-empty-body.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5372a0cfd641776ece77db5590bf0d265e810086 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 29 Mar 2022 21:39:03 +0000
-Subject: [PATCH] utils/viewer-cairo.c: fix empty-body
-
-Fix the following build failure raised
-since version 1.50.5 and
-https://gitlab.gnome.org/GNOME/pango/-/commit/cd08fb7402498e6ea542b4628447547477ac212e:
-
-../utils/viewer-cairo.c: In function 'cairo_vector_view_create':
-../utils/viewer-cairo.c:228:5: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
-     ;
-     ^
-
-Fixes:
- - http://autobuild.buildroot.org/results/dee3d631474f83b345f22eb26c59a305c32258f8
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://gitlab.gnome.org/GNOME/pango/-/commit/5372a0cfd641776ece77db5590bf0d265e810086]
----
- utils/viewer-cairo.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/viewer-cairo.c b/utils/viewer-cairo.c
-index ca98c1cd..f15b3fb9 100644
---- a/utils/viewer-cairo.c
-+++ b/utils/viewer-cairo.c
-@@ -225,7 +225,7 @@ cairo_vector_view_create (const PangoViewer *klass G_GNUC_UNUSED)
-     return NULL;
- 
-   if (0)
--    ;
-+    {}
-   #ifdef CAIRO_HAS_SVG_SURFACE
-     else if (0 == g_ascii_strcasecmp (extension, "svg"))
-       constructor = cairo_svg_surface_create;
--- 
-GitLab
-
diff --git a/package/pango/pango.hash b/package/pango/pango.hash
index fecf36853..7864df7a2 100644
--- a/package/pango/pango.hash
+++ b/package/pango/pango.hash
@@ -1,5 +1,5 @@
-# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.6.sha256sum
-sha256  a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a  pango-1.50.6.tar.xz
+# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.7.sha256sum
+sha256  0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33  pango-1.50.7.tar.xz
 
 # Locally computed
 sha256  d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index c264e7674..c1c7ceeed 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 PANGO_VERSION_MAJOR = 1.50
-PANGO_VERSION = $(PANGO_VERSION_MAJOR).6
+PANGO_VERSION = $(PANGO_VERSION_MAJOR).7
 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz
 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
 PANGO_INSTALL_STAGING = YES
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH] package/pango: bump to version 1.50.7
  2022-04-20  7:26 [Buildroot] [PATCH] package/pango: bump to version 1.50.7 Francois Perrad
@ 2022-05-26  8:17 ` Peter Korsgaard
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2022-05-26  8:17 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 > remove merged patch
 > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-05-26  8:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-20  7:26 [Buildroot] [PATCH] package/pango: bump to version 1.50.7 Francois Perrad
2022-05-26  8:17 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.