forge/ayaports
1
0
Fork 0
Code Issues 42 Pull requests 10 Projects Releases Packages Wiki Activity Actions

WIP: backports/freecad: upgrade to 0.20.2 #440

Draft
ayakael wants to merge 9 commits from freecad/upgrade-0.20.2 into edge
pull from: freecad/upgrade-0.20.2
merge into: forge:edge
Conversation 8 Commits 9 Files changed 10 +34 -444
ayakael commented 2024-04-14 22:14:06 +00:00 (Migrated from lab.ilot.io)
Copy link
No description provided.
ayakael commented 2024-04-16 23:14:19 +00:00 (Migrated from lab.ilot.io)
Copy link

added 55 commits

  • fb2d614f...050ac7ca - 52 commits from branch edge
  • b867a571 - backports/freecad: upgrade to 0.20.2
  • a090ff50 - backports/py3-pyside2: enable
  • 44541c68 - backports/py3-pivy: enable

Compare with previous version

added 55 commits <ul><li>fb2d614f...050ac7ca - 52 commits from branch <code>edge</code></li><li>b867a571 - backports/freecad: upgrade to 0.20.2</li><li>a090ff50 - backports/py3-pyside2: enable</li><li>44541c68 - backports/py3-pivy: enable</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/413/diffs?diff_id=4705&start_sha=fb2d614f538f4523af132658dd24eedee23b1b13)
ayakael commented 2024-04-16 23:39:09 +00:00 (Migrated from lab.ilot.io)
Copy link

added 2 commits

  • aa6c4f91 - backports/py3-pyside2: upgrade to 5.15.13
  • b2ef8a44 - backports/shiboken2: upgrade to 5.15.13

Compare with previous version

added 2 commits <ul><li>aa6c4f91 - backports/py3-pyside2: upgrade to 5.15.13</li><li>b2ef8a44 - backports/shiboken2: upgrade to 5.15.13</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/413/diffs?diff_id=4707&start_sha=44541c68087b2ccefd482bb9e93c99e939254919)
ayakael commented 2024-04-21 19:42:34 +00:00 (Migrated from lab.ilot.io)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>b69d408a - shiboken2</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/413/diffs?diff_id=4789&start_sha=b2ef8a44003393a843b33f8e53ad7ab63d07baa2)
ayakael commented 2024-04-21 19:49:46 +00:00 (Migrated from lab.ilot.io)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>939fa7bc - shiboken2</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/413/diffs?diff_id=4790&start_sha=b69d408ace054064a8b055b8127f90b4cb4000a5)
ayakael commented 2024-04-27 01:11:20 +00:00 (Migrated from lab.ilot.io)
Copy link

Broken now with upgrade to boost1.84. Needs to be rebuilt

Broken now with upgrade to boost1.84. Needs to be rebuilt
ayakael commented 2024-08-08 16:19:15 +00:00 (Migrated from lab.ilot.io)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>68ac2abb - upgrade to 0.21.2</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/413/diffs?diff_id=5739&start_sha=939fa7bc3830a0f3fa42867db9f6b861200c608f)
ayakael commented 2024-08-08 16:20:12 +00:00 (Migrated from lab.ilot.io)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>0363f706 - drop old depends</li></ul> [Compare with previous version](/ayakael/user-aports/-/merge_requests/413/diffs?diff_id=5740&start_sha=68ac2abbc04a9aa827889cfbd0a531cb279eff90)
ayakael commented 2024-08-08 16:24:05 +00:00 (Migrated from lab.ilot.io)
Copy link

Need to follow https://github.com/FreeCAD/FreeCAD/issues/6992

Need to follow https://github.com/FreeCAD/FreeCAD/issues/6992
forge changed title from backports/freecad: upgrade to 0.20.2 to WIP: backports/freecad: upgrade to 0.20.2 2024-09-03 16:27:24 +00:00
This pull request has changes conflicting with the target branch.
  • backports/freecad/APKBUILD
  • backports/py3-pivy/APKBUILD
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin freecad/upgrade-0.20.2:freecad/upgrade-0.20.2
git checkout freecad/upgrade-0.20.2

Merge

Merge the changes and update on Forgejo.
git checkout edge
git merge --no-ff freecad/upgrade-0.20.2
git checkout edge
git merge --ff-only freecad/upgrade-0.20.2
git checkout freecad/upgrade-0.20.2
git rebase edge
git checkout edge
git merge --no-ff freecad/upgrade-0.20.2
git checkout edge
git merge --squash freecad/upgrade-0.20.2
git checkout edge
git merge --ff-only freecad/upgrade-0.20.2
git checkout edge
git merge freecad/upgrade-0.20.2
git push origin edge
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Backport

   
Blocked

   
Enhancement

   
Fix

   
Maintenance

   
Needs action

   
New aport

   
Security
No labels
Backport
Blocked
Enhancement
Fix
Maintenance
Needs action
New aport
Security
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: forge/ayaports#440
No description provided.
Delete branch "freecad/upgrade-0.20.2"

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?