diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:08:08 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:09:42 +0100 |
| commit | 20a95d74ef94ed90cea5b1f2549f31644c26dcef (patch) | |
| tree | 79fd9a73d8399528effce8887466c5997630c3a8 /app-office | |
| parent | app-misc/ytree: respect ${PKG_CONFIG}, don't use pkg_setup for tc-export (diff) | |
| download | gentoo-20a95d74ef94ed90cea5b1f2549f31644c26dcef.tar.gz gentoo-20a95d74ef94ed90cea5b1f2549f31644c26dcef.tar.bz2 gentoo-20a95d74ef94ed90cea5b1f2549f31644c26dcef.zip | |
app-office/magicpoint: tidy up patch, respect ${PKG_CONFIG} and add dep
* Tidy up patch cruft
* Respect ${PKG_CONFIG}
* (B)DEPEND on virtual/pkgconfig
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch | 10 | ||||
| -rw-r--r-- | app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild | 7 |
2 files changed, 11 insertions, 6 deletions
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 diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild index 9c2bb3bdd01a..4c584b1af2c8 100644 --- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild +++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r2.ebuild @@ -49,8 +49,10 @@ DEPEND=" x11-libs/libxkbfile" BDEPEND=" app-text/rman + virtual/pkgconfig x11-base/xorg-proto - >=x11-misc/imake-1.0.8-r1" + >=x11-misc/imake-1.0.8-r1 +" SITEFILE="50${PN}-gentoo.el" @@ -105,6 +107,9 @@ src_configure() { --x-libraries="${ESYSROOT}/usr/$(get_libdir)" --x-includes="${ESYSROOT}/usr/include" ) + + tc-export PKG_CONFIG + econf "${myeconfargs[@]}" export IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" |