summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2019-01-22 16:45:23 +0300
committerAlexey Shvetsov <alexxy@gentoo.org>2019-01-22 16:56:48 +0300
commitceae9e8ff4ae85a93a3419942776a7c16b9ce5fe (patch)
tree86348e4cfa8c4f8b692376cf4cf8fb885216179c /app-text/ttf2pk2/files
parentx11-misc/safeeyes: 2.0.8 (diff)
downloadgentoo-ceae9e8ff4ae85a93a3419942776a7c16b9ce5fe.tar.gz
gentoo-ceae9e8ff4ae85a93a3419942776a7c16b9ce5fe.tar.bz2
gentoo-ceae9e8ff4ae85a93a3419942776a7c16b9ce5fe.zip
app-text/ttf2pk2: Reapply and migrate to eapi7
Revert "Revert "app-text/ttf2pk2: use pkg-config instead of freetype-config"" This reverts commit 84746a174fa59b40c50fad666f19ee009e197016. Package-Manager: Portage-2.3.57, Repoman-2.3.12 Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
Diffstat (limited to 'app-text/ttf2pk2/files')
-rw-r--r--app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch
new file mode 100644
index 000000000000..6387b28c8ba2
--- /dev/null
+++ b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch
@@ -0,0 +1,23 @@
+--- a/m4/kpse-freetype2-flags.m4 2018-09-19 10:19:06.437789178 +0100
++++ b/m4/kpse-freetype2-flags.m4 2018-09-19 10:23:48.556050046 +0100
+@@ -21,17 +21,10 @@
+
+ # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM])
+ # -------------------------------------
+-AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])])
++AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])])
+
+ # KPSE_FREETYPE2_SYSTEM_FLAGS
+ # ---------------------------
+ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library])
+-fi
+-]) # KPSE_FREETYPE2_SYSTEM_FLAGS
++_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])])
++