pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fcft: update to 3.3.3



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sat Feb 7 11:29:08 2026 +0100
Changeset:	81d3eb69e02ee99ebeeb90201a53e99bcd179e40

Modified Files:
	fcft/Makefile
	fcft/PLIST
	fcft/distinfo
Added Files:
	fcft/patches/patch-fcft.c
	fcft/patches/patch-meson.build

Log Message:
fcft: update to 3.3.3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=81d3eb69e02ee99ebeeb90201a53e99bcd179e40

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fcft/Makefile                  |  6 +++---
 fcft/PLIST                     | 23 ++++++++++++++++++++-
 fcft/distinfo                  |  8 +++++---
 fcft/patches/patch-fcft.c      | 45 ++++++++++++++++++++++++++++++++++++++++++
 fcft/patches/patch-meson.build | 24 ++++++++++++++++++++++
 5 files changed, 99 insertions(+), 7 deletions(-)

diffs:
diff --git a/fcft/Makefile b/fcft/Makefile
index c53acee1cc..b9fed70126 100644
--- a/fcft/Makefile
+++ b/fcft/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	fcft-3.1.8
+DISTNAME=	fcft-3.3.3
 CATEGORIES=	fonts
 MASTER_SITES=	https://codeberg.org/dnkl/fcft/releases/download/${PKGVERSION_NOREV}/
 
@@ -11,12 +11,12 @@ LICENSE=	mit
 
 USE_TOOLS+=	pkg-config
 
-BUILD_DEPENDS+=	scdoc-[0-9]*:../../textproc/scdoc
 
-.include "../../converters/utf8proc/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../converters/utf8proc/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../wip/tllist/buildlink3.mk"
 .include "../../devel/meson/build.mk"
+.include "../../textproc/scdoc/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fcft/PLIST b/fcft/PLIST
index b1a8d8ffe5..d81ead3e1c 100644
--- a/fcft/PLIST
+++ b/fcft/PLIST
@@ -3,5 +3,26 @@ include/fcft/fcft.h
 include/fcft/stride.h
 lib/libfcft.so
 lib/libfcft.so.4
-lib/libfcft.so.4.1.8
+lib/libfcft.so.4.3.3
 lib/pkgconfig/fcft.pc
+man/man3/fcft_capabilities.3
+man/man3/fcft_clone.3
+man/man3/fcft_destroy.3
+man/man3/fcft_fini.3
+man/man3/fcft_font_options_create.3
+man/man3/fcft_font_options_destroy.3
+man/man3/fcft_from_name.3
+man/man3/fcft_from_name2.3
+man/man3/fcft_init.3
+man/man3/fcft_kerning.3
+man/man3/fcft_log_init.3
+man/man3/fcft_precompose.3
+man/man3/fcft_rasterize_char_utf32.3
+man/man3/fcft_rasterize_grapheme_utf32.3
+man/man3/fcft_rasterize_text_run_utf32.3
+man/man3/fcft_set_emoji_presentation.3
+man/man3/fcft_set_scaling_filter.3
+man/man3/fcft_text_run_destroy.3
+share/doc/fcft/CHANGELOG.md
+share/doc/fcft/LICENSE
+share/doc/fcft/README.md
diff --git a/fcft/distinfo b/fcft/distinfo
index b7d324225b..0e424d095a 100644
--- a/fcft/distinfo
+++ b/fcft/distinfo
@@ -1,5 +1,7 @@
 $NetBSD$
 
-BLAKE2s (fcft-3.1.8.tar.gz) = d395d7855f0633b86ec272c273dac558098b9e9038de5d70d7db585ad6875e46
-SHA512 (fcft-3.1.8.tar.gz) = a73f0457cd44bdba4f5004beff6b87715c66ab1112f1d29e3b607f4b2662cf2ea3538481d4b8a4dce4e4c3fdc38f825416df13bc64609501bd9db1cf09c4b0d2
-Size (fcft-3.1.8.tar.gz) = 697864 bytes
+BLAKE2s (fcft-3.3.3.tar.gz) = 545e5bfb82c493722002178d9b29ba8356ade84936400052c7bda03dff993e26
+SHA512 (fcft-3.3.3.tar.gz) = b1d0264d490ba95872301a949e8a79da947f77e3196c8299bfddb01e9931cce4100ebcd53930e73c9fa830cc3b52f04ff555777fc17d7bbdd0445a2c924d8c20
+Size (fcft-3.3.3.tar.gz) = 741107 bytes
+SHA1 (patch-fcft.c) = c6cae286f4a581326b9b575e0f70e62834689122
+SHA1 (patch-meson.build) = baf72b1fca5508a886b7451c5a20a50197275f31
diff --git a/fcft/patches/patch-fcft.c b/fcft/patches/patch-fcft.c
new file mode 100644
index 0000000000..7ab4ce2284
--- /dev/null
+++ b/fcft/patches/patch-fcft.c
@@ -0,0 +1,45 @@
+$NetBSD$
+
+* Define bswap_16 on NetBSD
+* Check for uselocale before using it
+
+--- fcft.c.orig	2025-12-27 11:27:58.000000000 +0000
++++ fcft.c
+@@ -1,7 +1,12 @@
+ #include "fcft/fcft.h"
+ 
+ #include <assert.h>
++#if defined(__NetBSD__)
++#include <endian.h>
++#define bswap_16(X) htole16(X)
++#else
+ #include <byteswap.h>
++#endif
+ #include <locale.h>
+ #include <math.h>
+ #include <stdbool.h>
+@@ -533,7 +538,7 @@ base_pattern_from_name(const char *name,
+ {
+     /* Fontconfig fails to parse floating point values unless locale
+      * (LC_NUMERIC) is e.g C, or en_US.UTF-8 */
+-
++#if FCFT_HAVE_USELOCALE
+     locale_t c_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
+     if (c_locale == (locale_t)0) {
+         LOG_ERRNO("%s: failed to create temporary locale", name);
+@@ -546,12 +551,14 @@ base_pattern_from_name(const char *name,
+         freelocale(c_locale);
+         return NULL;
+     }
+-
++#endif
+     FcPattern *pattern = FcNameParse((const unsigned char *)name);
+ 
++#if FCFT_HAVE_USELOCALE
+     /* Restore locale */
+     uselocale(old_locale);
+     freelocale(c_locale);
++#endif
+ 
+     if (pattern == NULL) {
+         LOG_ERR("%s: failed to lookup font", name);
diff --git a/fcft/patches/patch-meson.build b/fcft/patches/patch-meson.build
new file mode 100644
index 0000000000..d55798407b
--- /dev/null
+++ b/fcft/patches/patch-meson.build
@@ -0,0 +1,24 @@
+$NetBSD$
+
+* Check for uselocale before using it
+
+--- meson.build.orig	2025-12-27 11:27:58.000000000 +0000
++++ meson.build
+@@ -79,6 +79,7 @@ pixman = dependency('pixman-1')
+ stdthreads = cc.find_library('stdthreads', required: false)
+ system_nanosvg = cc.find_library('nanosvg', required: get_option('system-nanosvg'))
+ system_nanosvgrast = cc.find_library('nanosvgrast', required: get_option('system-nanosvg'))
++uselocale = cc.has_function('uselocale')
+ 
+ tllist = dependency('tllist', version: '>=1.0.1', fallback: 'tllist')
+ 
+@@ -88,6 +89,9 @@ endif
+ if utf8proc.found()
+   add_project_arguments('-DFCFT_HAVE_UTF8PROC', language: 'c')
+ endif
++if uselocale
++  add_project_arguments('-DFCFT_HAVE_USELOCALE', language: 'c')
++endif
+ 
+ if freetype.version().version_compare('>=24.2.18')  # 2.12.0, TODO: double-check...
+   if get_option('svg-backend') == 'librsvg'


Home | Main Index | Thread Index | Old Index