From b50866e76c4aeef198d672b088f7c526ed29f7e1 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Thu, 2 Dec 2021 23:35:25 +0700 Subject: [PATCH 1/3] gtk 3.24.30 port --- ports/gtk3/0001-build.patch | 23 ++ ports/gtk3/0002-windows-sdk11.patch | 31 +++ ports/gtk3/portfile.cmake | 84 +++++++ ports/gtk3/vcpkg.json | 49 +++++ ports/gtk3/winpointer.h.patch | 326 ++++++++++++++++++++++++++++ versions/baseline.json | 4 + versions/g-/gtk3.json | 9 + 7 files changed, 526 insertions(+) create mode 100644 ports/gtk3/0001-build.patch create mode 100644 ports/gtk3/0002-windows-sdk11.patch create mode 100644 ports/gtk3/portfile.cmake create mode 100644 ports/gtk3/vcpkg.json create mode 100644 ports/gtk3/winpointer.h.patch create mode 100644 versions/g-/gtk3.json diff --git a/ports/gtk3/0001-build.patch b/ports/gtk3/0001-build.patch new file mode 100644 index 00000000000000..c35f146c11ca9d --- /dev/null +++ b/ports/gtk3/0001-build.patch @@ -0,0 +1,23 @@ +diff --git a/meson.build b/meson.build +index a886081..1568783 100644 +--- a/meson.build ++++ b/meson.build +@@ -981,12 +981,12 @@ subdir('docs/reference') + install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) + + # Keep this in sync with post-install.py expected arguments +-meson.add_install_script('build-aux/meson/post-install.py', +- gtk_api_version, +- gtk_binary_version, +- join_paths(gtk_prefix, get_option('bindir')), +- gtk_libdir, +- gtk_datadir) ++#meson.add_install_script('build-aux/meson/post-install.py', ++# gtk_api_version, ++# gtk_binary_version, ++# join_paths(gtk_prefix, get_option('bindir')), ++# gtk_libdir, ++# gtk_datadir) + + if host_machine.system() != 'windows' + # Install Valgrind suppression files (except on Windows, diff --git a/ports/gtk3/0002-windows-sdk11.patch b/ports/gtk3/0002-windows-sdk11.patch new file mode 100644 index 00000000000000..f659e2005f18d0 --- /dev/null +++ b/ports/gtk3/0002-windows-sdk11.patch @@ -0,0 +1,31 @@ +--- a/gtk/gen-rc.py 2021-06-16 03:58:25.000000000 +0700 ++++ b/gtk/gen-rc.py 2022-01-14 16:48:23.550635100 +0700 +@@ -11,7 +11,6 @@ + with open(out_file, 'w', encoding='utf-8') as o: + if old_msvc is not None and old_msvc == "1": + o.write("#define ISOLATION_AWARE_ENABLED 1\n") +- o.write('#include \n') + + with open(in_file, 'r', encoding='utf-8') as f: + for line in f: +--- a/gtk/gtk-win32.rc.body.in 2021-06-16 03:58:25.000000000 +0700 ++++ b/gtk/gtk-win32.rc.body.in 2022-01-14 16:49:00.411014900 +0700 +@@ -1,4 +1,5 @@ +-#include ++#define WIN32_LEAN_AND_MEAN ++#include + + VS_VERSION_INFO VERSIONINFO + FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0 +--- a/gtk/generate-uac-manifest.py 2021-06-16 03:58:25.000000000 +0700 ++++ b/gtk/generate-uac-manifest.py 2022-01-14 16:48:11.043237900 +0700 +@@ -92,7 +92,8 @@ + + if resource is None: + outfile = open(output_file_base_name + '.rc', 'w+') +- outfile.write('#include ') ++ outfile.write('#define WIN32_LEAN_AND_MEAN\n') ++ outfile.write('#include \n') + else: + if resource != output_file_base_name + '.rc': + outfile = open(output_file_base_name + '.rc', 'w+') diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake new file mode 100644 index 00000000000000..e708011f33ecb7 --- /dev/null +++ b/ports/gtk3/portfile.cmake @@ -0,0 +1,84 @@ +set(warning_length 24) +string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length) +if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32) + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" + "We recommend moving vcpkg to a short path such as 'C:\\vcpkg' or using the subst command." + ) +endif() + +set(GTK_MAJOR_MINOR 3.24) +set(GTK_PATCH 30) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.gnome.org/pub/gnome/sources/gtk+/${GTK_MAJOR_MINOR}/gtk+-${GTK_MAJOR_MINOR}.${GTK_PATCH}.tar.xz" + FILENAME "gtk+-${GTK_MAJOR_MINOR}.${GTK_PATCH}.tar.xz" + SHA512 4164559f3e14501b9f9330a76535ebf5e26961d436f65e65ea609998cb120fcbcc5d9591453a64e1d414248499857288e5758274d03a7f75e9ae76cbf8c68ff9 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + 0001-build.patch +) + +vcpkg_find_acquire_program(PKGCONFIG) +get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) +vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf") +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dwayland_backend=false + -Ddemos=false + -Dexamples=false + -Dtests=false + -Dgtk_doc=false + -Dman=false + -Dxinerama=no # Enable support for the X11 Xinerama extension + -Dcloudproviders=false # Enable the cloudproviders support + -Dprofiler=false # include tracing support for sysprof + -Dtracker3=false # Enable Tracker3 filechooser search + -Dcolord=no # Build colord support for the CUPS printing backend + -Dintrospection=false + ADDITIONAL_NATIVE_BINARIES + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +set(GTK_TOOLS + gtk-builder-tool + gtk-encode-symbolic-svg + gtk-launch + gtk-query-immodules-3.0 + gtk-query-settings + gtk-update-icon-cache +) +vcpkg_copy_tools(TOOL_NAMES ${GTK_TOOLS} AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json new file mode 100644 index 00000000000000..9e3f067184148e --- /dev/null +++ b/ports/gtk3/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "gtk3", + "version": "3.24.30", + "description": "Portable library for creating graphical user interfaces.", + "homepage": "https://www.gtk.org/", + "dependencies": [ + "atk", + { + "name": "cairo", + "default-features": false, + "features": [ + "gobject" + ] + }, + { + "name": "cairo", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + "gdk-pixbuf", + { + "name": "gdk-pixbuf", + "host": true + }, + "gettext", + { + "name": "gettext", + "host": true, + "default-features": false, + "features": [ + "tools" + ] + }, + "glib", + { + "name": "glib", + "host": true + }, + "libepoxy", + "pango", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/gtk3/winpointer.h.patch b/ports/gtk3/winpointer.h.patch new file mode 100644 index 00000000000000..8c4698a674e6d9 --- /dev/null +++ b/ports/gtk3/winpointer.h.patch @@ -0,0 +1,326 @@ +diff --git a/gdk/win32/winpointer.h b/gdk/win32/winpointer.h +new file mode 100644 +index 0000000..ee3e42e +--- /dev/null ++++ b/gdk/win32/winpointer.h +@@ -0,0 +1,320 @@ ++/* GDK - The GIMP Drawing Kit ++ * Copyright (C) 2021 the GTK team ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library. If not, see . ++ */ ++ ++/* This code is derived from portions provided by the mingw-w64 project ++ * (mingw-w64.org), originally licensed under the Zope Public License ++ * (ZPL) version 2.1, with modifications made on May 12, 2021. ++ * Legal notice of the Zope Public License version 2.1 follows: ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * 1. Redistributions in source code must retain the accompanying copyright ++ * notice, this list of conditions, and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the accompanying ++ * copyright notice, this list of conditions, and the following disclaimer ++ * in the documentation and/or other materials provided with the ++ * distribution. ++ * 3. Names of the copyright holders must not be used to endorse or promote ++ * products derived from this software without prior written permission ++ * from the copyright holders. ++ * 4. The right to distribute this software or to use it for any purpose does ++ * not give you the right to use Servicemarks (sm) or Trademarks (tm) of ++ * the copyright holders. Use of them is covered by separate agreement ++ * with the copyright holders. ++ * 5. If any files are modified, you must cause the modified files to carry ++ * prominent notices stating that you changed the files and the date of ++ * any change. ++ */ ++ ++#ifndef POINTER_FLAG_NONE ++ ++#include ++#include ++ ++#define WM_POINTERDEVICECHANGE 0x238 ++#define WM_POINTERDEVICEINRANGE 0x239 ++#define WM_POINTERDEVICEOUTOFRANGE 0x23a ++ ++#define WM_NCPOINTERUPDATE 0x0241 ++#define WM_NCPOINTERDOWN 0x0242 ++#define WM_NCPOINTERUP 0x0243 ++#define WM_POINTERUPDATE 0x0245 ++#define WM_POINTERDOWN 0x0246 ++#define WM_POINTERUP 0x0247 ++#define WM_POINTERENTER 0x0249 ++#define WM_POINTERLEAVE 0x024a ++#define WM_POINTERACTIVATE 0x024b ++#define WM_POINTERCAPTURECHANGED 0x024c ++#define WM_TOUCHHITTESTING 0x024d ++#define WM_POINTERWHEEL 0x024e ++#define WM_POINTERHWHEEL 0x024f ++#define DM_POINTERHITTEST 0x0250 ++#define WM_POINTERROUTEDTO 0x0251 ++#define WM_POINTERROUTEDAWAY 0x0252 ++#define WM_POINTERROUTEDRELEASED 0x0253 ++ ++#define POINTER_FLAG_NONE 0x00000000 ++#define POINTER_FLAG_NEW 0x00000001 ++#define POINTER_FLAG_INRANGE 0x00000002 ++#define POINTER_FLAG_INCONTACT 0x00000004 ++#define POINTER_FLAG_FIRSTBUTTON 0x00000010 ++#define POINTER_FLAG_SECONDBUTTON 0x00000020 ++#define POINTER_FLAG_THIRDBUTTON 0x00000040 ++#define POINTER_FLAG_FOURTHBUTTON 0x00000080 ++#define POINTER_FLAG_FIFTHBUTTON 0x00000100 ++#define POINTER_FLAG_PRIMARY 0x00002000 ++#define POINTER_FLAG_CONFIDENCE 0x00004000 ++#define POINTER_FLAG_CANCELED 0x00008000 ++#define POINTER_FLAG_DOWN 0x00010000 ++#define POINTER_FLAG_UPDATE 0x00020000 ++#define POINTER_FLAG_UP 0x00040000 ++#define POINTER_FLAG_WHEEL 0x00080000 ++#define POINTER_FLAG_HWHEEL 0x00100000 ++#define POINTER_FLAG_CAPTURECHANGED 0x00200000 ++#define POINTER_FLAG_HASTRANSFORM 0x00400000 ++ ++#define POINTER_MOD_SHIFT (0x0004) ++#define POINTER_MOD_CTRL (0x0008) ++ ++#define TOUCH_FLAG_NONE 0x00000000 ++ ++#define TOUCH_MASK_NONE 0x00000000 ++#define TOUCH_MASK_CONTACTAREA 0x00000001 ++#define TOUCH_MASK_ORIENTATION 0x00000002 ++#define TOUCH_MASK_PRESSURE 0x00000004 ++ ++#define PEN_FLAG_NONE 0x00000000 ++#define PEN_FLAG_BARREL 0x00000001 ++#define PEN_FLAG_INVERTED 0x00000002 ++#define PEN_FLAG_ERASER 0x00000004 ++ ++#define PEN_MASK_NONE 0x00000000 ++#define PEN_MASK_PRESSURE 0x00000001 ++#define PEN_MASK_ROTATION 0x00000002 ++#define PEN_MASK_TILT_X 0x00000004 ++#define PEN_MASK_TILT_Y 0x00000008 ++ ++#define POINTER_MESSAGE_FLAG_NEW 0x00000001 ++#define POINTER_MESSAGE_FLAG_INRANGE 0x00000002 ++#define POINTER_MESSAGE_FLAG_INCONTACT 0x00000004 ++#define POINTER_MESSAGE_FLAG_FIRSTBUTTON 0x00000010 ++#define POINTER_MESSAGE_FLAG_SECONDBUTTON 0x00000020 ++#define POINTER_MESSAGE_FLAG_THIRDBUTTON 0x00000040 ++#define POINTER_MESSAGE_FLAG_FOURTHBUTTON 0x00000080 ++#define POINTER_MESSAGE_FLAG_FIFTHBUTTON 0x00000100 ++#define POINTER_MESSAGE_FLAG_PRIMARY 0x00002000 ++#define POINTER_MESSAGE_FLAG_CONFIDENCE 0x00004000 ++#define POINTER_MESSAGE_FLAG_CANCELED 0x00008000 ++ ++#define GET_POINTERID_WPARAM(wParam) (LOWORD (wParam)) ++#define IS_POINTER_FLAG_SET_WPARAM(wParam, flag) (((DWORD)HIWORD (wParam) &(flag)) == (flag)) ++#define IS_POINTER_NEW_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_NEW) ++#define IS_POINTER_INRANGE_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_INRANGE) ++#define IS_POINTER_INCONTACT_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_INCONTACT) ++#define IS_POINTER_FIRSTBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FIRSTBUTTON) ++#define IS_POINTER_SECONDBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_SECONDBUTTON) ++#define IS_POINTER_THIRDBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_THIRDBUTTON) ++#define IS_POINTER_FOURTHBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FOURTHBUTTON) ++#define IS_POINTER_FIFTHBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FIFTHBUTTON) ++#define IS_POINTER_PRIMARY_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_PRIMARY) ++#define HAS_POINTER_CONFIDENCE_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_CONFIDENCE) ++#define IS_POINTER_CANCELED_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_CANCELED) ++ ++#define PA_ACTIVATE MA_ACTIVATE ++#define PA_NOACTIVATE MA_NOACTIVATE ++ ++typedef DWORD POINTER_INPUT_TYPE; ++typedef UINT32 POINTER_FLAGS; ++typedef UINT32 TOUCH_FLAGS; ++typedef UINT32 TOUCH_MASK; ++typedef UINT32 PEN_FLAGS; ++typedef UINT32 PEN_MASK; ++ ++enum tagPOINTER_INPUT_TYPE { ++ PT_POINTER = 0x00000001, ++ PT_TOUCH = 0x00000002, ++ PT_PEN = 0x00000003, ++ PT_MOUSE = 0x00000004, ++ PT_TOUCHPAD = 0x00000005 ++}; ++ ++typedef enum tagFEEDBACK_TYPE { ++ FEEDBACK_TOUCH_CONTACTVISUALIZATION = 1, ++ FEEDBACK_PEN_BARRELVISUALIZATION = 2, ++ FEEDBACK_PEN_TAP = 3, ++ FEEDBACK_PEN_DOUBLETAP = 4, ++ FEEDBACK_PEN_PRESSANDHOLD = 5, ++ FEEDBACK_PEN_RIGHTTAP = 6, ++ FEEDBACK_TOUCH_TAP = 7, ++ FEEDBACK_TOUCH_DOUBLETAP = 8, ++ FEEDBACK_TOUCH_PRESSANDHOLD = 9, ++ FEEDBACK_TOUCH_RIGHTTAP = 10, ++ FEEDBACK_GESTURE_PRESSANDTAP = 11, ++ FEEDBACK_MAX = 0xffffffff ++} FEEDBACK_TYPE; ++ ++typedef enum tagPOINTER_BUTTON_CHANGE_TYPE { ++ POINTER_CHANGE_NONE, ++ POINTER_CHANGE_FIRSTBUTTON_DOWN, ++ POINTER_CHANGE_FIRSTBUTTON_UP, ++ POINTER_CHANGE_SECONDBUTTON_DOWN, ++ POINTER_CHANGE_SECONDBUTTON_UP, ++ POINTER_CHANGE_THIRDBUTTON_DOWN, ++ POINTER_CHANGE_THIRDBUTTON_UP, ++ POINTER_CHANGE_FOURTHBUTTON_DOWN, ++ POINTER_CHANGE_FOURTHBUTTON_UP, ++ POINTER_CHANGE_FIFTHBUTTON_DOWN, ++ POINTER_CHANGE_FIFTHBUTTON_UP, ++} POINTER_BUTTON_CHANGE_TYPE; ++ ++typedef struct tagPOINTER_INFO { ++ POINTER_INPUT_TYPE pointerType; ++ UINT32 pointerId; ++ UINT32 frameId; ++ POINTER_FLAGS pointerFlags; ++ HANDLE sourceDevice; ++ HWND hwndTarget; ++ POINT ptPixelLocation; ++ POINT ptHimetricLocation; ++ POINT ptPixelLocationRaw; ++ POINT ptHimetricLocationRaw; ++ DWORD dwTime; ++ UINT32 historyCount; ++ INT32 InputData; ++ DWORD dwKeyStates; ++ UINT64 PerformanceCount; ++ POINTER_BUTTON_CHANGE_TYPE ButtonChangeType; ++} POINTER_INFO; ++ ++typedef struct tagPOINTER_TOUCH_INFO { ++ POINTER_INFO pointerInfo; ++ TOUCH_FLAGS touchFlags; ++ TOUCH_MASK touchMask; ++ RECT rcContact; ++ RECT rcContactRaw; ++ UINT32 orientation; ++ UINT32 pressure; ++} POINTER_TOUCH_INFO; ++ ++typedef struct tagPOINTER_PEN_INFO { ++ POINTER_INFO pointerInfo; ++ PEN_FLAGS penFlags; ++ PEN_MASK penMask; ++ UINT32 pressure; ++ UINT32 rotation; ++ INT32 tiltX; ++ INT32 tiltY; ++} POINTER_PEN_INFO; ++ ++typedef enum { ++ POINTER_FEEDBACK_DEFAULT = 1, ++ POINTER_FEEDBACK_INDIRECT = 2, ++ POINTER_FEEDBACK_NONE = 3 ++} POINTER_FEEDBACK_MODE; ++ ++typedef struct tagUSAGE_PROPERTIES { ++ USHORT level; ++ USHORT page; ++ USHORT usage; ++ INT32 logicalMinimum; ++ INT32 logicalMaximum; ++ USHORT unit; ++ USHORT exponent; ++ BYTE count; ++ INT32 physicalMinimum; ++ INT32 physicalMaximum; ++} USAGE_PROPERTIES, *PUSAGE_PROPERTIES; ++ ++typedef struct tagPOINTER_TYPE_INFO { ++ POINTER_INPUT_TYPE type; ++ union { ++ POINTER_TOUCH_INFO touchInfo; ++ POINTER_PEN_INFO penInfo; ++ } DUMMYUNIONNAME; ++} POINTER_TYPE_INFO, *PPOINTER_TYPE_INFO; ++ ++#define POINTER_DEVICE_PRODUCT_STRING_MAX 520 ++#define PDC_ARRIVAL 0x001 ++#define PDC_REMOVAL 0x002 ++#define PDC_ORIENTATION_0 0x004 ++#define PDC_ORIENTATION_90 0x008 ++#define PDC_ORIENTATION_180 0x010 ++#define PDC_ORIENTATION_270 0x020 ++#define PDC_MODE_DEFAULT 0x040 ++#define PDC_MODE_CENTERED 0x080 ++#define PDC_MAPPING_CHANGE 0x100 ++#define PDC_RESOLUTION 0x200 ++#define PDC_ORIGIN 0x400 ++#define PDC_MODE_ASPECTRATIOPRESERVED 0x800 ++ ++typedef enum tagPOINTER_DEVICE_TYPE { ++ POINTER_DEVICE_TYPE_INTEGRATED_PEN = 0x00000001, ++ POINTER_DEVICE_TYPE_EXTERNAL_PEN = 0x00000002, ++ POINTER_DEVICE_TYPE_TOUCH = 0x00000003, ++ POINTER_DEVICE_TYPE_TOUCH_PAD = 0x00000004, ++ POINTER_DEVICE_TYPE_MAX = 0xffffffff ++} POINTER_DEVICE_TYPE; ++ ++typedef struct tagPOINTER_DEVICE_INFO { ++ DWORD displayOrientation; ++ HANDLE device; ++ POINTER_DEVICE_TYPE pointerDeviceType; ++ HMONITOR monitor; ++ ULONG startingCursorId; ++ USHORT maxActiveContacts; ++ WCHAR productString[POINTER_DEVICE_PRODUCT_STRING_MAX]; ++} POINTER_DEVICE_INFO; ++ ++typedef struct tagPOINTER_DEVICE_PROPERTY { ++ INT32 logicalMin; ++ INT32 logicalMax; ++ INT32 physicalMin; ++ INT32 physicalMax; ++ UINT32 unit; ++ UINT32 unitExponent; ++ USHORT usagePageId; ++ USHORT usageId; ++} POINTER_DEVICE_PROPERTY; ++ ++typedef enum tagPOINTER_DEVICE_CURSOR_TYPE { ++ POINTER_DEVICE_CURSOR_TYPE_UNKNOWN = 0x00000000, ++ POINTER_DEVICE_CURSOR_TYPE_TIP = 0x00000001, ++ POINTER_DEVICE_CURSOR_TYPE_ERASER = 0x00000002, ++ POINTER_DEVICE_CURSOR_TYPE_MAX = 0xffffffff ++} POINTER_DEVICE_CURSOR_TYPE; ++ ++typedef struct tagPOINTER_DEVICE_CURSOR_INFO { ++ UINT32 cursorId; ++ POINTER_DEVICE_CURSOR_TYPE cursor; ++} POINTER_DEVICE_CURSOR_INFO; ++ ++#endif /* POINTER_FLAG_NONE */ ++ ++#if WINVER < 0x0601 ++ ++typedef struct tagGESTURECONFIG { ++ DWORD dwID; ++ DWORD dwWant; ++ DWORD dwBlock; ++} GESTURECONFIG,*PGESTURECONFIG; ++ ++#endif /* WINVER < 0x0601 */ ++ ++#ifndef MICROSOFT_TABLETPENSERVICE_PROPERTY ++#define MICROSOFT_TABLETPENSERVICE_PROPERTY _T("MicrosoftTabletPenServiceProperty") ++#endif diff --git a/versions/baseline.json b/versions/baseline.json index a80f3d43bee33a..c64dcdda9bd2ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2708,6 +2708,10 @@ "baseline": "4.6.2", "port-version": 1 }, + "gtk3": { + "baseline": "3.24.30", + "port-version": 0 + }, "gtkmm": { "baseline": "4.6.0", "port-version": 0 diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json new file mode 100644 index 00000000000000..5fd17c51b3c7d1 --- /dev/null +++ b/versions/g-/gtk3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "53b363c6d206f54f722b02d4ba884bfaf2fe9038", + "version": "3.24.30", + "port-version": 0 + } + ] +} From b408bec26c1e8c2614a500aeb38d33f39404336e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 11 May 2022 21:00:50 +0200 Subject: [PATCH 2/3] - Update to 3.24.33 - Use vcpkg_from_gitlab() --- ports/gtk3/0001-build.patch | 26 +-- ports/gtk3/0002-windows-sdk11.patch | 31 --- ports/gtk3/portfile.cmake | 16 +- ports/gtk3/vcpkg.json | 3 +- ports/gtk3/winpointer.h.patch | 326 ---------------------------- versions/baseline.json | 2 +- versions/g-/gtk3.json | 4 +- 7 files changed, 18 insertions(+), 390 deletions(-) delete mode 100644 ports/gtk3/0002-windows-sdk11.patch delete mode 100644 ports/gtk3/winpointer.h.patch diff --git a/ports/gtk3/0001-build.patch b/ports/gtk3/0001-build.patch index c35f146c11ca9d..0f3d7b4fffabbe 100644 --- a/ports/gtk3/0001-build.patch +++ b/ports/gtk3/0001-build.patch @@ -1,23 +1,13 @@ diff --git a/meson.build b/meson.build -index a886081..1568783 100644 +index c599843..0cafd79 100644 --- a/meson.build +++ b/meson.build -@@ -981,12 +981,12 @@ subdir('docs/reference') - install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) +@@ -1008,7 +1008,7 @@ subdir('docs/reference') - # Keep this in sync with post-install.py expected arguments --meson.add_install_script('build-aux/meson/post-install.py', -- gtk_api_version, -- gtk_binary_version, -- join_paths(gtk_prefix, get_option('bindir')), -- gtk_libdir, -- gtk_datadir) -+#meson.add_install_script('build-aux/meson/post-install.py', -+# gtk_api_version, -+# gtk_binary_version, -+# join_paths(gtk_prefix, get_option('bindir')), -+# gtk_libdir, -+# gtk_datadir) + install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) - if host_machine.system() != 'windows' - # Install Valgrind suppression files (except on Windows, +-if not meson.is_cross_build() ++if false + if meson.version().version_compare('>=0.57.0') + gnome.post_install( + glib_compile_schemas: true, diff --git a/ports/gtk3/0002-windows-sdk11.patch b/ports/gtk3/0002-windows-sdk11.patch deleted file mode 100644 index f659e2005f18d0..00000000000000 --- a/ports/gtk3/0002-windows-sdk11.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/gtk/gen-rc.py 2021-06-16 03:58:25.000000000 +0700 -+++ b/gtk/gen-rc.py 2022-01-14 16:48:23.550635100 +0700 -@@ -11,7 +11,6 @@ - with open(out_file, 'w', encoding='utf-8') as o: - if old_msvc is not None and old_msvc == "1": - o.write("#define ISOLATION_AWARE_ENABLED 1\n") -- o.write('#include \n') - - with open(in_file, 'r', encoding='utf-8') as f: - for line in f: ---- a/gtk/gtk-win32.rc.body.in 2021-06-16 03:58:25.000000000 +0700 -+++ b/gtk/gtk-win32.rc.body.in 2022-01-14 16:49:00.411014900 +0700 -@@ -1,4 +1,5 @@ --#include -+#define WIN32_LEAN_AND_MEAN -+#include - - VS_VERSION_INFO VERSIONINFO - FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0 ---- a/gtk/generate-uac-manifest.py 2021-06-16 03:58:25.000000000 +0700 -+++ b/gtk/generate-uac-manifest.py 2022-01-14 16:48:11.043237900 +0700 -@@ -92,7 +92,8 @@ - - if resource is None: - outfile = open(output_file_base_name + '.rc', 'w+') -- outfile.write('#include ') -+ outfile.write('#define WIN32_LEAN_AND_MEAN\n') -+ outfile.write('#include \n') - else: - if resource != output_file_base_name + '.rc': - outfile = open(output_file_base_name + '.rc', 'w+') diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index e708011f33ecb7..e52015eb6e26b6 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -6,18 +6,12 @@ if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32) ) endif() -set(GTK_MAJOR_MINOR 3.24) -set(GTK_PATCH 30) - -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/gtk+/${GTK_MAJOR_MINOR}/gtk+-${GTK_MAJOR_MINOR}.${GTK_PATCH}.tar.xz" - FILENAME "gtk+-${GTK_MAJOR_MINOR}.${GTK_PATCH}.tar.xz" - SHA512 4164559f3e14501b9f9330a76535ebf5e26961d436f65e65ea609998cb120fcbcc5d9591453a64e1d414248499857288e5758274d03a7f75e9ae76cbf8c68ff9 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE}" + GITLAB_URL https://gitlab.gnome.org + REPO GNOME/gtk + REF 3.24.33 + SHA512 634c3684e670e662340e780a0f561ddc191790625d6b7f28ec7fbb1fcaec86856091e94124565f138d3adaa08a9e063ead2ff441354763b21b4e887c2a54e8d0 PATCHES 0001-build.patch ) diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index 9e3f067184148e..67892394bb2b83 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,8 +1,9 @@ { "name": "gtk3", - "version": "3.24.30", + "version": "3.24.33", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", + "license": null, "dependencies": [ "atk", { diff --git a/ports/gtk3/winpointer.h.patch b/ports/gtk3/winpointer.h.patch deleted file mode 100644 index 8c4698a674e6d9..00000000000000 --- a/ports/gtk3/winpointer.h.patch +++ /dev/null @@ -1,326 +0,0 @@ -diff --git a/gdk/win32/winpointer.h b/gdk/win32/winpointer.h -new file mode 100644 -index 0000000..ee3e42e ---- /dev/null -+++ b/gdk/win32/winpointer.h -@@ -0,0 +1,320 @@ -+/* GDK - The GIMP Drawing Kit -+ * Copyright (C) 2021 the GTK team -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see . -+ */ -+ -+/* This code is derived from portions provided by the mingw-w64 project -+ * (mingw-w64.org), originally licensed under the Zope Public License -+ * (ZPL) version 2.1, with modifications made on May 12, 2021. -+ * Legal notice of the Zope Public License version 2.1 follows: -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions in source code must retain the accompanying copyright -+ * notice, this list of conditions, and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the accompanying -+ * copyright notice, this list of conditions, and the following disclaimer -+ * in the documentation and/or other materials provided with the -+ * distribution. -+ * 3. Names of the copyright holders must not be used to endorse or promote -+ * products derived from this software without prior written permission -+ * from the copyright holders. -+ * 4. The right to distribute this software or to use it for any purpose does -+ * not give you the right to use Servicemarks (sm) or Trademarks (tm) of -+ * the copyright holders. Use of them is covered by separate agreement -+ * with the copyright holders. -+ * 5. If any files are modified, you must cause the modified files to carry -+ * prominent notices stating that you changed the files and the date of -+ * any change. -+ */ -+ -+#ifndef POINTER_FLAG_NONE -+ -+#include -+#include -+ -+#define WM_POINTERDEVICECHANGE 0x238 -+#define WM_POINTERDEVICEINRANGE 0x239 -+#define WM_POINTERDEVICEOUTOFRANGE 0x23a -+ -+#define WM_NCPOINTERUPDATE 0x0241 -+#define WM_NCPOINTERDOWN 0x0242 -+#define WM_NCPOINTERUP 0x0243 -+#define WM_POINTERUPDATE 0x0245 -+#define WM_POINTERDOWN 0x0246 -+#define WM_POINTERUP 0x0247 -+#define WM_POINTERENTER 0x0249 -+#define WM_POINTERLEAVE 0x024a -+#define WM_POINTERACTIVATE 0x024b -+#define WM_POINTERCAPTURECHANGED 0x024c -+#define WM_TOUCHHITTESTING 0x024d -+#define WM_POINTERWHEEL 0x024e -+#define WM_POINTERHWHEEL 0x024f -+#define DM_POINTERHITTEST 0x0250 -+#define WM_POINTERROUTEDTO 0x0251 -+#define WM_POINTERROUTEDAWAY 0x0252 -+#define WM_POINTERROUTEDRELEASED 0x0253 -+ -+#define POINTER_FLAG_NONE 0x00000000 -+#define POINTER_FLAG_NEW 0x00000001 -+#define POINTER_FLAG_INRANGE 0x00000002 -+#define POINTER_FLAG_INCONTACT 0x00000004 -+#define POINTER_FLAG_FIRSTBUTTON 0x00000010 -+#define POINTER_FLAG_SECONDBUTTON 0x00000020 -+#define POINTER_FLAG_THIRDBUTTON 0x00000040 -+#define POINTER_FLAG_FOURTHBUTTON 0x00000080 -+#define POINTER_FLAG_FIFTHBUTTON 0x00000100 -+#define POINTER_FLAG_PRIMARY 0x00002000 -+#define POINTER_FLAG_CONFIDENCE 0x00004000 -+#define POINTER_FLAG_CANCELED 0x00008000 -+#define POINTER_FLAG_DOWN 0x00010000 -+#define POINTER_FLAG_UPDATE 0x00020000 -+#define POINTER_FLAG_UP 0x00040000 -+#define POINTER_FLAG_WHEEL 0x00080000 -+#define POINTER_FLAG_HWHEEL 0x00100000 -+#define POINTER_FLAG_CAPTURECHANGED 0x00200000 -+#define POINTER_FLAG_HASTRANSFORM 0x00400000 -+ -+#define POINTER_MOD_SHIFT (0x0004) -+#define POINTER_MOD_CTRL (0x0008) -+ -+#define TOUCH_FLAG_NONE 0x00000000 -+ -+#define TOUCH_MASK_NONE 0x00000000 -+#define TOUCH_MASK_CONTACTAREA 0x00000001 -+#define TOUCH_MASK_ORIENTATION 0x00000002 -+#define TOUCH_MASK_PRESSURE 0x00000004 -+ -+#define PEN_FLAG_NONE 0x00000000 -+#define PEN_FLAG_BARREL 0x00000001 -+#define PEN_FLAG_INVERTED 0x00000002 -+#define PEN_FLAG_ERASER 0x00000004 -+ -+#define PEN_MASK_NONE 0x00000000 -+#define PEN_MASK_PRESSURE 0x00000001 -+#define PEN_MASK_ROTATION 0x00000002 -+#define PEN_MASK_TILT_X 0x00000004 -+#define PEN_MASK_TILT_Y 0x00000008 -+ -+#define POINTER_MESSAGE_FLAG_NEW 0x00000001 -+#define POINTER_MESSAGE_FLAG_INRANGE 0x00000002 -+#define POINTER_MESSAGE_FLAG_INCONTACT 0x00000004 -+#define POINTER_MESSAGE_FLAG_FIRSTBUTTON 0x00000010 -+#define POINTER_MESSAGE_FLAG_SECONDBUTTON 0x00000020 -+#define POINTER_MESSAGE_FLAG_THIRDBUTTON 0x00000040 -+#define POINTER_MESSAGE_FLAG_FOURTHBUTTON 0x00000080 -+#define POINTER_MESSAGE_FLAG_FIFTHBUTTON 0x00000100 -+#define POINTER_MESSAGE_FLAG_PRIMARY 0x00002000 -+#define POINTER_MESSAGE_FLAG_CONFIDENCE 0x00004000 -+#define POINTER_MESSAGE_FLAG_CANCELED 0x00008000 -+ -+#define GET_POINTERID_WPARAM(wParam) (LOWORD (wParam)) -+#define IS_POINTER_FLAG_SET_WPARAM(wParam, flag) (((DWORD)HIWORD (wParam) &(flag)) == (flag)) -+#define IS_POINTER_NEW_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_NEW) -+#define IS_POINTER_INRANGE_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_INRANGE) -+#define IS_POINTER_INCONTACT_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_INCONTACT) -+#define IS_POINTER_FIRSTBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FIRSTBUTTON) -+#define IS_POINTER_SECONDBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_SECONDBUTTON) -+#define IS_POINTER_THIRDBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_THIRDBUTTON) -+#define IS_POINTER_FOURTHBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FOURTHBUTTON) -+#define IS_POINTER_FIFTHBUTTON_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_FIFTHBUTTON) -+#define IS_POINTER_PRIMARY_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_PRIMARY) -+#define HAS_POINTER_CONFIDENCE_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_CONFIDENCE) -+#define IS_POINTER_CANCELED_WPARAM(wParam) IS_POINTER_FLAG_SET_WPARAM (wParam, POINTER_MESSAGE_FLAG_CANCELED) -+ -+#define PA_ACTIVATE MA_ACTIVATE -+#define PA_NOACTIVATE MA_NOACTIVATE -+ -+typedef DWORD POINTER_INPUT_TYPE; -+typedef UINT32 POINTER_FLAGS; -+typedef UINT32 TOUCH_FLAGS; -+typedef UINT32 TOUCH_MASK; -+typedef UINT32 PEN_FLAGS; -+typedef UINT32 PEN_MASK; -+ -+enum tagPOINTER_INPUT_TYPE { -+ PT_POINTER = 0x00000001, -+ PT_TOUCH = 0x00000002, -+ PT_PEN = 0x00000003, -+ PT_MOUSE = 0x00000004, -+ PT_TOUCHPAD = 0x00000005 -+}; -+ -+typedef enum tagFEEDBACK_TYPE { -+ FEEDBACK_TOUCH_CONTACTVISUALIZATION = 1, -+ FEEDBACK_PEN_BARRELVISUALIZATION = 2, -+ FEEDBACK_PEN_TAP = 3, -+ FEEDBACK_PEN_DOUBLETAP = 4, -+ FEEDBACK_PEN_PRESSANDHOLD = 5, -+ FEEDBACK_PEN_RIGHTTAP = 6, -+ FEEDBACK_TOUCH_TAP = 7, -+ FEEDBACK_TOUCH_DOUBLETAP = 8, -+ FEEDBACK_TOUCH_PRESSANDHOLD = 9, -+ FEEDBACK_TOUCH_RIGHTTAP = 10, -+ FEEDBACK_GESTURE_PRESSANDTAP = 11, -+ FEEDBACK_MAX = 0xffffffff -+} FEEDBACK_TYPE; -+ -+typedef enum tagPOINTER_BUTTON_CHANGE_TYPE { -+ POINTER_CHANGE_NONE, -+ POINTER_CHANGE_FIRSTBUTTON_DOWN, -+ POINTER_CHANGE_FIRSTBUTTON_UP, -+ POINTER_CHANGE_SECONDBUTTON_DOWN, -+ POINTER_CHANGE_SECONDBUTTON_UP, -+ POINTER_CHANGE_THIRDBUTTON_DOWN, -+ POINTER_CHANGE_THIRDBUTTON_UP, -+ POINTER_CHANGE_FOURTHBUTTON_DOWN, -+ POINTER_CHANGE_FOURTHBUTTON_UP, -+ POINTER_CHANGE_FIFTHBUTTON_DOWN, -+ POINTER_CHANGE_FIFTHBUTTON_UP, -+} POINTER_BUTTON_CHANGE_TYPE; -+ -+typedef struct tagPOINTER_INFO { -+ POINTER_INPUT_TYPE pointerType; -+ UINT32 pointerId; -+ UINT32 frameId; -+ POINTER_FLAGS pointerFlags; -+ HANDLE sourceDevice; -+ HWND hwndTarget; -+ POINT ptPixelLocation; -+ POINT ptHimetricLocation; -+ POINT ptPixelLocationRaw; -+ POINT ptHimetricLocationRaw; -+ DWORD dwTime; -+ UINT32 historyCount; -+ INT32 InputData; -+ DWORD dwKeyStates; -+ UINT64 PerformanceCount; -+ POINTER_BUTTON_CHANGE_TYPE ButtonChangeType; -+} POINTER_INFO; -+ -+typedef struct tagPOINTER_TOUCH_INFO { -+ POINTER_INFO pointerInfo; -+ TOUCH_FLAGS touchFlags; -+ TOUCH_MASK touchMask; -+ RECT rcContact; -+ RECT rcContactRaw; -+ UINT32 orientation; -+ UINT32 pressure; -+} POINTER_TOUCH_INFO; -+ -+typedef struct tagPOINTER_PEN_INFO { -+ POINTER_INFO pointerInfo; -+ PEN_FLAGS penFlags; -+ PEN_MASK penMask; -+ UINT32 pressure; -+ UINT32 rotation; -+ INT32 tiltX; -+ INT32 tiltY; -+} POINTER_PEN_INFO; -+ -+typedef enum { -+ POINTER_FEEDBACK_DEFAULT = 1, -+ POINTER_FEEDBACK_INDIRECT = 2, -+ POINTER_FEEDBACK_NONE = 3 -+} POINTER_FEEDBACK_MODE; -+ -+typedef struct tagUSAGE_PROPERTIES { -+ USHORT level; -+ USHORT page; -+ USHORT usage; -+ INT32 logicalMinimum; -+ INT32 logicalMaximum; -+ USHORT unit; -+ USHORT exponent; -+ BYTE count; -+ INT32 physicalMinimum; -+ INT32 physicalMaximum; -+} USAGE_PROPERTIES, *PUSAGE_PROPERTIES; -+ -+typedef struct tagPOINTER_TYPE_INFO { -+ POINTER_INPUT_TYPE type; -+ union { -+ POINTER_TOUCH_INFO touchInfo; -+ POINTER_PEN_INFO penInfo; -+ } DUMMYUNIONNAME; -+} POINTER_TYPE_INFO, *PPOINTER_TYPE_INFO; -+ -+#define POINTER_DEVICE_PRODUCT_STRING_MAX 520 -+#define PDC_ARRIVAL 0x001 -+#define PDC_REMOVAL 0x002 -+#define PDC_ORIENTATION_0 0x004 -+#define PDC_ORIENTATION_90 0x008 -+#define PDC_ORIENTATION_180 0x010 -+#define PDC_ORIENTATION_270 0x020 -+#define PDC_MODE_DEFAULT 0x040 -+#define PDC_MODE_CENTERED 0x080 -+#define PDC_MAPPING_CHANGE 0x100 -+#define PDC_RESOLUTION 0x200 -+#define PDC_ORIGIN 0x400 -+#define PDC_MODE_ASPECTRATIOPRESERVED 0x800 -+ -+typedef enum tagPOINTER_DEVICE_TYPE { -+ POINTER_DEVICE_TYPE_INTEGRATED_PEN = 0x00000001, -+ POINTER_DEVICE_TYPE_EXTERNAL_PEN = 0x00000002, -+ POINTER_DEVICE_TYPE_TOUCH = 0x00000003, -+ POINTER_DEVICE_TYPE_TOUCH_PAD = 0x00000004, -+ POINTER_DEVICE_TYPE_MAX = 0xffffffff -+} POINTER_DEVICE_TYPE; -+ -+typedef struct tagPOINTER_DEVICE_INFO { -+ DWORD displayOrientation; -+ HANDLE device; -+ POINTER_DEVICE_TYPE pointerDeviceType; -+ HMONITOR monitor; -+ ULONG startingCursorId; -+ USHORT maxActiveContacts; -+ WCHAR productString[POINTER_DEVICE_PRODUCT_STRING_MAX]; -+} POINTER_DEVICE_INFO; -+ -+typedef struct tagPOINTER_DEVICE_PROPERTY { -+ INT32 logicalMin; -+ INT32 logicalMax; -+ INT32 physicalMin; -+ INT32 physicalMax; -+ UINT32 unit; -+ UINT32 unitExponent; -+ USHORT usagePageId; -+ USHORT usageId; -+} POINTER_DEVICE_PROPERTY; -+ -+typedef enum tagPOINTER_DEVICE_CURSOR_TYPE { -+ POINTER_DEVICE_CURSOR_TYPE_UNKNOWN = 0x00000000, -+ POINTER_DEVICE_CURSOR_TYPE_TIP = 0x00000001, -+ POINTER_DEVICE_CURSOR_TYPE_ERASER = 0x00000002, -+ POINTER_DEVICE_CURSOR_TYPE_MAX = 0xffffffff -+} POINTER_DEVICE_CURSOR_TYPE; -+ -+typedef struct tagPOINTER_DEVICE_CURSOR_INFO { -+ UINT32 cursorId; -+ POINTER_DEVICE_CURSOR_TYPE cursor; -+} POINTER_DEVICE_CURSOR_INFO; -+ -+#endif /* POINTER_FLAG_NONE */ -+ -+#if WINVER < 0x0601 -+ -+typedef struct tagGESTURECONFIG { -+ DWORD dwID; -+ DWORD dwWant; -+ DWORD dwBlock; -+} GESTURECONFIG,*PGESTURECONFIG; -+ -+#endif /* WINVER < 0x0601 */ -+ -+#ifndef MICROSOFT_TABLETPENSERVICE_PROPERTY -+#define MICROSOFT_TABLETPENSERVICE_PROPERTY _T("MicrosoftTabletPenServiceProperty") -+#endif diff --git a/versions/baseline.json b/versions/baseline.json index c64dcdda9bd2ff..51ff84af4765a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2709,7 +2709,7 @@ "port-version": 1 }, "gtk3": { - "baseline": "3.24.30", + "baseline": "3.24.33", "port-version": 0 }, "gtkmm": { diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index 5fd17c51b3c7d1..b8179ac1a6ad9a 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "53b363c6d206f54f722b02d4ba884bfaf2fe9038", - "version": "3.24.30", + "git-tree": "22074fb5f57852d5d7679329587fbbb88fdc42d6", + "version": "3.24.33", "port-version": 0 } ] From 74a40b7e01778a4819fd9a13b94808f154029936 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Tue, 31 May 2022 23:30:52 +0700 Subject: [PATCH 3/3] Update to 3.24.34 --- ports/gtk3/portfile.cmake | 4 ++-- ports/gtk3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtk3.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index e52015eb6e26b6..6821b386bf6fd5 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -10,8 +10,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH GITLAB_URL https://gitlab.gnome.org REPO GNOME/gtk - REF 3.24.33 - SHA512 634c3684e670e662340e780a0f561ddc191790625d6b7f28ec7fbb1fcaec86856091e94124565f138d3adaa08a9e063ead2ff441354763b21b4e887c2a54e8d0 + REF 3.24.34 + SHA512 20a91e30a89070461af06b33829bc723b348806b4a785d0743af8bd4789b55dade24686e08bf1b2f0335240463aacc040134babb0605b809186b15de9cf261e4 PATCHES 0001-build.patch ) diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index 67892394bb2b83..656c4f5d71caea 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtk3", - "version": "3.24.33", + "version": "3.24.34", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 51ff84af4765a0..e607848e28780e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2709,7 +2709,7 @@ "port-version": 1 }, "gtk3": { - "baseline": "3.24.33", + "baseline": "3.24.34", "port-version": 0 }, "gtkmm": { diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index b8179ac1a6ad9a..456911adf37c71 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "22074fb5f57852d5d7679329587fbbb88fdc42d6", - "version": "3.24.33", + "git-tree": "2a245ace5edaf583f10781a2fdee1254e4bc30f2", + "version": "3.24.34", "port-version": 0 } ]