git: 7efdd3656f53 - main - x11-toolkits/gtk40: update to 4.16.1 after 8c1efc578d6f
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 23 Sep 2024 01:39:56 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7efdd3656f533931031bfd18b6641b627264ebd1
commit 7efdd3656f533931031bfd18b6641b627264ebd1
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-09-13 14:11:36 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-09-23 01:39:05 +0000
x11-toolkits/gtk40: update to 4.16.1 after 8c1efc578d6f
Changes: https://gitlab.gnome.org/GNOME/gtk/-/blob/4.16.1/NEWS
Reported by: Repology
---
x11-toolkits/gtk40/Makefile | 4 ++--
x11-toolkits/gtk40/distinfo | 6 +++---
x11-toolkits/gtk40/files/patch-cairo-1.17 | 21 +++++++++++++++++++++
x11-toolkits/gtk40/files/patch-dmabuf | 6 +++---
.../patch-gdk_wayland_cursor_os-compatibility.c | 6 +++---
.../files/patch-gdk_wayland_gdkdmabuf-wayland.c | 16 ++++++++++++++++
x11-toolkits/gtk40/pkg-plist | 4 ++++
7 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
index 20f2cb239082..cdbce8c758c7 100644
--- a/x11-toolkits/gtk40/Makefile
+++ b/x11-toolkits/gtk40/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gtk
-PORTVERSION= 4.14.5
+PORTVERSION= 4.16.1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
PKGNAMESUFFIX= 4
@@ -38,7 +38,7 @@ LDFLAGS+= -lexecinfo
BINARY_ALIAS= python3=${PYTHON_CMD}
-LIBVERSION= 1.1400.5
+LIBVERSION= 1.1600.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 abba21c229e3..0bcdb04e2822 100644
--- a/x11-toolkits/gtk40/distinfo
+++ b/x11-toolkits/gtk40/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723820174
-SHA256 (gnome/gtk-4.14.5.tar.xz) = 5547f2b9f006b133993e070b87c17804e051efda3913feaca1108fa2be41e24d
-SIZE (gnome/gtk-4.14.5.tar.xz) = 18310736
+TIMESTAMP = 1726236696
+SHA256 (gnome/gtk-4.16.1.tar.xz) = 926a1eabd481f9bfa25538f95016fdfcfaf963b2f90b40ae69e90def5499215c
+SIZE (gnome/gtk-4.16.1.tar.xz) = 18638012
diff --git a/x11-toolkits/gtk40/files/patch-cairo-1.17 b/x11-toolkits/gtk40/files/patch-cairo-1.17
new file mode 100644
index 000000000000..6ed5c91ce913
--- /dev/null
+++ b/x11-toolkits/gtk40/files/patch-cairo-1.17
@@ -0,0 +1,21 @@
+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-dmabuf b/x11-toolkits/gtk40/files/patch-dmabuf
index b1fa7e5a1c85..a116f83a218e 100644
--- a/x11-toolkits/gtk40/files/patch-dmabuf
+++ b/x11-toolkits/gtk40/files/patch-dmabuf
@@ -35,12 +35,12 @@
typedef struct _GdkDrmFormatInfo GdkDrmFormatInfo;
---- gsk/gpu/gskgpudownloadop.c.orig 2024-08-27 18:18:39 UTC
+--- gsk/gpu/gskgpudownloadop.c.orig 2024-09-13 14:11:36 UTC
+++ gsk/gpu/gskgpudownloadop.c
-@@ -16,7 +16,7 @@
- #include "gdk/gdkglcontextprivate.h"
+@@ -22,7 +22,7 @@
#ifdef HAVE_DMABUF
+ #include <glib-unix.h>
-#include <linux/dma-buf.h>
+#include "../../dma-buf-compat.h"
#endif
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
index 80508f6f443e..c46dde039ff9 100644
--- a/x11-toolkits/gtk40/files/patch-gdk_wayland_cursor_os-compatibility.c
+++ b/x11-toolkits/gtk40/files/patch-gdk_wayland_cursor_os-compatibility.c
@@ -1,9 +1,9 @@
---- gdk/wayland/cursor/os-compatibility.c.orig 2021-05-04 01:43:41 UTC
+--- gdk/wayland/cursor/os-compatibility.c.orig 2024-09-13 14:11:36 UTC
+++ gdk/wayland/cursor/os-compatibility.c
-@@ -31,10 +31,7 @@
- #include <errno.h>
+@@ -32,10 +32,7 @@
#include <string.h>
#include <stdlib.h>
+ #include <glib.h>
-
-#ifdef HAVE_MEMFD_CREATE
#include <sys/mman.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
new file mode 100644
index 000000000000..f6f911ef5624
--- /dev/null
+++ b/x11-toolkits/gtk40/files/patch-gdk_wayland_gdkdmabuf-wayland.c
@@ -0,0 +1,16 @@
+../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 cc5a503b05f5..3efb179872e8 100644
--- a/x11-toolkits/gtk40/pkg-plist
+++ b/x11-toolkits/gtk40/pkg-plist
@@ -4,6 +4,7 @@ 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
bin/gtk4-path-tool
@@ -22,7 +23,9 @@ include/gtk-4.0/gdk/gdk.h
include/gtk-4.0/gdk/gdkapplaunchcontext.h
include/gtk-4.0/gdk/gdkcairo.h
include/gtk-4.0/gdk/gdkcairocontext.h
+include/gtk-4.0/gdk/gdkcicpparams.h
include/gtk-4.0/gdk/gdkclipboard.h
+include/gtk-4.0/gdk/gdkcolorstate.h
include/gtk-4.0/gdk/gdkconfig.h
include/gtk-4.0/gdk/gdkcontentdeserializer.h
include/gtk-4.0/gdk/gdkcontentformats.h
@@ -54,6 +57,7 @@ include/gtk-4.0/gdk/gdkgltexturebuilder.h
include/gtk-4.0/gdk/gdkkeys.h
include/gtk-4.0/gdk/gdkkeysyms.h
include/gtk-4.0/gdk/gdkmemorytexture.h
+include/gtk-4.0/gdk/gdkmemorytexturebuilder.h
include/gtk-4.0/gdk/gdkmonitor.h
include/gtk-4.0/gdk/gdkpaintable.h
include/gtk-4.0/gdk/gdkpango.h