| 1 |
commit: 982ed20f0e7ec567fbb0d1b8bb565f77c249a442 |
| 2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 2 06:40:06 2016 +0000 |
| 4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 2 08:01:41 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982ed20f |
| 7 |
|
| 8 |
app-office/magicpoint: add patch, submitted by proxy maintianer |
| 9 |
|
| 10 |
patch addresses upstream's configure.in which does not handle |
| 11 |
fontconfig correctly, edited ebuild and patch submitted vie the gentoo bug |
| 12 |
|
| 13 |
Gentoo bug: #572658 |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.26 |
| 16 |
|
| 17 |
.../magicpoint-1.13a_p20121015-fontconfig.patch | 33 ++++++++++++++++++++++ |
| 18 |
.../magicpoint/magicpoint-1.13a_p20121015.ebuild | 13 +++++++-- |
| 19 |
2 files changed, 43 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch |
| 22 |
new file mode 100644 |
| 23 |
index 0000000..9a49eb3 |
| 24 |
--- /dev/null |
| 25 |
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch |
| 26 |
@@ -0,0 +1,33 @@ |
| 27 |
+# Bug #572658 |
| 28 |
+--- kit.orig/configure.in 2009-05-04 09:36:47.000000000 +0200 |
| 29 |
++++ kit/configure.in 2016-01-23 04:25:17.047720246 +0100 |
| 30 |
+@@ -16,6 +16,7 @@ |
| 31 |
+ AC_PROG_AWK |
| 32 |
+ AC_PROG_YACC |
| 33 |
+ AC_PROG_LEX |
| 34 |
++PKG_PROG_PKG_CONFIG([0.22]) |
| 35 |
+ AC_PATH_PROGS(mgp_cv_path_perl, perl5 perl, no) |
| 36 |
+ AC_SUBST(mgp_cv_path_perl) |
| 37 |
+ AC_PATH_PROGS(mgp_cv_path_uuencode, uuencode, no) |
| 38 |
+@@ -385,9 +386,9 @@ |
| 39 |
+ if test "$mgp_use_xft2" = "yes"; then |
| 40 |
+ AC_MSG_CHECKING(for xft2 library..) |
| 41 |
+ AC_CHECK_LIB(Xft, XftFontOpen, |
| 42 |
+- [LIBS="$LIBS -lXft -lfontconfig" |
| 43 |
++ [LIBS="$LIBS -lXft `pkg-config --libs fontconfig`" |
| 44 |
+ AC_DEFINE(USE_XFT2) |
| 45 |
+- mgp_xft2_found=yes], [], [-lfontconfig]) |
| 46 |
++ mgp_xft2_found=yes], [], [`pkg-config --libs fontconfig`]) |
| 47 |
+ fi |
| 48 |
+ fi |
| 49 |
+ fi |
| 50 |
+@@ -507,6 +508,9 @@ |
| 51 |
+ AC_DEFINE(USE_M17N) |
| 52 |
+ OPTFLAGS="$OPTFLAGS `m17n-config X --cflags`" |
| 53 |
+ LIBS="$LIBS `m17n-config X --libs` -lm17n-core" |
| 54 |
++ if test "x$ac_cv_header_fontconfig_fontconfig_h" = "xyes"; then |
| 55 |
++ LIBS="$LIBS `pkg-config --libs fontconfig`" |
| 56 |
++ fi |
| 57 |
+ fi |
| 58 |
+ fi |
| 59 |
+ |
| 60 |
|
| 61 |
diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild |
| 62 |
index 7c25f03..872fe4c 100644 |
| 63 |
--- a/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild |
| 64 |
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild |
| 65 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://member.wide.ad.jp/wg/mgp/" |
| 66 |
LICENSE="BSD" |
| 67 |
SLOT="0" |
| 68 |
KEYWORDS="~amd64 ~x86" |
| 69 |
-IUSE="cjk contrib doc emacs examples gif imlib m17n-lib mng nls png truetype" |
| 70 |
+IUSE="cjk contrib doc emacs examples fontconfig gif imlib m17n-lib mng nls png truetype" |
| 71 |
|
| 72 |
REQUIRED_USE="imlib? ( !gif !png )" |
| 73 |
S="${WORKDIR}/kit" |
| 74 |
@@ -29,9 +29,15 @@ COMMON_DEPEND="x11-libs/libICE |
| 75 |
gif? ( media-libs/giflib:= ) |
| 76 |
png? ( >=media-libs/libpng-1.4:0= ) |
| 77 |
) |
| 78 |
- truetype? ( x11-libs/libXft ) |
| 79 |
+ truetype? ( |
| 80 |
+ x11-libs/libXft |
| 81 |
+ media-libs/fontconfig |
| 82 |
+ ) |
| 83 |
emacs? ( virtual/emacs ) |
| 84 |
- m17n-lib? ( dev-libs/m17n-lib ) |
| 85 |
+ m17n-lib? ( |
| 86 |
+ dev-libs/m17n-lib |
| 87 |
+ fontconfig? ( media-libs/fontconfig ) |
| 88 |
+ ) |
| 89 |
mng? ( media-libs/libmng )" |
| 90 |
DEPEND="${COMMON_DEPEND} |
| 91 |
sys-devel/autoconf |
| 92 |
@@ -51,6 +57,7 @@ src_prepare() { |
| 93 |
|
| 94 |
epatch \ |
| 95 |
"${FILESDIR}"/${PN}-1.11b-gentoo.diff \ |
| 96 |
+ "${FILESDIR}"/${PN}-1.13a_p20121015-fontconfig.patch \ |
| 97 |
"${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \ |
| 98 |
"${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \ |
| 99 |
"${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \ |
Archives