diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-office/magicpoint/files | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'app-office/magicpoint/files')
| -rw-r--r-- | app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch | 4 | ||||
| -rw-r--r-- | app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch index 7990b4685544..31ae6200e441 100644 --- a/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch +++ b/app-office/magicpoint/files/magicpoint-1.13a-libpng15.patch @@ -1,5 +1,5 @@ ---- image/png.c -+++ image/png.c +--- a/image/png.c ++++ b/image/png.c @@ -86,7 +86,7 @@ return NULL; } diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch index 9a49eb39282e..7a3599ea475f 100644 --- a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch +++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch @@ -1,6 +1,6 @@ # Bug #572658 ---- kit.orig/configure.in 2009-05-04 09:36:47.000000000 +0200 -+++ kit/configure.in 2016-01-23 04:25:17.047720246 +0100 +--- a/configure.in ++++ b/configure.in @@ -16,6 +16,7 @@ AC_PROG_AWK AC_PROG_YACC @@ -14,10 +14,10 @@ AC_MSG_CHECKING(for xft2 library..) AC_CHECK_LIB(Xft, XftFontOpen, - [LIBS="$LIBS -lXft -lfontconfig" -+ [LIBS="$LIBS -lXft `pkg-config --libs fontconfig`" ++ [LIBS="$LIBS -lXft `${PKG_CONFIG} --libs fontconfig`" AC_DEFINE(USE_XFT2) - mgp_xft2_found=yes], [], [-lfontconfig]) -+ mgp_xft2_found=yes], [], [`pkg-config --libs fontconfig`]) ++ mgp_xft2_found=yes], [], [`${PKG_CONFIG} --libs fontconfig`]) fi fi fi @@ -26,7 +26,7 @@ OPTFLAGS="$OPTFLAGS `m17n-config X --cflags`" LIBS="$LIBS `m17n-config X --libs` -lm17n-core" + if test "x$ac_cv_header_fontconfig_fontconfig_h" = "xyes"; then -+ LIBS="$LIBS `pkg-config --libs fontconfig`" ++ LIBS="$LIBS `${PKG_CONFIG} --libs fontconfig`" + fi fi fi |