Date: Saturday, August 21, 2021 @ 09:28:25
Author: andyrtr
Revision: 422437
archrelease: copy trunk to testing-x86_64
Added:
freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch
(from rev 422436,
freetype2/trunk/0001-Enable-table-validation-modules.patch)
freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch
(from rev 422436, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
freetype2/repos/testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch
(from rev 422436,
freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
freetype2/repos/testing-x86_64/0004-Enable-long-PCF-family-names.patch
(from rev 422436, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
freetype2/repos/testing-x86_64/0005-ft2-demos-meson-fixes.patch
(from rev 422436, freetype2/trunk/0005-ft2-demos-meson-fixes.patch)
freetype2/repos/testing-x86_64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
(from rev 422436,
freetype2/trunk/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch)
freetype2/repos/testing-x86_64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
(from rev 422436,
freetype2/trunk/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch)
freetype2/repos/testing-x86_64/PKGBUILD
(from rev 422436, freetype2/trunk/PKGBUILD)
freetype2/repos/testing-x86_64/freetype2.install
(from rev 422436, freetype2/trunk/freetype2.install)
freetype2/repos/testing-x86_64/freetype2.sh
(from rev 422436, freetype2/trunk/freetype2.sh)
Deleted:
freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch
freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch
freetype2/repos/testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch
freetype2/repos/testing-x86_64/0004-Enable-long-PCF-family-names.patch
freetype2/repos/testing-x86_64/0005-ft2-demos-meson-fixes.patch
freetype2/repos/testing-x86_64/PKGBUILD
freetype2/repos/testing-x86_64/freetype2.install
freetype2/repos/testing-x86_64/freetype2.sh
-----------------------------------------------------------+
0001-Enable-table-validation-modules.patch | 84 +--
0002-Enable-subpixel-rendering.patch | 44 -
0003-Enable-infinality-subpixel-hinting.patch | 48 -
0004-Enable-long-PCF-family-names.patch | 44 -
0005-ft2-demos-meson-fixes.patch | 300 ++++++------
0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch | 35 +
0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch | 41 +
PKGBUILD | 214 ++++----
freetype2.install | 16
freetype2.sh | 24
10 files changed, 467 insertions(+), 383 deletions(-)
Deleted: 0001-Enable-table-validation-modules.patch
===================================================================
--- 0001-Enable-table-validation-modules.patch 2021-08-21 09:28:08 UTC (rev
422436)
+++ 0001-Enable-table-validation-modules.patch 2021-08-21 09:28:25 UTC (rev
422437)
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
-Date: Tue, 23 Jun 2015 08:40:29 +0200
-Subject: [PATCH] Enable table validation modules
-
----
- modules.cfg | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.cfg b/modules.cfg
-index 30f7fac45a..a9a4703989 100644
---- a/modules.cfg
-+++ b/modules.cfg
-@@ -114,26 +114,26 @@ AUX_MODULES += cache
-
- # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
- #
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
- # See include/freetype/ftgzip.h for the API.
- AUX_MODULES += gzip
-
- # Support for streams compressed with LZW (files with suffix .Z).
- #
- # See include/freetype/ftlzw.h for the API.
- AUX_MODULES += lzw
-
- # Support for streams compressed with bzip2 (files with suffix .bz2).
- #
- # See include/freetype/ftbzip2.h for the API.
- AUX_MODULES += bzip2
-
- # OpenType table validation. Needs `ftotval.c' below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
Copied:
freetype2/repos/testing-x86_64/0001-Enable-table-validation-modules.patch (from
rev 422436, freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- 0001-Enable-table-validation-modules.patch (rev 0)
+++ 0001-Enable-table-validation-modules.patch 2021-08-21 09:28:25 UTC (rev
422437)
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index 30f7fac45a..a9a4703989 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -114,26 +114,26 @@ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
+ #
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+ # See include/freetype/ftgzip.h for the API.
+ AUX_MODULES += gzip
+
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ AUX_MODULES += lzw
+
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ AUX_MODULES += bzip2
+
+ # OpenType table validation. Needs `ftotval.c' below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
Deleted: 0002-Enable-subpixel-rendering.patch
===================================================================
--- 0002-Enable-subpixel-rendering.patch 2021-08-21 09:28:08 UTC (rev
422436)
+++ 0002-Enable-subpixel-rendering.patch 2021-08-21 09:28:25 UTC (rev
422437)
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
-Date: Tue, 23 Jun 2015 08:43:07 +0200
-Subject: [PATCH] Enable subpixel rendering
-
----
- include/freetype/config/ftoption.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h
b/include/freetype/config/ftoption.h
-index 4227fd376e..32da3fa039 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
- * When this macro is not defined, FreeType offers alternative LCD
- * rendering technology that produces excellent output.
- */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /**************************************************************************
Copied: freetype2/repos/testing-x86_64/0002-Enable-subpixel-rendering.patch
(from rev 422436, freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- 0002-Enable-subpixel-rendering.patch (rev 0)
+++ 0002-Enable-subpixel-rendering.patch 2021-08-21 09:28:25 UTC (rev
422437)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH] Enable subpixel rendering
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h
b/include/freetype/config/ftoption.h
+index 4227fd376e..32da3fa039 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
+ * When this macro is not defined, FreeType offers alternative LCD
+ * rendering technology that produces excellent output.
+ */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /**************************************************************************
Deleted: 0003-Enable-infinality-subpixel-hinting.patch
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch 2021-08-21 09:28:08 UTC
(rev 422436)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2021-08-21 09:28:25 UTC
(rev 422437)
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
-Date: Mon, 29 Aug 2016 08:43:10 +0200
-Subject: [PATCH] Enable infinality subpixel hinting
-
----
- include/freetype/config/ftoption.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/freetype/config/ftoption.h
b/include/freetype/config/ftoption.h
-index 32da3fa039..0dd4021e24 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -688,8 +688,8 @@ FT_BEGIN_HEADER
- * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
- */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
-+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
-
-
- /**************************************************************************
Copied:
freetype2/repos/testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch
(from rev 422436, freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- 0003-Enable-infinality-subpixel-hinting.patch
(rev 0)
+++ 0003-Enable-infinality-subpixel-hinting.patch 2021-08-21 09:28:25 UTC
(rev 422437)
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH] Enable infinality subpixel hinting
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h
b/include/freetype/config/ftoption.h
+index 32da3fa039..0dd4021e24 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -688,8 +688,8 @@ FT_BEGIN_HEADER
+ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+ */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /**************************************************************************
Deleted: 0004-Enable-long-PCF-family-names.patch
===================================================================
--- 0004-Enable-long-PCF-family-names.patch 2021-08-21 09:28:08 UTC (rev
422436)
+++ 0004-Enable-long-PCF-family-names.patch 2021-08-21 09:28:25 UTC (rev
422437)
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
-Date: Sun, 14 May 2017 18:09:31 +0200
-Subject: [PATCH] Enable long PCF family names
-
----
- include/freetype/config/ftoption.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/freetype/config/ftoption.h
b/include/freetype/config/ftoption.h
-index 0dd4021e24..8da3073b6d 100644
---- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -877,7 +877,7 @@ FT_BEGIN_HEADER
- * If this option is activated, it can be controlled with the
- * `no-long-family-names` property of the 'pcf' driver module.
- */
--/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
-+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-
-
- /*************************************************************************/
Copied: freetype2/repos/testing-x86_64/0004-Enable-long-PCF-family-names.patch
(from rev 422436, freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
===================================================================
--- 0004-Enable-long-PCF-family-names.patch (rev 0)
+++ 0004-Enable-long-PCF-family-names.patch 2021-08-21 09:28:25 UTC (rev
422437)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH] Enable long PCF family names
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h
b/include/freetype/config/ftoption.h
+index 0dd4021e24..8da3073b6d 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -877,7 +877,7 @@ FT_BEGIN_HEADER
+ * If this option is activated, it can be controlled with the
+ * `no-long-family-names` property of the 'pcf' driver module.
+ */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+
+ /*************************************************************************/
Deleted: 0005-ft2-demos-meson-fixes.patch
===================================================================
--- 0005-ft2-demos-meson-fixes.patch 2021-08-21 09:28:08 UTC (rev 422436)
+++ 0005-ft2-demos-meson-fixes.patch 2021-08-21 09:28:25 UTC (rev 422437)
@@ -1,150 +0,0 @@
-diff --git a/meson.build b/meson.build
-index
fc2d29f9e86551ebb332876d50950e0935b87bce..c425afea09016c6334231bd3e426d605f05fd329
100644
---- a/meson.build
-+++ b/meson.build
-@@ -76,25 +76,8 @@ ftcommon_lib = static_library('ftcommon',
- link_with: [common_lib, graph_lib],
- )
-
--executable('fttimer',
-- 'src/fttimer.c',
-- dependencies: libfreetype2_dep,
-- install: false)
--
--executable('ftchkwd',
-- 'src/ftchkwd.c',
-- dependencies: libfreetype2_dep,
-- install: false)
-
--executable('ftmemchk',
-- 'src/ftmemchk.c',
-- dependencies: libfreetype2_dep,
-- install: false)
--
--executable('ftpatchk',
-- 'src/ftpatchk.c',
-- dependencies: libfreetype2_dep,
-- install: false)
-+# programs
-
- executable('ftbench',
- 'src/ftbench.c',
-@@ -102,17 +85,10 @@ executable('ftbench',
- link_with: common_lib,
- install: true)
-
--executable('ftdump',
-- 'src/ftdump.c',
-- dependencies: libfreetype2_dep,
-- link_with: [common_lib, output_lib],
-- install: true)
--
--executable('ftlint',
-- 'src/ftlint.c',
-+executable('ftchkwd',
-+ 'src/ftchkwd.c',
- dependencies: libfreetype2_dep,
-- link_with: common_lib,
-- install: true)
-+ install: false)
-
- executable('ftdiff',
- 'src/ftdiff.c',
-@@ -121,6 +97,12 @@ executable('ftdiff',
- link_with: ftcommon_lib,
- install: true)
-
-+executable('ftdump',
-+ 'src/ftdump.c',
-+ dependencies: libfreetype2_dep,
-+ link_with: [common_lib, output_lib],
-+ install: true)
-+
- executable('ftgamma',
- 'src/ftgamma.c',
- dependencies: [libfreetype2_dep, math_dep],
-@@ -135,6 +117,17 @@ executable('ftgrid',
- link_with: [ftcommon_lib, output_lib],
- install: true)
-
-+executable('ftlint',
-+ 'src/ftlint.c',
-+ dependencies: libfreetype2_dep,
-+ link_with: common_lib,
-+ install: true)
-+
-+executable('ftmemchk',
-+ 'src/ftmemchk.c',
-+ dependencies: libfreetype2_dep,
-+ install: false)
-+
- executable('ftmulti',
- 'src/ftmulti.c',
- dependencies: libfreetype2_dep,
-@@ -142,6 +135,11 @@ executable('ftmulti',
- link_with: ftcommon_lib,
- install: true)
-
-+executable('ftpatchk',
-+ 'src/ftpatchk.c',
-+ dependencies: libfreetype2_dep,
-+ install: false)
-+
- executable('ftsdf',
- 'src/ftsdf.c',
- dependencies: libfreetype2_dep,
-@@ -156,12 +154,10 @@ executable('ftstring',
- link_with: ftcommon_lib,
- install: true)
-
--executable('ftview',
-- 'src/ftview.c',
-+executable('fttimer',
-+ 'src/fttimer.c',
- dependencies: libfreetype2_dep,
-- include_directories: graph_include_dir,
-- link_with: ftcommon_lib,
-- install: true)
-+ install: false)
-
- executable('ftvalid',
- 'src/ftvalid.c',
-@@ -169,6 +165,14 @@ executable('ftvalid',
- link_with: common_lib,
- install: true)
-
-+executable('ftview',
-+ 'src/ftview.c',
-+ dependencies: libfreetype2_dep,
-+ include_directories: graph_include_dir,
-+ link_with: ftcommon_lib,
-+ install: true)
-+
-+
- install_man([
- 'man/ftbench.1',
- 'man/ftdiff.1',
-diff --git a/meson.build b/meson.build
-index
c425afea09016c6334231bd3e426d605f05fd329..36d0309ed75c5e3a3cfa79276800832e2e9eae7c
100644
---- a/meson.build
-+++ b/meson.build
-@@ -172,6 +172,19 @@ executable('ftview',
- link_with: ftcommon_lib,
- install: true)
-
-+# This program only works if FreeType has been compiled with enabled option
-+# `TT_CONFIG_OPTION_BYTECODE_INTERPRETER` (which is the default).
-+#
-+# We need a path into FreeType's `src/truetype` directory. This is
-+# something normal applications should never need.
-+executable('ttdebug',
-+ 'src/ttdebug.c',
-+ dependencies: libfreetype2_dep,
-+ c_args: '-DFT2_BUILD_LIBRARY=1',
-+ include_directories: 'subprojects/freetype2/src/truetype',
-+ link_with: common_lib,
-+ install: true)
-+
-
- install_man([
- 'man/ftbench.1',
Copied: freetype2/repos/testing-x86_64/0005-ft2-demos-meson-fixes.patch (from
rev 422436, freetype2/trunk/0005-ft2-demos-meson-fixes.patch)
===================================================================
--- 0005-ft2-demos-meson-fixes.patch (rev 0)
+++ 0005-ft2-demos-meson-fixes.patch 2021-08-21 09:28:25 UTC (rev 422437)
@@ -0,0 +1,150 @@
+diff --git a/meson.build b/meson.build
+index
fc2d29f9e86551ebb332876d50950e0935b87bce..c425afea09016c6334231bd3e426d605f05fd329
100644
+--- a/meson.build
++++ b/meson.build
+@@ -76,25 +76,8 @@ ftcommon_lib = static_library('ftcommon',
+ link_with: [common_lib, graph_lib],
+ )
+
+-executable('fttimer',
+- 'src/fttimer.c',
+- dependencies: libfreetype2_dep,
+- install: false)
+-
+-executable('ftchkwd',
+- 'src/ftchkwd.c',
+- dependencies: libfreetype2_dep,
+- install: false)
+
+-executable('ftmemchk',
+- 'src/ftmemchk.c',
+- dependencies: libfreetype2_dep,
+- install: false)
+-
+-executable('ftpatchk',
+- 'src/ftpatchk.c',
+- dependencies: libfreetype2_dep,
+- install: false)
++# programs
+
+ executable('ftbench',
+ 'src/ftbench.c',
+@@ -102,17 +85,10 @@ executable('ftbench',
+ link_with: common_lib,
+ install: true)
+
+-executable('ftdump',
+- 'src/ftdump.c',
+- dependencies: libfreetype2_dep,
+- link_with: [common_lib, output_lib],
+- install: true)
+-
+-executable('ftlint',
+- 'src/ftlint.c',
++executable('ftchkwd',
++ 'src/ftchkwd.c',
+ dependencies: libfreetype2_dep,
+- link_with: common_lib,
+- install: true)
++ install: false)
+
+ executable('ftdiff',
+ 'src/ftdiff.c',
+@@ -121,6 +97,12 @@ executable('ftdiff',
+ link_with: ftcommon_lib,
+ install: true)
+
++executable('ftdump',
++ 'src/ftdump.c',
++ dependencies: libfreetype2_dep,
++ link_with: [common_lib, output_lib],
++ install: true)
++
+ executable('ftgamma',
+ 'src/ftgamma.c',
+ dependencies: [libfreetype2_dep, math_dep],
+@@ -135,6 +117,17 @@ executable('ftgrid',
+ link_with: [ftcommon_lib, output_lib],
+ install: true)
+
++executable('ftlint',
++ 'src/ftlint.c',
++ dependencies: libfreetype2_dep,
++ link_with: common_lib,
++ install: true)
++
++executable('ftmemchk',
++ 'src/ftmemchk.c',
++ dependencies: libfreetype2_dep,
++ install: false)
++
+ executable('ftmulti',
+ 'src/ftmulti.c',
+ dependencies: libfreetype2_dep,
+@@ -142,6 +135,11 @@ executable('ftmulti',
+ link_with: ftcommon_lib,
+ install: true)
+
++executable('ftpatchk',
++ 'src/ftpatchk.c',
++ dependencies: libfreetype2_dep,
++ install: false)
++
+ executable('ftsdf',
+ 'src/ftsdf.c',
+ dependencies: libfreetype2_dep,
+@@ -156,12 +154,10 @@ executable('ftstring',
+ link_with: ftcommon_lib,
+ install: true)
+
+-executable('ftview',
+- 'src/ftview.c',
++executable('fttimer',
++ 'src/fttimer.c',
+ dependencies: libfreetype2_dep,
+- include_directories: graph_include_dir,
+- link_with: ftcommon_lib,
+- install: true)
++ install: false)
+
+ executable('ftvalid',
+ 'src/ftvalid.c',
+@@ -169,6 +165,14 @@ executable('ftvalid',
+ link_with: common_lib,
+ install: true)
+
++executable('ftview',
++ 'src/ftview.c',
++ dependencies: libfreetype2_dep,
++ include_directories: graph_include_dir,
++ link_with: ftcommon_lib,
++ install: true)
++
++
+ install_man([
+ 'man/ftbench.1',
+ 'man/ftdiff.1',
+diff --git a/meson.build b/meson.build
+index
c425afea09016c6334231bd3e426d605f05fd329..36d0309ed75c5e3a3cfa79276800832e2e9eae7c
100644
+--- a/meson.build
++++ b/meson.build
+@@ -172,6 +172,19 @@ executable('ftview',
+ link_with: ftcommon_lib,
+ install: true)
+
++# This program only works if FreeType has been compiled with enabled option
++# `TT_CONFIG_OPTION_BYTECODE_INTERPRETER` (which is the default).
++#
++# We need a path into FreeType's `src/truetype` directory. This is
++# something normal applications should never need.
++executable('ttdebug',
++ 'src/ttdebug.c',
++ dependencies: libfreetype2_dep,
++ c_args: '-DFT2_BUILD_LIBRARY=1',
++ include_directories: 'subprojects/freetype2/src/truetype',
++ link_with: common_lib,
++ install: true)
++
+
+ install_man([
+ 'man/ftbench.1',
Copied:
freetype2/repos/testing-x86_64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
(from rev 422436,
freetype2/trunk/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch)
===================================================================
--- 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
(rev 0)
+++ 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch 2021-08-21
09:28:25 UTC (rev 422437)
@@ -0,0 +1,35 @@
+From d7f649f283763af099256eb2d5e326df601c3e76 Mon Sep 17 00:00:00 2001
+From: Anuj Verma <an...@iitbhilai.ac.in>
+Date: Mon, 16 Aug 2021 07:48:09 +0530
+Subject: [PATCH] [sdf] Return `FT_Err_Ok` while trying to render bitmap.
+
+ * src/sdf/ftsdfrend.c (ft_bsdf_render): Return OK if the slot is
+ a bitmap and the render mode is anything other than `FT_RENDER_MODE_SDF`.
+ This is for compatibility reasons.
+
+ Fixes issue #1076
+---
+ src/sdf/ftsdfrend.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/sdf/ftsdfrend.c b/src/sdf/ftsdfrend.c
+index 30f2e62a4..5686c0bf5 100644
+--- a/src/sdf/ftsdfrend.c
++++ b/src/sdf/ftsdfrend.c
+@@ -502,8 +502,11 @@
+ /* check whether render mode is correct */
+ if ( mode != FT_RENDER_MODE_SDF )
+ {
+- error = FT_THROW( Cannot_Render_Glyph );
+- goto Exit;
++ FT_TRACE0(( "ft_bsdf_render: trying to render bitmap\n" ));
++
++ /* return OK since the slot is already a bitmap */
++ error = FT_Err_Ok;
++ return error;
+ }
+
+ if ( origin )
+--
+GitLab
+
Copied:
freetype2/repos/testing-x86_64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
(from rev 422436,
freetype2/trunk/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch)
===================================================================
--- 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
(rev 0)
+++ 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch 2021-08-21
09:28:25 UTC (rev 422437)
@@ -0,0 +1,41 @@
+From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001
+From: Alexei Podtelezhnikov <apodt...@gmail.com>
+Date: Fri, 20 Aug 2021 16:01:32 -0400
+Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs.
+
+Fixes #1076.
+
+* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when
+rendering a bitmap glyph.
+---
+ src/base/ftobjs.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
+index 342ac4a27..7b40c6421 100644
+--- a/src/base/ftobjs.c
++++ b/src/base/ftobjs.c
+@@ -4703,7 +4703,7 @@
+ else
+ renderer = FT_Lookup_Renderer( library, slot->format, &node );
+
+- error = FT_ERR( Unimplemented_Feature );
++ error = FT_ERR( Cannot_Render_Glyph );
+ while ( renderer )
+ {
+ error = renderer->render( renderer, slot, render_mode, NULL );
+@@ -4719,6 +4719,11 @@
+ /* format. */
+ renderer = FT_Lookup_Renderer( library, slot->format, &node );
+ }
++
++ /* it is not an error if we cannot render a bitmat glyph */
++ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
++ slot->format == FT_GLYPH_FORMAT_BITMAP )
++ error = FT_Err_Ok;
+ }
+ }
+
+--
+GitLab
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-21 09:28:08 UTC (rev 422436)
+++ PKGBUILD 2021-08-21 09:28:25 UTC (rev 422437)
@@ -1,103 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgbase=freetype2
-pkgname=(freetype2 freetype2-demos freetype2-docs)
-pkgver=2.11.0
-pkgrel=2
-pkgdesc="Font rasterization library"
-url="https://www.freetype.org/";
-arch=(x86_64)
-license=(GPL)
-# adding harfbuzz for improved OpenType features auto-hinting
-# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
-depends=(zlib bzip2 sh libpng harfbuzz brotli)
-makedepends=(libx11 qt5-base meson)
-source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
-
https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-$pkgver.tar.xz{,.sig}
-
https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-$pkgver.tar.xz{,.sig}
- 0001-Enable-table-validation-modules.patch
- 0002-Enable-subpixel-rendering.patch
- 0003-Enable-infinality-subpixel-hinting.patch
- 0004-Enable-long-PCF-family-names.patch
- 0005-ft2-demos-meson-fixes.patch
- freetype2.sh)
-sha256sums=('8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7'
- 'SKIP'
- '5b0b5f504f3547ab6123049917b36cfe6944837eaa7baa86ae742a596b5c206c'
- 'SKIP'
- 'eb0622296c6dfb38fc305c99ebbfb5c770db7e344b94f63042ec03f3db164550'
- 'SKIP'
- 'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
- '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
- '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
- '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6'
- '7b1268c229414bc75c50fa826a0f8d391c15568742bca10afd8c12f0c61e5597'
- 'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
-validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg
<w...@gnu.org>
-
-prepare() {
- pushd freetype-$pkgver
- patch -Np1 -i ../0001-Enable-table-validation-modules.patch
- patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
- patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
- patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
- ln -sr . ../ft2demos-$pkgver/subprojects/freetype2
- popd
-
- pushd ft2demos-$pkgver
- patch -Np1 -i ../0005-ft2-demos-meson-fixes.patch
- popd
-}
-
-build() {
- arch-meson ft2demos-$pkgver build \
- -D freetype2:default_library=shared
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_freetype2() {
- provides=(libfreetype.so)
- install=freetype2.install
- backup=(etc/profile.d/freetype2.sh)
-
- meson install -C build --destdir="$pkgdir"
- install -Dt "$pkgdir/etc/profile.d" -m644 freetype2.sh
- install -Dt "$pkgdir/usr/share/aclocal" -m644 \
- freetype-$pkgver/builds/unix/freetype2.m4
-
- cd "$pkgdir"
- _pick demos usr/bin
- _pick demos usr/share/man/man1
-}
-
-package_freetype2-demos() {
- pkgdesc="Freetype tools and demos"
- depends=(freetype2 libx11)
- optdepends=('qt5-base: ftinspect')
- mv demos/* "$pkgdir"
-}
-
-package_freetype2-docs() {
- pkgdesc="Freetype documentation"
- depends=(freetype2)
-
- mkdir -p "${pkgdir}/usr/share/doc"
- cp -r freetype-$pkgver/docs "$pkgdir/usr/share/doc/freetype2"
-}
-
-# vim:set sw=2 et:
Copied: freetype2/repos/testing-x86_64/PKGBUILD (from rev 422436,
freetype2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-21 09:28:25 UTC (rev 422437)
@@ -0,0 +1,111 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgbase=freetype2
+pkgname=(freetype2 freetype2-demos freetype2-docs)
+pkgver=2.11.0
+pkgrel=3
+pkgdesc="Font rasterization library"
+url="https://www.freetype.org/";
+arch=(x86_64)
+license=(GPL)
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+depends=(zlib bzip2 sh libpng harfbuzz brotli)
+makedepends=(libx11 qt5-base meson)
+source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
+
https://download-mirror.savannah.gnu.org/releases/freetype/freetype-doc-$pkgver.tar.xz{,.sig}
+
https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-$pkgver.tar.xz{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0004-Enable-long-PCF-family-names.patch
+ 0005-ft2-demos-meson-fixes.patch
+ 0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
+ 0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
+ freetype2.sh)
+sha256sums=('8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7'
+ 'SKIP'
+ '5b0b5f504f3547ab6123049917b36cfe6944837eaa7baa86ae742a596b5c206c'
+ 'SKIP'
+ 'eb0622296c6dfb38fc305c99ebbfb5c770db7e344b94f63042ec03f3db164550'
+ 'SKIP'
+ 'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
+ '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
+ '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
+ '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6'
+ '7b1268c229414bc75c50fa826a0f8d391c15568742bca10afd8c12f0c61e5597'
+ '2b13b8cc9acc3e56be6b0f8102d648864227bf93637bc956d5052c77c8509782'
+ '21a2d243bc6b44d1cdb88ef29af2bd5ceda8d0faaf928bdc2c078a474ddc61f1'
+ 'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
+validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg
<w...@gnu.org>
+
+prepare() {
+ pushd freetype-$pkgver
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+ # https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076
+ patch -Np1 -i ../0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
+ patch -Np1 -i ../0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
+
+ ln -sr . ../ft2demos-$pkgver/subprojects/freetype2
+ popd
+
+ pushd ft2demos-$pkgver
+ patch -Np1 -i ../0005-ft2-demos-meson-fixes.patch
+ popd
+}
+
+build() {
+ arch-meson ft2demos-$pkgver build \
+ -D freetype2:default_library=shared
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_freetype2() {
+ provides=(libfreetype.so)
+ install=freetype2.install
+ backup=(etc/profile.d/freetype2.sh)
+
+ meson install -C build --destdir="$pkgdir"
+ install -Dt "$pkgdir/etc/profile.d" -m644 freetype2.sh
+ install -Dt "$pkgdir/usr/share/aclocal" -m644 \
+ freetype-$pkgver/builds/unix/freetype2.m4
+
+ cd "$pkgdir"
+ _pick demos usr/bin
+ _pick demos usr/share/man/man1
+}
+
+package_freetype2-demos() {
+ pkgdesc="Freetype tools and demos"
+ depends=(freetype2 libx11)
+ optdepends=('qt5-base: ftinspect')
+ mv demos/* "$pkgdir"
+}
+
+package_freetype2-docs() {
+ pkgdesc="Freetype documentation"
+ depends=(freetype2)
+
+ mkdir -p "${pkgdir}/usr/share/doc"
+ cp -r freetype-$pkgver/docs "$pkgdir/usr/share/doc/freetype2"
+}
+
+# vim:set sw=2 et:
Deleted: freetype2.install
===================================================================
--- freetype2.install 2021-08-21 09:28:08 UTC (rev 422436)
+++ freetype2.install 2021-08-21 09:28:25 UTC (rev 422437)
@@ -1,8 +0,0 @@
-post_upgrade() {
- if (( $(vercmp $2 2.7-1) < 0 )); then
- cat <<MSG
- The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
- Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
-MSG
- fi
-}
Copied: freetype2/repos/testing-x86_64/freetype2.install (from rev 422436,
freetype2/trunk/freetype2.install)
===================================================================
--- freetype2.install (rev 0)
+++ freetype2.install 2021-08-21 09:28:25 UTC (rev 422437)
@@ -0,0 +1,8 @@
+post_upgrade() {
+ if (( $(vercmp $2 2.7-1) < 0 )); then
+ cat <<MSG
+ The Arch-specific FT2_SUBPIXEL_HINTING has been removed.
+ Subpixel hinting is now configured in /etc/profile.d/freetype2.sh .
+MSG
+ fi
+}
Deleted: freetype2.sh
===================================================================
--- freetype2.sh 2021-08-21 09:28:08 UTC (rev 422436)
+++ freetype2.sh 2021-08-21 09:28:25 UTC (rev 422437)
@@ -1,12 +0,0 @@
-# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
-# version. The available settings are:
-#
-# truetype:interpreter-version=35 # Classic mode (default in 2.6)
-# truetype:interpreter-version=38 # Infinality mode
-# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
-#
-# There are more properties that can be set, separated by whitespace. Please
-# refer to the FreeType documentation for details.
-
-# Uncomment and configure below
-#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
Copied: freetype2/repos/testing-x86_64/freetype2.sh (from rev 422436,
freetype2/trunk/freetype2.sh)
===================================================================
--- freetype2.sh (rev 0)
+++ freetype2.sh 2021-08-21 09:28:25 UTC (rev 422437)
@@ -0,0 +1,12 @@
+# Subpixel hinting mode can be chosen by setting the right TrueType interpreter
+# version. The available settings are:
+#
+# truetype:interpreter-version=35 # Classic mode (default in 2.6)
+# truetype:interpreter-version=38 # Infinality mode
+# truetype:interpreter-version=40 # Minimal mode (default in 2.7)
+#
+# There are more properties that can be set, separated by whitespace. Please
+# refer to the FreeType documentation for details.
+
+# Uncomment and configure below
+#export FREETYPE_PROPERTIES="truetype:interpreter-version=40"
