From ec78fd0a32cb0bf15c8cd574e63b30cb22d3f182 Mon Sep 17 00:00:00 2001 From: zangrc Date: Tue, 23 Feb 2021 02:57:14 +0800 Subject: enca: upgrade 1.9 -> 1.19 configure-hack.patch configure-remove-dumbness.patch Removed since these are included in 1.19. Refresh the following patch: libenca-003-iconv.patch makefile-remove-tools.patch Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../recipes-support/enca/enca/configure-hack.patch | 12 -------- .../enca/enca/configure-remove-dumbness.patch | 26 ---------------- .../enca/enca/libenca-003-iconv.patch | 6 ++-- .../enca/enca/makefile-remove-tools.patch | 7 ++--- meta-oe/recipes-support/enca/enca_1.19.bb | 34 ++++++++++++++++++++ meta-oe/recipes-support/enca/enca_1.9.bb | 36 ---------------------- 6 files changed, 40 insertions(+), 81 deletions(-) delete mode 100644 meta-oe/recipes-support/enca/enca/configure-hack.patch delete mode 100644 meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch create mode 100644 meta-oe/recipes-support/enca/enca_1.19.bb delete mode 100644 meta-oe/recipes-support/enca/enca_1.9.bb diff --git a/meta-oe/recipes-support/enca/enca/configure-hack.patch b/meta-oe/recipes-support/enca/enca/configure-hack.patch deleted file mode 100644 index 85abcdcf02..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-02-15 00:57:39.000000000 -0800 -+++ enca-1.9/configure.ac 2006-02-15 00:57:46.000000000 -0800 -@@ -92,9 +92,6 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Check for good random number sources --AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) -- - dnl Dirty path hack. Helps some people with badly set up search paths. - if test "$prefix" = "NONE"; then - LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" diff --git a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch b/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch deleted file mode 100644 index 6f6f3e320e..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-06-29 15:30:44.000000000 +0100 -+++ enca-1.9/configure.ac 2006-06-29 15:31:41.000000000 +0100 -@@ -92,14 +92,15 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Dirty path hack. Helps some people with badly set up search paths. --if test "$prefix" = "NONE"; then -- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" --else -- LDFLAGS="$LDFLAGS -L$prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$prefix/include" --fi -+# This is really dumb code -+#dnl Dirty path hack. Helps some people with badly set up search paths. -+#if test "$prefix" = "NONE"; then -+# LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" -+#else -+# LDFLAGS="$LDFLAGS -L$prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$prefix/include" -+#fi - - dnl Checks for libraries. - ye_CHECK_LIBM diff --git a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch index dbf0fb8ea7..baf5547642 100644 --- a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch +++ b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch @@ -17,12 +17,12 @@ index fc8c6f8..3a59549 100644 +++ b/m4/libiconv.m4 @@ -17,7 +17,7 @@ AC_REQUIRE([AC_C_CONST])dnl dnl - + dnl Use standard iconv test -AM_ICONV +m4_pattern_allow([AM_ICONV]) - CONVERTOR_LIBS="$CONVERTOR_LIBS $LIBICONV" - + CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" + dnl Compile iconvcap.c and run it to determine what encodings iconv actually -- 1.9.3 diff --git a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch index accfbccd6b..48497d68c8 100644 --- a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch +++ b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch @@ -1,7 +1,6 @@ ---- enca-1.9/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 -+++ enca-1.9/Makefile.am 2006-06-29 15:35:20.000000000 +0100 -@@ -1,8 +1,8 @@ - # @(#) $Id: Makefile.am,v 1.35 2005/11/24 10:21:32 yeti Exp $ +--- enca-1.19/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 ++++ enca-1.19/Makefile.am 2006-06-29 15:35:20.000000000 +0100 +@@ -1,7 +1,7 @@ if MAINTAINER_MODE -SUBDIRS = tools data script lib src devel-docs test +SUBDIRS = data script lib src devel-docs test diff --git a/meta-oe/recipes-support/enca/enca_1.19.bb b/meta-oe/recipes-support/enca/enca_1.19.bb new file mode 100644 index 0000000000..0adf0a29c5 --- /dev/null +++ b/meta-oe/recipes-support/enca/enca_1.19.bb @@ -0,0 +1,34 @@ +SUMMARY = "Enca is an Extremely Naive Charset Analyser" +SECTION = "libs" +HOMEPAGE = "https://cihar.com/software/enca/" + +DEPENDS += "gettext-native" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" + +SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ + file://dont-run-tests.patch \ + file://makefile-remove-tools.patch \ + file://libenca-003-iconv.patch " + +SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" + +inherit autotools + +do_configure_prepend() { + # remove failing test which checks for something that isn't even used + sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac +} + +do_configure_append() { + sed -i s:-I/usr/include::g ${B}/Makefile + sed -i s:-I/usr/include::g ${B}/*/Makefile +} + +do_compile() { + cd ${S}/tools && ${BUILD_CC} -o make_hash make_hash.c + cd ${B} + oe_runmake +} + diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.9.bb deleted file mode 100644 index b0ba3aedef..0000000000 --- a/meta-oe/recipes-support/enca/enca_1.9.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Enca is an Extremely Naive Charset Analyser" -SECTION = "libs" -HOMEPAGE = "https://cihar.com/software/enca/" - -DEPENDS += "gettext-native" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" - -SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ - file://configure-hack.patch \ - file://dont-run-tests.patch \ - file://configure-remove-dumbness.patch \ - file://makefile-remove-tools.patch \ - file://libenca-003-iconv.patch " - -SRC_URI[sha256sum] = "75a38ed23bac37cc12166cc5edc8335c3af862adc202f84823d3aef3e2208e47" - -inherit autotools - -do_configure_prepend() { - # remove failing test which checks for something that isn't even used - sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac -} - -do_configure_append() { - sed -i s:-I/usr/include::g ${B}/Makefile - sed -i s:-I/usr/include::g ${B}/*/Makefile -} - -do_compile() { - cd ${S}/tools && ${BUILD_CC} -o make_hash make_hash.c - cd ${B} - oe_runmake -} - -- cgit v1.2.3-54-g00ecf