Krita merge requestshttps://invent.kde.org/graphics/krita/-/merge_requests2023-01-13T11:41:57Zhttps://invent.kde.org/graphics/krita/-/merge_requests/1719Fix python, sip, and pyqt build on macos2023-01-13T11:41:57ZIvan YossiFix python, sip, and pyqt build on macosWith the recent merge of python 3.10 to master, our dependencies build broke (my fault since I never actually pushed the patches). The patches I used to compile 3.10.7 on macOS use pip install to get the binary libs from wheels. I used ...With the recent merge of python 3.10 to master, our dependencies build broke (my fault since I never actually pushed the patches). The patches I used to compile 3.10.7 on macOS use pip install to get the binary libs from wheels. I used this as I could not make setup.py to find the correct egg version number of sip and refused to compile. This pip approach works without issues, and it seems there is no problem from a license point of view. However I'm not sure hence I make this MR.
It might also give use pip on the release dmg which it could in theory make python module a breeze to install into krita on macos. In practice it might be difficult because of codesign restrictions.
Changed to install sip and pyqt using pip3. In this form we do not
compile our own libs but use the wheels libs from PyPI.
This is a first approach to have it working ASAP and seems to be license
compatible with krita: https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html#installing-from-wheels
In the future it might be advised to avoid setup.py and use sip-build and
sip-install scripts to compile pyqt on macos.https://invent.kde.org/graphics/krita/-/merge_requests/1120Fix atomic check on macOS2021-10-22T21:58:23ZIvan YossiFix atomic check on macOSCommit f963f4f42b66715405c9bf087c630df8725332a2 broke libatomic on macOS, this patch fixes it, however I could not check it does not break Bugs 430872, 443817Commit f963f4f42b66715405c9bf087c630df8725332a2 broke libatomic on macOS, this patch fixes it, however I could not check it does not break Bugs 430872, 443817https://invent.kde.org/graphics/krita/-/merge_requests/946Revert "macOS: add PyQt5/SIP v5 support"2021-07-07T14:24:02ZAmy sparkRevert "macOS: add PyQt5/SIP v5 support"This MR attempts to bring compatibility with the M1 runner back by reverting commit 32d09e7339ca1c82f1209bb53a8b052431ff06c2.
@ivany: perhaps we still need to add [universal binary support for macOS](https://github.com/python/cpython/bl...This MR attempts to bring compatibility with the M1 runner back by reverting commit 32d09e7339ca1c82f1209bb53a8b052431ff06c2.
@ivany: perhaps we still need to add [universal binary support for macOS](https://github.com/python/cpython/blob/main/Mac/README.rst)?
Test Plan
---------
Build Krita **on an M1 Mac**. This error seems to be ARM-specific, or at least to the M1.
Formalities Checklist
---------------------
- [X] I confirmed this builds. (See above)
- [X] I confirmed Krita ran and the relevant functions work.
- [X] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
- [X] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
- [X] I made sure my code conforms to the standards set in the HACKING file.
- [X] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).https://invent.kde.org/graphics/krita/-/merge_requests/629Fix LibMyPaint directory lookup in macOS2021-02-18T06:46:49ZAmy sparkFix LibMyPaint directory lookup in macOSThis MR derives from my work in !581. It fixes linking against libMyPaint in macOS.
cc @ivany
Test Plan
---------
Build Krita in macOS.
Formalities Checklist
---------------------
- [X] I confirmed this builds.
- [X] I confirmed Kr...This MR derives from my work in !581. It fixes linking against libMyPaint in macOS.
cc @ivany
Test Plan
---------
Build Krita in macOS.
Formalities Checklist
---------------------
- [X] I confirmed this builds.
- [X] I confirmed Krita ran and the relevant functions work.
- [X] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
- [X] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
- [X] I made sure my code conforms to the standards set in the HACKING file.
- [X] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy).Ivan YossiIvan Yossi