Skip to content

[kf5windowsystem] fix cmake.in for static usage; extra fixes#19440

Merged
ras0219-msft merged 4 commits intomicrosoft:masterfrom
wrobelda:kf5windowsystem_fixes
Aug 19, 2021
Merged

[kf5windowsystem] fix cmake.in for static usage; extra fixes#19440
ras0219-msft merged 4 commits intomicrosoft:masterfrom
wrobelda:kf5windowsystem_fixes

Conversation

@wrobelda
Copy link
Contributor

@wrobelda wrobelda commented Aug 7, 2021

  • What does your PR fix?

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    No change.

  • Does your PR follow the maintainer guide?

    Yes.

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes.

@wrobelda wrobelda force-pushed the kf5windowsystem_fixes branch from e0b337b to 2121ced Compare August 7, 2021 20:35
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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: Local changes detected for kf5windowsystem but no changes to version or port version.
-- Version: 5.84.0#1
-- Old SHA: 719b81cebad63502bbb619781290844c586acef9
-- New SHA: 5f78206cf77d0ca151e367199ed0443dd45532b1
-- Did you remember to update the version or port version?
-- Pass `--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 57bd7102d9fd880daa1b0958692294c4a125f6d8 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json
index 04bc1e4..091e5c1 100644
--- a/versions/k-/kf5windowsystem.json
+++ b/versions/k-/kf5windowsystem.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "5f78206cf77d0ca151e367199ed0443dd45532b1",
-      "version-semver": "5.84.0",
+      "git-tree": "719b81cebad63502bbb619781290844c586acef9",
+      "version": "5.84.0",
       "port-version": 1
     },
     {

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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: Local changes detected for kf5windowsystem but no changes to version or port version.
-- Version: 5.84.0#1
-- Old SHA: 719b81cebad63502bbb619781290844c586acef9
-- New SHA: c9b5cbae7c21fcde752f9973f5dafabd896111f4
-- Did you remember to update the version or port version?
-- Pass `--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 57bd7102d9fd880daa1b0958692294c4a125f6d8 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json
index cdfae26..091e5c1 100644
--- a/versions/k-/kf5windowsystem.json
+++ b/versions/k-/kf5windowsystem.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "c9b5cbae7c21fcde752f9973f5dafabd896111f4",
-      "version-semver": "5.84.0",
+      "git-tree": "719b81cebad63502bbb619781290844c586acef9",
+      "version": "5.84.0",
       "port-version": 1
     },
     {

@wrobelda wrobelda force-pushed the kf5windowsystem_fixes branch from 2121ced to 5342845 Compare August 7, 2021 20:37
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 57bd7102d9fd880daa1b0958692294c4a125f6d8 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json
index 505c2c4..db56ed7 100644
--- a/versions/k-/kf5windowsystem.json
+++ b/versions/k-/kf5windowsystem.json
@@ -6,8 +6,8 @@
       "port-version": 2
     },
     {
-      "git-tree": "c9b5cbae7c21fcde752f9973f5dafabd896111f4",
-      "version-semver": "5.84.0",
+      "git-tree": "719b81cebad63502bbb619781290844c586acef9",
+      "version": "5.84.0",
       "port-version": 1
     },
     {

@wrobelda wrobelda force-pushed the kf5windowsystem_fixes branch from 5342845 to dd06eba Compare August 7, 2021 20:41
- apply https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/27 patch
- fix MAYBE_UNUSED_VARIABLES usage
- use semVer
- update deprecated functions
- wrap paths in quotes
- don't overzealously remove folders
@wrobelda wrobelda force-pushed the kf5windowsystem_fixes branch from dd06eba to d0774ac Compare August 7, 2021 21:14
@JackBoosY JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label Aug 9, 2021
@wrobelda wrobelda mentioned this pull request Aug 9, 2021
@wrobelda wrobelda force-pushed the kf5windowsystem_fixes branch from 57d4756 to 8e06356 Compare August 9, 2021 22:58
@JackBoosY JackBoosY added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. labels Aug 12, 2021
@ras0219-msft ras0219-msft merged commit ab60f27 into microsoft:master Aug 19, 2021
@ras0219-msft
Copy link
Contributor

This LGTM, thanks for the PR and sincerest apologies that it took so long to get merged!

Jimmy-Hu added a commit to Jimmy-Hu/vcpkg that referenced this pull request Aug 20, 2021
[kf5windowsystem] fix cmake.in for static usage; extra fixes (microsoft#19440)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants