diff --git a/temp/gtk4.0/0001-window-Maximize-resizable-transient-windows-on-small.patch b/temp/gtk4.0/0001-window-Maximize-resizable-transient-windows-on-small.patch index b95f466a2..c809f9a48 100644 --- a/temp/gtk4.0/0001-window-Maximize-resizable-transient-windows-on-small.patch +++ b/temp/gtk4.0/0001-window-Maximize-resizable-transient-windows-on-small.patch @@ -1,4 +1,4 @@ -From 1f2a4d3bda07d9dce1bc577ef8b9a86007bdabdc Mon Sep 17 00:00:00 2001 +From f045668198a98d744c88af508c4c5a8d0a51346d Mon Sep 17 00:00:00 2001 From: Teemu Ikonen Date: Mon, 20 Feb 2023 19:35:17 +0200 Subject: [PATCH 1/2] window: Maximize resizable transient windows on small @@ -13,7 +13,7 @@ Only maximize transients on small (< 120 mm) screens 1 file changed, 11 insertions(+) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c -index dced97168b..a3f62b5923 100644 +index bac2a25b89..e7d43f033e 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -32,6 +32,7 @@ @@ -32,7 +32,7 @@ index dced97168b..a3f62b5923 100644 #include "gdk/gdkprofilerprivate.h" #include "gdk/gdksurfaceprivate.h" #include "gdk/gdktextureprivate.h" -@@ -3924,6 +3926,8 @@ gtk_window_map (GtkWidget *widget) +@@ -3989,6 +3991,8 @@ gtk_window_map (GtkWidget *widget) GtkWindow *window = GTK_WINDOW (widget); GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkWidget *child = priv->child; @@ -41,7 +41,7 @@ index dced97168b..a3f62b5923 100644 GTK_WIDGET_CLASS (gtk_window_parent_class)->map (widget); -@@ -3937,6 +3941,13 @@ gtk_window_map (GtkWidget *widget) +@@ -4002,6 +4006,13 @@ gtk_window_map (GtkWidget *widget) gtk_window_present_toplevel (window); @@ -56,5 +56,5 @@ index dced97168b..a3f62b5923 100644 gdk_toplevel_minimize (GDK_TOPLEVEL (priv->surface)); -- -2.39.2 +2.41.0 diff --git a/temp/gtk4.0/0002-windowcontrols-Force-close-buttons-for-transient-win.patch b/temp/gtk4.0/0002-windowcontrols-Force-close-buttons-for-transient-win.patch index a297b90eb..ea156377e 100644 --- a/temp/gtk4.0/0002-windowcontrols-Force-close-buttons-for-transient-win.patch +++ b/temp/gtk4.0/0002-windowcontrols-Force-close-buttons-for-transient-win.patch @@ -1,4 +1,4 @@ -From ec91be7b61e5f82222976f789f731c4060b2cecf Mon Sep 17 00:00:00 2001 +From aec8069fca283b1e17c4dec2f9a865849fd27596 Mon Sep 17 00:00:00 2001 From: Teemu Ikonen Date: Mon, 20 Feb 2023 19:43:24 +0200 Subject: [PATCH 2/2] windowcontrols: Force close buttons for transient windows @@ -10,7 +10,7 @@ https://source.puri.sm/Librem5/debs/gtk4/-/blob/pureos/byzantium/debian/patches/ 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gtk/gtkwindowcontrols.c b/gtk/gtkwindowcontrols.c -index 52ba2f8b32..34cf80a213 100644 +index 0f3e926899..0e1499335d 100644 --- a/gtk/gtkwindowcontrols.c +++ b/gtk/gtkwindowcontrols.c @@ -25,6 +25,7 @@ @@ -42,5 +42,5 @@ index 52ba2f8b32..34cf80a213 100644 tokens = g_strsplit (layout_desc, ":", 2); -- -2.39.2 +2.41.0 diff --git a/temp/gtk4.0/6250.patch b/temp/gtk4.0/6250.patch new file mode 100644 index 000000000..fe0619c71 --- /dev/null +++ b/temp/gtk4.0/6250.patch @@ -0,0 +1,69 @@ +From 4d7277f72c8f4915f237e36982ffd7dfba524b15 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Mon, 7 Aug 2023 18:00:34 +0800 +Subject: [PATCH] print: Revert "Start sorting apart includes" change for + gtkprinteroptionprivate.h + +The print backends needs the functions in gtkprinteroptionprivate.h to +be exported. + +Fixes #6003. +--- + gtk/print/gtkprinteroptionprivate.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/gtk/print/gtkprinteroptionprivate.h b/gtk/print/gtkprinteroptionprivate.h +index 82dd8739ba1..a7d8e8ad5b6 100644 +--- a/gtk/print/gtkprinteroptionprivate.h ++++ b/gtk/print/gtkprinteroptionprivate.h +@@ -27,6 +27,7 @@ + #endif + + #include ++#include + + G_BEGIN_DECLS + +@@ -87,28 +88,39 @@ struct _GtkPrinterOptionClass + void (*_gtk_reserved4) (void); + }; + ++GDK_AVAILABLE_IN_ALL + GType gtk_printer_option_get_type (void) G_GNUC_CONST; + ++GDK_AVAILABLE_IN_ALL + GtkPrinterOption *gtk_printer_option_new (const char *name, + const char *display_text, + GtkPrinterOptionType type); ++GDK_AVAILABLE_IN_ALL + void gtk_printer_option_set (GtkPrinterOption *option, + const char *value); ++GDK_AVAILABLE_IN_ALL + void gtk_printer_option_set_has_conflict (GtkPrinterOption *option, + gboolean has_conflict); ++GDK_AVAILABLE_IN_ALL + void gtk_printer_option_clear_has_conflict (GtkPrinterOption *option); ++GDK_AVAILABLE_IN_ALL + void gtk_printer_option_set_boolean (GtkPrinterOption *option, + gboolean value); ++GDK_AVAILABLE_IN_ALL + void gtk_printer_option_allocate_choices (GtkPrinterOption *option, + int num); ++GDK_AVAILABLE_IN_ALL + void gtk_printer_option_choices_from_array (GtkPrinterOption *option, + int num_choices, + const char **choices, + const char **choices_display); ++GDK_AVAILABLE_IN_ALL + gboolean gtk_printer_option_has_choice (GtkPrinterOption *option, + const char *choice); ++GDK_AVAILABLE_IN_ALL + void gtk_printer_option_set_activates_default (GtkPrinterOption *option, + gboolean activates); ++GDK_AVAILABLE_IN_ALL + gboolean gtk_printer_option_get_activates_default (GtkPrinterOption *option); + + +-- +GitLab + diff --git a/temp/gtk4.0/APKBUILD b/temp/gtk4.0/APKBUILD index 8b90d0572..376e3ff9a 100644 --- a/temp/gtk4.0/APKBUILD +++ b/temp/gtk4.0/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Teemu Ikonen # Forked from Alpine to apply patches for adaptive transient window handling pkgname=gtk4.0 -pkgver=9999.4.10.4 -_pkgver=4.10.4 +pkgver=9999.4.12.0 +_pkgver=4.12.0 pkgrel=0 pkgdesc="The GTK Toolkit (v4)" url="https://www.gtk.org/" @@ -62,6 +62,7 @@ source=" https://download.gnome.org/sources/gtk/${_pkgver%.*}/gtk-${_pkgver}.tar.xz 0001-window-Maximize-resizable-transient-windows-on-small.patch 0002-windowcontrols-Force-close-buttons-for-transient-win.patch + 6250.patch " builddir="$srcdir/gtk-${_pkgver}" @@ -74,7 +75,7 @@ prepare() { build() { CFLAGS="$CFLAGS -O2" \ abuild-meson \ - -Dgtk_doc=true \ + -Ddocumentation=true \ -Dintrospection=enabled \ -Dbroadway-backend=true \ -Dman-pages=true \ @@ -133,7 +134,8 @@ lang() { } sha512sums=" -0c5db3af72227977e11fea3adddec1321b82bcace3c3d10a7c914b8d98b0bdb7994084c0a9e883b24815038bf4a0efe1eb1c4ff79e6838e83cadb6ddf2a1239f gtk-4.10.4.tar.xz -e7b1e11207ea56c4173210d9a92f4a7b5ab41323b55366a69fd7e333d13c09aa872ec5ef1e1527fda068f0fbe91b1b9ba933fe9a8b0961efa5f32eaba2c7482b 0001-window-Maximize-resizable-transient-windows-on-small.patch -d2f09af3965eee592602819be6ed9240b6467f6409ca9ab892a757760af504ac4a7551ff89389659e2602a6e12489080dadc444c9d7e0665e7038dc4b409a68a 0002-windowcontrols-Force-close-buttons-for-transient-win.patch +a69f82e1f021b1eb68e8723bc9003bfca0b5939fd3cc7cda87d7dde0b3e37bb39d9594cb93a73f54bd1cff1b63a1c459d1217e8df794c67fda50bf0b9b732826 gtk-4.12.0.tar.xz +85ced777c23111f502f8a7d49902c65b113f51c1156490c08de2d8f9cb4a5e85c4a3eec0f043c0fa9d9ff44d6b9ab44c4c2865ecd06c3979a3f2558b287c35fd 0001-window-Maximize-resizable-transient-windows-on-small.patch +559f362a918f0f60dfd621daa489f16a61ea9ddd9ad0ef7ad043ceebe1013b8f2fce2f5c3c27597bfc801f2703867095909f16e2b9088e0bf374f36667e25abe 0002-windowcontrols-Force-close-buttons-for-transient-win.patch +7e76f23b4ae63a470651934db3935395b70f69ba0d73f3698549bf3abaa4df867336b2a24a52e337bffc608b433ee193c6ffc6df9d8b4205aadaa888c5d059f5 6250.patch "