- update to 3.3.1
- remove patch included upstream
- align local patches
- patch out python usage to fix build (w/o this python is needed to build python :))