[gtk] update to 4.4.0 #20654

Berrysoft · 2021-10-11T10:09:15Z

It should also fix #20241 according to my test on Windows.

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json
index 3bd4af4..d045461 100644
--- a/ports/gtk/vcpkg.json
+++ b/ports/gtk/vcpkg.json
@@ -32,4 +32,4 @@
     "pango",
     "sassc"
   ]
-}
\ No newline at end of file
+}

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
index 24c1a71..31b7038 100644
--- a/versions/g-/gtk.json
+++ b/versions/g-/gtk.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f1f197e3b94a55d5cbfaae2498f991a0ae733b32",
+      "git-tree": "7a0b64ed1aad48778c783587ead610d7368ee580",
       "version": "4.4.0",
       "port-version": 0
     },

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
index e13b293..31b7038 100644
--- a/versions/g-/gtk.json
+++ b/versions/g-/gtk.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "9e7905845335a944321446ecd346ff7b3e154a47",
+      "git-tree": "7a0b64ed1aad48778c783587ead610d7368ee580",
       "version": "4.4.0",
       "port-version": 0
     },

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
index 31b7038..3592b00 100644
--- a/versions/g-/gtk.json
+++ b/versions/g-/gtk.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "7a0b64ed1aad48778c783587ead610d7368ee580",
+      "git-tree": "770f1bccb962223beac9a40b7069d2ae414b068c",
       "version": "4.4.0",
       "port-version": 0
     },

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json
index 31b7038..7dac5e1 100644
--- a/versions/g-/gtk.json
+++ b/versions/g-/gtk.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "7a0b64ed1aad48778c783587ead610d7368ee580",
+      "git-tree": "e6e7ce0da8740be9a4fa16e0245a35ff16a185b6",
       "version": "4.4.0",
       "port-version": 0
     },

Berrysoft · 2021-10-11T12:53:58Z

There seems to be no xdamage extension in the CI image, so I modified the meson.build to adapt to that. However, it seems that the GTK developers require the package to be available. Are there some ways to add xdamage to the CI Linux image?

JackBoosY · 2021-10-12T00:57:22Z

cc @BillyONeal to add xdamage in the next roll if it's suitable.

ports/gtk/0003-vs2022-rc.patch

ports/gtk/0005-xdamage-optional.patch

BillyONeal · 2021-10-12T19:38:45Z

There seems to be no xdamage extension in the CI image, so I modified the meson.build to adapt to that. However, it seems that the GTK developers require the package to be available. Are there some ways to add xdamage to the CI Linux image?

@BillyONeal ➜ /workspaces/vcpkg-tool (main) $ sudo apt install xdamage
Reading package lists... Done
Building dependency tree
Reading state information... Done
E: Unable to locate package xdamage

Please provide a patch to scripts/azure-pipelines/linux/provision-image.sh that adds what you need.

Berrysoft · 2021-10-13T07:36:40Z

The package should be libxdamage-dev. I'll try it.

cenit · 2021-11-19T16:47:15Z

what's blocking this PR?
if a rebuild is triggered it should pass easily. It passed in my own #20658

cenit · 2021-11-19T16:47:44Z

@JackBoosY this PR does not depend anymore on other PRs

Berrysoft · 2021-11-19T16:48:25Z

/azp run

azure-pipelines · 2021-11-19T16:48:31Z

Commenter does not have sufficient privileges for PR 20654 in repo microsoft/vcpkg

Berrysoft · 2021-11-19T16:50:01Z

Well, then... we need a rerun @JackBoosY

cenit · 2021-11-19T19:50:13Z

you can merge with master and trigger a rebuild in that way

PhoebeHui · 2021-11-22T08:32:26Z

/azp run

azure-pipelines · 2021-11-22T08:32:37Z

Azure Pipelines successfully started running 1 pipeline(s).

BillyONeal · 2021-11-22T22:20:30Z

ports/gtk/0003-vs2022-rc.patch

+@@ -1,5 +1,5 @@
+-#include <winuser.h>
+-#include <winver.h>
+#define WIN32_LEAN_AND_MEAN


Has this patch been submitted upstream? I don't think it is a correct fix. The problem is that rc.exe is being handed a huge blob of C header files it is not intended to tolerate, and I think the correct fix is that all such things should be guarded by RC_INVOKED; but at a minimum upstream needs to be made aware and OK this as they seem relatively responsive.

Well, it has been merged: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4063

I don't know how the headers affect rc.exe, but at least it works...

Oh, and by the way, the merged patch is not authored by me. Mine was closed in perfer of the merged one.

BillyONeal · 2021-11-22T22:20:43Z

ports/gtk/0003-vs2022-rc.patch

+                         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')


Seems like this part of the change is unintended?

Hm, seems so. This is only a diff, and git might see something we could not found.

So, please revert this changes.

Oh, I finally found the difference. winuser.h was changed to windows.h, because of the headers included changed above.

I think the changes should not be reverted then, although it doesn't make effects to our end users.

So I think it's good.
Ping @BillyONeal for review again.

Ah, I see. The change is unrelated to how it builds in vcpkg which means we would normally want to keep it out of a vcpkg patch, but it's here because of the corresponding upstream change.

BillyONeal

Waiting for notification that upstream has been notified about the patch and the lines that look like an unrelated whitespace change removed. (We don't need to wait until upstream has done a release with the changes, but we want to give them some opportunity to either accept or reject them since this is effectively putting code in their mouth)

BillyONeal · 2021-11-29T16:43:09Z

Thanks for providing the link to the upstream change :)

BillyONeal · 2021-11-29T16:43:53Z

Thanks for the update!

Berrysoft added 2 commits October 11, 2021 18:01

Make gtk4.4 build.

9565a07

Update baseline for gtk

36e72b7

github-actions bot requested changes Oct 11, 2021

View reviewed changes

JonLiu1993 assigned JackBoosY Oct 11, 2021

Fix vcpkg version.

6fd26a9

github-actions bot requested changes Oct 11, 2021

View reviewed changes

Fix vcpkg version.

c37d4b6

github-actions bot approved these changes Oct 11, 2021

View reviewed changes

JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 11, 2021

Berrysoft added 3 commits October 11, 2021 20:23

[gtk] Fix macos build.

04e7d33

[gtk] Fix linux build.

3225d58

[gtk] Add patches.

8d4afab

github-actions bot requested changes Oct 11, 2021

View reviewed changes

[gtk] Bump versions - again

fa00182

github-actions bot approved these changes Oct 11, 2021

View reviewed changes

Berrysoft added 2 commits October 11, 2021 20:40

Fix macos patch.

d642a2b

Bump versions.

f2e1049

github-actions bot approved these changes Oct 11, 2021

View reviewed changes

JackBoosY added the depends:vm-update PR contains changes to the VM provisioning scripts label Oct 12, 2021

JackBoosY suggested changes Oct 12, 2021

View reviewed changes

ports/gtk/0003-vs2022-rc.patch Outdated Show resolved Hide resolved

ports/gtk/0005-xdamage-optional.patch Outdated Show resolved Hide resolved

JackBoosY added the requires:author-response label Oct 12, 2021

cenit mentioned this pull request Oct 12, 2021

[OpenCV] update to v4.5.4 and v3.4.16 #20658

Merged

JackBoosY added depends:upstream-changes Waiting on a change to the upstream project and removed requires:author-response labels Oct 12, 2021

Install xdamage.

93da5e1

JackBoosY added depends:different-pr This PR or Issue depends on a PR which has been filed and removed requires:author-response labels Nov 12, 2021

JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Nov 22, 2021

BillyONeal reviewed Nov 22, 2021

View reviewed changes

BillyONeal added depends:upstream-changes Waiting on a change to the upstream project requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Nov 22, 2021

BillyONeal requested changes Nov 22, 2021

View reviewed changes

JackBoosY removed the depends:upstream-changes Waiting on a change to the upstream project label Nov 23, 2021

JackBoosY requested a review from BillyONeal November 23, 2021 08:47

JackBoosY removed the requires:author-response label Nov 23, 2021

BillyONeal added 2 commits November 29, 2021 08:31

Add comment about change being merged upstream.

16de417

Merge remote-tracking branch 'origin/master' into HEAD

17e5339

BillyONeal approved these changes Nov 29, 2021

View reviewed changes

github-actions bot approved these changes Nov 29, 2021

View reviewed changes

BillyONeal added the info:reviewed Pull Request changes follow basic guidelines label Nov 29, 2021

BillyONeal merged commit 3f56cc6 into microsoft:master Nov 29, 2021

Berrysoft deleted the gtk4.4 branch November 29, 2021 17:01

ruifengx mentioned this pull request Feb 4, 2022

Support for vcpkg on Windows gtk-rs/gtk4-rs#865

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[gtk] update to 4.4.0 #20654

[gtk] update to 4.4.0 #20654

Berrysoft commented Oct 11, 2021

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

Berrysoft commented Oct 11, 2021 •

edited

Loading

JackBoosY commented Oct 12, 2021 •

edited

Loading

BillyONeal commented Oct 12, 2021

Berrysoft commented Oct 13, 2021

cenit commented Nov 19, 2021

cenit commented Nov 19, 2021

Berrysoft commented Nov 19, 2021

azure-pipelines bot commented Nov 19, 2021

Berrysoft commented Nov 19, 2021

cenit commented Nov 19, 2021

PhoebeHui commented Nov 22, 2021

azure-pipelines bot commented Nov 22, 2021

BillyONeal Nov 22, 2021

Berrysoft Nov 23, 2021

Berrysoft Nov 23, 2021 •

edited

Loading

BillyONeal Nov 22, 2021

Berrysoft Nov 23, 2021 •

edited

Loading

JackBoosY Nov 23, 2021

Berrysoft Nov 23, 2021

Berrysoft Nov 23, 2021

JackBoosY Nov 23, 2021

BillyONeal Nov 29, 2021

BillyONeal left a comment •

edited

Loading

BillyONeal commented Nov 29, 2021

BillyONeal commented Nov 29, 2021

[gtk] update to 4.4.0 #20654

[gtk] update to 4.4.0 #20654

Conversation

Berrysoft commented Oct 11, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

Berrysoft commented Oct 11, 2021 • edited Loading

JackBoosY commented Oct 12, 2021 • edited Loading

BillyONeal commented Oct 12, 2021

Berrysoft commented Oct 13, 2021

cenit commented Nov 19, 2021

cenit commented Nov 19, 2021

Berrysoft commented Nov 19, 2021

azure-pipelines bot commented Nov 19, 2021

Berrysoft commented Nov 19, 2021

cenit commented Nov 19, 2021

PhoebeHui commented Nov 22, 2021

azure-pipelines bot commented Nov 22, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Berrysoft Nov 23, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Berrysoft Nov 23, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BillyONeal left a comment • edited Loading

Choose a reason for hiding this comment

BillyONeal commented Nov 29, 2021

BillyONeal commented Nov 29, 2021

Berrysoft commented Oct 11, 2021 •

edited

Loading

JackBoosY commented Oct 12, 2021 •

edited

Loading

Berrysoft Nov 23, 2021 •

edited

Loading

Berrysoft Nov 23, 2021 •

edited

Loading

BillyONeal left a comment •

edited

Loading