mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-libs/m17n-lib: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
committed by
Conrad Kostecki
Conrad Kostecki
parent
a376a59287
commit
583f596437
@@ -1,91 +0,0 @@
|
||||
--- 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)
|
||||
|
||||
@@ -125,7 +125,9 @@
|
||||
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 @@
|
||||
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 @@
|
||||
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 @@
|
||||
#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 @@
|
||||
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 @@
|
||||
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 @@
|
||||
|
||||
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"
|
||||
@@ -1,21 +0,0 @@
|
||||
https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git/commit/?id=624b987e7b252e223de0bdbe148cd56aef0da28f
|
||||
|
||||
From 624b987e7b252e223de0bdbe148cd56aef0da28f Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Thu, 4 May 2023 13:57:49 +0200
|
||||
Subject: Add missing int in example/medit.c
|
||||
|
||||
Resolves: https://savannah.nongnu.org/bugs/index.php?64106
|
||||
|
||||
--- a/example/medit.c
|
||||
+++ b/example/medit.c
|
||||
@@ -662,7 +662,7 @@ static void MenuHelpProc (Widget, XEvent *, String *, Cardinal *);
|
||||
off the current input method, otherwide turn on the input method
|
||||
input_method_table[$IDX]. */
|
||||
void
|
||||
-select_input_method (idx)
|
||||
+select_input_method (int idx)
|
||||
{
|
||||
int previous_input_method = current_input_method;
|
||||
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -210,21 +210,20 @@
|
||||
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$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
|
||||
- FREETYPE_INC=`freetype-config --cflags`
|
||||
+if test "x$with_freetype" != "xno"; then
|
||||
+ PKG_CHECK_MODULES([FT2], [freetype2])
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
- CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
|
||||
+ CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
|
||||
AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
|
||||
HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS")
|
||||
if test "x$HAVE_FREETYPE" = "xyes" ; then
|
||||
save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS `freetype-config --libs`"
|
||||
+ LIBS="$LIBS $FT2_LIBS"
|
||||
AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
|
||||
HAVE_FREETYPE=no)
|
||||
LIBS="$save_LIBS"
|
||||
if test "x$HAVE_FREETYPE" = "xyes"; then
|
||||
- FREETYPE_LD_FLAGS=`freetype-config --libs`
|
||||
+ FREETYPE_LD_FLAGS=$FT2_LIBS
|
||||
AC_DEFINE(HAVE_FREETYPE, 1,
|
||||
[Define to 1 if you have FreeType library and header file.])
|
||||
M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"
|
||||
@@ -1,61 +0,0 @@
|
||||
--- 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
|
||||
@@ -1,19 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -120,7 +120,6 @@
|
||||
M17N_EXT_LIBS=
|
||||
|
||||
AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
|
||||
-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
|
||||
|
||||
if test "x$no_x" != "xyes"; then
|
||||
AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
|
||||
@@ -318,6 +317,8 @@
|
||||
|
||||
fi
|
||||
|
||||
+AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
|
||||
+
|
||||
dnl Check for libxml2 usability.
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
Reference in New Issue
Block a user