-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Make gtk4.4 build. * Update baseline for gtk * Fix vcpkg version. * Fix vcpkg version. * [gtk] Fix macos build. * [gtk] Fix linux build. * [gtk] Add patches. * [gtk] Bump versions - again * Fix macos patch. * Bump versions. * Install xdamage. * Bump versions. * Add merged patch from upstream. * [gtk] Bump version. * Delete duplicate install of libxdamage-dev * Add comment about change being merged upstream. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
- Loading branch information
1 parent
b6b0e29
commit 3f56cc6
Showing
8 changed files
with
79 additions
and
13 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
diff -ru /gdk/win32/gdkinput-winpointer.c b/gdk/win32/gdkinput-winpointer.c | ||
--- a/gdk/win32/gdkinput-winpointer.c | ||
+++ b/gdk/win32/gdkinput-winpointer.c | ||
@@ -18,6 +18,7 @@ | ||
#include "config.h" | ||
|
||
#include <gdk/gdk.h> | ||
+#include "gdk-private.h" | ||
#include "gdkwin32.h" | ||
#include "gdkprivate-win32.h" | ||
#include "gdkdevicemanager-win32.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in | ||
index b876a6ddf51846236f2c77e4c529b0c0a84e303e..fc2dfd2ed31ed518cc8238bd5b5602cc4a343f02 100644 | ||
--- a/gtk/gtk-win32.rc.body.in | ||
+++ b/gtk/gtk-win32.rc.body.in | ||
@@ -1,5 +1,5 @@ | ||
-#include <winuser.h> | ||
-#include <winver.h> | ||
+#define WIN32_LEAN_AND_MEAN | ||
+#include <windows.h> | ||
|
||
GTK_ICON ICON "gtk.ico" | ||
|
||
diff --git a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py | ||
index ede6ba5044c3f11112f5e8f36dea8f1aaa14a70d..62f063a8bb6d00201ca42a28eb33e560179a41f5 100644 | ||
--- a/tools/generate-uac-manifest.py | ||
+++ b/tools/generate-uac-manifest.py | ||
@@ -24,7 +24,7 @@ def main(): | ||
help='require admin access to application') | ||
parser.add_argument('--input-resource-file', dest='resource', | ||
default=None, | ||
- help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it') | ||
+ help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it') | ||
parser.add_argument('--output-dir', dest='outdir', | ||
default=None, | ||
help='directory to output resulting files') | ||
@@ -92,7 +92,8 @@ def write_rc_file(name, resource, outdir): | ||
|
||
if resource is None: | ||
outfile = open(output_file_base_name + '.rc', 'w+') | ||
- outfile.write('#include <winuser.h>') | ||
+ outfile.write('#define WIN32_LEAN_AND_MEAN\n') | ||
+ outfile.write('#include <windows.h>\n') | ||
else: | ||
if resource != output_file_base_name + '.rc': | ||
outfile = open(output_file_base_name + '.rc', 'w+') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff -u a/gdk/macos/gdkmacoseventsource-private.h b/gdk/macos/gdkmacoseventsource-private.h | ||
--- a/gdk/macos/gdkmacoseventsource-private.h | ||
+++ b/gdk/macos/gdkmacoseventsource-private.h | ||
@@ -24,6 +24,8 @@ | ||
|
||
#include "gdkmacosdisplay.h" | ||
|
||
+#include "gdk-private.h" | ||
+ | ||
G_BEGIN_DECLS | ||
|
||
typedef enum |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters