From 9998a856ee86034b8d1ee1d8cda3a68c91e4e61a Mon Sep 17 00:00:00 2001 From: jbeich Date: Wed, 16 Sep 2020 15:24:58 +0000 Subject: [PATCH] x11-toolkits/gtk30: update to 3.24.24 Changes: https://gitlab.gnome.org/GNOME/gtk/compare/3.24.23...3.24.24 Changes: https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/compare/3.24.20...3.24.24 PR: 251647 Approved by: tcberner Exp-run by: antoine --- graphics/gtk-update-icon-cache/Makefile | 4 ++-- graphics/gtk-update-icon-cache/distinfo | 6 +++--- x11-toolkits/gtk30/Makefile | 5 ++--- x11-toolkits/gtk30/distinfo | 6 +++--- x11-toolkits/gtk30/files/patch-atk-bridge-option | 10 +++++----- x11-toolkits/gtk30/pkg-plist | 2 ++ 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile index 69d707b33d03..79edb3b0b16c 100644 --- a/graphics/gtk-update-icon-cache/Makefile +++ b/graphics/gtk-update-icon-cache/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gtk-update-icon-cache -PORTVERSION= 3.24.20 +PORTVERSION= 3.24.24 CATEGORIES= graphics DIST_SUBDIR= gnome @@ -17,7 +17,7 @@ USE_GNOME= gdkpixbuf2 USE_GITLAB= yes GL_SITE= https://gitlab.gnome.org GL_ACCOUNT= Community/gentoo -GL_COMMIT= 667cc0e1cdfd63a49703fe37228b0550e9f91f73 +GL_COMMIT= e63f1449334b9279fb4640ba1f2e6f57976b43e6 OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES diff --git a/graphics/gtk-update-icon-cache/distinfo b/graphics/gtk-update-icon-cache/distinfo index 7269d39a8225..cc40d76dee5f 100644 --- a/graphics/gtk-update-icon-cache/distinfo +++ b/graphics/gtk-update-icon-cache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1580730312 -SHA256 (gnome/Community/gentoo-gtk-update-icon-cache-667cc0e1cdfd63a49703fe37228b0550e9f91f73_GL0.tar.gz) = 405b7d5147c3fedddf53ef411d69c4575550abfdcae1bfffaa89f17cddb33732 -SIZE (gnome/Community/gentoo-gtk-update-icon-cache-667cc0e1cdfd63a49703fe37228b0550e9f91f73_GL0.tar.gz) = 113939 +TIMESTAMP = 1607270842 +SHA256 (gnome/Community/gentoo-gtk-update-icon-cache-e63f1449334b9279fb4640ba1f2e6f57976b43e6_GL0.tar.gz) = 936bbdd51d29e09a16c252a6b75932ce8e33822b248d9d1af57a6dd7b36695c1 +SIZE (gnome/Community/gentoo-gtk-update-icon-cache-e63f1449334b9279fb4640ba1f2e6f57976b43e6_GL0.tar.gz) = 114133 diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 148289027298..be2e41ba7f91 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -4,8 +4,7 @@ # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk -PORTVERSION= 3.24.23 -PORTREVISION= 2 +PORTVERSION= 3.24.24 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 @@ -39,7 +38,7 @@ CPPFLAGS+= -fno-omit-frame-pointer INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -LIBVERSION= 0.2404.19 +LIBVERSION= 0.2404.20 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index a41150fc4fa4..887ad027d6f6 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597070504 -SHA256 (gnome/gtk+-3.24.23.tar.xz) = 5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1 -SIZE (gnome/gtk+-3.24.23.tar.xz) = 21345936 +TIMESTAMP = 1607215804 +SHA256 (gnome/gtk+-3.24.24.tar.xz) = cc9d4367c55b724832f6b09ab85481738ea456871f0381768a6a99335a98378a +SIZE (gnome/gtk+-3.24.24.tar.xz) = 21341240 diff --git a/x11-toolkits/gtk30/files/patch-atk-bridge-option b/x11-toolkits/gtk30/files/patch-atk-bridge-option index 7891677b0ac0..aa07786f757d 100644 --- a/x11-toolkits/gtk30/files/patch-atk-bridge-option +++ b/x11-toolkits/gtk30/files/patch-atk-bridge-option @@ -84,18 +84,18 @@ Revert https://gitlab.gnome.org/GNOME/gtk/-/commit/ed8203e700aa atk_bridge_adaptor_init (NULL, NULL); #endif ---- meson.build.orig 2019-07-03 20:24:52 UTC +--- meson.build.orig 2020-12-06 00:49:26 UTC +++ meson.build -@@ -561,7 +561,7 @@ if x11_enabled +@@ -576,7 +576,7 @@ if x11_enabled xfixes_dep = dependency('xfixes', required: false) xcomposite_dep = dependency('xcomposite', required: false) fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) -- atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req) -+ atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req, required: get_option('atk-bridge')) +- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: get_option('atk-bridge')) x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr'] -@@ -578,7 +578,10 @@ if x11_enabled +@@ -593,7 +593,10 @@ if x11_enabled x11_pkgs += ['xdamage'] endif diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 005661399ff7..b9d0cb6bb025 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -120,6 +120,7 @@ include/gtk-3.0/gtk/a11y/gtkmenushellaccessible.h include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h +include/gtk-3.0/gtk/a11y/gtkplugaccessible.h include/gtk-3.0/gtk/a11y/gtkpopoveraccessible.h include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h @@ -129,6 +130,7 @@ include/gtk-3.0/gtk/a11y/gtkrenderercellaccessible.h include/gtk-3.0/gtk/a11y/gtkscaleaccessible.h include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h +include/gtk-3.0/gtk/a11y/gtksocketaccessible.h include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h include/gtk-3.0/gtk/a11y/gtkstackaccessible.h