Open jwm-art-net opened 8 years ago
I'm not entirely sure of the correct way for you to merge the code to fix this issue, but it's fairly straightforward to generate a patch and apply it to your code.
Clone jwm-art-net/Petri-Foo and enter the Petri-Foo directory then git format-patch 6263bcf..ae313ae
to generate a file named 0001-Removed-openssl-and-use-libgcrypt.patch
. Change directory to wherever you have your jphaenlin/Petri-Foo fork, and patch -p1 < path/to/patch/0001-Removed-openssl-and-use-libgcrypt.patch
should do the trick.
https://github.com/jwm-art-net/Petri-Foo/issues/22#issuecomment-110145232