diff options
author | Matt Turner <mattst88@gentoo.org> | 2022-08-17 09:52:14 -0400 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2022-08-17 12:21:07 -0400 |
commit | 1e1ae215ec653d12554c7a5031255390b3f6ce40 (patch) | |
tree | 0645d78a82f77bbc4fb2f66136938329b4086663 /media-libs/freetype/files | |
parent | sys-libs/openipmi: Drop old versions (diff) | |
download | gentoo-1e1ae215ec653d12554c7a5031255390b3f6ce40.tar.gz gentoo-1e1ae215ec653d12554c7a5031255390b3f6ce40.tar.bz2 gentoo-1e1ae215ec653d12554c7a5031255390b3f6ce40.zip |
media-libs/freetype: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs/freetype/files')
-rw-r--r-- | media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch | 31 | ||||
-rw-r--r-- | media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch | 56 |
2 files changed, 0 insertions, 87 deletions
diff --git a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch b/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch deleted file mode 100644 index 6578475f4d7f..000000000000 --- a/media-libs/freetype/files/freetype-2.12.0-cffgload_segfault_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 978eefee5401abee6bf702c6bcde9afb47893145 Mon Sep 17 00:00:00 2001 -From: Georg Brandl <georg@python.org> -Date: Tue, 12 Apr 2022 11:43:37 +0000 -Subject: [PATCH] * src/cff/cffgload.c (cff_slot_load) [FT_CONFIG_OPTION_SVG]: - Fix segfault. - -This can happen if the function is called with `size` being `NULL`. - -Fixes #1147. ---- - src/cff/cffgload.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c -index 5c15c804b..7586b886f 100644 ---- a/src/cff/cffgload.c -+++ b/src/cff/cffgload.c -@@ -370,8 +370,8 @@ - SFNT_Service sfnt; - - -- if ( size->root.metrics.x_ppem < 1 || -- size->root.metrics.y_ppem < 1 ) -+ if ( size && (size->root.metrics.x_ppem < 1 || -+ size->root.metrics.y_ppem < 1 ) ) - { - error = FT_THROW( Invalid_Size_Handle ); - return error; --- -GitLab - diff --git a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch b/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch deleted file mode 100644 index bb6854e9ecb5..000000000000 --- a/media-libs/freetype/files/freetype-2.12.0-librsvg_automagic.patch +++ /dev/null @@ -1,56 +0,0 @@ -https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/156 - ---- freetype-2.12.0/builds/unix/configure.ac -+++ freetype-2.12.0/builds/unix/configure.ac -@@ -530,13 +530,20 @@ - [test "$ac_cv_search_clock_gettime" = "none required" \ - || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) - --# 'librsvg' is needed to demonstrate SVG support. --PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0], -- [have_librsvg="yes (pkg-config)"], [have_librsvg=no]) -- - FT_DEMO_CFLAGS="" - FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME" - -+# 'librsvg' is needed to demonstrate SVG support. -+AC_ARG_WITH([librsvg], -+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@], -+ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])], -+ [], [with_librsvg=auto]) -+ -+have_librsvg=no -+AS_IF([test x"$with_librsvg" != xno], [ -+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0], -+ [have_librsvg="yes (pkg-config)"]) -+]) - if test "$have_librsvg" != no; then - FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG" - FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS" ---- freetype-2.12.0/builds/unix/configure.raw -+++ freetype-2.12.0/builds/unix/configure.raw -@@ -530,13 +530,20 @@ - [test "$ac_cv_search_clock_gettime" = "none required" \ - || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) - --# 'librsvg' is needed to demonstrate SVG support. --PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0], -- [have_librsvg="yes (pkg-config)"], [have_librsvg=no]) -- - FT_DEMO_CFLAGS="" - FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME" - -+# 'librsvg' is needed to demonstrate SVG support. -+AC_ARG_WITH([librsvg], -+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@], -+ [librsvg is needed to demonstrate SVG support in demos @<:@default=auto@:>@])], -+ [], [with_librsvg=auto]) -+ -+have_librsvg=no -+AS_IF([test x"$with_librsvg" != xno], [ -+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0], -+ [have_librsvg="yes (pkg-config)"]) -+]) - if test "$have_librsvg" != no; then - FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG" - FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS" |