git: 9f8a33ee435c - main - x11-toolkits/gtk40: update to 4.18.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 16 Mar 2025 00:56:31 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9f8a33ee435cb289a5dd1fddfa55c5c0e1c911c6
commit 9f8a33ee435cb289a5dd1fddfa55c5c0e1c911c6
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-03-15 14:14:48 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-03-16 00:45:36 +0000
x11-toolkits/gtk40: update to 4.18.1
Changes: https://gitlab.gnome.org/GNOME/gtk/-/blob/4.18.1/NEWS
Reported by: GitLab (notify releases)
---
x11-toolkits/gtk40/Makefile | 4 ++--
x11-toolkits/gtk40/distinfo | 6 +++---
x11-toolkits/gtk40/files/patch-cairo-1.17 | 21 ---------------------
.../patch-gdk_wayland_cursor_os-compatibility.c | 13 -------------
.../files/patch-gdk_wayland_gdkdisplay-wayland.c | 12 ------------
.../files/patch-gdk_wayland_gdkdmabuf-wayland.c | 16 ----------------
x11-toolkits/gtk40/pkg-plist | 16 ++++++----------
7 files changed, 11 insertions(+), 77 deletions(-)
diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
index 88d3bf49023b..767bc528200f 100644
--- a/x11-toolkits/gtk40/Makefile
+++ b/x11-toolkits/gtk40/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gtk
-PORTVERSION= 4.16.12
+PORTVERSION= 4.18.1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
PKGNAMESUFFIX= 4
@@ -38,7 +38,7 @@ LDFLAGS+= -lexecinfo
BINARY_ALIAS= python3=${PYTHON_CMD}
-LIBVERSION= 1.1600.12
+LIBVERSION= 1.1800.1
PLIST_SUB+= LIBVERSION=${LIBVERSION}
GLIB_SCHEMAS= org.gtk.Demo4.gschema.xml \
diff --git a/x11-toolkits/gtk40/distinfo b/x11-toolkits/gtk40/distinfo
index 19392a2fa64d..edb97ed11e1c 100644
--- a/x11-toolkits/gtk40/distinfo
+++ b/x11-toolkits/gtk40/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735931456
-SHA256 (gnome/gtk-4.16.12.tar.xz) = ef31bdbd6f082c4401634a20c850b0050c9bf252ef1e079764ee95a2a0c4c95a
-SIZE (gnome/gtk-4.16.12.tar.xz) = 14620652
+TIMESTAMP = 1741998682
+SHA256 (gnome/gtk-4.18.1.tar.xz) = 6a1c3bc2dc7cacd28fba3b885ecb4086aa85b3d0941265d6651e92c7ff909e74
+SIZE (gnome/gtk-4.18.1.tar.xz) = 17709476
diff --git a/x11-toolkits/gtk40/files/patch-cairo-1.17 b/x11-toolkits/gtk40/files/patch-cairo-1.17
deleted file mode 100644
index 6ed5c91ce913..000000000000
--- a/x11-toolkits/gtk40/files/patch-cairo-1.17
+++ /dev/null
@@ -1,21 +0,0 @@
-Drop after graphics/cairo >= 1.18 update
-
-Dependency cairo found: NO. Found 1.17.4 but need: '>= 1.18.0'
-Did not find CMake 'cmake'
-Found CMake: NO
-Run-time dependency cairo found: NO (tried pkgconfig and cmake)
-Looking for a fallback subproject for the dependency cairo
-
-meson.build:395:17: ERROR: Git program not found, cannot download cairo.wrap via git.
-
---- meson.build.orig 2024-09-13 14:11:36 UTC
-+++ meson.build
-@@ -16,7 +16,7 @@ fribidi_req = '>= 1.0.6'
- pango_req = '>= 1.52.0' # keep this in sync with .gitlab-ci/test-msys.sh
- harfbuzz_req = '>= 2.6.0'
- fribidi_req = '>= 1.0.6'
--cairo_req = '>= 1.18.0'
-+cairo_req = '>= 1.17.0'
- gdk_pixbuf_req = '>= 2.30.0'
- wayland_proto_req = '>= 1.36'
- wayland_req = '>= 1.21.0'
diff --git a/x11-toolkits/gtk40/files/patch-gdk_wayland_cursor_os-compatibility.c b/x11-toolkits/gtk40/files/patch-gdk_wayland_cursor_os-compatibility.c
deleted file mode 100644
index c46dde039ff9..000000000000
--- a/x11-toolkits/gtk40/files/patch-gdk_wayland_cursor_os-compatibility.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdk/wayland/cursor/os-compatibility.c.orig 2024-09-13 14:11:36 UTC
-+++ gdk/wayland/cursor/os-compatibility.c
-@@ -32,10 +32,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <glib.h>
--
--#ifdef HAVE_MEMFD_CREATE
- #include <sys/mman.h>
--#endif
-
- #include "os-compatibility.h"
-
diff --git a/x11-toolkits/gtk40/files/patch-gdk_wayland_gdkdisplay-wayland.c b/x11-toolkits/gtk40/files/patch-gdk_wayland_gdkdisplay-wayland.c
deleted file mode 100644
index 4e3687f458f7..000000000000
--- a/x11-toolkits/gtk40/files/patch-gdk_wayland_gdkdisplay-wayland.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdk/wayland/gdkdisplay-wayland.c.orig 2024-03-12 11:52:13 UTC
-+++ gdk/wayland/gdkdisplay-wayland.c
-@@ -24,7 +24,9 @@
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
- #include <sys/sysmacros.h>
-+#endif
-
- #ifdef HAVE_LINUX_MEMFD_H
- #include <linux/memfd.h>
diff --git a/x11-toolkits/gtk40/files/patch-gdk_wayland_gdkdmabuf-wayland.c b/x11-toolkits/gtk40/files/patch-gdk_wayland_gdkdmabuf-wayland.c
deleted file mode 100644
index f6f911ef5624..000000000000
--- a/x11-toolkits/gtk40/files/patch-gdk_wayland_gdkdmabuf-wayland.c
+++ /dev/null
@@ -1,16 +0,0 @@
-../gdk/wayland/gdkdmabuf-wayland.c:12:10: fatal error: 'sys/sysmacros.h' file not found
- 12 | #include <sys/sysmacros.h>
- | ^~~~~~~~~~~~~~~~~
-
---- gdk/wayland/gdkdmabuf-wayland.c.orig 2024-09-13 14:11:36 UTC
-+++ gdk/wayland/gdkdmabuf-wayland.c
-@@ -9,7 +9,9 @@
-
- #include <fcntl.h>
- #include <sys/mman.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
- #include <sys/sysmacros.h>
-+#endif
-
- #include "linux-dmabuf-unstable-v1-client-protocol.h"
-
diff --git a/x11-toolkits/gtk40/pkg-plist b/x11-toolkits/gtk40/pkg-plist
index 3efb179872e8..58e2aaa4db31 100644
--- a/x11-toolkits/gtk40/pkg-plist
+++ b/x11-toolkits/gtk40/pkg-plist
@@ -3,7 +3,6 @@ bin/gtk4-builder-tool
bin/gtk4-demo
bin/gtk4-demo-application
bin/gtk4-encode-symbolic-svg
-bin/gtk4-icon-browser
bin/gtk4-image-tool
bin/gtk4-launch
bin/gtk4-node-editor
@@ -104,6 +103,7 @@ include/gtk-4.0/gdk/version/gdkversionmacros.h
%%X11%%include/gtk-4.0/gdk/x11/gdkx11utils.h
%%BROADWAY%%include/gtk-4.0/gsk/broadway/gskbroadwayrenderer.h
include/gtk-4.0/gsk/gl/gskglrenderer.h
+include/gtk-4.0/gsk/gpu/gskglrenderer.h
include/gtk-4.0/gsk/gpu/gskvulkanrenderer.h
include/gtk-4.0/gsk/gsk.h
include/gtk-4.0/gsk/gskcairorenderer.h
@@ -170,6 +170,11 @@ include/gtk-4.0/gtk/deprecated/gtkliststore.h
include/gtk-4.0/gtk/deprecated/gtklockbutton.h
include/gtk-4.0/gtk/deprecated/gtkmessagedialog.h
include/gtk-4.0/gtk/deprecated/gtkrender.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutlabel.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutsgroup.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutssection.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutsshortcut.h
+include/gtk-4.0/gtk/deprecated/gtkshortcutswindow.h
include/gtk-4.0/gtk/deprecated/gtkshow.h
include/gtk-4.0/gtk/deprecated/gtkstatusbar.h
include/gtk-4.0/gtk/deprecated/gtkstylecontext.h
@@ -347,12 +352,7 @@ include/gtk-4.0/gtk/gtksettings.h
include/gtk-4.0/gtk/gtkshortcut.h
include/gtk-4.0/gtk/gtkshortcutaction.h
include/gtk-4.0/gtk/gtkshortcutcontroller.h
-include/gtk-4.0/gtk/gtkshortcutlabel.h
include/gtk-4.0/gtk/gtkshortcutmanager.h
-include/gtk-4.0/gtk/gtkshortcutsgroup.h
-include/gtk-4.0/gtk/gtkshortcutssection.h
-include/gtk-4.0/gtk/gtkshortcutsshortcut.h
-include/gtk-4.0/gtk/gtkshortcutswindow.h
include/gtk-4.0/gtk/gtkshortcuttrigger.h
include/gtk-4.0/gtk/gtksignallistitemfactory.h
include/gtk-4.0/gtk/gtksingleselection.h
@@ -429,7 +429,6 @@ libdata/pkgconfig/gtk4-unix-print.pc
%%X11%%libdata/pkgconfig/gtk4-x11.pc
libdata/pkgconfig/gtk4.pc
share/applications/org.gtk.Demo4.desktop
-share/applications/org.gtk.IconBrowser4.desktop
share/applications/org.gtk.PrintEditor4.desktop
share/applications/org.gtk.WidgetFactory4.desktop
share/applications/org.gtk.gtk4.NodeEditor.desktop
@@ -466,14 +465,12 @@ share/gir-1.0/Gtk-4.0.gir
%%DATADIR%%-4.0/gtk4builder.rng
%%DATADIR%%-4.0/valgrind/gtk.supp
share/icons/hicolor/scalable/apps/org.gtk.Demo4.svg
-share/icons/hicolor/scalable/apps/org.gtk.IconBrowser4.svg
share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.Devel.svg
share/icons/hicolor/scalable/apps/org.gtk.PrintEditor4.svg
share/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg
share/icons/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg
share/icons/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.svg
share/icons/hicolor/symbolic/apps/org.gtk.Demo4-symbolic.svg
-share/icons/hicolor/symbolic/apps/org.gtk.IconBrowser4-symbolic.svg
share/icons/hicolor/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg
share/icons/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg
share/icons/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg
@@ -597,7 +594,6 @@ share/locale/zh_CN/LC_MESSAGES/gtk40.mo
share/locale/zh_HK/LC_MESSAGES/gtk40.mo
share/locale/zh_TW/LC_MESSAGES/gtk40.mo
share/metainfo/org.gtk.Demo4.appdata.xml
-share/metainfo/org.gtk.IconBrowser4.appdata.xml
share/metainfo/org.gtk.PrintEditor4.appdata.xml
share/metainfo/org.gtk.WidgetFactory4.appdata.xml
share/metainfo/org.gtk.gtk4.NodeEditor.appdata.xml