diff options
| -rw-r--r-- | x11/gtk3/Makefile | 5 | ||||
| -rw-r--r-- | x11/gtk3/distinfo | 10 | ||||
| -rw-r--r-- | x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index 18b2fc7d796..3f51e7d9ae6 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.168 2021/12/08 16:02:50 adam Exp $ +# $NetBSD: Makefile,v 1.169 2022/01/12 11:09:07 adam Exp $ -DISTNAME= gtk+-3.24.30 +DISTNAME= gtk+-3.24.31 PKGNAME= ${DISTNAME:S/gtk/gtk3/} -PKGREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo index f7a747160f2..32ac4a69974 100644 --- a/x11/gtk3/distinfo +++ b/x11/gtk3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.92 2021/10/26 11:33:52 nia Exp $ +$NetBSD: distinfo,v 1.93 2022/01/12 11:09:07 adam Exp $ -BLAKE2s (gtk+-3.24.30.tar.xz) = 8328518bef280db10e775fa636c4208c708194500206118b6a1cd51a24391c76 -SHA512 (gtk+-3.24.30.tar.xz) = 4164559f3e14501b9f9330a76535ebf5e26961d436f65e65ea609998cb120fcbcc5d9591453a64e1d414248499857288e5758274d03a7f75e9ae76cbf8c68ff9 -Size (gtk+-3.24.30.tar.xz) = 22407016 bytes +BLAKE2s (gtk+-3.24.31.tar.xz) = 8951a4c3fed2aebfd2b5cb4f1911f692552578885f8da0e8f35ba7e4d99723bf +SHA512 (gtk+-3.24.31.tar.xz) = e7f8e5003a919e297bd3e616acccbc5cc9bf9c9d41377c108c24db51817fcccec919abc12d05c0ed585d49526d52f0395a1c0f3ed9d9ef816bb0c4b2aa615f9b +Size (gtk+-3.24.31.tar.xz) = 22449112 bytes SHA1 (patch-Makefile.in) = 8edcfe2ff492d90138a24b680fe39814c3848d80 SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300 @@ -12,5 +12,5 @@ SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd -SHA1 (patch-gtk_gtkfontchooserwidget.c) = 5ca98e5417865d8c60333c8c2b2ba757755ef547 +SHA1 (patch-gtk_gtkfontchooserwidget.c) = 0f4a47b7260e9227ed7e20613bbe435163afd149 SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61 diff --git a/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c b/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c index 9f7ae2ce76f..effde97844a 100644 --- a/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c +++ b/x11/gtk3/patches/patch-gtk_gtkfontchooserwidget.c @@ -1,4 +1,4 @@ -$NetBSD: patch-gtk_gtkfontchooserwidget.c,v 1.2 2018/10/30 17:49:37 leot Exp $ +$NetBSD: patch-gtk_gtkfontchooserwidget.c,v 1.3 2022/01/12 11:09:07 adam Exp $ Correctly include freetype2 headers (<ft2build.h> and then macros should be used instead of directly including the headers). @@ -7,9 +7,9 @@ Issue opened upstream as: <https://gitlab.gnome.org/GNOME/gtk/issues/1432> ---- gtk/gtkfontchooserwidget.c.orig 2018-07-18 11:04:31.000000000 +0000 +--- gtk/gtkfontchooserwidget.c.orig 2021-12-11 02:50:17.000000000 +0000 +++ gtk/gtkfontchooserwidget.c -@@ -58,8 +58,9 @@ +@@ -66,8 +66,9 @@ #include <hb.h> #include <hb-ot.h> #include <hb-ft.h> @@ -20,4 +20,4 @@ Issue opened upstream as: +#include FT_MULTIPLE_MASTERS_H #include "language-names.h" #include "script-names.h" - #endif + #elif defined (HAVE_FONT_FEATURES) |