[many ports] Add X windows part 11/N #27441

Neumann-A · 2022-10-24T14:44:05Z

No description provided.

github-actions

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for libx11 have changed but the version was not updated
version: 1.7.3.1#1
old SHA: e69bacce69d31cc63b4c1f6c5637ba204289a496
new SHA: 573cd06f2b603a5e604855a4ef14624ed87a3fda
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

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

git add -u && git commit
git checkout 934a99dc13cabb330824ae1a5ab4a53a9acc5a49 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 32b4280..b831e7c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3822,7 +3822,7 @@
     },
     "libice": {
       "baseline": "1.0.10",
-      "port-version": 0
+      "port-version": 1
     },
     "libiconv": {
       "baseline": "1.17",
@@ -4376,6 +4376,10 @@
       "baseline": "1.0.9",
       "port-version": 0
     },
+    "libxaw": {
+      "baseline": "1.0.13",
+      "port-version": 0
+    },
     "libxcomposite": {
       "baseline": "0.4.5",
       "port-version": 0
@@ -4444,6 +4448,10 @@
       "baseline": "4.4.1",
       "port-version": 8
     },
+    "libxmu": {
+      "baseline": "1.1.3",
+      "port-version": 0
+    },
     "libxpm": {
       "baseline": "3.5.11",
       "port-version": 1
@@ -4472,10 +4480,22 @@
       "baseline": "1.1.37",
       "port-version": 0
     },
+    "libxt": {
+      "baseline": "1.2.1",
+      "port-version": 0
+    },
+    "libxtst": {
+      "baseline": "1.2.4",
+      "port-version": 0
+    },
     "libxv": {
       "baseline": "1.0.11",
       "port-version": 0
     },
+    "libxxf86vm": {
+      "baseline": "1.1.5",
+      "port-version": 0
+    },
     "libyaml": {
       "baseline": "0.2.5",
       "port-version": 3
diff --git a/versions/l-/libice.json b/versions/l-/libice.json
index 38babce..3328243 100644
--- a/versions/l-/libice.json
+++ b/versions/l-/libice.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c19081b820dd8056dbb7bbb052ca0c3bcf628cd7",
+      "version": "1.0.10",
+      "port-version": 1
+    },
     {
       "git-tree": "95b91f0eb6ed362a133896484d1cc4fa5ee3b007",
       "version": "1.0.10",

ports/libxaw/getpagesize.patch

github-actions

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for libxxf86vm have changed but the version was not updated
version: 1.1.5
old SHA: 699ebcb7ff1874847d75c5da456a2d00860a1074
new SHA: a4dfb11cf5012b77357e097116359740ee7ade1f
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for libxt have changed but the version was not updated
version: 1.2.1
old SHA: 0bee0757045f9a2f3bf939f0cbbf3176a7b40abe
new SHA: bedb03dd27570db1aeb3e435549b5c527eba11b9
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

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

git add -u && git commit
git checkout 934a99dc13cabb330824ae1a5ab4a53a9acc5a49 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 898233b..aae3735 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4454,7 +4454,7 @@
     },
     "libxpm": {
       "baseline": "3.5.11",
-      "port-version": 1
+      "port-version": 2
     },
     "libxpresent": {
       "baseline": "1.0.0",
diff --git a/versions/l-/libxpm.json b/versions/l-/libxpm.json
index cc9d5fc..4a56da7 100644
--- a/versions/l-/libxpm.json
+++ b/versions/l-/libxpm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "57445ce71e4aaed7f8474048b8f84525208f7007",
+      "version": "3.5.11",
+      "port-version": 2
+    },
     {
       "git-tree": "04f6484a58c91b33e62feae8a44caa25ab667aaf",
       "version": "3.5.11",

github-actions

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for libxxf86vm have changed but the version was not updated
version: 1.1.5
old SHA: 699ebcb7ff1874847d75c5da456a2d00860a1074
new SHA: a4dfb11cf5012b77357e097116359740ee7ade1f
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for libxt have changed but the version was not updated
version: 1.2.1
old SHA: 0bee0757045f9a2f3bf939f0cbbf3176a7b40abe
new SHA: fe82861ef794282accd3879ea421e25af282923c
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

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

git add -u && git commit
git checkout 934a99dc13cabb330824ae1a5ab4a53a9acc5a49 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 898233b..aae3735 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4454,7 +4454,7 @@
     },
     "libxpm": {
       "baseline": "3.5.11",
-      "port-version": 1
+      "port-version": 2
     },
     "libxpresent": {
       "baseline": "1.0.0",
diff --git a/versions/l-/libxpm.json b/versions/l-/libxpm.json
index cc9d5fc..4a56da7 100644
--- a/versions/l-/libxpm.json
+++ b/versions/l-/libxpm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "57445ce71e4aaed7f8474048b8f84525208f7007",
+      "version": "3.5.11",
+      "port-version": 2
+    },
     {
       "git-tree": "04f6484a58c91b33e62feae8a44caa25ab667aaf",
       "version": "3.5.11",

github-actions

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/kf5kio/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for libxpm have changed but the version was not updated
version: 3.5.11#2
old SHA: 7d7e7aaaf8aa2bd886dcea789497ed9496d0d7dc
new SHA: 3efa6a545aff99a8e1a6055284149e7717043f47
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

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

git add -u && git commit
git checkout 934a99dc13cabb330824ae1a5ab4a53a9acc5a49 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index f258f03..312c88a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4369,8 +4369,8 @@
       "port-version": 3
     },
     "libx11": {
-      "baseline": "1.7.3.1",
-      "port-version": 2
+      "baseline": "1.8.1",
+      "port-version": 0
     },
     "libxau": {
       "baseline": "1.0.9",
diff --git a/versions/l-/libx11.json b/versions/l-/libx11.json
index d5635b8..0a7c072 100644
--- a/versions/l-/libx11.json
+++ b/versions/l-/libx11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c8326a2ece2f179c0e57b26233c8506872ef49d5",
+      "version": "1.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "05282e1e4d501c80dc305b386ce7b814296a66da",
       "version": "1.7.3.1",

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/kf5kio/vcpkg.json

Valid values for the license field can be found in the documentation

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/libxt/vcpkg.json b/ports/libxt/vcpkg.json
index 33fe7b8..473e3fb 100644
--- a/ports/libxt/vcpkg.json
+++ b/ports/libxt/vcpkg.json
@@ -11,11 +11,11 @@
     "libsm",
     "libx11",
     {
-      "name": "vcpkg-cmake-get-vars",
+      "name": "libxt",
       "host": true
     },
     {
-      "name": "libxt",
+      "name": "vcpkg-cmake-get-vars",
       "host": true
     },
     "xorg-macros",

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for libxt have changed but the version was not updated
version: 1.2.1
old SHA: fe82861ef794282accd3879ea421e25af282923c
new SHA: f2d8e9953f3fa31376a7f44be649ae34e6fb7d15
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for libxpm have changed but the version was not updated
version: 3.5.11#2
old SHA: 7d7e7aaaf8aa2bd886dcea789497ed9496d0d7dc
new SHA: 3efa6a545aff99a8e1a6055284149e7717043f47
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

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

git add -u && git commit
git checkout 44135c31038685cb7deaed1d703ef6707c867a0d -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 27941a4..89326b6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4369,8 +4369,8 @@
       "port-version": 3
     },
     "libx11": {
-      "baseline": "1.7.3.1",
-      "port-version": 2
+      "baseline": "1.8.1",
+      "port-version": 0
     },
     "libxau": {
       "baseline": "1.0.9",
diff --git a/versions/l-/libx11.json b/versions/l-/libx11.json
index d5635b8..0a7c072 100644
--- a/versions/l-/libx11.json
+++ b/versions/l-/libx11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c8326a2ece2f179c0e57b26233c8506872ef49d5",
+      "version": "1.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "05282e1e4d501c80dc305b386ce7b814296a66da",
       "version": "1.7.3.1",

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/kf5kio/vcpkg.json

Valid values for the license field can be found in the documentation

BillyONeal · 2022-11-01T02:28:50Z

I'm not sure how to evaluate the correctness of these patches. Have they been submitted upstream?

Neumann-A · 2022-11-01T09:10:50Z

I'm not sure how to evaluate the correctness of these patches. Have they been submitted upstream?

No upstream doesn't care about MSVC or native Windows at all. Leave a comment at the patch you have a problem to evaluate the correctness of.

BillyONeal · 2022-11-02T02:46:04Z

No upstream doesn't care about MSVC or native Windows at all.

Upstream not caring is not itself justification for vcpkg to be taking up such a mantle. In the contrary, it argues against something being included in the index in the first place.

Leave a comment at the patch you have a problem to evaluate the correctness of.

Anything that is a meaningful and substantial change to the product code, that makes decisions that occur in product code. The entierty of thread_safe_init.patch for example which looks like it was copy pasted out of a StackOverflow answer without thought for what initialization order consequences in the resulting program are.

Similarly libxmu/cl-build.patch sets a macro controlling an unknowably large amount of code, and the creates a global variable bringing up the nonlocal static initialization order fiasco.

The burden of proof is on the patch to demonstrate its correctness, and I think at an absolute minimum upstream notification is necessary here.

Neumann-A · 2022-11-02T09:21:02Z

Anything that is a meaningful and substantial ....

I already said I am fine with removing that patch and just configure libx11 without threadsafe init. All multi-threaded Xlib application should already be calling XInitThreads (assuming they read the docs ;) )

initialization order consequences

there are none. XInitThreads just initializes some variables/locks itself so other functions in main can call xlib functions without caring to call XInitThreads before that. Basically the code should always look like:

int main() {
XInitThreads() // Only necessary If you plan to all call xlib functions from different threads
<other xlib functions call go here>
}

but as i said no need to argue here I just remove it ;)

Similarly libxmu/cl-build.patch sets a macro controlling an unknowably large amount of code, and the creates a global variable bringing up the nonlocal static initialization order fiasco.

#define XTSTRINGDEFINES // Otherwise XtRImmediate is not a constant expression

Is a funny one. It only controls how some purely string defines are handled from <X11/StringDefs.h> (same behavior in <X11/Shell.h>; XTSTRINGDEFINES is only used in those two headers. And those two headers are also automatically generated by the build of libX11)

#ifdef XTSTRINGDEFINES
#define XtNaccelerators "accelerators"
#define XtNallowHoriz "allowHoriz"
...
#else
XT_EXTERN_API _XtStringDefs_h_Const char XtStrings[]; // XtStrings is a char array containing the above names as a null terminated list of char arrays
#ifndef XtNaccelerators
#define XtNaccelerators ((String)&XtStrings[0])
#endif
#ifndef XtNallowHoriz
#define XtNallowHoriz ((String)&XtStrings[13])
#endif
....
#endif

Basically MSVC cannot use something like ((String)&XtStrings[13]) in const context if libX11 has been build dynamically (it works if libX11 is a static library). I can generally set XTSTRINGDEFINES in the header of libX11 if that is more to your liking but I assumed explicitly switching is better to avoid duplication of strings in non const context.

and the creates a global variable bringing up the non-local static initialization order fiasco.

I'll recheck if const EditresBlock editDefault(BlockNone); is required. I currently cannot remember why I added it. (I probably will just remove it for now until I see a problem about it again.)

Neumann-A · 2022-11-07T10:21:41Z

@JonLiu1993 Remove author_response tag?

BillyONeal · 2022-11-10T21:59:01Z

@JavierMatosD @valeriaconde @ras0219-msft @vicroms and I looked at this today and now that a lot of the patching has been removed agree it might be OK after some investigation of what that set macro does. Retagging reviewed.

[many ports] Add X windows part 11/N (microsoft#27441)

Neumann-A added 7 commits October 24, 2022 15:25

[libice] replace macros with typedefs

a05ba9c

[libx11] fix dl linkage on linux and cleanup the cmake wrapper.

3e70ad8

[libxxf86vm] add port

80bfa2b

[libxtst] add port

fb41692

[libxt] add port

385e2dd

[libxmu] add port

248b69d

[libxaw] add port

5f991b6

github-actions bot requested changes Oct 24, 2022

View reviewed changes

Neumann-A commented Oct 24, 2022

View reviewed changes

ports/libxaw/getpagesize.patch Outdated Show resolved Hide resolved

Neumann-A added 2 commits October 24, 2022 17:05

bump port version

8bafb04

v db

a478f45

github-actions bot previously approved these changes Oct 24, 2022

View reviewed changes

LilyWangLL assigned JonLiu1993 Oct 25, 2022

JonLiu1993 changed the title ~~X windows part 11/N~~ [many ports] Add X windows part 11/N Oct 25, 2022

JonLiu1993 added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Oct 25, 2022

Neumann-A added 2 commits October 25, 2022 13:16

fix libxpm and maybe cross libxt

fb303f1

malloc returns null for cross builds

571918c

Neumann-A dismissed github-actions[bot]’s stale review via 571918c October 25, 2022 11:18

github-actions bot requested changes Oct 25, 2022

View reviewed changes

fix typo

b40609d

github-actions bot requested changes Oct 25, 2022

View reviewed changes

Neumann-A added 2 commits October 25, 2022 16:56

fix stuff

9148fc9

v db

a0d399d

github-actions bot previously approved these changes Oct 25, 2022

View reviewed changes

fix stuff ?

5ef2145

Neumann-A dismissed github-actions[bot]’s stale review via 5ef2145 October 25, 2022 21:21

github-actions bot requested changes Oct 25, 2022

View reviewed changes

Neumann-A added 2 commits October 26, 2022 12:23

Merge remote-tracking branch 'upstream/master' into x_windows_part11

0ba69f1

WIP commit

f7adf91

github-actions bot requested changes Oct 26, 2022

View reviewed changes

JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Oct 31, 2022

JonLiu1993 added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Nov 1, 2022

Neumann-A added 5 commits November 2, 2022 10:25

Merge remote-tracking branch 'upstream/master' into x_windows_part11

6960211

libxmu remove global variable.

d49ac26

correctly split unistd.patch and apply it

409c474

disable thread safe init in libx11 on windows

b3388f7

v db

98a4d85

Neumann-A dismissed stale reviews from JonLiu1993 and github-actions[bot] via 98a4d85 November 2, 2022 09:31

github-actions bot previously approved these changes Nov 2, 2022

View reviewed changes

Neumann-A added 2 commits November 2, 2022 11:23

libx11 append options correctly.

1b97ceb

v db

847d3a9

Neumann-A dismissed github-actions[bot]’s stale review via 847d3a9 November 2, 2022 10:24

github-actions bot previously approved these changes Nov 2, 2022

View reviewed changes

Neumann-A added 2 commits November 2, 2022 11:25

still not correct.

3d1cd4b

v db

f4e4f33

Neumann-A dismissed github-actions[bot]’s stale review via f4e4f33 November 2, 2022 10:26

github-actions bot approved these changes Nov 2, 2022

View reviewed changes

JonLiu1993 removed the requires:author-response label Nov 7, 2022

BillyONeal added the info:reviewed Pull Request changes follow basic guidelines label Nov 10, 2022

JavierMatosD merged commit 6f7ffeb into microsoft:master Nov 12, 2022

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Nov 12, 2022

Merge pull request #1200 from microsoft/master

f20c5b1

[many ports] Add X windows part 11/N (microsoft#27441)

Neumann-A deleted the x_windows_part11 branch November 12, 2022 19:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[many ports] Add X windows part 11/N #27441

[many ports] Add X windows part 11/N #27441

Neumann-A commented Oct 24, 2022

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

BillyONeal commented Nov 1, 2022

Neumann-A commented Nov 1, 2022

BillyONeal commented Nov 2, 2022 •

edited

Loading

Neumann-A commented Nov 2, 2022 •

edited

Loading

Neumann-A commented Nov 7, 2022

BillyONeal commented Nov 10, 2022

[many ports] Add X windows part 11/N #27441

[many ports] Add X windows part 11/N #27441

Conversation

Neumann-A commented Oct 24, 2022

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

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

BillyONeal commented Nov 1, 2022

Neumann-A commented Nov 1, 2022

BillyONeal commented Nov 2, 2022 • edited Loading

Neumann-A commented Nov 2, 2022 • edited Loading

Neumann-A commented Nov 7, 2022

BillyONeal commented Nov 10, 2022

BillyONeal commented Nov 2, 2022 •

edited

Loading

Neumann-A commented Nov 2, 2022 •

edited

Loading