fontconfig: Branch 'main' - 3 commits

[GitLab Mirror]

 NEWS                       |   11 +++++++++--
 configure.ac               |    4 ++--
 fontconfig/fontconfig.h.in |    2 +-
 meson.build                |    2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 6d0a98982ec351c165c9224c8b7dbdfca3010e47
Merge: 7081d61 d0a3354
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 2 04:46:34 2025 +0000

    Merge branch 'release-2-17-1' into 'main'
    
    Release 2.17.1
    
    See merge request fontconfig/fontconfig!448

commit d0a33543e1ee8c38816db389cc9f9f5dcf29dcd8
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 2 13:27:03 2025 +0900

    Bump version to 2.17.1

diff --git a/NEWS b/NEWS
index 6b59da7..bdc3b54 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,19 @@
                               Fontconfig
              Font configuration and customization library
-                             Version 2.17
-                              2025-06-27
+                            Version 2.17.1
+                              2025-07-02
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new.
 
+2.17.1
+
+Akira TAGOH (3):
+      Fix a heap buffer overflow
+      meson: Add 'noinstall' to default-hinting, default-sub-pixel-rendering, bitmap-conf build options
+      Bump the libtool version
+
 2.17
 
 Akira TAGOH (48):
diff --git a/configure.ac b/configure.ac
index 56fbb37..2d48096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AC_INIT([fontconfig],[2.17.0],[https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
+AC_INIT([fontconfig],[2.17.1],[https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
 AM_INIT_AUTOMAKE([1.11 parallel-tests dist-xz foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
diff --git a/fontconfig/fontconfig.h.in b/fontconfig/fontconfig.h.in
index 19432c1..e8944f9 100644
--- a/fontconfig/fontconfig.h.in
+++ b/fontconfig/fontconfig.h.in
@@ -55,7 +55,7 @@ typedef int            FcBool;
 
 #define FC_MAJOR                2
 #define FC_MINOR                17
-#define FC_REVISION             0
+#define FC_REVISION             1
 
 #define FC_VERSION              ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
diff --git a/meson.build b/meson.build
index 606eb84..e742ea6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('fontconfig', 'c',
-  version: '2.17.0',
+  version: '2.17.1',
   meson_version : '>= 1.6.1',
   default_options: [
     'c_std=c11,c99',
commit e623555fed2498b6658c2de111a5674f6c17ad4e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 2 13:26:52 2025 +0900

    Bump the libtool version

diff --git a/configure.ac b/configure.ac
index 3f72c10..56fbb37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ dnl bump revision when fixing bugs
 dnl bump current and age, reset revision to zero when adding APIs
 dnl bump current, leave age, reset revision to zero when changing/removing APIS
 LIBT_CURRENT=17
-LIBT_REVISION=0
+LIBT_REVISION=1
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=16