diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-libs/m17n-lib/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-libs/m17n-lib/files')
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch | 16 | ||||
-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 |
5 files changed, 181 insertions, 0 deletions
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch b/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch new file mode 100644 index 000000000000..cfc298e320e7 --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch @@ -0,0 +1,16 @@ +diff --git a/src/draw.c b/src/draw.c +index f9667d0..1ba6cf6 100644 +--- a/src/draw.c ++++ b/src/draw.c +@@ -1750,7 +1750,11 @@ mdraw__init () + MbidiS = msymbol ("S"); + MbidiNSM = msymbol ("NSM"); + #ifdef HAVE_FRIBIDI ++#if FRIBIDI_INTERFACE_VERSION < 3 + fribidi_set_mirroring (TRUE); ++#else ++ fribidi_set_mirroring (1); ++#endif + #endif + + M_break_at_space = msymbol ("bs"); 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 |