I have found a small design change in that latch asssembly, Not a big deal but the easier fix is to just replace the spring. That is the part that usually breaks. Just remove the hinge pin from the old and new, exchange the spring, replace pivot with a cotter pin and your done!. No riveting, no painting and easier to fix the next time it breaks.
Ben