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 <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
zangrc 2021-02-23 02:57:14 +08:00 committed by Khem Raj
parent 8df1a9aa65
commit ec78fd0a32
5 changed files with 7 additions and 48 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -8,13 +8,11 @@ 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"
SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a"
inherit autotools