diff --git a/mingw-w64-gtk4/3887.patch b/mingw-w64-gtk4/3887.patch deleted file mode 100644 index 857c0b525f..0000000000 --- a/mingw-w64-gtk4/3887.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b3bb216229146b6dcc522b9b7e2d1f2435cacf71 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Thu, 26 Aug 2021 05:14:18 +0200 -Subject: [PATCH] build: fix implicit-fallthrough errors with clang - -The clang build fails due to -Werror=implicit-fallthrough being -on by default and some fallthrough cases not being marked as such. - -Use G_GNUC_FALLTHROUGH or duplicate the code in those cases. ---- - gtk/gtkimcontextime.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/gtk/gtkimcontextime.c b/gtk/gtkimcontextime.c -index c8378c836e..102eccec38 100644 ---- a/gtk/gtkimcontextime.c -+++ b/gtk/gtkimcontextime.c -@@ -667,6 +667,7 @@ gtk_im_context_ime_focus_in (GtkIMContext *context) - switch (context_ime->priv->focus_behavior) - { - case GTK_WIN32_IME_FOCUS_BEHAVIOR_COMMIT: -+ G_GNUC_FALLTHROUGH; - case GTK_WIN32_IME_FOCUS_BEHAVIOR_DISCARD: - gtk_im_context_ime_reset (context); - break; -@@ -724,7 +725,7 @@ gtk_im_context_ime_focus_out (GtkIMContext *context) - context_ime->priv->pretend_empty_preedit = FALSE; - g_free (utf8str); - } -- /* fallthrough */ -+ G_GNUC_FALLTHROUGH; - case GTK_WIN32_IME_FOCUS_BEHAVIOR_DISCARD: - gtk_im_context_ime_reset (context); - -@@ -1054,7 +1055,7 @@ gtk_im_context_ime_message_filter (GdkWin32Display *display, - default: - break; - } -- -+ break; - default: - break; - } --- -GitLab - diff --git a/mingw-w64-gtk4/PKGBUILD b/mingw-w64-gtk4/PKGBUILD index 6b8bc87d04..2136f13448 100644 --- a/mingw-w64-gtk4/PKGBUILD +++ b/mingw-w64-gtk4/PKGBUILD @@ -3,8 +3,8 @@ _realname=gtk4 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.4.0 -pkgrel=3 +pkgver=4.4.1 +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v4) (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -30,19 +30,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-ffmpeg" "${MINGW_PACKAGE_PREFIX}-shared-mime-info") source=("https://download.gnome.org/sources/gtk/${pkgver:0:3}/gtk-${pkgver}.tar.xz" - "3887.patch" "include-stdlib.patch") -sha256sums=('e0a1508f441686c3a20dfec48af533b19a4b2e017c18eaee31dccdb7d292505b' - '70efcdf6affc8efa7a4e8c03054d46eced3b3c4a401a43da57dc0157e9b71899' +sha256sums=('0faada983dc6b0bc409cb34c1713c1f3267e67c093f86b1e3b17db6100a3ddf4' '8de14123a4e49b5228c6d469f569272c6950401febe0add29ab01e25254d4677') prepare() { cd "${srcdir}/gtk-${pkgver}" - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3887 - patch -p1 -i "${srcdir}"/3887.patch - # fix for clang32 implicitly-defined malloc patch -Nbp1 -i "${srcdir}"/include-stdlib.patch }