Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
patches 2bf604ffc3 update some packages after libpng15 update, misc stuff 14 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu