* [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/
@ 2017-11-15 19:26 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2017-11-15 19:26 UTC (permalink / raw
To: gentoo-commits
commit: ae78fd8d3ba93fff04dcd9c692f5f8c10d538003
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Nov 15 18:17:46 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 19:26:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae78fd8d
dev-libs/m17n-lib: Fix building with USE="X fontconfig -xft" (bug #636276).
Bug: https://bugs.gentoo.org/636276
.../files/m17n-lib-1.7.0-no-freetype.patch | 46 ++++++++++++++++++++++
dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild | 1 +
2 files changed, 47 insertions(+)
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 00000000000..59b040c4335
--- /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/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index 12c424df8a4..72dc298cdd0 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gui.patch
"${FILESDIR}"/${PN}-ispell.patch
"${FILESDIR}"/${PN}-parallel-make.patch
+ "${FILESDIR}"/${PN}-1.7.0-no-freetype.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/
@ 2024-06-28 12:29 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2024-06-28 12:29 UTC (permalink / raw
To: gentoo-commits
commit: a286836697fc5fcd3408434ea320b0e8559f0c89
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 12:26:50 2024 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 12:28:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2868366
dev-libs/m17n-lib: fix build with USE=xft
Closes: https://bugs.gentoo.org/935025
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-libs/m17n-lib/files/m17n-lib-configure.patch | 8 +++++++-
.../m17n-lib/{m17n-lib-1.8.4.ebuild => m17n-lib-1.8.4-r1.ebuild} | 0
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 90cfc774b806..12e571bd086b 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -56,7 +56,7 @@
AC_SUBST(FRIBIDI_LD_FLAGS)
dnl Check for otflib usability.
-@@ -201,6 +209,9 @@
+@@ -201,11 +209,14 @@
AC_SUBST(OTF_LD_FLAGS)
dnl Check for Freetype2 usability.
@@ -66,6 +66,12 @@
PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes],
[HAVE_FREETYPE=no])
AS_IF([test "x$HAVE_FREETYPE" = "xyes"],
+ [CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS";
+- FREETYPE_LD_FLAGS=FREETYPE_LIBS;
++ FREETYPE_LD_FLAGS=$FREETYPE_LIBS;
+ AC_DEFINE([HAVE_FREETYPE], [1],
+ [Define to 1 if you have FreeType library and header file.])
+ M17N_EXT_LIBS="$M17N_EXT_LIBS freetype";
@@ -220,9 +231,13 @@
],
[]
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
similarity index 100%
rename from dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild
rename to dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/
@ 2024-06-27 13:15 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2024-06-27 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 26df43b5026e054e11e9c0b2e73ef9304db4d32a
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 13:14:03 2024 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 13:14:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26df43b5
dev-libs/m17n-lib: fix build with Clang
Closes: https://bugs.gentoo.org/919393
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-libs/m17n-lib/files/m17n-lib-clang.patch | 21 +++++++++++++++++++++
dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild | 1 +
2 files changed, 22 insertions(+)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-clang.patch b/dev-libs/m17n-lib/files/m17n-lib-clang.patch
new file mode 100644
index 000000000000..fb5d303d01b9
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-clang.patch
@@ -0,0 +1,21 @@
+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;
+
+
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
index abca676406af..e3a2db9f3487 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0-r1.ebuild
@@ -36,6 +36,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${PN}-clang.patch
"${FILESDIR}"/${PN}-freetype.patch
"${FILESDIR}"/${PN}-ftconfig.patch
"${FILESDIR}"/${PN}-ispell.patch
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/
@ 2018-08-29 13:36 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-08-29 13:36 UTC (permalink / raw
To: gentoo-commits
commit: cfe2bf058f9d2e61dd9ce39b46cc4df491a18ec9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 08:47:49 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 13:33:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe2bf05
dev-libs/m17n-lib: use pkg-config to find freetype
Closes: https://bugs.gentoo.org/664818
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch | 29 +++++++++++++++++++++++++
dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch
new file mode 100644
index 00000000000..203f836bf94
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch
@@ -0,0 +1,29 @@
+--- 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"
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
index c98449bc342..767f8eabe5f 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-configure.patch
"${FILESDIR}"/${PN}-freetype.patch
+ "${FILESDIR}"/${PN}-ftconfig.patch
"${FILESDIR}"/${PN}-ispell.patch
"${FILESDIR}"/${PN}-parallel-make.patch
"${FILESDIR}"/${PN}-pkg-config.patch
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/
@ 2018-08-29 12:47 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-08-29 12:47 UTC (permalink / raw
To: gentoo-commits
commit: a5cfb0c36c36a3dc93e3ed874babfe8b90406a2b
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 12:42:52 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 12:46:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5cfb0c3
dev-libs/m17n-lib: update patches
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-libs/m17n-lib/files/m17n-lib-configure.patch | 25 +++++++++++++++++-------
dev-libs/m17n-lib/files/m17n-lib-gui.patch | 13 ------------
dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild | 1 -
dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild | 1 -
4 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 00ba09493f3..04ffc7749a5 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -1,6 +1,17 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then
+@@ -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"
@@ -11,7 +22,7 @@
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
+@@ -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)
@@ -22,7 +33,7 @@
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
+@@ -202,8 +206,10 @@
AC_SUBST(OTF_LD_FLAGS)
dnl Check for Freetype2 usability.
@@ -34,7 +45,7 @@
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,
+@@ -255,7 +261,9 @@
#else
Version too old. Compiling this line should fail.
#endif])
@@ -45,7 +56,7 @@
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
+@@ -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, /**/)
@@ -56,7 +67,7 @@
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)
+@@ -344,7 +354,9 @@
dnl Check for Anthy usability.
PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
@@ -67,7 +78,7 @@
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)
+@@ -355,7 +367,9 @@
dnl Check for Ispell usability.
AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-gui.patch
deleted file mode 100644
index b60d81bbc22..00000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-gui.patch
+++ /dev/null
@@ -1,13 +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)
-
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index 089a7275cc9..b5dcd1285ee 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -36,7 +36,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-configure.patch
"${FILESDIR}"/${PN}-freetype.patch
- "${FILESDIR}"/${PN}-gui.patch
"${FILESDIR}"/${PN}-ispell.patch
"${FILESDIR}"/${PN}-parallel-make.patch
)
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
index 7ea10bb0d92..ca3d353d0df 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
@@ -36,7 +36,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-configure.patch
"${FILESDIR}"/${PN}-freetype.patch
- "${FILESDIR}"/${PN}-gui.patch
"${FILESDIR}"/${PN}-ispell.patch
"${FILESDIR}"/${PN}-parallel-make.patch
)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/
@ 2017-07-05 13:16 Akinori Hattori
0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2017-07-05 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 37ac5eb7aafd85fb101bf2809532916d9b70b6ad
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 5 13:15:44 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 5 13:15:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ac5eb7
dev-libs/m17n-lib: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/m17n-lib-1.6.2-candidates-list.patch | 83 ----------------------
dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch | 16 -----
.../files/m17n-lib-1.6.2-parallel-make.patch | 63 ----------------
....3-configure.patch => m17n-lib-configure.patch} | 2 -
dev-libs/m17n-lib/files/m17n-lib-gui.patch | 13 ++++
...ib-1.6.3-ispell.patch => m17n-lib-ispell.patch} | 2 -
...lel-make.patch => m17n-lib-parallel-make.patch} | 16 ++---
dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild | 14 ++--
dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild | 10 +--
dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild | 12 ++--
10 files changed, 38 insertions(+), 193 deletions(-)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch
deleted file mode 100644
index 40cd85d49c2..00000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- src/input.c 2011/02/14 04:59:22 1.154
-+++ src/input.c 2011/03/09 05:45:49 1.155
-@@ -3004,9 +3004,6 @@
- take_action_list (MInputContext *ic, MPlist *action_list)
- {
- MInputContextInfo *ic_info = (MInputContextInfo *) ic->info;
-- MPlist *candidate_list = ic->candidate_list;
-- int candidate_index = ic->candidate_index;
-- int candidate_show = ic->candidate_show;
- MTextProperty *prop;
-
- MPLIST_DO (action_list, action_list)
-@@ -3480,31 +3477,6 @@
- };
- }
- }
--
-- if (ic->candidate_list)
-- {
-- M17N_OBJECT_UNREF (ic->candidate_list);
-- ic->candidate_list = NULL;
-- }
-- if (ic->cursor_pos > 0
-- && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
-- Mcandidate_list)))
-- {
-- ic->candidate_list = mtext_property_value (prop);
-- M17N_OBJECT_REF (ic->candidate_list);
-- ic->candidate_index
-- = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
-- Mcandidate_index);
-- ic->candidate_from = mtext_property_start (prop);
-- ic->candidate_to = mtext_property_end (prop);
-- }
--
-- if (candidate_list != ic->candidate_list)
-- ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
-- if (candidate_index != ic->candidate_index)
-- ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
-- if (candidate_show != ic->candidate_show)
-- ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;
- return 0;
- }
-
-@@ -3914,7 +3886,37 @@
- ic_info->key_unhandled = 0;
-
- do {
-- if (handle_key (ic) < 0)
-+ MPlist *candidate_list = ic->candidate_list;
-+ int candidate_index = ic->candidate_index;
-+ int candidate_show = ic->candidate_show;
-+ MTextProperty *prop;
-+ int result = handle_key (ic);
-+
-+ if (ic->candidate_list)
-+ {
-+ M17N_OBJECT_UNREF (ic->candidate_list);
-+ ic->candidate_list = NULL;
-+ }
-+ if (ic->cursor_pos > 0
-+ && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
-+ Mcandidate_list)))
-+ {
-+ ic->candidate_list = mtext_property_value (prop);
-+ M17N_OBJECT_REF (ic->candidate_list);
-+ ic->candidate_index
-+ = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
-+ Mcandidate_index);
-+ ic->candidate_from = mtext_property_start (prop);
-+ ic->candidate_to = mtext_property_end (prop);
-+ }
-+ if (candidate_list != ic->candidate_list)
-+ ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
-+ if (candidate_index != ic->candidate_index)
-+ ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
-+ if (candidate_show != ic->candidate_show)
-+ ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;
-+
-+ if (result < 0)
- {
- /* KEY was not handled. Delete it from the current key sequence. */
- if (ic_info->used > 0)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch
deleted file mode 100644
index 2c37246a6e5..00000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: m17n-lib-1.6.2/configure.ac
-===================================================================
---- m17n-lib-1.6.2.orig/configure.ac
-+++ m17n-lib-1.6.2/configure.ac
-@@ -100,9 +100,9 @@ dnl Checks which levels of APIs should b
- AC_ARG_ENABLE(gui,
- AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
-
--AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
-+AM_CONDITIONAL(WITH_GUI, test x$enable_gui != xno)
-
--if test x$with_gui != xno; then
-+if test x$enable_gui != xno; then
-
- dnl Checks if dlopen exists, and if it's in libc or libdl.
-
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch
deleted file mode 100644
index 4402188aa88..00000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: m17n-lib-1.6.2/src/Makefile.am
-===================================================================
---- m17n-lib-1.6.2.orig/src/Makefile.am
-+++ m17n-lib-1.6.2/src/Makefile.am
-@@ -53,7 +53,7 @@ libm17n_la_SOURCES = \
- 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 @@ FLT_SOURCES = \
- 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 @@ OPTIONAL_LD_FLAGS = \
- @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 @@ module_LTLIBRARIES = libm17n-X.la libm17
- 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@ ${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@ 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 @@ if MAINTAINER_MODE
- 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/files/m17n-lib-1.6.3-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
similarity index 97%
rename from dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch
rename to dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 024dea6fea4..00ba09493f3 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index 2e58d68..49b812a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then
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 00000000000..b60d81bbc22
--- /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-1.6.3-ispell.patch b/dev-libs/m17n-lib/files/m17n-lib-ispell.patch
similarity index 83%
rename from dev-libs/m17n-lib/files/m17n-lib-1.6.3-ispell.patch
rename to dev-libs/m17n-lib/files/m17n-lib-ispell.patch
index d548bdf2048..c9f87fb1c6d 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-ispell.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-ispell.patch
@@ -1,5 +1,3 @@
-diff --git a/example/mimx-ispell.c b/example/mimx-ispell.c
-index daa244f..7507de8 100644
--- a/example/mimx-ispell.c
+++ b/example/mimx-ispell.c
@@ -166,7 +166,7 @@ ispell_word (MPlist *args)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-parallel-make.patch b/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch
similarity index 84%
rename from dev-libs/m17n-lib/files/m17n-lib-1.6.3-parallel-make.patch
rename to dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch
index 63da1405477..a035921d055 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-parallel-make.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch
@@ -1,8 +1,6 @@
-Index: m17n-lib-1.6.2/src/Makefile.am
-===================================================================
---- m17n-lib-1.6.2.orig/src/Makefile.am
-+++ m17n-lib-1.6.2/src/Makefile.am
-@@ -53,7 +53,7 @@ libm17n_la_SOURCES = \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -53,7 +53,7 @@
language.h language.c \
mlocale.h locale.c \
m17n.h m17n.c
@@ -11,7 +9,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
FLT_SOURCES = \
-@@ -61,7 +61,7 @@ FLT_SOURCES = \
+@@ -61,7 +61,7 @@
m17n-flt.h m17n-flt.c
libm17n_flt_la_SOURCES = ${FLT_SOURCES}
@@ -20,7 +18,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO}
GUI_SOURCES = \
-@@ -80,7 +80,7 @@ OPTIONAL_LD_FLAGS = \
+@@ -80,7 +80,7 @@
@FONTCONFIG_LD_FLAGS@
libm17n_gui_la_SOURCES = ${GUI_SOURCES}
@@ -29,7 +27,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
if WITH_GUI
-@@ -90,11 +90,11 @@ module_LTLIBRARIES = libm17n-X.la libm17
+@@ -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
@@ -43,7 +41,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
libm17n_gd_la_LDFLAGS = -avoid-version -module
endif
-@@ -121,14 +121,14 @@ if MAINTAINER_MODE
+@@ -121,14 +121,14 @@
noinst_PROGRAMS = linkcore linkshell linkgui
linkcore_SOURCES = linkcore.c
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
index a8e19cb778e..3115d8bcdcb 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -41,10 +41,10 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}-1.6.2-gui.patch \
- "${FILESDIR}"/${PN}-1.6.3-parallel-make.patch \
- "${FILESDIR}"/${PN}-1.6.3-configure.patch \
- "${FILESDIR}"/${PN}-1.6.3-ispell.patch
+ "${FILESDIR}"/${PN}-gui.patch \
+ "${FILESDIR}"/${PN}-parallel-make.patch \
+ "${FILESDIR}"/${PN}-configure.patch \
+ "${FILESDIR}"/${PN}-ispell.patch
eautoreconf
}
@@ -53,11 +53,11 @@ src_configure() {
local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
if use X; then
- myconf+=" --with-x --enable-gui $(use_with athena) $(use_with bidi fribidi)
+ myconf+=" --with-x --with-gui $(use_with athena) $(use_with bidi fribidi)
$(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
$(use_with xft)"
else
- myconf+=" --without-x --disable-gui --without-athena --without-fribidi
+ myconf+=" --without-x --without-gui --without-athena --without-fribidi
--without-fontconfig --without-freetype --without-gd --without-libotf
--without-xft"
fi
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
index aec9881e782..3ef131f92f8 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -37,8 +37,8 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}-1.6.2-gui.patch \
- "${FILESDIR}"/${PN}-1.6.3-parallel-make.patch
+ "${FILESDIR}"/${PN}-gui.patch \
+ "${FILESDIR}"/${PN}-parallel-make.patch
eautoreconf
}
@@ -47,9 +47,9 @@ src_configure() {
local myconf=
if use X; then
- myconf+=" --enable-gui $(use_with gd)"
+ myconf+=" --with-gui $(use_with gd)"
else
- myconf+=" --disable-gui --without-gd"
+ myconf+=" --without-gui --without-gd"
fi
econf ${myconf} || die
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
index 1641b70b5c8..4e09dc7686d 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
@@ -41,10 +41,10 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}-1.6.2-gui.patch \
- "${FILESDIR}"/${PN}-1.6.3-parallel-make.patch \
- "${FILESDIR}"/${PN}-1.6.3-configure.patch \
- "${FILESDIR}"/${PN}-1.6.3-ispell.patch
+ "${FILESDIR}"/${PN}-gui.patch \
+ "${FILESDIR}"/${PN}-parallel-make.patch \
+ "${FILESDIR}"/${PN}-configure.patch \
+ "${FILESDIR}"/${PN}-ispell.patch
eautoreconf
}
@@ -53,11 +53,11 @@ src_configure() {
local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
if use X; then
- myconf+=" --with-x --enable-gui $(use_with athena) $(use_with bidi fribidi)
+ myconf+=" --with-x --with-gui $(use_with athena) $(use_with bidi fribidi)
$(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
$(use_with xft)"
else
- myconf+=" --without-x --disable-gui --without-athena --without-fribidi
+ myconf+=" --without-x --without-gui --without-athena --without-fribidi
--without-fontconfig --without-freetype --without-gd --without-libotf
--without-xft"
fi
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-28 12:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-15 19:26 [gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-06-28 12:29 Akinori Hattori
2024-06-27 13:15 Akinori Hattori
2018-08-29 13:36 Akinori Hattori
2018-08-29 12:47 Akinori Hattori
2017-07-05 13:16 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox