ports
/
kde-plasma-6
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.7 #2

Closed
Leeroy wants to merge 3 commits from Leeroy/kde-plasma-6:3.7 into 3.7
pull from: Leeroy/kde-plasma-6:3.7
merge into: ports:3.7
Conversation 3 Commits 3 Files Changed 70 +298 -140
Leeroy commented 2024-04-17 20:55:09 +02:00
Contributor
Copy Link

This updates plasma to 6.0.4.
Let me know if all is well

This updates plasma to 6.0.4. Let me know if all is well
Leeroy added 3 commits 2024-04-17 20:55:10 +02:00
tb commented 2024-04-17 22:38:56 +02:00
Owner
Copy Link

At a quick glance:
Most stuff looks great! 👍

But:

  • you did not rebase your repository to the latest commit, so it includes your first commit (#1) which results in conflicting files for the pull, no big deal I'm sure
  • you changed the Depends on line for ocean-sound-theme, oxygen-sounds and plasma-workspace-wallpapers for each to just depend on itself

I will probably have to do these tomorrow if @jaeger does not beat me to it, I was investigating build issues with qt6-webengine and ninja 1.12 earlier and have not fully resolved the issue I'm seeing yet.. :/

At a quick glance: Most stuff looks great! 👍 But: - you did not rebase your repository to the latest commit, so it includes your first commit (#1) which results in conflicting files for the pull, no big deal I'm sure - you changed the Depends on line for ocean-sound-theme, oxygen-sounds and plasma-workspace-wallpapers for each to just depend on itself I will probably have to do these tomorrow if @jaeger does not beat me to it, I was investigating build issues with qt6-webengine and ninja 1.12 earlier and have not fully resolved the issue I'm seeing yet.. :/
Leeroy commented 2024-04-18 07:56:50 +02:00
Author
Contributor
Copy Link

Sorry about that, I'm still learning how to use git properly!
About the depends, probably the script I'm using to remove redundant deps needs some work, I'll get to that.

Sorry about that, I'm still learning how to use git properly! About the depends, probably the script I'm using to remove redundant deps needs some work, I'll get to that.
👍 1
tb commented 2024-04-19 00:12:27 +02:00
Owner
Copy Link

I bumped the ports for now, lets figure out the git workflow the next time? :)
Thanks for the submit!

I bumped the ports for now, lets figure out the git workflow the next time? :) Thanks for the submit!
tb closed this pull request 2024-04-19 00:12:28 +02:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ports/kde-plasma-6#2
No description provided.
Delete Branch "Leeroy/kde-plasma-6:3.7"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?