summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-10-11 09:03:28 +0200
committerLars Wendler <polynomial-c@gentoo.org>2020-10-11 09:24:38 +0200
commit09600e1de936bdf51f9c9d4ace1593d740d65e45 (patch)
tree7ea62321275dd2df6ceaab614a0431dde0b987de /media-libs/freetype/files
parentx11-misc/lightdm: include ⟶ substack pambase files (diff)
downloadgentoo-09600e1de936bdf51f9c9d4ace1593d740d65e45.tar.gz
gentoo-09600e1de936bdf51f9c9d4ace1593d740d65e45.tar.bz2
gentoo-09600e1de936bdf51f9c9d4ace1593d740d65e45.zip
media-libs/freetype: Bump to version 2.10.3
Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-libs/freetype/files')
-rw-r--r--media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
new file mode 100644
index 000000000000..ea02a15df115
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.10.3-sizeof-types.patch
@@ -0,0 +1,31 @@
+From 56e6ee69d298c0d150e2b76d2cfa2306e901df40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 11 Oct 2020 08:59:08 +0200
+Subject: [PATCH] Prevent apps from using the autoconf sizeof branch.
+
+Use #error to make sure that any app trying to enable that branch fails
+miserably. This guarantees the code to be multilib-friendly and also
+removes the header differences triggering QA errors.
+---
+ builds/unix/ftconfig.h.in | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/builds/unix/ftconfig.h.in b/builds/unix/ftconfig.h.in
+index 00b5a8226..020593a95 100644
+--- a/builds/unix/ftconfig.h.in
++++ b/builds/unix/ftconfig.h.in
+@@ -45,10 +45,7 @@
+ #undef FT_USE_AUTOCONF_SIZEOF_TYPES
+ #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES
+
+-#undef SIZEOF_INT
+-#undef SIZEOF_LONG
+-#define FT_SIZEOF_INT SIZEOF_INT
+-#define FT_SIZEOF_LONG SIZEOF_LONG
++#error "Unsupported code branch enabled. Please report a bug to bugs.gentoo.org."
+
+ #endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */
+
+--
+2.28.0
+