[Buildroot] [PATCH 2/2] package/fontconfig: bump version to 2.14.2
Yann E. MORIN
yann.morin.1998 at free.fr
Sun May 7 19:07:14 UTC 2023
Bernd, All,
On 2023-05-07 18:39 +0200, Bernd Kuhls spake thusly:
> Removed patch included in upstream release, renumbered and reformatted
> Upstream: tag for remaining patch, updated .checkpackageignore.
Thanks! :-)
> Updated license hash due to upstream commit:
> "Add line between licenses in COPYING."
> https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/23cede3e955fcdbc6d6d9b5a5974aaac5760c217
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> .checkpackageignore | 2 -
> ...x-the-build-issue-with-enable-static.patch | 133 ------------------
> ...ead-as-a-dependency-of-a-static-lib.patch} | 3 +-
> package/fontconfig/fontconfig.hash | 6 +-
> package/fontconfig/fontconfig.mk | 8 +-
> 5 files changed, 8 insertions(+), 144 deletions(-)
> delete mode 100644 package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
> rename package/fontconfig/{0002-add-pthread-as-a-dependency-of-a-static-lib.patch => 0001-add-pthread-as-a-dependency-of-a-static-lib.patch} (93%)
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index cd0ccc1abd..5893803096 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -500,8 +500,6 @@ package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch Upstream
> package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch Upstream
> package/fluent-bit/0003-fix-build-without-C.patch Upstream
> package/fluxbox/0001-fixes-bug-1138.patch Upstream
> -package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch Upstream
> -package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch Upstream
> package/freeipmi/0001-add-disable-doc.patch Upstream
> package/freeradius-client/0001-fix-for-nettle.patch Upstream
> package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream
> diff --git a/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch b/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
> deleted file mode 100644
> index bf04bd95fc..0000000000
> --- a/package/fontconfig/0001-Fix-the-build-issue-with-enable-static.patch
> +++ /dev/null
> @@ -1,133 +0,0 @@
> -From 8208f99fa1676c42bfd8d74de3e9dac5366c150c Mon Sep 17 00:00:00 2001
> -From: Akira TAGOH <akira at tagoh.org>
> -Date: Mon, 3 Sep 2018 04:56:16 +0000
> -Subject: [PATCH] Fix the build issue with --enable-static
> -
> -Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> -[Retrieved from:
> -https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/8208f99fa1676c42bfd8d74de3e9dac5366c150c]
> ----
> - doc/fcstring.fncs | 12 ++++++++++++
> - fontconfig/fontconfig.h | 4 ++++
> - src/fcint.h | 4 ----
> - test/test-bz106632.c | 35 ++++++++++++-----------------------
> - 4 files changed, 28 insertions(+), 27 deletions(-)
> -
> -diff --git a/doc/fcstring.fncs b/doc/fcstring.fncs
> -index 0412bbd..d5ec043 100644
> ---- a/doc/fcstring.fncs
> -+++ b/doc/fcstring.fncs
> -@@ -223,6 +223,18 @@ This is just a wrapper around free(3) which helps track memory usage of
> - strings within the fontconfig library.
> - @@
> -
> -+ at RET@ FcChar8 *
> -+ at FUNC@ FcStrBuildFilename
> -+ at TYPE1@ const FcChar8 * @ARG1@ path
> -+ at TYPE2@ ...
> -+ at PURPOSE@ Concatenate strings as a file path
> -+ at DESC@
> -+Creates a filename from the given elements of strings as file paths
> -+and concatenate them with the appropriate file separator.
> -+Arguments must be null-terminated.
> -+This returns a newly-allocated memory which should be freed when no longer needed.
> -+@@
> -+
> - @RET@ FcChar8 *
> - @FUNC@ FcStrDirname
> - @TYPE1@ const FcChar8 * @ARG1@ file
> -diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
> -index bac1dda..af870d0 100644
> ---- a/fontconfig/fontconfig.h
> -+++ b/fontconfig/fontconfig.h
> -@@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8 *string,
> - int *nchar,
> - int *wchar);
> -
> -+FcPublic FcChar8 *
> -+FcStrBuildFilename (const FcChar8 *path,
> -+ ...);
> -+
> - FcPublic FcChar8 *
> - FcStrDirname (const FcChar8 *file);
> -
> -diff --git a/src/fcint.h b/src/fcint.h
> -index de78cd8..a9d075a 100644
> ---- a/src/fcint.h
> -+++ b/src/fcint.h
> -@@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s);
> - FcPrivate FcBool
> - FcStrIsAbsoluteFilename (const FcChar8 *s);
> -
> --FcPrivate FcChar8 *
> --FcStrBuildFilename (const FcChar8 *path,
> -- ...);
> --
> - FcPrivate FcChar8 *
> - FcStrLastSlash (const FcChar8 *path);
> -
> -diff --git a/test/test-bz106632.c b/test/test-bz106632.c
> -index daa0c1e..2d67c2e 100644
> ---- a/test/test-bz106632.c
> -+++ b/test/test-bz106632.c
> -@@ -25,25 +25,26 @@
> - #ifdef HAVE_CONFIG_H
> - #include "config.h"
> - #endif
> -+#include <stdio.h>
> - #include <stdlib.h>
> -+#include <string.h>
> - #include <dirent.h>
> -+#include <unistd.h>
> -+#include <errno.h>
> - #ifndef HAVE_STRUCT_DIRENT_D_TYPE
> - #include <sys/types.h>
> - #include <sys/stat.h>
> --#include <unistd.h>
> - #endif
> --#include "fcstr.c"
> --#undef FcConfigBuildFonts
> --#undef FcConfigCreate
> --#undef FcConfigGetCurrent
> --#undef FcConfigParseAndLoadFromMemory
> --#undef FcConfigUptoDate
> --#undef FcFontList
> --#undef FcInitReinitialize
> --#undef FcPatternCreate
> --#undef FcPatternDestroy
> - #include <fontconfig/fontconfig.h>
> -
> -+#ifdef _WIN32
> -+# define FC_DIR_SEPARATOR '\\'
> -+# define FC_DIR_SEPARATOR_S "\\"
> -+#else
> -+# define FC_DIR_SEPARATOR '/'
> -+# define FC_DIR_SEPARATOR_S "/"
> -+#endif
> -+
> - #ifdef HAVE_MKDTEMP
> - #define fc_mkdtemp mkdtemp
> - #else
> -@@ -154,18 +155,6 @@ unlink_dirs (const char *dir)
> - return ret;
> - }
> -
> --FcChar8 *
> --FcLangNormalize (const FcChar8 *lang)
> --{
> -- return NULL;
> --}
> --
> --FcChar8 *
> --FcConfigHome (void)
> --{
> -- return NULL;
> --}
> --
> - int
> - main (void)
> - {
> ---
> -2.18.1
> -
> diff --git a/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch b/package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch
> similarity index 93%
> rename from package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch
> rename to package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch
> index eed9dba005..c6aa514534 100644
> --- a/package/fontconfig/0002-add-pthread-as-a-dependency-of-a-static-lib.patch
> +++ b/package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch
> @@ -5,8 +5,7 @@ Subject: [PATCH] add pthread as a dependency of a static lib
>
> Downloaded from https://trac.netlabs.org/ports/changeset/2220
>
> -Patch sent upstream:
> -https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121
> +Upstream: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
> ---
> diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash
> index 844ee426d4..a4f87caf1e 100644
> --- a/package/fontconfig/fontconfig.hash
> +++ b/package/fontconfig/fontconfig.hash
> @@ -1,5 +1,5 @@
> -# From https://lists.freedesktop.org/archives/fontconfig/2018-August/006324.html
> -sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2
> +# From https://lists.freedesktop.org/archives/fontconfig/2023-January/006950.html
> +sha256 dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b fontconfig-2.14.2.tar.xz
>
> # Locally calculated
> -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 COPYING
> +sha256 51a51aa9823704fd90bccc616cdd17ebabb5b2b3e9cbde886ca02c7002288067 COPYING
> diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
> index e34acde534..d2eb76e40a 100644
> --- a/package/fontconfig/fontconfig.mk
> +++ b/package/fontconfig/fontconfig.mk
> @@ -4,10 +4,10 @@
> #
> ################################################################################
>
> -FONTCONFIG_VERSION = 2.13.1
> -FONTCONFIG_SITE = http://fontconfig.org/release
> -FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2
> -# 0002-add-pthread-as-a-dependency-of-a-static-lib.patch
> +FONTCONFIG_VERSION = 2.14.2
> +FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release
> +FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.xz
> +# 0001-add-pthread-as-a-dependency-of-a-static-lib.patch
> FONTCONFIG_AUTORECONF = YES
> FONTCONFIG_INSTALL_STAGING = YES
> FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \
> --
> 2.39.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list