gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

app-office/magicpoint: add patch, submitted by proxy maintianer

Browse Source 
patch addresses upstream's configure.in which does not handle
fontconfig correctly, edited ebuild and patch submitted vie the gentoo bug

Gentoo bug: #572658

Package-Manager: portage-2.2.26
This commit is contained in:
Ian Delaney
2016-02-02 14:40:06 +08:00
parent 2530948c04
commit 982ed20f0e
2 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch Normal file
View File

@@ -0,0 +1,33 @@
# 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
@@ -16,6 +16,7 @@
AC_PROG_AWK
AC_PROG_YACC
AC_PROG_LEX
+PKG_PROG_PKG_CONFIG([0.22])
AC_PATH_PROGS(mgp_cv_path_perl, perl5 perl, no)
AC_SUBST(mgp_cv_path_perl)
AC_PATH_PROGS(mgp_cv_path_uuencode, uuencode, no)
@@ -385,9 +386,9 @@
if test "$mgp_use_xft2" = "yes"; then
AC_MSG_CHECKING(for xft2 library..)
AC_CHECK_LIB(Xft, XftFontOpen,
- [LIBS="$LIBS -lXft -lfontconfig"
+ [LIBS="$LIBS -lXft `pkg-config --libs fontconfig`"
AC_DEFINE(USE_XFT2)
- mgp_xft2_found=yes], [], [-lfontconfig])
+ mgp_xft2_found=yes], [], [`pkg-config --libs fontconfig`])
fi
fi
fi
@@ -507,6 +508,9 @@
AC_DEFINE(USE_M17N)
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`"
+ fi
fi
fi

13
app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild
View File

@@ -15,7 +15,7 @@ HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cjk contrib doc emacs examples gif imlib m17n-lib mng nls png truetype"
IUSE="cjk contrib doc emacs examples fontconfig gif imlib m17n-lib mng nls png truetype"
REQUIRED_USE="imlib? ( !gif !png )"
S="${WORKDIR}/kit"
@@ -29,9 +29,15 @@ COMMON_DEPEND="x11-libs/libICE
gif? ( media-libs/giflib:= )
png? ( >=media-libs/libpng-1.4:0= )
)
truetype? ( x11-libs/libXft )
truetype? (
x11-libs/libXft
media-libs/fontconfig
)
emacs? ( virtual/emacs )
m17n-lib? ( dev-libs/m17n-lib )
m17n-lib? (
dev-libs/m17n-lib
fontconfig? ( media-libs/fontconfig )
)
mng? ( media-libs/libmng )"
DEPEND="${COMMON_DEPEND}
sys-devel/autoconf
@@ -51,6 +57,7 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.11b-gentoo.diff \
"${FILESDIR}"/${PN}-1.13a_p20121015-fontconfig.patch \
"${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \
"${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \
"${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \