diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/m17n-lib | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/m17n-lib')
-rw-r--r-- | dev-libs/m17n-lib/Manifest | 8 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch | 46 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-configure.patch | 80 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-gui.patch | 13 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-ispell.patch | 11 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch | 61 | ||||
-rw-r--r-- | dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild | 85 | ||||
-rw-r--r-- | dev-libs/m17n-lib/metadata.xml | 23 |
8 files changed, 327 insertions, 0 deletions
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest new file mode 100644 index 000000000000..a67ff6e9ceb2 --- /dev/null +++ b/dev-libs/m17n-lib/Manifest @@ -0,0 +1,8 @@ +AUX m17n-lib-1.7.0-no-freetype.patch 1181 BLAKE2B ce58fa83e9e9b123541ccc9aa1336b62018eb1201996eecd7c936e475aee80f8d989b07449cf345706c1bc9510e0add938e9cb821ae1383359e1e7c8ca8766a4 SHA512 dc94d2637c65242a3b53d8a0121e3502e9b389514961146c62cb1a28859e0726fb3abb21f530d829984cc37546cba443f520e6bfd6d02f7f5f23be7597db29eb +AUX m17n-lib-configure.patch 3290 BLAKE2B 8b82158404739bd9f976f01d600e4f820c981f6cc128662250eaf3df4e8138d8f2a25c2ee8b244154894207d8a813ff6287a805f3983b50979078cda3aba01f4 SHA512 01a5ef3f1efb1dd81cc569a797be6fab45247df92c9fb95ed72da44637bf0eedc310198b487c30a1727bd38f39e5868cf4921a61f4a130d459c17516976ea7dc +AUX m17n-lib-gui.patch 365 BLAKE2B 0efcef5e8be1f794f2fadb193aed03371c334226225cf2c53df81c54ad0d26e1d367c7d7e9f04365f415b61a428662fcbcae2cfe70e75e71df076f4ff8145400 SHA512 792900e167d8ed47a006dd48f8cb0b0b58e239f1ab56751131de15179b917c5ec8251d00932dc5d0d2fec8c51b2532606e958e90c943f6360a3442a02b76f445 +AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c +AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1 +DIST m17n-lib-1.7.0.tar.gz 1063169 BLAKE2B 61192d26dec8a8bdb55b6a819c5b1aa5503e4320d57864889065c9490ee6720f5b258fbef10d5944f69f5a9ccbe49ea5494c8b0a10d536592c301f46df6826c5 SHA512 26fc1be02a5e487a2fa5f2f63d991f3c745aa1b78e20d931fe4b265125266501cc8d402aa3cb5c1b71a7d4c0f7a0bf5b2c3b17ec5f4f8e0f5ee3052ad4e205b7 +EBUILD m17n-lib-1.7.0.ebuild 1797 BLAKE2B 6ba7262da1e21d675d2b458cd791b9cfd7273436c5bc04110f4fb8d3e81fee2c38a960ec2f9a32708e0fb580dbd95f306a5406747fdee1df0ba85c01cf14462d SHA512 9b0bf74495f2ccb2c3c50f1ff44f2716149fd961a9c7536cb1d46229576b26abe3ed7c21e2ee6ca26b8c139336ca852c39a52ffeb1fceb5ffd07317f3e51679d +MISC metadata.xml 873 BLAKE2B b273eacca314fca66e3b779dbc02401d36030747c3068c9e70799500dfdd6a5ea8e5e04f259bf4e284278ec633ad625abae6b1559e757857ba585caeffe6128d SHA512 e0318084f83ee510dee477bb9b6396a81dfe4afbdc407daecc49d51c037217002686af4db286e4bcd6a158061ca0a77822f3853f25f12db5a384a3fafdd38291 diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch b/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch new file mode 100644 index 000000000000..59b040c4335b --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch @@ -0,0 +1,46 @@ +--- /src/font.c ++++ /src/font.c +@@ -1763,10 +1763,10 @@ + + if (format == Mx || format == Mnil) + result = xlfd_parse_name (name, font); +-#ifdef HAVE_FONTCONFIG ++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE) + if (format == Mfontconfig || (result < 0 && format == Mnil)) + result = mfont__ft_parse_name (name, font); +-#endif /* HAVE_FONTCONFIG */ ++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/ + return result; + } + +@@ -2352,11 +2352,11 @@ + + if (format == Mx) + name = xlfd_unparse_name (font, 1); +-#ifdef HAVE_FONTCONFIG ++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE) + else if (format == Mfontconfig) + name = mfont__ft_unparse_name (font); + +-#endif /* HAVE_FONTCONFIG */ ++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/ + else + MERROR (MERROR_FONT, NULL); + return name; +--- /src/font.h ++++ /src/font.h +@@ -307,10 +307,14 @@ + + extern void mfont__ft_fini (); + ++#ifdef HAVE_FONTCONFIG ++ + extern int mfont__ft_parse_name (const char *name, MFont *font); + + extern char *mfont__ft_unparse_name (MFont *font); + ++#endif /* HAVE_FONTCONFIG */ ++ + #ifdef HAVE_OTF + + extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to, diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch new file mode 100644 index 000000000000..00ba09493f3d --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch @@ -0,0 +1,80 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then + X11_LD_FLAGS="-lXt -lX11" + M17N_EXT_LIBS="$M17N_EXT_LIBS X11" + +- if test "x$HAVE_XAW" = "xyes"; then ++ AC_ARG_WITH(athena, ++ AS_HELP_STRING([--with-athena],[with MIT Athena widget suport])) ++ if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then + AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1, + [Define to 1 if you have the Xaw header files.]) + XAW_LD_FLAGS="-lXaw -lXmu" +@@ -149,7 +151,9 @@ else + fi + AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no) + AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no) +-if test "x$HAVE_FRIBIDI" = "xyes"; then ++AC_ARG_WITH(fribidi, ++ AS_HELP_STRING([--with-fribidi],[with fribidi suport])) ++if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then + AC_DEFINE(HAVE_FRIBIDI, 1, + [Define to 1 if you have Fribidi library and header file.]) + M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi" +@@ -202,8 +206,10 @@ fi + AC_SUBST(OTF_LD_FLAGS) + + dnl Check for Freetype2 usability. ++AC_ARG_WITH(freetype, ++ AS_HELP_STRING([--with-freetype],[enable Freetype support])) + AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) +-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then ++if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then + FREETYPE_INC=`freetype-config --cflags` + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_INC" +@@ -255,7 +261,9 @@ AC_CHECK_HEADER(X11/Xft/Xft.h,, HAVE_XFT2=no, + #else + Version too old. Compiling this line should fail. + #endif]) +-if test "x$HAVE_XFT2" = "xyes"; then ++AC_ARG_WITH(xft, ++ AS_HELP_STRING([--with-xft],[enable Xft2 support])) ++if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then + AC_DEFINE(HAVE_XFT2, 1, + [Define to 1 if you have Xft2 library and header file.]) + M17N_EXT_LIBS="$M17N_EXT_LIBS xft2" +@@ -330,7 +338,9 @@ else + fi + AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no) + AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/) +-if test "x$HAVE_XML2" = "xyes"; then ++AC_ARG_WITH(libxml2, ++ AS_HELP_STRING([--with-libxml2],[with libxml2 suport])) ++if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then + AC_DEFINE(HAVE_XML2, 1, + [Define to 1 if you have libxml2 library and header file]) + M17N_EXT_LIBS="$M17N_EXT_LIBS xml2" +@@ -344,7 +354,9 @@ AC_SUBST(XML2_LD_FLAGS) + dnl Check for Anthy usability. + + PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no) +-if test "x$HAVE_ANTHY" = "xyes"; then ++AC_ARG_WITH(anthy, ++ AS_HELP_STRING([--with-anthy],[with anthy suport])) ++if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then + AC_DEFINE(HAVE_ANTHY, 1, + [Define to 1 if you have Anthy library and header file]) + M17N_EXT_LIBS="$M17N_EXT_LIBS anthy" +@@ -355,7 +367,9 @@ AC_SUBST(ANTHY_LD_FLAGS) + + dnl Check for Ispell usability. + AC_CHECK_PROG(HAVE_ISPELL, ispell, yes) +-if test "x$HAVE_ISPELL" = "xyes"; then ++AC_ARG_WITH(ispell, ++ AS_HELP_STRING([--with-ispell],[with ispell suport])) ++if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then + AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.]) + M17N_EXT_LIBS="$M17N_EXT_LIBS ispell" + CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL" diff --git a/dev-libs/m17n-lib/files/m17n-lib-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-gui.patch new file mode 100644 index 000000000000..b60d81bbc221 --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-gui.patch @@ -0,0 +1,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -97,8 +97,8 @@ + + dnl Checks which levels of APIs should be compiled. + +-AC_ARG_ENABLE(gui, +- AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)])) ++AC_ARG_WITH(gui, ++ AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)])) + + AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno) + diff --git a/dev-libs/m17n-lib/files/m17n-lib-ispell.patch b/dev-libs/m17n-lib/files/m17n-lib-ispell.patch new file mode 100644 index 000000000000..c9f87fb1c6d0 --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-ispell.patch @@ -0,0 +1,11 @@ +--- a/example/mimx-ispell.c ++++ b/example/mimx-ispell.c +@@ -166,7 +166,7 @@ ispell_word (MPlist *args) + return add_action (actions, msymbol ("shift"), Msymbol, init_state); + + buf[nbytes] = '\0'; +- sprintf (command, "echo %s | ispell -a -m", (char *) buf); ++ sprintf (command, "echo %s | ispell-aspell -a -m", (char *) buf); + ispell = popen (command, "r"); + if (! ispell) + return add_action (actions, msymbol ("shift"), Msymbol, init_state); diff --git a/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch b/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch new file mode 100644 index 000000000000..a035921d055c --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch @@ -0,0 +1,61 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -53,7 +53,7 @@ + language.h language.c \ + mlocale.h locale.c \ + m17n.h m17n.c +-libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl ++libm17n_la_LIBADD = libm17n-core.la -ldl + libm17n_la_LDFLAGS = -export-dynamic ${VINFO} + + FLT_SOURCES = \ +@@ -61,7 +61,7 @@ + m17n-flt.h m17n-flt.c + + libm17n_flt_la_SOURCES = ${FLT_SOURCES} +-libm17n_flt_la_LIBADD = ${top_builddir}/src/libm17n-core.la ++libm17n_flt_la_LIBADD = libm17n-core.la + libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO} + + GUI_SOURCES = \ +@@ -80,7 +80,7 @@ + @FONTCONFIG_LD_FLAGS@ + + libm17n_gui_la_SOURCES = ${GUI_SOURCES} +-libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ++libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} libm17n-core.la libm17n.la libm17n-flt.la + libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO} + + if WITH_GUI +@@ -90,11 +90,11 @@ + X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS} + + libm17n_X_la_SOURCES = m17n-X.h m17n-X.c +-libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ @FONTCONFIG_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la ++libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ @FONTCONFIG_LD_FLAGS@ libm17n-core.la libm17n.la libm17n-flt.la libm17n-gui.la + libm17n_X_la_LDFLAGS = -avoid-version -module + + libm17n_gd_la_SOURCES = m17n-gd.c +-libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la ++libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ libm17n-core.la libm17n.la libm17n-flt.la libm17n-gui.la + libm17n_gd_la_LDFLAGS = -avoid-version -module + + endif +@@ -121,14 +121,14 @@ + noinst_PROGRAMS = linkcore linkshell linkgui + + linkcore_SOURCES = linkcore.c +-linkcore_LDADD = ${top_builddir}/src/libm17n-core.la ++linkcore_LDADD = libm17n-core.la + linkcore_LDFLAGS = -static + + linkshell_SOURCES = linkshell.c +-linkshell_LDADD = ${top_builddir}/src/libm17n.la ++linkshell_LDADD = libm17n.la + linkshell_LDFLAGS = -static + + linkgui_SOURCES = linkgui.c +-linkgui_LDADD = ${top_builddir}/src/libm17n-gui.la ++linkgui_LDADD = libm17n-gui.la + linkgui_LDFLAGS = -static + endif diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild new file mode 100644 index 000000000000..a6cd8d7426e9 --- /dev/null +++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit autotools + +DESCRIPTION="Multilingual Library for Unix/Linux" +HOMEPAGE="https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git" +SRC_URI="mirror://nongnu/m17n/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86" +IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft" + +RDEPEND="~dev-db/m17n-db-${PV} + X? ( + x11-libs/libX11 + athena? ( x11-libs/libXaw ) + bidi? ( dev-libs/fribidi ) + fontconfig? ( media-libs/fontconfig ) + gd? ( media-libs/gd[png] ) + libotf? ( dev-libs/libotf ) + xft? ( + media-libs/freetype + x11-libs/libXft + ) + ) + anthy? ( app-i18n/anthy ) + libxml2? ( dev-libs/libxml2 ) + spell? ( app-text/aspell )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-configure.patch + "${FILESDIR}"/${PN}-gui.patch + "${FILESDIR}"/${PN}-ispell.patch + "${FILESDIR}"/${PN}-parallel-make.patch + "${FILESDIR}"/${PN}-1.7.0-no-freetype.patch +) + +src_prepare() { + default + + eautoreconf + # workaround for parallel install + sed -i "/^install-module/s/:/: install-libLTLIBRARIES/" src/Makefile.in +} + +src_configure() { + local myconf=( + $(use_with anthy) + $(use_with libxml2) + $(use_with spell ispell) + ) + if use X; then + myconf+=( + $(use_with athena) + $(use_with bidi fribidi) + $(use_with fontconfig) + $(use_with xft freetype) + $(use_with gd) + --with-gui + $(use_with libotf) + --with-x + $(use_with xft) + ) + else + myconf+=( + --without-athena + --without-fontconfig + --without-freetype + --without-fribidi + --without-gd + --without-gui + --without-libotf + --without-x + --without-xft + ) + fi + + econf "${myconf[@]}" +} diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml new file mode 100644 index 000000000000..0c2995cb954a --- /dev/null +++ b/dev-libs/m17n-lib/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <use> + <flag name="X">Build the Graphical User Interface API and utilities</flag> + <flag name="anthy"> + Enable support for <pkg>app-i18n/anthy</pkg> input method + </flag> + <flag name="athena"> + Enable the MIT Athena widget set (<pkg>x11-libs/libXaw</pkg>) + </flag> + <flag name="gd"> + Build API and utilities based on <pkg>media-libs/gd</pkg>. This + flag is only meaningful if the X USE flag is also enabled. + </flag> + <flag name="libotf">Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag> + <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag> + </use> +</pkgmetadata> |