diff --git a/temp/gtk4.0/6250.patch b/temp/gtk4.0/6250.patch deleted file mode 100644 index fe0619c71..000000000 --- a/temp/gtk4.0/6250.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 376e3ff9a..63a90f786 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.12.0 -_pkgver=4.12.0 +pkgver=9999.4.12.1 +_pkgver=4.12.1 pkgrel=0 pkgdesc="The GTK Toolkit (v4)" url="https://www.gtk.org/" @@ -39,7 +39,6 @@ makedepends=" graphene-dev gst-plugins-bad-dev gstreamer-dev - gtk-doc>=1.33 iso-codes-dev libice-dev libx11-dev @@ -56,13 +55,11 @@ makedepends=" tiff-dev vulkan-loader-dev zlib-dev - zstd-dev " 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,6 +71,7 @@ prepare() { build() { CFLAGS="$CFLAGS -O2" \ + CPPFLAGS="$CPPFLAGS -O2" \ abuild-meson \ -Ddocumentation=true \ -Dintrospection=enabled \ @@ -82,13 +80,14 @@ build() { -Dbuild-tests=false \ -Dbuild-testsuite=false \ . output + meson compile -j 1 -C output gdk/version/gdkversionmacros.h gdk/version/gdk-visibility.h meson compile ${JOBS:+-j ${JOBS}} -C output } package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output - # use gtk-update-icon-cache from gtk+2.0 for now. The icon cache is forward + # use gtk-update-icon-cache from gtk+3.0 for now. The icon cache is forward # compatible so this is fine. # do the same for gtk4-update-icon-cache rm -f "$pkgdir"/usr/bin/gtk-update-icon-cache @@ -134,8 +133,7 @@ lang() { } sha512sums=" -a69f82e1f021b1eb68e8723bc9003bfca0b5939fd3cc7cda87d7dde0b3e37bb39d9594cb93a73f54bd1cff1b63a1c459d1217e8df794c67fda50bf0b9b732826 gtk-4.12.0.tar.xz +5a893d3d855b5f1cf5b2e3c1c5178cc25e4165288f1ecc257d8af5ac1f94fc70fce7be34cf4b0292acd6652e544dd989c0065c1287623b6d4a115a9974a441c9 gtk-4.12.1.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 "