[Commits] [SCM] claws-win32-installer branch, gtk3, updated. 4.0.0-1-134-g3b02cb6
jonathan at claws-mail.org
jonathan at claws-mail.org
Sun Mar 6 02:06:10 UTC 2022
The branch, gtk3 has been updated
via 3b02cb69a6aee3d94638d6445683c788e131797c (commit)
from 4d12386aa904cf421c4bdf79447c00dc08ce9347 (commit)
Summary of changes:
packages/packages.current | 2 +-
patches/gtk-3.24.31/01-gdkkeys-win32-h.patch | 171 ---------------------------
patches/gtk-3.24.31/02-windows-h.patch | 24 ----
patches/gtk-3.24.31/03-gc-allgestures.patch | 26 ----
src/sections-installer.nsi | 4 +-
5 files changed, 3 insertions(+), 224 deletions(-)
delete mode 100644 patches/gtk-3.24.31/01-gdkkeys-win32-h.patch
delete mode 100644 patches/gtk-3.24.31/02-windows-h.patch
delete mode 100644 patches/gtk-3.24.31/03-gc-allgestures.patch
- Log -----------------------------------------------------------------
commit 3b02cb69a6aee3d94638d6445683c788e131797c
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Fri Mar 4 18:57:30 2022 -0700
update to gtk-3.24.32
diff --git a/packages/packages.current b/packages/packages.current
index cb6ba24..b8e06fd 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -22,7 +22,7 @@ glib_networking,2.70.1,file,https://download.gnome.org/sources/glib-networking/2
gmp,6.2.1,file,https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz,fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2,,
gnutls,3.7.3,file,https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz,fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a,,
gpgme,1.17.0,file,https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.0.tar.bz2,4ed3f50ceb7be2fce2c291414256b20c9ebf4c03fddb922c88cda99c119a69f5,,
-gtk,3.24.31,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.31.tar.xz,423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9,,
+gtk,3.24.32,file,https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.32.tar.xz,a667e13f8f86ea44455b0443f4870bf23f53f6707c1df436eb2b516c62496bff,,
gumbo_parser,0.10.1,file,https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz,28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad,,
harfbuzz,3.2.0,file,https://github.com/harfbuzz/harfbuzz/releases/download/3.2.0/harfbuzz-3.2.0.tar.xz,0ada50a1c199bb6f70843ab893c55867743a443b84d087d54df08ad883ebc2cd,,
hunspell,1.7.0,file,https://github.com/hunspell/hunspell/files/2573619/hunspell-1.7.0.tar.gz,57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951,,
diff --git a/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch b/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch
deleted file mode 100644
index a275f92..0000000
--- a/patches/gtk-3.24.31/01-gdkkeys-win32-h.patch
+++ /dev/null
@@ -1,171 +0,0 @@
---- a/gdk/win32/gdkkeys-win32.h 2022-01-02 13:05:43.284701904 -0700
-+++ b/gdk/win32/gdkkeys-win32.h 2022-01-02 13:04:57.244227175 -0700
-@@ -0,0 +1,168 @@
-+/*
-+ * Copyright (c) 2021 Philip Zander
-+ * Copyright (c) 2018 Microsoft
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in all
-+ * copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+#include <glib.h>
-+#include <Windows.h>
-+
-+/* For lookup table VK -> chars */
-+typedef struct
-+{
-+ int table;
-+ int index;
-+} GdkWin32KeymapTableAndIndex;
-+
-+/* For reverse lookup char -> VKs */
-+typedef struct
-+{
-+ BYTE mod_bits;
-+ BYTE vk;
-+
-+ /* Index of next KeyEntry. -1 if there is no next entry. */
-+ int next;
-+} GdkWin32KeymapKeyEntry;
-+
-+typedef struct
-+{
-+ HKL handle;
-+
-+ /* Keyboard layout identifier */
-+ char name[KL_NAMELENGTH];
-+
-+ /* Path of the layout DLL */
-+ char *file;
-+
-+ /* Handle of the layout DLL */
-+ HINSTANCE lib;
-+
-+ /* The actual conversion tables provided by the layout DLL.
-+ *
-+ * This is a pointer to a KBDTABLES structure. The exact definition
-+ * of this structure depends on the kernel on which the executable
-+ * run and can in general only be determined at runtime. That's why
-+ * we have to use a generic gpointer instead of the actual type here.
-+ *
-+ * See comment on GdkWin32KeymapImpl below for more information. */
-+ gpointer tables;
-+
-+ /* VK -> chars lookup table so we don't have to do a linear scan
-+ * every time we look up a key. */
-+ GdkWin32KeymapTableAndIndex vk_lookup_table[256];
-+
-+ /* List of entries for reverse (char ->VKs) lookup. */
-+ GArray *key_entries;
-+
-+ /* Reverse lookup table (char -> VKs). Key: Unichar. Value: int.
-+ * The value is used to index into the key_entries array. The key_entries
-+ * array can contain multiple consecutive entries for a given char.
-+ * The end of the list for the char is marked by a key entry that has
-+ * mod_bits and vk set to 0xFF. */
-+ GHashTable *reverse_lookup_table;
-+
-+ /* Map level to modbits */
-+ BYTE level_to_modbits[256];
-+
-+ /* Max Number of levels */
-+ BYTE max_level;
-+
-+ /* Maximum possible value of a modbits bitset. */
-+ BYTE max_modbit_value;
-+
-+} GdkWin32KeymapLayoutInfo;
-+
-+/* Some keyboard driver constants
-+ * See https://github.com/microsoft/windows-rs/blob/0.28.0/crates/deps/sys/src/Windows/Win32/UI/Input/KeyboardAndMouse/mod.rs
-+ */
-+
-+/* Modifier bits */
-+#define KBDBASE 0x00
-+#define KBDSHIFT 0x01
-+#define KBDCTRL 0x02
-+#define KBDALT 0x04
-+#define KBDKANA 0x08
-+#define KBDROYA 0x10
-+#define KBDLOYA 0x20
-+#define KBDGRPSELTAP 0x80
-+
-+#define KBDALTGR (KBDCTRL| KBDALT)
-+
-+/* */
-+#define SHFT_INVALID 0x0F
-+
-+/* Char table constants */
-+#define WCH_NONE 0xF000
-+#define WCH_DEAD 0xF001
-+#define WCH_LGTR 0xF002
-+
-+/* Char table flags */
-+#define CAPLOK 0x01
-+#define SGCAPS 0x02
-+#define CAPLOKALTGR 0x04
-+#define KANALOK 0x08
-+#define GRPSELTAP 0x80
-+
-+/* IMPORTANT:
-+ *
-+ * Keyboard layout DLLs are dependent on the host architecture.
-+ *
-+ * - 32 bit systems have just one 32 bit DLL in System32.
-+ * - 64 bit systems contain two versions of each layout DLL: One in System32
-+ * for 64-bit applications, and one in SysWOW64 for 32-bit applications.
-+ *
-+ * Here comes the tricky part:
-+ *
-+ * The 32-bit DLL in SysWOW64 is *not* identical to the DLL you would find
-+ * on a true 32 bit system, because all the pointers there are declared with
-+ * the attribute `__ptr64` (which means they are 64 bits wide, but only the
-+ * lower 32 bits are used).
-+ *
-+ * This leads to the following problems:
-+ *
-+ * (1) GCC does not support `__ptr64`
-+ * (2) When compiling the 32-bit library, we need two versions of the same code
-+ * and decide at run-time which one to execute, because we can't know at
-+ * compile time whether we will be running on a true 32-bit system, or on
-+ * WOW64.
-+ *
-+ * To solve this problem, we generate code for both cases (see
-+ * gdkkeys-win32-impl.c + gdkkeys-win32-impl-wow64.c) and encapsulate
-+ * the resulting functions in a struct of type GdkWin32KeymapImpl,
-+ * allowing us to select the correct implementation at runtime.
-+ *
-+ */
-+
-+typedef struct
-+{
-+ gboolean (*load_layout_dll) (const char *dll,
-+ GdkWin32KeymapLayoutInfo *info);
-+ void (*init_vk_lookup_table) (GdkWin32KeymapLayoutInfo *info);
-+ BYTE (*keystate_to_modbits) (GdkWin32KeymapLayoutInfo *info,
-+ const BYTE keystate[256]);
-+ BYTE (*modbits_to_level) (GdkWin32KeymapLayoutInfo *info,
-+ BYTE modbits);
-+ WCHAR (*vk_to_char_fuzzy) (GdkWin32KeymapLayoutInfo *info,
-+ const BYTE keystate[256],
-+ BYTE extra_mod_bits,
-+ BYTE *consumed_mod_bits,
-+ gboolean *is_dead,
-+ BYTE vk);
-+} GdkWin32KeymapImpl;
diff --git a/patches/gtk-3.24.31/02-windows-h.patch b/patches/gtk-3.24.31/02-windows-h.patch
deleted file mode 100644
index d45273b..0000000
--- a/patches/gtk-3.24.31/02-windows-h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4090306fd7216cb102590262b444de7127242725 Mon Sep 17 00:00:00 2001
-From: Melroy van den Berg <melroy at melroy.org>
-Date: Tue, 28 Dec 2021 00:47:28 +0100
-Subject: [PATCH] Lowercaps Windows.h -> windows.h
-
----
- gdk/win32/gdkkeys-win32.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk/win32/gdkkeys-win32.h b/gdk/win32/gdkkeys-win32.h
-index 14a69d8081..17b7d7125c 100644
---- a/gdk/win32/gdkkeys-win32.h
-+++ b/gdk/win32/gdkkeys-win32.h
-@@ -22,7 +22,7 @@
- */
-
- #include <glib.h>
--#include <Windows.h>
-+#include <windows.h>
-
- /* For lookup table VK -> chars */
- typedef struct
---
-2.30.2
diff --git a/patches/gtk-3.24.31/03-gc-allgestures.patch b/patches/gtk-3.24.31/03-gc-allgestures.patch
deleted file mode 100644
index 0e8fcbb..0000000
--- a/patches/gtk-3.24.31/03-gc-allgestures.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 37f9af58059252c27197444f13fd9fe5b65ef4b4 Mon Sep 17 00:00:00 2001
-From: Melroy van den Berg <melroy at melroy.org>
-Date: Tue, 28 Dec 2021 00:50:17 +0100
-Subject: [PATCH] Add define for GC_ALLGESTURES, in-case WINVER is not set.
-
----
- gdk/win32/winpointer.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gdk/win32/winpointer.h b/gdk/win32/winpointer.h
-index ee3e42e063..786f6016c7 100644
---- a/gdk/win32/winpointer.h
-+++ b/gdk/win32/winpointer.h
-@@ -138,6 +138,10 @@
- #define PA_ACTIVATE MA_ACTIVATE
- #define PA_NOACTIVATE MA_NOACTIVATE
-
-+#ifndef GC_ALLGESTURES
-+#define GC_ALLGESTURES 0x1
-+#endif
-+
- typedef DWORD POINTER_INPUT_TYPE;
- typedef UINT32 POINTER_FLAGS;
- typedef UINT32 TOUCH_FLAGS;
---
-2.30.2
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 6336fe4..fc3fb3b 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -257,11 +257,11 @@ SetOutPath "$INSTDIR\share\locale\"
File /r ${prefix}/share/locale/
SetOutPath "$INSTDIR\share\glib-2.0\schemas"
-File ${prefix}/share/glib-2.0/schemas/gschemas.compiled
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
File ${prefix}/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
+ExecShell "open" "$INSTDIR\glib-compile-schemas.exe" '"$INSTDIR\share\glib-2.0\schemas"' SW_HIDE
SetOutPath "$INSTDIR"
#######################################
@@ -380,7 +380,7 @@ File ${prefix}/share/icons/Adwaita/cursors/dnd-none.cur
SetOutPath "$INSTDIR\share\icons\Adwaita"
File ${prefix}/share/icons/Adwaita/index.theme
-ExecShell "open" "$INSTDIR\gtk-update-icon-cache.exe" '-f "$INSTDIR\share\icons\Adwaita"' SW_HIDE
+ExecShell "open" "$INSTDIR\gtk-update-icon-cache.exe" '-q -t -f "$INSTDIR\share\icons\Adwaita"' SW_HIDE
SetOutPath "$INSTDIR"
#######################################
-----------------------------------------------------------------------
hooks/post-receive
--
Installer sources for Claws Mail Windows port
More information about the Commits
mailing list