diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-10-14 04:04:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-14 04:04:03 +0100 |
commit | 2916cf6049cf9d3092021e247d56c580df6029a7 (patch) | |
tree | c796a6fc8b6fd0e4fd5ac06b009000b438fed7d9 /dev-libs/m17n-lib | |
parent | 7b5306e0d287565138e8b051e32f57e6af6ae0ed (diff) |
gentoo auto-resync : 14:10:2024 - 04:04:03
Diffstat (limited to 'dev-libs/m17n-lib')
-rw-r--r-- | dev-libs/m17n-lib/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch | 91 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-clang.patch | 21 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch | 29 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch | 61 | ||||
-rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch | 19 |
6 files changed, 0 insertions, 226 deletions
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest index 6d05da3058e2..c53308e1cf47 100644 --- a/dev-libs/m17n-lib/Manifest +++ b/dev-libs/m17n-lib/Manifest @@ -1,11 +1,6 @@ -AUX m17n-lib-1.8.0-configure.patch 3476 BLAKE2B 6e74f8e94de9d589b7a5054bee0e805f4fb1f031b82c9d532347d7a06005828b068cb6b350f41464e21682c056a2ac6470e8db4fcd9b16f258ddb8c6c958b6c7 SHA512 d66119495b0eb3a67964826540e9fb86d9b6bfd057dfa6f3156628659751f0b9f9a702e6c6f7eefed2a26ced2101087678ef6af0d1e2098f77c35521ef400a43 -AUX m17n-lib-clang.patch 720 BLAKE2B 6f5551d98aaba930488b932f07578ae7210f8aa464489ede65d561723dd706da8fcd2a734e0842e6885458ee00bdaab011f3f01267a1cf456359152def61384e SHA512 8430fc9299a903e62cabbbc938ff4643c37cc42217f91474bcae0d2a5547fd89ff1d9e9180c4e8c3aaad453c7bba9ceadcc8879c60a0ca6ccab2fb7437fd21ac AUX m17n-lib-configure.patch 4025 BLAKE2B 4c535cb3ed0ac0c0a7d3e69fa8c08f5bc337416ca1dc3ac5354b2cfd29aa303c7b7e089f0c78a8f1b9e8dbfaad7b0fb16bf6a283809ea5f094cca210c2399323 SHA512 6ed722ccb3995873af7dcf9bf28c14b18a6ce967ee04adba3abbd7f882e157cb80e7c9a30ce80a5033f74997bc2f39ec8fe14979bc84612d7b36a7faea756f2a AUX m17n-lib-freetype.patch 1185 BLAKE2B 4056c1e6dffb6783151ca9e33668b76dd64fe59fe21585f433e2a484fb20ebb3e72707174f28993a98ef4d9c7f010e339e9c750dd62343dc8ed2de0fbcef9c04 SHA512 637e27602030cd1d690ad802e31cbf9802f442c690a9df554397db8ae069f3a67f87dffb486403c30f0c6769f8ecc255f4889691671ca073b51692ec295e9fb7 -AUX m17n-lib-ftconfig.patch 1200 BLAKE2B 8aea727469596923fba54ac98cde29719a09eaecdabde0ab5f02b491e0d86ed855689eeb92f536e420a75111d937fdb0941bc419c9d15ef4baf1e0a4f678bb81 SHA512 b03680b185dccf063ef01ce85bb1d252bd984a77e94e314e76482747af4ecd4f90c3b7dd03b5da88e1d75654526b22368c70c80df398044baa39bc80f5936ba3 AUX m17n-lib-ispell.patch 458 BLAKE2B 745b7567421b475fad70e63c4a6c5e12606de89bd7add18cc269d0a18e294dd3c1fed542cf65aa776120989f63009bf95bfabaad1b795fd5316e1599dd66dbf7 SHA512 cbfbd70a1b6d7525627ad8d87c3b2d79f8bfbd74915da5b6f8646a5ab7cbb351abb7a1ea103320faaa4cf80fa0a58d0adf7d9b3a7cc0ee40e8bb4220dd92574c -AUX m17n-lib-parallel-make.patch 2379 BLAKE2B 2867ed88387bf6014841b1f00ceebacda768948e92f4fb0bdaa7d5316657bc48342232edc64c24ec4e7f7b1329fff8ba2b453e8211856168d6830218d6ebd48c SHA512 a1726270680ab0124764a092aca36369e89a21b0164b039d5663cb0af8352b316ed59bec049dc849201f046bcb7bbcf3dd8522bbc7ab20ef64c59d898274eef1 -AUX m17n-lib-pkg-config.patch 465 BLAKE2B 9e66c6cea978acabcafe6b1c8d1bcf58a29987881c4cebe9fd0e0f6fc5ed49a36b602c61259acfedc0f7020258b4313595c45326bcfc65d9744b273a49e1ab11 SHA512 978d968bdfe590861ec078135db5afb7edf21e2d0bb73403926f5fb7d77566bbd51813849bcd97e1ae127721b886be1ad8216b47b53a82f5df6dec813b249e7f DIST m17n-lib-1.8.4.tar.gz 1119271 BLAKE2B 790a002e0abd66d7db0d61ab0240712b2810e698c73d507a5054ad83d4a7a7258c4407d5167ce92fc4c1f3acdfc9f8d3244634af801cde2a00762f09d5e1d823 SHA512 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6 EBUILD m17n-lib-1.8.4-r1.ebuild 1753 BLAKE2B a68391595cecf928fe4d041c4017923363f9c7c86ca1373f0e2380126be1cc37be4c89cfa19b0c5de43f7c08f242a3f763e5ce59bf669f7ef10ae41ab7f9e88c SHA512 e5783bc8a3e3961b26d79810e1966c936814a1cfc4040001b7d623a5e5516bafc6ca8f34e09b0050799d090b78a70393d2f26772346df1131c2e0b426464c949 MISC metadata.xml 889 BLAKE2B 4fdd373094410c6fac69020e36d1433b10eae0ff3530e666f1445819175e118c8266d6000145e1be27912c530162ed9a76e71014bb37998c11a1355b125d1665 SHA512 fcecdbf2fefbc637a023c3f3b03922dbb6708a6b540e5555242d415e4d70b5ef73df3f9cccc14536aa237a018b9b23e3a5a3d04141d93401fcc06984b542754b diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch deleted file mode 100644 index 04ffc7749a5b..000000000000 --- a/dev-libs/m17n-lib/files/m17n-lib-1.8.0-configure.patch +++ /dev/null @@ -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" diff --git a/dev-libs/m17n-lib/files/m17n-lib-clang.patch b/dev-libs/m17n-lib/files/m17n-lib-clang.patch deleted file mode 100644 index fb5d303d01b9..000000000000 --- a/dev-libs/m17n-lib/files/m17n-lib-clang.patch +++ /dev/null @@ -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; - - diff --git a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch deleted file mode 100644 index 203f836bf942..000000000000 --- a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch +++ /dev/null @@ -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" diff --git a/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch b/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch deleted file mode 100644 index a035921d055c..000000000000 --- a/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch +++ /dev/null @@ -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 diff --git a/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch deleted file mode 100644 index aabe12e586d8..000000000000 --- a/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch +++ /dev/null @@ -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" |