From f0a71bd13709e87026ffe7ad7b8aff9ef66a4f94 Mon Sep 17 00:00:00 2001 From: sth0 Date: Thu, 31 Oct 2024 18:29:40 -0400 Subject: [PATCH 1/5] xft2-dev patch to complie under macOS 15 / CLT 16.1 Needed cast of NULL to (unsigned long) in xftdpy.c --- .../stable/main/finkinfo/x11/xft2-dev.info | 2 +- .../stable/main/finkinfo/x11/xft2-dev.patch | 24 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info index 932a7fb2fad..67577ed0268 100644 --- a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info +++ b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info @@ -19,7 +19,7 @@ Depends: xft2-shlibs (= %v-%r) Source-Checksum: SHA256(c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2) Source: http://xorg.freedesktop.org/releases/individual/lib/libXft-%v.tar.bz2 PatchFile: %n.patch -PatchFile-MD5: 95f1a8efbec3abec682e76e2df8b792a +PatchFile-Checksum: SHA256(c36aeabbe147f49ec0ddd5003f67e710348d8a1255612dd94f75630251905c54) ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static # Moved from pkgconfig to ppkg-config for Apple Silicon diff --git a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch index 9e82e8f51aa..b0bd2a4eeb7 100644 --- a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch +++ b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch @@ -1,6 +1,6 @@ -diff -Nurd -x'*~' libXft-2.2.0.orig/src/Makefile.in libXft-2.2.0/src/Makefile.in ---- libXft-2.2.0.orig/src/Makefile.in 2010-10-29 19:22:06.000000000 -0400 -+++ libXft-2.2.0/src/Makefile.in 2011-04-22 16:40:59.000000000 -0400 +diff -ruN libXft-2.2.0-orig/src/Makefile.in libXft-2.2.0/src/Makefile.in +--- libXft-2.2.0-orig/src/Makefile.in 2010-10-29 19:22:06 ++++ libXft-2.2.0/src/Makefile.in 2024-10-31 18:05:45 @@ -254,8 +254,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -12,9 +12,21 @@ diff -Nurd -x'*~' libXft-2.2.0.orig/src/Makefile.in libXft-2.2.0/src/Makefile.in lib_LTLIBRARIES = libXft.la libXft_la_SOURCES = xftint.h \ -diff -Nurd -x'*~' libXft-2.2.0.orig/src/xftglyphs.c libXft-2.2.0/src/xftglyphs.c ---- libXft-2.2.0.orig/src/xftglyphs.c 2009-10-16 17:27:08.000000000 -0400 -+++ libXft-2.2.0/src/xftglyphs.c 2015-01-25 01:07:12.000000000 -0500 +diff -ruN libXft-2.2.0-orig/src/xftdpy.c libXft-2.2.0/src/xftdpy.c +--- libXft-2.2.0-orig/src/xftdpy.c 2009-10-16 17:27:08 ++++ libXft-2.2.0/src/xftdpy.c 2024-10-31 18:10:10 +@@ -160,7 +160,7 @@ + info->next = _XftDisplayInfo; + _XftDisplayInfo = info; + +- info->glyph_memory = NULL; ++ info->glyph_memory = (unsigned long) NULL; + info->max_glyph_memory = XftDefaultGetInteger (dpy, + XFT_MAX_GLYPH_MEMORY, 0, + XFT_DPY_MAX_GLYPH_MEMORY); +diff -ruN libXft-2.2.0-orig/src/xftglyphs.c libXft-2.2.0/src/xftglyphs.c +--- libXft-2.2.0-orig/src/xftglyphs.c 2009-10-16 17:27:08 ++++ libXft-2.2.0/src/xftglyphs.c 2024-10-31 18:05:45 @@ -21,10 +21,11 @@ */ From f1cc4cbc4b90262e28722b9f9d28609d7f24cf7e Mon Sep 17 00:00:00 2001 From: sth0 Date: Thu, 31 Oct 2024 20:01:47 -0400 Subject: [PATCH 2/5] Update using upstream version 2.3.8 --- .../stable/main/finkinfo/x11/xft2-dev.info | 18 +++----- .../stable/main/finkinfo/x11/xft2-dev.patch | 43 ------------------- 2 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch diff --git a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info index 67577ed0268..9742784b8c1 100644 --- a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info +++ b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info @@ -1,11 +1,8 @@ Package: xft2-dev -# 2.3.1 seems to give spacing problems -# https://bugs.freedesktop.org/show_bug.cgi?id=47178 -# and no major new features vs 2.2.0 -Version: 2.2.0 +Version: 2.3.8 -Revision: 5 +Revision: 1 Maintainer: The Gnome Core Team BuildDependsOnly: true BuildDepends: << @@ -16,10 +13,9 @@ BuildDepends: << x11-dev << Depends: xft2-shlibs (= %v-%r) -Source-Checksum: SHA256(c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2) -Source: http://xorg.freedesktop.org/releases/individual/lib/libXft-%v.tar.bz2 -PatchFile: %n.patch -PatchFile-Checksum: SHA256(c36aeabbe147f49ec0ddd5003f67e710348d8a1255612dd94f75630251905c54) +Source-Checksum: SHA256(32e48fe2d844422e64809e4e99b9d8aed26c1b541a5acf837c5037b8d9f278a8) +Source: http://xorg.freedesktop.org/releases/individual/lib/libXft-%v.tar.gz + ConfigureParams: --prefix=%p/lib/xft2 --mandir=%p/share/man --disable-silent-rules --enable-dependency-tracking --disable-static # Moved from pkgconfig to ppkg-config for Apple Silicon @@ -56,7 +52,7 @@ InstallScript: << # only keep the main ld file, not all the underlying pieces rm %i/lib/libXft.2.* << -DocFiles: AUTHORS COPYING ChangeLog NEWS README +DocFiles: AUTHORS COPYING ChangeLog NEWS README.md SplitOff: << Package: xft2-shlibs Depends: << @@ -67,7 +63,7 @@ SplitOff: << << Files: lib/xft2/lib/libXft.2.*dylib Shlibs: %p/lib/xft2/lib/libXft.2.dylib 5.0.0 %n (>= 2.2.0-1) - DocFiles: AUTHORS COPYING ChangeLog NEWS README + DocFiles: AUTHORS COPYING ChangeLog NEWS README.md << Description: FreeType font support for X11 apps DescPackaging: << diff --git a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch deleted file mode 100644 index b0bd2a4eeb7..00000000000 --- a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ruN libXft-2.2.0-orig/src/Makefile.in libXft-2.2.0/src/Makefile.in ---- libXft-2.2.0-orig/src/Makefile.in 2010-10-29 19:22:06 -+++ libXft-2.2.0/src/Makefile.in 2024-10-31 18:05:45 -@@ -254,8 +254,8 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CFLAGS = $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) \ -- $(CWARNFLAGS) -I$(top_builddir)/include/X11/Xft -+AM_CPPFLAGS = -I$(top_builddir)/include/X11/Xft $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) $(XRENDER_CFLAGS) -+AM_CFLAGS = $(CWARNFLAGS) - - lib_LTLIBRARIES = libXft.la - libXft_la_SOURCES = xftint.h \ -diff -ruN libXft-2.2.0-orig/src/xftdpy.c libXft-2.2.0/src/xftdpy.c ---- libXft-2.2.0-orig/src/xftdpy.c 2009-10-16 17:27:08 -+++ libXft-2.2.0/src/xftdpy.c 2024-10-31 18:10:10 -@@ -160,7 +160,7 @@ - info->next = _XftDisplayInfo; - _XftDisplayInfo = info; - -- info->glyph_memory = NULL; -+ info->glyph_memory = (unsigned long) NULL; - info->max_glyph_memory = XftDefaultGetInteger (dpy, - XFT_MAX_GLYPH_MEMORY, 0, - XFT_DPY_MAX_GLYPH_MEMORY); -diff -ruN libXft-2.2.0-orig/src/xftglyphs.c libXft-2.2.0/src/xftglyphs.c ---- libXft-2.2.0-orig/src/xftglyphs.c 2009-10-16 17:27:08 -+++ libXft-2.2.0/src/xftglyphs.c 2024-10-31 18:05:45 -@@ -21,10 +21,11 @@ - */ - - #include "xftint.h" --#include -+#include -+#include FT_OUTLINE_H - - #if HAVE_FT_GLYPHSLOT_EMBOLDEN --#include -+#include FT_SYNTHESIS_H - #endif - - static const int filters[3][3] = { From 95a237c946a14c0cf001900f25e760ac0d6db69f Mon Sep 17 00:00:00 2001 From: sth0 Date: Fri, 1 Nov 2024 22:28:23 -0400 Subject: [PATCH 3/5] Updated Shlibs: tag --- 10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info index 9742784b8c1..d91fafe76ac 100644 --- a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info +++ b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info @@ -62,7 +62,7 @@ SplitOff: << x11-shlibs << Files: lib/xft2/lib/libXft.2.*dylib - Shlibs: %p/lib/xft2/lib/libXft.2.dylib 5.0.0 %n (>= 2.2.0-1) + Shlibs: %p/lib/xft2/lib/libXft.2.dylib 6.0.0 %n (>= 2.3.8-1) DocFiles: AUTHORS COPYING ChangeLog NEWS README.md << Description: FreeType font support for X11 apps From 928321fc454099148c0b00bd0c508c0e5f17f116 Mon Sep 17 00:00:00 2001 From: sth0 Date: Mon, 11 Nov 2024 15:21:57 -0500 Subject: [PATCH 4/5] Reverted Shlibs definition to previous version --- 10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info index d91fafe76ac..9742784b8c1 100644 --- a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info +++ b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info @@ -62,7 +62,7 @@ SplitOff: << x11-shlibs << Files: lib/xft2/lib/libXft.2.*dylib - Shlibs: %p/lib/xft2/lib/libXft.2.dylib 6.0.0 %n (>= 2.3.8-1) + Shlibs: %p/lib/xft2/lib/libXft.2.dylib 5.0.0 %n (>= 2.2.0-1) DocFiles: AUTHORS COPYING ChangeLog NEWS README.md << Description: FreeType font support for X11 apps From 48471367ae956b5ed963407912d0eeaf5a763771 Mon Sep 17 00:00:00 2001 From: sth0 Date: Thu, 14 Nov 2024 21:45:56 -0500 Subject: [PATCH 5/5] Set compatibility version to 6.0.0, resolved merge with master. % 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) --- 10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info index 9742784b8c1..890f52529e0 100644 --- a/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info +++ b/10.9-libcxx/stable/main/finkinfo/x11/xft2-dev.info @@ -62,7 +62,7 @@ SplitOff: << x11-shlibs << Files: lib/xft2/lib/libXft.2.*dylib - Shlibs: %p/lib/xft2/lib/libXft.2.dylib 5.0.0 %n (>= 2.2.0-1) + Shlibs: %p/lib/xft2/lib/libXft.2.dylib 6.0.0 %n (>= 2.2.0-1) DocFiles: AUTHORS COPYING ChangeLog NEWS README.md << Description: FreeType font support for X11 apps