xft2-dev patch to complie under macOS 15 / CLT 16.1

[sth0]

Needed cast of NULL to (unsigned long) in xftdpy.c to comply with stricter compiler requirements.

[dhomeier]

Does build on 14.7/Xcode 16.1 as well; however I was also able to build the latest version 2.3.8 without needing to patch any additional files; the bug in https://bugs.freedesktop.org/show_bug.cgi?id=47178 seems to have long been fixed upstream.

[sth0]

I will try the newer upstream version, I just didn't want to get into recreating a complex patch file.

[sth0]

Updated to use upstream 2.3.8 version. Only tested on Intel 15.X system

[dhomeier]

looks good apart from the Shlibs-version; built on 14.7/Xcode 16.1-arm64.
I originally tried with the old AM_CPPFLAGS patch (the freetype one in xftglyphs.c is already merged upstream), but that does not seem to be needed anymore either – compiled with -I../include/X11/Xft in front in any case.

[sth0]

After reading the shlibs policy, I am not sure why this package would be compatibility version 6.0.0 vs 5.0.0 and not 2.0.0. What sets that version number? Is it just an incremented value as the shlib version is changed? Why would it be a major change instead of a minor change to reflect the actual code revision version?

[dhomeier]

The compatibility version is whatever otool -L says it is, which is set upstream in the code, so not really within the powers of our packaging policy. When and how upstream developers decide to increment it is usually beyond my understanding, so I generally build with fink --validate.

[nieder]

Is the spacing bug mentioned in the unpatched .info (now at https://gitlab.freedesktop.org/xorg/lib/libxft/-/issues/1 ) fixed? @dmacks

ETA: noticed @dhomeier saying https://bugs.freedesktop.org/show_bug.cgi?id=47178 was fixed. That bug was only closed because upstream moved from bugzilla to gitlab. The moved current bug URL is at my link above.

[nieder]

Doesn't matter since I think the NULL fix is fine, but upstream changed it to 0, rather than typing it.
https://gitlab.freedesktop.org/xorg/lib/libxft/-/commit/9c23173cf1ff861bdb8538e3aa21ec509b0d87d8

I cherry picked the first commit (NULL fix) and applied it to master.

[sth0]

I thought I had reverted everything except the NULL fix. But anyway, thanks, and I think which value is cast to what is irrelevant. I personally prefer keeping the NULL for readability of the code, but YMMV.

[nieder]

Yeah, I don't care if it's a typed NULL or 0. Anyway, I have no idea why this PR shows conflicts since I specifically cherry picked the first commit in the PR.

[sth0]

I see the difference, the update to the newer upstream as suggested by dhomeier was rejected. 2.3.8 vs 2.3.0

[sth0]

Been traveling, seems like I didn't push the reversion to the previous Shlibs def. Now done.

[nieder]

From the build output during deb file validation at the end:

Validating .deb dir /opt/sw/build.build/root-xft2-shlibs-2.3.8-1...
Error: Shlibs field says compatibility version for /opt/sw/lib/xft2/lib/libXft.2.dylib is 5.0.0, but it is actually 6.0.0.

The values before 928321f were actually correct.

[dhomeier]

The previous ones were those for 2.3.8, these are now the 2.2.0 ones again, but I thought the update to 2.3.8 was rejected since it is not clear if the spacing problem in https://gitlab.freedesktop.org/xorg/lib/libxft/-/issues/1 has really been fixed?
There is one newer commit https://gitlab.freedesktop.org/xorg/lib/libxft/-/commit/3ca7a7c that sounds like it might be dealing with it, but I haven't been able to confirm that – did not notice any fonts problems with my xterm, but it does not look like that is linking xft2.

[dhomeier]

I did build mrxvt now once against the 2.2.0 version from your initial commit, and against 2.3.8 without the patches, and cannot see any differences in font spacings or other issues between the two:

So updating might be OK? Also built on 10.14 with Xcode 11.3 without the patchfile.

[sth0]

Set compatibility version to 6.0.0 as tool declares it
Resolved merge with master, this should be working.

% otool -L /opt/sw/lib/xft2/lib/libXft.2.3.8.dylib
/opt/sw/lib/xft2/lib/libXft.2.3.8.dylib:
/opt/sw/lib/xft2/lib/libXft.2.dylib (compatibility version 6.0.0, current version 6.8.0)

[sth0]

Should be good to go?

Patchfile necessary for stringent compiler on Sequoia