[packages/recode] Up to 3.7.14
arekm
arekm at pld-linux.org
Wed Feb 1 22:00:04 CET 2023
commit 81922d7387732d41aac1518fbdccf355fe590752
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Feb 1 21:59:43 2023 +0100
Up to 3.7.14
recode-ac.patch | 29 --
recode-ac25x.patch | 57 ----
recode-am.patch | 718 ----------------------------------------
recode-bool.patch | 11 -
recode-debian-11.patch | 49 ---
recode-el.po-no0xD2.patch | 63 ----
recode-format.patch | 11 -
recode-gcc4_3.patch | 12 -
recode-hash-nameconflict.patch | 657 ------------------------------------
recode-use_malloc_realloc.patch | 77 -----
recode.spec | 55 ++-
11 files changed, 20 insertions(+), 1719 deletions(-)
---
diff --git a/recode.spec b/recode.spec
index 256e138..3e2a6ec 100644
--- a/recode.spec
+++ b/recode.spec
@@ -1,31 +1,25 @@
+# TODO: package python extension
+%bcond_without tests
+#
Summary: Utility for converting text between multiple character sets
Summary(pl.UTF-8): Uniwersalny konwerter między zestawami znaków
Name: recode
-Version: 3.6
-Release: 8
+Version: 3.7.14
+Release: 1
License: LGPL v2+ (library), GPL v2+ (utility)
Group: Applications/Text
-# for future releases (3.7/4.0) see https://github.com/pinard/Recode/
-Source0: %{name}-%{version}.tar.gz
-# Source0-md5: be3f40ad2e93dae5cd5f628264bf1877
-Patch0: %{name}-info.patch
-Patch1: %{name}-use_malloc_realloc.patch
-Patch2: %{name}-am.patch
-Patch3: %{name}-hash-nameconflict.patch
-Patch4: %{name}-ac25x.patch
-Patch5: %{name}-el.po-no0xD2.patch
-Patch6: %{name}-pl.po-update.patch
-Patch7: %{name}-debian-11.patch
-Patch8: %{name}-gcc4_3.patch
-Patch9: %{name}-bool.patch
-Patch10: %{name}-ac.patch
-Patch11: %{name}-format.patch
-URL: http://recode.progiciels-bpi.ca/
+Source0: https://github.com/rrthomas/recode/releases/download/v%{version}/recode-%{version}.tar.gz
+# Source0-md5: d88b41fd27549123a0822e5a3fae98a8
+Patch0: %{name}-info.patch
+Patch1: %{name}-pl.po-update.patch
+URL: https://github.com/rrthomas/recode
BuildRequires: autoconf >= 2.53
BuildRequires: automake
BuildRequires: flex
BuildRequires: libtool
BuildRequires: texinfo
+BuildRequires: python3
+BuildRequires: python3-modules
Requires(post,postun): /sbin/ldconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,21 +61,8 @@ Biblioteka statyczna librecode.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-
-# duplicate of m4/*.m4 files
-%{__rm} acinclude.m4
+#%patch0 -p1
+#%patch1 -p1
%{__sed} -i '1 i @documentencoding ISO-8859-1' doc/recode.texi
@@ -93,6 +74,10 @@ Biblioteka statyczna librecode.
%configure
%{__make}
+%if %{with tests}
+%{__make} check
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -114,10 +99,10 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS BACKLOG README THANKS TODO
+%doc AUTHORS NEWS README THANKS TODO
%attr(755,root,root) %{_bindir}/recode
%attr(755,root,root) %{_libdir}/librecode.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librecode.so.0
+%attr(755,root,root) %ghost %{_libdir}/librecode.so.3
%{_infodir}/recode.info*
%{_mandir}/man1/recode.1*
diff --git a/recode-ac.patch b/recode-ac.patch
deleted file mode 100644
index df645d5..0000000
--- a/recode-ac.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- recode-3.6/configure.in.orig 2012-10-21 10:45:16.803895982 +0200
-+++ recode-3.6/configure.in 2012-10-21 10:58:36.950529071 +0200
-@@ -15,7 +15,6 @@
- AM_PROG_LIBTOOL
-
- AC_ISC_POSIX
--AM_C_PROTOTYPES
- AC_C_CONST
- AC_C_INLINE
- ad_AC_PROG_FLEX
---- recode-3.6/src/Makefile.am.orig 2012-10-21 11:02:39.490518891 +0200
-+++ recode-3.6/src/Makefile.am 2012-10-21 11:07:12.987174080 +0200
-@@ -17,7 +17,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
-
--AUTOMAKE_OPTIONS = gnits ansi2knr
-+AUTOMAKE_OPTIONS = gnits
- bin_PROGRAMS = recode
- lib_LTLIBRARIES = librecode.la
- man_MANS = recode.1
---- recode-3.6/m4/flex.m4.orig 2000-06-28 16:39:06.000000000 +0200
-+++ recode-3.6/m4/flex.m4 2012-10-21 11:40:05.783757954 +0200
-@@ -15,4 +15,5 @@
- else
- AC_PROG_LEX
- AC_DECL_YYTEXT
-+ :
- fi])
diff --git a/recode-ac25x.patch b/recode-ac25x.patch
deleted file mode 100644
index 4e23853..0000000
--- a/recode-ac25x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- recode-3.5d/configure.in.orig Wed Jun 28 16:36:30 2000
-+++ recode-3.5d/configure.in Mon Jul 29 11:45:34 2002
-@@ -32,7 +32,6 @@
-
- jm_FUNC_MALLOC
- jm_FUNC_REALLOC
--AC_SUBST(LIBOBJS)
-
- fp_OS_MICROSOFT
- AC_MSG_CHECKING(the default charset)
-@@ -52,12 +51,12 @@
-
- # This is necessary so that .o files in LIBOBJS are also built via
- # the ANSI2KNR-filtering rules.
--LIBOBJS=`echo $LIBOBJS | sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
-+LIB@&t at OBJS=`echo $LIB@&t at OBJS | sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
-
- LTALLOCA=`echo $ALLOCA | sed 's/\.o/.lo/g'`
- AC_SUBST(LTALLOCA)
--LTLIBOBJS=`echo $LIBOBJS | sed 's/\.o /.lo /g;s/\.o$/.lo/'`
--AC_SUBST(LTLIBOBJS)
-+LTLIB@&t at OBJS=`echo $LIB@&t at OBJS | sed 's/\.o /.lo /g;s/\.o$/.lo/'`
-+AC_SUBST(LTLIB@&t at OBJS)
-
- AC_OUTPUT(Makefile contrib/Makefile doc/Makefile i18n/Makefile lib/Makefile
- libiconv/Makefile m4/Makefile src/Makefile tests/Makefile tests/atconfig)
---- recode-3.5d/acinclude.m4.orig Mon Jul 29 11:42:18 2002
-+++ recode-3.5d/acinclude.m4 Mon Jul 29 11:47:01 2002
-@@ -120,8 +120,7 @@
- jm_cv_func_working_malloc=no)
- ])
- if test $jm_cv_func_working_malloc = no; then
-- AC_SUBST(LIBOBJS)
-- LIBOBJS="$LIBOBJS malloc.$ac_objext"
-+ AC_LIBOBJ([malloc])
- AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
- [Define to rpl_malloc if the replacement function should be used.])
- fi
-@@ -156,8 +155,7 @@
- jm_cv_func_working_realloc=no)
- ])
- if test $jm_cv_func_working_realloc = no; then
-- AC_SUBST(LIBOBJS)
-- LIBOBJS="$LIBOBJS realloc.$ac_objext"
-+ AC_LIBOBJ([realloc])
- AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
- [Define to rpl_realloc if the replacement function should be used.])
- fi
-@@ -255,7 +253,7 @@
- with_included_gettext=yes
- fi
- if test $with_included_gettext = yes; then
-- LIBOBJS="$LIBOBJS gettext.o"
-+ AC_LIBOBJ([gettext])
- AC_DEFINE(HAVE_GETTEXT)
- AC_DEFINE(HAVE_DCGETTEXT)
- else
diff --git a/recode-am.patch b/recode-am.patch
deleted file mode 100644
index 131d38f..0000000
--- a/recode-am.patch
+++ /dev/null
@@ -1,718 +0,0 @@
---- recode-3.5d.orig/acinclude.m4 Fri Dec 3 12:03:01 1999
-+++ recode-3.5d/acinclude.m4 Thu Oct 18 22:02:10 2001
-@@ -1,430 +1,312 @@
--## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
--## Copyright (C) 1996-1999 Free Software Foundation, Inc.
--## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--##
--## This program is free software; you can redistribute it and/or modify
--## it under the terms of the GNU General Public License as published by
--## the Free Software Foundation; either version 2 of the License, or
--## (at your option) any later version.
--##
--## This program is distributed in the hope that it will be useful, but
--## WITHOUT ANY WARRANTY; without even the implied warranty of
--## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--## General Public License for more details.
--##
--## You should have received a copy of the GNU General Public License
--## along with this program; if not, write to the Free Software
--## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--##
--## As a special exception to the GNU General Public License, if you
--## distribute this file as part of a program that contains a
--## configuration script generated by Autoconf, you may include it under
--## the same distribution terms that you use for the rest of that program.
--
--# serial 40 AC_PROG_LIBTOOL
--AC_DEFUN(AC_PROG_LIBTOOL,
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--
--# Save cache, so that ltconfig can load it
--AC_CACHE_SAVE
--
--# Actually configure libtool. ac_aux_dir is where install-sh is found.
--CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
--LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
--LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
--DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
--|| AC_MSG_ERROR([libtool configure failed])
--
--# Reload cache, that may have been modified by ltconfig
--AC_CACHE_LOAD
--
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
--
--# Redirect the config.log output again, so that the ltconfig log is not
--# clobbered by the next message.
--exec 5>>./config.log
--])
-+# The argument (often `../src') says where are the built sources to test,
-+# relative to the built test directory. Empty for a flat distribution, as
-+# `.' gets always added in front of the search path by the `atconfig' script.
-
--AC_DEFUN(AC_LIBTOOL_SETUP,
--[AC_PREREQ(2.13)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_RANLIB])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--AC_REQUIRE([AC_PROG_LN_S])dnl
--dnl
-+AC_DEFUN(AT_CONFIG,
-+[AT_TESTPATH=$1
-+AC_SUBST(AT_TESTPATH)
-+fp_PROG_ECHO
-+])
-
--case "$target" in
--NONE) lt_target="$host" ;;
--*) lt_target="$target" ;;
--esac
-
--# Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
--test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
--test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
--test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
--test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
--test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
--ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
--[libtool_flags="$libtool_flags --enable-dlopen"])
--ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--[libtool_flags="$libtool_flags --enable-win32-dll"])
--AC_ARG_ENABLE(libtool-lock,
-- [ --disable-libtool-lock avoid locking (might break parallel builds)])
--test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
--test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
--
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case "$lt_target" in
--*-*-irix6*)
-- # Find out which ABI we are using.
-- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-- if AC_TRY_EVAL(ac_compile); then
-- case "`/usr/bin/file conftest.o`" in
-- *32-bit*)
-- LD="${LD-ld} -32"
-- ;;
-- *N32*)
-- LD="${LD-ld} -n32"
-- ;;
-- *64-bit*)
-- LD="${LD-ld} -64"
-- ;;
-- esac
-- fi
-- rm -rf conftest*
-- ;;
-+# Once this macro is called, you may output with no echo in a Makefile or
-+# script using: echo @ECHO_N@ "STRING_TO_OUTPUT at ECHO_C@".
-
--*-*-sco3.2v5*)
-- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -belf"
-- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-- [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
-- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-- CFLAGS="$SAVE_CFLAGS"
-+AC_DEFUN(fp_PROG_ECHO,
-+[AC_CACHE_CHECK(how to suppress newlines using echo, fp_cv_prog_echo_nonl,
-+[if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-+ fp_cv_prog_echo_nonl=no
-+ else
-+ fp_cv_prog_echo_nonl=option
- fi
-- ;;
--
--ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw*)
-- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-- AC_CHECK_TOOL(AS, as, false)
-- AC_CHECK_TOOL(OBJDUMP, objdump, false)
-- ;;
-+else
-+ fp_cv_prog_echo_nonl=escape
-+fi
- ])
-+test $fp_cv_prog_echo_nonl = no \
-+ && echo 2>&1 "WARNING: \`echo' not powerful enough for \`make check'"
-+case $fp_cv_prog_echo_nonl in
-+ no) ECHO_N= ECHO_C= ;;
-+ option) ECHO_N=-n ECHO_C= ;;
-+ escape) ECHO_N= ECHO_C='\c' ;;
- esac
-+AC_SUBST(ECHO_N)dnl
-+AC_SUBST(ECHO_C)dnl
- ])
-
--# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
--AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+# serial 2
-
--# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
--AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+dnl ad_AC_PROG_FLEX
-+dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-+AC_DEFUN(ad_AC_PROG_FLEX,
-+[AC_CHECK_PROGS(LEX, flex, missing)
-+if test "$LEX" = missing; then
-+ LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
-+ LEX_OUTPUT_ROOT=lex.yy
-+ AC_SUBST(LEX_OUTPUT_ROOT)dnl
-+else
-+ AC_PROG_LEX
-+ AC_DECL_YYTEXT
-+fi])
-
--# AC_ENABLE_SHARED - implement the --enable-shared flag
--# Usage: AC_ENABLE_SHARED[(DEFAULT)]
--# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
--# `yes'.
--AC_DEFUN(AC_ENABLE_SHARED, [dnl
--define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(shared,
--changequote(<<, >>)dnl
--<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case "$enableval" in
--yes) enable_shared=yes ;;
--no) enable_shared=no ;;
--*)
-- enable_shared=no
-- # Look at the argument we got. We use all the common list separators.
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-- for pkg in $enableval; do
-- if test "X$pkg" = "X$p"; then
-- enable_shared=yes
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac],
--enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-+#serial 2
-+
-+dnl From Jim Meyering
-+
-+dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared --
-+dnl usually in <utime.h>.
-+dnl Some systems have utime.h but don't declare the struct anywhere.
-+
-+AC_DEFUN(jm_STRUCT_UTIMBUF,
-+[
-+ AC_CHECK_HEADERS(utime.h)
-+ AC_REQUIRE([AC_HEADER_TIME])
-+ AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf,
-+ [AC_TRY_COMPILE(
-+ [
-+#ifdef TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# ifdef HAVE_SYS_TIME_H
-+# include <sys/time.h>
-+# else
-+# include <time.h>
-+# endif
-+#endif
-+#ifdef HAVE_UTIME_H
-+# include <utime.h>
-+#endif
-+ ],
-+ [static struct utimbuf x; x.actime = x.modtime;],
-+ fu_cv_sys_struct_utimbuf=yes,
-+ fu_cv_sys_struct_utimbuf=no)
-+ ])
-+
-+ if test $fu_cv_sys_struct_utimbuf = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1,
-+[Define if struct utimbuf is declared -- usually in <utime.h>.
-+ Some systems have utime.h but don't declare the struct anywhere. ])
-+ fi
- ])
-
--# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
--AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)])
--
--# AC_ENABLE_STATIC - implement the --enable-static flag
--# Usage: AC_ENABLE_STATIC[(DEFAULT)]
--# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
--# `yes'.
--AC_DEFUN(AC_ENABLE_STATIC, [dnl
--define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(static,
--changequote(<<, >>)dnl
--<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case "$enableval" in
--yes) enable_static=yes ;;
--no) enable_static=no ;;
--*)
-- enable_static=no
-- # Look at the argument we got. We use all the common list separators.
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-- for pkg in $enableval; do
-- if test "X$pkg" = "X$p"; then
-- enable_static=yes
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac],
--enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-+#serial 3
-+
-+dnl From Jim Meyering.
-+dnl Determine whether malloc accepts 0 as its argument.
-+dnl If it doesn't, arrange to use the replacement function.
-+dnl
-+
-+AC_DEFUN(jm_FUNC_MALLOC,
-+[
-+ dnl xmalloc.c requires that this symbol be defined so it doesn't
-+ dnl mistakenly use a broken malloc -- as it might if this test were omitted.
-+ AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
-+ [Define if the malloc check has been performed. ])
-+
-+ AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
-+ [AC_TRY_RUN([
-+ char *malloc ();
-+ int
-+ main ()
-+ {
-+ exit (malloc (0) ? 0 : 1);
-+ }
-+ ],
-+ jm_cv_func_working_malloc=yes,
-+ jm_cv_func_working_malloc=no,
-+ dnl When crosscompiling, assume malloc is broken.
-+ jm_cv_func_working_malloc=no)
-+ ])
-+ if test $jm_cv_func_working_malloc = no; then
-+ AC_SUBST(LIBOBJS)
-+ LIBOBJS="$LIBOBJS malloc.$ac_objext"
-+ AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
-+ [Define to rpl_malloc if the replacement function should be used.])
-+ fi
- ])
-
--# AC_DISABLE_STATIC - set the default static flag to --disable-static
--AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_STATIC(no)])
--
--
--# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
--# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
--# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
--# `yes'.
--AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
--define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(fast-install,
--changequote(<<, >>)dnl
--<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case "$enableval" in
--yes) enable_fast_install=yes ;;
--no) enable_fast_install=no ;;
--*)
-- enable_fast_install=no
-- # Look at the argument we got. We use all the common list separators.
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-- for pkg in $enableval; do
-- if test "X$pkg" = "X$p"; then
-- enable_fast_install=yes
-- fi
-- done
-- IFS="$ac_save_ifs"
-- ;;
--esac],
--enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-+#serial 3
-+
-+dnl From Jim Meyering.
-+dnl Determine whether realloc works when both arguments are 0.
-+dnl If it doesn't, arrange to use the replacement function.
-+dnl
-+
-+AC_DEFUN(jm_FUNC_REALLOC,
-+[
-+ dnl xmalloc.c requires that this symbol be defined so it doesn't
-+ dnl mistakenly use a broken realloc -- as it might if this test were omitted.
-+ AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
-+ [Define if the realloc check has been performed. ])
-+
-+ AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
-+ [AC_TRY_RUN([
-+ char *realloc ();
-+ int
-+ main ()
-+ {
-+ exit (realloc (0, 0) ? 0 : 1);
-+ }
-+ ],
-+ jm_cv_func_working_realloc=yes,
-+ jm_cv_func_working_realloc=no,
-+ dnl When crosscompiling, assume realloc is broken.
-+ jm_cv_func_working_realloc=no)
-+ ])
-+ if test $jm_cv_func_working_realloc = no; then
-+ AC_SUBST(LIBOBJS)
-+ LIBOBJS="$LIBOBJS realloc.$ac_objext"
-+ AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
-+ [Define to rpl_realloc if the replacement function should be used.])
-+ fi
- ])
-
--# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
--AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_FAST_INSTALL(no)])
--
--# AC_PROG_LD - find the path to the GNU or non-GNU linker
--AC_DEFUN(AC_PROG_LD,
--[AC_ARG_WITH(gnu-ld,
--[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--ac_prog=ld
--if test "$ac_cv_prog_gcc" = yes; then
-- # Check if gcc -print-prog-name=ld gives a path.
-- AC_MSG_CHECKING([for ld used by GCC])
-- ac_prog=`($CC -print-prog-name=ld) 2>&5`
-- case "$ac_prog" in
-- # Accept absolute paths.
--changequote(,)dnl
-- [\\/]* | [A-Za-z]:[\\/]*)
-- re_direlt='/[^/][^/]*/\.\./'
--changequote([,])dnl
-- # Canonicalize the path of ld
-- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-- done
-- test -z "$LD" && LD="$ac_prog"
-- ;;
-- "")
-- # If it fails, then pretend we aren't using GCC.
-- ac_prog=ld
-- ;;
-- *)
-- # If it is relative, then search for the first ld in PATH.
-- with_gnu_ld=unknown
-- ;;
-- esac
--elif test "$with_gnu_ld" = yes; then
-- AC_MSG_CHECKING([for GNU ld])
--else
-- AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(ac_cv_path_LD,
--[if test -z "$LD"; then
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-- ac_cv_path_LD="$ac_dir/$ac_prog"
-- # Check to see if the program is GNU ld. I'd rather use --version,
-- # but apparently some GNU ld's only accept -v.
-- # Break only if it was the GNU/non-GNU ld that we prefer.
-- if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-- test "$with_gnu_ld" != no && break
-- else
-- test "$with_gnu_ld" != yes && break
-- fi
-- fi
-- done
-- IFS="$ac_save_ifs"
--else
-- ac_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$ac_cv_path_LD"
--if test -n "$LD"; then
-- AC_MSG_RESULT($LD)
-+
-+AC_DEFUN(fp_OS_MICROSOFT,
-+[AC_CACHE_CHECK([for MSDOS, Win95 or WinNT], fp_cv_os_microsoft,
-+[if test -n "$COMSPEC"; then
-+ # MSDOS or Win95
-+ fp_cv_os_microsoft=yes
-+elif test -n "$ComSpec"; then
-+ # WinNT
-+ fp_cv_os_microsoft=yes
- else
-- AC_MSG_RESULT(no)
-+ fp_cv_os_microsoft=no
- fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_PROG_LD_GNU
--])
-+])])
-
--AC_DEFUN(AC_PROG_LD_GNU,
--[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
--if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-- ac_cv_prog_gnu_ld=yes
--else
-- ac_cv_prog_gnu_ld=no
--fi])
--])
-+# Select gettext and choose translations to install. -*- shell-script -*-
-+# Fran�ois Pinard <pinard at iro.umontreal.ca>, 1998.
-
--# AC_PROG_NM - find the path to a BSD-compatible name lister
--AC_DEFUN(AC_PROG_NM,
--[AC_MSG_CHECKING([for BSD-compatible nm])
--AC_CACHE_VAL(ac_cv_path_NM,
--[if test -n "$NM"; then
-- # Let the user override the test.
-- ac_cv_path_NM="$NM"
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
-- # Check to see if the nm accepts a BSD-compat flag.
-- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-- # nm: unknown option "B" ignored
-- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-- ac_cv_path_NM="$ac_dir/nm -B"
-- break
-- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-- ac_cv_path_NM="$ac_dir/nm -p"
-- break
-- else
-- ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-- continue # so that we can try to find one that supports BSD flags
-+# Here is a check list about how one could use this macro.
-+# - In the build directory, execute `make distclean'.
-+# - Rename `po/' to `i18n/'.
-+# - Recursively delete directory `intl/'.
-+# - Add the following files:
-+# . `i18n/Makefile.am'
-+# . `m4/gettext.m4'
-+# . `lib/gettext.c'
-+# . `lib/gettext.h'.
-+# - In top level `configure.in':
-+# . use `fp_WITH_GETTEXT'.
-+# . delete `AM_GNU_GETTEXT' and any `AC_LINK_FILES' for $nls variables.
-+# . add `i18n/Makefile' to `AC_OUTPUT'.
-+# . delete `intl/Makefile' and `po/Makefile.in' from `AC_OUTPUT'.
-+# - In top level `Makefile.am':
-+# . add `i18n' in SUBDIRS, and remove `intl' and `po'.
-+# . define `POTFILES' (peek at previous `i18n/POTFILES.in).
-+# . add `$(srcdir)/stamp-pot' to `all-local'.
-+# . add rule for `$(srcdir)/stamp-pot'.
-+# - In top level `acconfig.h':
-+# . document `HAVE_DCGETTEXT' and `LOCALEDIR'.
-+# . delete documentation for `HAVE_CATGETS'.
-+# - In `lib/Makefile.am':
-+# . add `gettext.c' to `EXTRA_DIST'.
-+# . add `gettext.h' to `noinstl_HEADERS'.
-+# . add definitions for `localdir' and `aliaspath'.
-+# . add special rules for `gettext.o' and `gettext._o'.
-+# - In `m4/Makefile.am':
-+# . add `gettext.m4' to `EXTRA_DIST'.
-+# - In `src/Makefile.am':
-+# . delete `-I/..intl' from `INCLUDES'.
-+# . delete `@INTLLIBS@' from `LDADD'.
-+# . delete `localedir' and its references.
-+# - Clean up directory `i18n/':
-+# . delete `Makefile.in.in' and `POTFILES.in'.
-+# . delete all `*.gmo' files, `cat-id-tbl.c' and `stamp-cat-id'.
-+# - In the top level distribution directory:
-+# . run `aclocal -I m4'.
-+# . run `autoreconf'.
-+# - In the build directory:
-+# . run `$top_srcdir/configure'.
-+# . run `make check'.
-+
-+AC_DEFUN(fp_WITH_GETTEXT, [
-+
-+ AC_MSG_CHECKING(whether NLS is wanted)
-+ AC_ARG_ENABLE(nls,
-+ [ --disable-nls disallow Native Language Support],
-+ enable_nls=$enableval, enable_nls=yes)
-+ AC_MSG_RESULT($enable_nls)
-+ use_nls=$enable_nls
-+ AM_CONDITIONAL(USE_NLS, test $use_nls = yes)
-+
-+ if test $enable_nls = yes; then
-+ AC_DEFINE(ENABLE_NLS)
-+
-+ AC_ARG_WITH(catgets,
-+ [ --with-catgets say that catgets is not supported],
-+ [AC_MSG_WARN([catgets not supported, --with-catgets ignored])])
-+
-+ AC_CHECK_FUNCS(gettext)
-+ AC_CHECK_LIB(intl, gettext, :)
-+ if test $ac_cv_lib_intl_gettext$ac_cv_func_gettext != nono; then
-+ AC_MSG_CHECKING(whether the included gettext is preferred)
-+ AC_ARG_WITH(included-gettext,
-+ [ --without-included-gettext avoid our provided version of gettext],
-+ with_included_gettext=$withval, with_included_gettext=yes)
-+ AC_MSG_RESULT($with_included_gettext)
-+ if test $with_included_gettext$ac_cv_func_gettext = nono; then
-+ LIBS="$LIBS -lintl"
- fi
-+ else
-+ with_included_gettext=yes
-+ fi
-+ if test $with_included_gettext = yes; then
-+ LIBOBJS="$LIBOBJS gettext.o"
-+ AC_DEFINE(HAVE_GETTEXT)
-+ AC_DEFINE(HAVE_DCGETTEXT)
-+ else
-+ AC_CHECK_HEADERS(libintl.h)
-+ AC_CHECK_FUNCS(dcgettext gettext)
- fi
-- done
-- IFS="$ac_save_ifs"
-- test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
--fi])
--NM="$ac_cv_path_NM"
--AC_MSG_RESULT([$NM])
--])
--
--# AC_CHECK_LIBM - check for math library
--AC_DEFUN(AC_CHECK_LIBM,
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case "$lt_target" in
--*-*-beos* | *-*-cygwin*)
-- # These system don't have libm
-- ;;
--*-ncr-sysv4.3*)
-- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-- ;;
--*)
-- AC_CHECK_LIB(m, main, LIBM="-lm")
-- ;;
--esac
--])
-
--# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
--# the libltdl convenience library, adds --enable-ltdl-convenience to
--# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
--# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
--# to be `${top_builddir}/libltdl'. Make sure you start DIR with
--# '${top_builddir}/' (note the single quotes!) if your package is not
--# flat, and, if you're not using automake, define top_builddir as
--# appropriate in the Makefiles.
--AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-- case "$enable_ltdl_convenience" in
-- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-- "") enable_ltdl_convenience=yes
-- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-- esac
-- LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-- INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
--])
-+ AC_CHECK_HEADERS(locale.h)
-+ AC_CHECK_FUNCS(getcwd setlocale stpcpy)
-+ AM_LC_MESSAGES
-+
-+ if test -z "$ALL_LINGUAS"; then
-+ AC_MSG_WARN(This package does not install translations yet.)
-+ else
-+ ac_items="$ALL_LINGUAS"
-+ for ac_item in $ac_items; do
-+ ALL_POFILES="$ALL_POFILES $ac_item.po"
-+ ALL_MOFILES="$ALL_MOFILES $ac_item.mo"
-+ done
-+ fi
-+ AC_SUBST(ALL_LINGUAS)
-+ AC_SUBST(ALL_POFILES)
-+ AC_SUBST(ALL_MOFILES)
-+
-+ AC_MSG_CHECKING(which translations to install)
-+ if test -z "$LINGUAS"; then
-+ ac_print="$ALL_LINGUAS"
-+ MOFILES="$ALL_MOFILES"
-+ else
-+ ac_items="$LINGUAS"
-+ for ac_item in $ac_items; do
-+ case "$ALL_LINGUAS" in
-+ *$ac_item*)
-+ ac_print="$ac_print $ac_item"
-+ MOFILES="$MOFILES $ac_item.mo"
-+ ;;
-+ esac
-+ done
-+ fi
-+ AC_SUBST(MOFILES)
-+ if test -z "$ac_print"; then
-+ AC_MSG_RESULT(none)
-+ else
-+ AC_MSG_RESULT($ac_print)
-+ fi
-
--# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
--# the libltdl installable library, and adds --enable-ltdl-install to
--# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
--# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
--# to be `${top_builddir}/libltdl'. Make sure you start DIR with
--# '${top_builddir}/' (note the single quotes!) if your package is not
--# flat, and, if you're not using automake, define top_builddir as
--# appropriate in the Makefiles.
--# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
--AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-- AC_CHECK_LIB(ltdl, main,
-- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-- [if test x"$enable_ltdl_install" = xno; then
-- AC_MSG_WARN([libltdl not installed, but installation disabled])
-- else
-- enable_ltdl_install=yes
-- fi
-- ])
-- if test x"$enable_ltdl_install" = x"yes"; then
-- ac_configure_args="$ac_configure_args --enable-ltdl-install"
-- LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
-- INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
-- else
-- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-- LIBLTDL="-lltdl"
-- INCLTDL=
-- fi
--])
-+ if test "x$prefix" = xNONE; then
-+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$ac_default_prefix/share/locale")
-+ else
-+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$prefix/share/locale")
-+ fi
-+ fi])
-
--dnl old names
--AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
--AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
--AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
--AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
--AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
--AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
--AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-
--dnl This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])dnl
diff --git a/recode-bool.patch b/recode-bool.patch
deleted file mode 100644
index ecff647..0000000
--- a/recode-bool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- recode-3.6/src/recode.h.orig 2000-06-28 20:40:16.000000000 +0200
-+++ recode-3.6/src/recode.h 2012-10-21 10:44:04.443899019 +0200
-@@ -17,6 +17,8 @@
- If not, write to the Free Software Foundation, Inc., 59 Temple Place -
- Suite 330, Boston, MA 02111-1307, USA. */
-
-+#include <stdbool.h>
-+
- #ifndef PARAMS
- # if __STDC__
- # define PARAMS(Args) Args
diff --git a/recode-debian-11.patch b/recode-debian-11.patch
deleted file mode 100644
index 7a584aa..0000000
--- a/recode-debian-11.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Ripped from Debian patchset 3.6-11
-
---- recode-3.6.orig/src/libiconv.c
-+++ recode-3.6/src/libiconv.c
-@@ -195,12 +195,17 @@
- memcpy() doesn't do here, because the regions might overlap.
- memmove() isn't worth it, because we rarely have to move more
- than 12 bytes. */
-- if (input > input_buffer && input_left > 0)
-+ cursor = input_buffer;
-+ if (input_left > 0)
- {
-- cursor = input_buffer;
-- do
-- *cursor++ = *input++;
-- while (--input_left > 0);
-+ if (input > input_buffer)
-+ {
-+ do
-+ *cursor++ = *input++;
-+ while (--input_left > 0);
-+ }
-+ else
-+ cursor += input_left;
- }
- }
-
---- recode-3.6.orig/src/request.c
-+++ recode-3.6/src/request.c
-@@ -1073,7 +1073,7 @@
- if (task->output.cursor + 4 >= task->output.limit)
- {
- RECODE_OUTER outer = task->request->outer;
-- size_t old_size = task->output.limit - task->output.buffer;
-+ size_t old_size = task->output.cursor - task->output.buffer;
- size_t new_size = task->output.cursor + 4 - task->output.buffer;
-
- /* FIXME: Rethink about how the error should be reported. */
---- recode-3.6.orig/src/task.c
-+++ recode-3.6/src/task.c
-@@ -1198,6 +1198,8 @@
- else
- success = transform_mere_copy (subtask);
-
-+ task->output = subtask->output;
-+
- if (subtask->input.name && *subtask->input.name)
- fclose (subtask->input.file);
- if (subtask->output.name && *subtask->output.name)
diff --git a/recode-el.po-no0xD2.patch b/recode-el.po-no0xD2.patch
deleted file mode 100644
index 3754b5a..0000000
--- a/recode-el.po-no0xD2.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- recode-3.6/i18n/el.po.orig Mon Jan 22 19:09:15 2001
-+++ recode-3.6/i18n/el.po Sun Oct 27 12:19:34 2002
-@@ -70,9 +70,9 @@
- "along with this program; if not, write to the Free Software Foundation,\n"
- "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
- msgstr ""
--"���� �� ��������� ����� �������� ���������� �������� �� �� �������������\n"
-+"���� �� ��������� ����� �������� ��������� �������� �� �� �������������\n"
- "���/� �� �� ������������� ������� �� ���� ������� ��� ������� ��������\n"
--"������ GNU ���� ��������� ��� �� Free Software Foundation� ���� ���\n"
-+"������ GNU ���� ��������� ��� �� Free Software Foundation ���� ���\n"
- "������ 2 ���� (���� ��� ��������� ���) ������������ �������������� �������.\n"
- "\n"
- "���� �� ��������� ���������� �� ��� ������ ��� �� ����� �������,\n"
-@@ -81,7 +81,7 @@
- "����������� ��� GNU General Public License ��� ������������ ������������.\n"
- "\n"
- "�� ������ �� ������ ����� ��� ��������� ��� ������� �������� ������ GNU\n"
--"���� �� ���� �� ���������� ��� ���, ������ ��� Free Software Foundation,\n"
-+"���� �� ���� �� ��������� ��� ���, ������ ��� Free Software Foundation,\n"
- "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-
- # src/main.c:479
-@@ -251,7 +251,7 @@
- msgid ""
- "LN is some language, it may be `c', `perl' or `po'; `c' is the default.\n"
- msgstr ""
--"LN ����� ��� ������, ������ �� ����� `c', `perl' � `po'� ��'������� ����� "
-+"LN ����� ��� ������, ������ �� ����� `c', `perl' � `po' ��'������� ����� "
- "`c'.\n"
-
- # src/main.c:321
-@@ -268,14 +268,14 @@
- "with an empty surface name means no surfaces at all. See the manual.\n"
- msgstr ""
- "\n"
--"������ ����� ���������[,���������]...� ��������� ����� "
-+"������ ����� ���������[,���������]... ��������� ����� "
- "������������[...������������]...\n"
--"������������ ����� [������][/[���������]]...� ������ ������� ������� �� "
-+"������������ ����� [������][/[���������]]... ������ ������� ������� �� "
- "�����������...�������,\n"
- "�� ����������� ��� ������� �� ����� ������� ����������. ���� ������ ���\n"
--"���� ����������, ���������� �� ������� ������ ����������� ��� "
-+"���� ����������, ���������� �� ������� ������ ���������� ��� "
- "[/���������]...\n"
--"��� ���� ����������, �������� ��� ������������ ���������� ��� ������� ��� /\n"
-+"��� ���� ����������, �������� ��� ������������ ���������� ��� ������ ��� /\n"
- "����� ����� ���������� �������� ����� ������� ����������. �������� �� "
- "����������.\n"
-
-@@ -357,9 +357,9 @@
- "This is free software; see the source for copying conditions. There is NO\n"
- "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
- msgstr ""
--"���� ����� �������� ���������� ����� �� ������ ������ ��� ���� ������� "
-+"���� ����� �������� ��������� ����� �� ������ ������ ��� ���� ������� "
- "����������.\n"
--"��� ������� �������� ���� ����� ��� ����������� � ������������� ��� ���\n"
-+"��� ������� ������� ���� ����� ��� ����������� � ������������� ��� ���\n"
- "������������ �����.\n"
-
- #: src/main.c:669
diff --git a/recode-format.patch b/recode-format.patch
deleted file mode 100644
index d2efdb4..0000000
--- a/recode-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- recode-3.6/src/names.c.orig 2012-10-21 17:18:20.230127254 +0200
-+++ recode-3.6/src/names.c 2012-10-21 17:20:09.311782629 +0200
-@@ -892,7 +892,7 @@
- if (ucs2 >= 0)
- printf (format, code);
- else if (mnemonic || counter2 != 112)
-- printf (blanks);
-+ fputs (blanks, stdout);
-
- if (mnemonic)
- printf (counter2 == 112 ? " %s\n" : " %-3s", mnemonic);
diff --git a/recode-gcc4_3.patch b/recode-gcc4_3.patch
deleted file mode 100644
index f2b917b..0000000
--- a/recode-gcc4_3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur recode-3.6.orig/src/recodext.h recode-3.6/src/recodext.h
---- recode-3.6.orig/src/recodext.h 2001-01-04 15:36:54.000000000 +0100
-+++ recode-3.6/src/recodext.h 2009-03-17 13:26:19.000000000 +0100
-@@ -218,7 +218,7 @@
- enum recode_symbol_type type : 3;
-
- /* Non zero if this one should be ignored. */
-- bool ignore : 2;
-+ bool ignore : 1;
- };
-
- struct recode_surface_list
diff --git a/recode-hash-nameconflict.patch b/recode-hash-nameconflict.patch
deleted file mode 100644
index 9a478e7..0000000
--- a/recode-hash-nameconflict.patch
+++ /dev/null
@@ -1,657 +0,0 @@
-diff -Nur recode-3.6.orig/src/combine.c recode-3.6/src/combine.c
---- recode-3.6.orig/src/combine.c Sat Jul 1 21:08:35 2000
-+++ recode-3.6/src/combine.c Sun Oct 27 12:01:29 2002
-@@ -91,7 +91,7 @@
- if (before_options || after_options)
- return false;
-
-- table = hash_initialize (0, NULL, combined_hash, combined_compare, NULL);
-+ table = _recode_hash_initialize (0, NULL, combined_hash, combined_compare, NULL);
-
- if (!table)
- return false;
-@@ -103,7 +103,7 @@
-
- while (*data != DONE)
- {
-- if (!hash_insert (table, data))
-+ if (!_recode_hash_insert (table, data))
- return false;
-
- while (*data != DONE)
-@@ -127,7 +127,7 @@
- while (value = get_byte (subtask), value != EOF)
- {
- unsigned short lookup = value;
-- unsigned short *result = hash_lookup (table, &lookup);
-+ unsigned short *result = _recode_hash_lookup (table, &lookup);
-
- if (result)
- {
-@@ -154,7 +154,7 @@
- while (get_ucs2 (&value, subtask))
- {
- unsigned short lookup = value;
-- unsigned short *result = hash_lookup (table, &lookup);
-+ unsigned short *result = _recode_hash_lookup (table, &lookup);
-
- if (result)
- {
-@@ -186,7 +186,7 @@
- while (true)
- {
- unsigned short lookup = value;
-- unsigned short *result = hash_lookup (table, &lookup);
-+ unsigned short *result = _recode_hash_lookup (table, &lookup);
-
- if (result)
- {
-@@ -219,7 +219,7 @@
- while (true)
- {
- unsigned short lookup = value;
-- unsigned short *result = hash_lookup (table, &lookup);
-+ unsigned short *result = _recode_hash_lookup (table, &lookup);
-
- if (result)
- {
-@@ -325,7 +325,7 @@
- struct state lookup;
-
- lookup.character = character;
-- state = hash_lookup (table, &lookup);
-+ state = _recode_hash_lookup (table, &lookup);
- if (!state)
- {
- if (state= (struct state *) malloc (sizeof (struct state)), !state)
-@@ -337,7 +337,7 @@
- state->unshift = NULL;
- state->next = NULL;
-
-- if (!hash_insert (table, state))
-+ if (!_recode_hash_insert (table, state))
- return NULL;
- }
- return state;
-@@ -366,7 +366,7 @@
- struct state lookup;
-
- lookup.character = character;
-- return hash_lookup (table, &lookup);
-+ return _recode_hash_lookup (table, &lookup);
- }
- }
-
-@@ -382,7 +382,7 @@
- if (before_options || after_options)
- return false;
-
-- table = hash_initialize (0, NULL, state_hash, state_compare, state_free);
-+ table = _recode_hash_initialize (0, NULL, state_hash, state_compare, state_free);
-
- if (!table)
- return false;
-diff -Nur recode-3.6.orig/src/hash.c recode-3.6/src/hash.c
---- recode-3.6.orig/src/hash.c Mon Jan 22 17:55:31 2001
-+++ recode-3.6/src/hash.c Sun Oct 27 12:01:29 2002
-@@ -116,7 +116,7 @@
- the same quantity. */
-
- unsigned
--hash_get_n_buckets (const Hash_table *table)
-+_recode_hash_get_n_buckets (const Hash_table *table)
- {
- return table->n_buckets;
- }
-@@ -124,7 +124,7 @@
- /* Return the number of slots in use (non-empty buckets). */
-
- unsigned
--hash_get_n_buckets_used (const Hash_table *table)
-+_recode_hash_get_n_buckets_used (const Hash_table *table)
- {
- return table->n_buckets_used;
- }
-@@ -132,7 +132,7 @@
- /* Return the number of active entries. */
-
- unsigned
--hash_get_n_entries (const Hash_table *table)
-+_recode_hash_get_n_entries (const Hash_table *table)
- {
- return table->n_entries;
- }
-@@ -140,7 +140,7 @@
- /* Return the length of the longest chain (bucket). */
-
- unsigned
--hash_get_max_bucket_length (const Hash_table *table)
-+_recode_hash_get_max_bucket_length (const Hash_table *table)
- {
- struct hash_entry *bucket;
- unsigned max_bucket_length = 0;
-@@ -167,7 +167,7 @@
- statistics. */
-
- bool
--hash_table_ok (const Hash_table *table)
-+_recode_hash_table_ok (const Hash_table *table)
- {
- struct hash_entry *bucket;
- unsigned n_buckets_used = 0;
-@@ -196,12 +196,12 @@
- }
-
- void
--hash_print_statistics (const Hash_table *table, FILE *stream)
-+_recode_hash_print_statistics (const Hash_table *table, FILE *stream)
- {
-- unsigned n_entries = hash_get_n_entries (table);
-- unsigned n_buckets = hash_get_n_buckets (table);
-- unsigned n_buckets_used = hash_get_n_buckets_used (table);
-- unsigned max_bucket_length = hash_get_max_bucket_length (table);
-+ unsigned n_entries = _recode_hash_get_n_entries (table);
-+ unsigned n_buckets = _recode_hash_get_n_buckets (table);
-+ unsigned n_buckets_used = _recode_hash_get_n_buckets_used (table);
-+ unsigned max_bucket_length = _recode_hash_get_max_bucket_length (table);
-
- fprintf (stream, "# entries: %u\n", n_entries);
- fprintf (stream, "# buckets: %u\n", n_buckets);
-@@ -214,7 +214,7 @@
- entry from the table. Otherwise, return NULL. */
-
- void *
--hash_lookup (const Hash_table *table, const void *entry)
-+_recode_hash_lookup (const Hash_table *table, const void *entry)
- {
- struct hash_entry *bucket
- = table->bucket + table->hasher (entry, table->n_buckets);
-@@ -242,7 +242,7 @@
- /* Return the first data in the table, or NULL if the table is empty. */
-
- void *
--hash_get_first (const Hash_table *table)
-+_recode_hash_get_first (const Hash_table *table)
- {
- struct hash_entry *bucket;
-
-@@ -261,7 +261,7 @@
- Return NULL if there is no more entries. */
-
- void *
--hash_get_next (const Hash_table *table, const void *entry)
-+_recode_hash_get_next (const Hash_table *table, const void *entry)
- {
- struct hash_entry *bucket
- = table->bucket + table->hasher (entry, table->n_buckets);
-@@ -288,7 +288,7 @@
- pointers. */
-
- unsigned
--hash_get_entries (const Hash_table *table, void **buffer,
-+_recode_hash_get_entries (const Hash_table *table, void **buffer,
- unsigned buffer_size)
- {
- unsigned counter = 0;
-@@ -320,7 +320,7 @@
- returns nonzero. When it returns zero, the walking is interrupted. */
-
- unsigned
--hash_do_for_each (const Hash_table *table, Hash_processor processor,
-+_recode_hash_do_for_each (const Hash_table *table, Hash_processor processor,
- void *processor_data)
- {
- unsigned counter = 0;
-@@ -357,7 +357,7 @@
- may not be good for your application." */
-
- unsigned
--hash_string (const char *string, unsigned n_buckets)
-+_recode_hash_string (const char *string, unsigned n_buckets)
- {
- # ifndef CHAR_BIT
- # define CHAR_BIT 8
-@@ -385,7 +385,7 @@
- (By the way, what happened to this excellent man? Is he still alive?) */
-
- unsigned
--hash_string (const char *string, unsigned n_buckets)
-+_recode_hash_string (const char *string, unsigned n_buckets)
- {
- unsigned value = 0;
-
-@@ -436,7 +436,7 @@
- }
-
- void
--hash_reset_tuning (Hash_tuning *tuning)
-+_recode_hash_reset_tuning (Hash_tuning *tuning)
- {
- *tuning = default_tuning;
- }
-@@ -498,7 +498,7 @@
- values. */
-
- Hash_table *
--hash_initialize (unsigned candidate, const Hash_tuning *tuning,
-+_recode_hash_initialize (unsigned candidate, const Hash_tuning *tuning,
- Hash_hasher hasher, Hash_comparator comparator,
- Hash_data_freer data_freer)
- {
-@@ -563,7 +563,7 @@
- affected entries. */
-
- void
--hash_clear (Hash_table *table)
-+_recode_hash_clear (Hash_table *table)
- {
- struct hash_entry *bucket;
- struct hash_entry *cursor;
-@@ -603,7 +603,7 @@
- entry. */
-
- void
--hash_free (Hash_table *table)
-+_recode_hash_free (Hash_table *table)
- {
- struct hash_entry *bucket;
- struct hash_entry *cursor;
-@@ -773,14 +773,14 @@
- exact number of buckets desired. */
-
- bool
--hash_rehash (Hash_table *table, unsigned candidate)
-+_recode_hash_rehash (Hash_table *table, unsigned candidate)
- {
- Hash_table *new_table;
- struct hash_entry *bucket;
- struct hash_entry *cursor;
- struct hash_entry *next;
-
-- new_table = hash_initialize (candidate, table->tuning, table->hasher,
-+ new_table = _recode_hash_initialize (candidate, table->tuning, table->hasher,
- table->comparator, table->data_freer);
- if (new_table == NULL)
- return false;
-@@ -859,7 +859,7 @@
- Return NULL if the storage required for insertion cannot be allocated. */
-
- void *
--hash_insert (Hash_table *table, const void *entry)
-+_recode_hash_insert (Hash_table *table, const void *entry)
- {
- void *data;
- struct hash_entry *bucket;
-@@ -916,7 +916,7 @@
- * tuning->growth_threshold));
-
- /* If the rehash fails, arrange to return NULL. */
-- if (!hash_rehash (table, candidate))
-+ if (!_recode_hash_rehash (table, candidate))
- entry = NULL;
- }
- }
-@@ -929,7 +929,7 @@
- table, don't modify the table and return NULL. */
-
- void *
--hash_delete (Hash_table *table, const void *entry)
-+_recode_hash_delete (Hash_table *table, const void *entry)
- {
- void *data;
- struct hash_entry *bucket;
-@@ -961,7 +961,7 @@
- : (table->n_buckets * tuning->shrink_factor
- * tuning->growth_threshold));
-
-- hash_rehash (table, candidate);
-+ _recode_hash_rehash (table, candidate);
- }
- }
- }
-@@ -974,7 +974,7 @@
- #if TESTING
-
- void
--hash_print (const Hash_table *table)
-+_recode_hash_print (const Hash_table *table)
- {
- struct hash_entry *bucket;
-
-diff -Nur recode-3.6.orig/src/hash.h recode-3.6/src/hash.h
---- recode-3.6.orig/src/hash.h Thu Aug 3 03:21:15 2000
-+++ recode-3.6/src/hash.h Sun Oct 27 12:01:29 2002
-@@ -91,30 +91,30 @@
- typedef struct hash_table Hash_table;
-
- /* Information and lookup. */
--unsigned hash_get_n_buckets PARAMS ((const Hash_table *));
--unsigned hash_get_n_buckets_used PARAMS ((const Hash_table *));
--unsigned hash_get_n_entries PARAMS ((const Hash_table *));
--unsigned hash_get_max_bucket_length PARAMS ((const Hash_table *));
--bool hash_table_ok PARAMS ((const Hash_table *));
--void hash_print_statistics PARAMS ((const Hash_table *, FILE *));
--void *hash_lookup PARAMS ((const Hash_table *, const void *));
-+unsigned _recode_hash_get_n_buckets PARAMS ((const Hash_table *));
-+unsigned _recode_hash_get_n_buckets_used PARAMS ((const Hash_table *));
-+unsigned _recode_hash_get_n_entries PARAMS ((const Hash_table *));
-+unsigned _recode_hash_get_max_bucket_length PARAMS ((const Hash_table *));
-+bool _recode_hash_table_ok PARAMS ((const Hash_table *));
-+void _recode_hash_print_statistics PARAMS ((const Hash_table *, FILE *));
-+void *_recode_hash_lookup PARAMS ((const Hash_table *, const void *));
-
- /* Walking. */
--void *hash_get_first PARAMS ((const Hash_table *));
--void *hash_get_next PARAMS ((const Hash_table *, const void *));
--unsigned hash_get_entries PARAMS ((const Hash_table *, void **, unsigned));
--unsigned hash_do_for_each PARAMS ((const Hash_table *, Hash_processor, void *));
-+void *_recode_hash_get_first PARAMS ((const Hash_table *));
-+void *_recode_hash_get_next PARAMS ((const Hash_table *, const void *));
-+unsigned _recode_hash_get_entries PARAMS ((const Hash_table *, void **, unsigned));
-+unsigned _recode_hash_do_for_each PARAMS ((const Hash_table *, Hash_processor, void *));
-
- /* Allocation and clean-up. */
--unsigned hash_string PARAMS ((const char *, unsigned));
--void hash_reset_tuning PARAMS ((Hash_tuning *));
--Hash_table *hash_initialize PARAMS ((unsigned, const Hash_tuning *,
-+unsigned _recode_hash_string PARAMS ((const char *, unsigned));
-+void _recode_hash_reset_tuning PARAMS ((Hash_tuning *));
-+Hash_table *_recode_hash_initialize PARAMS ((unsigned, const Hash_tuning *,
- Hash_hasher, Hash_comparator,
- Hash_data_freer));
--void hash_clear PARAMS ((Hash_table *));
--void hash_free PARAMS ((Hash_table *));
-+void _recode_hash_clear PARAMS ((Hash_table *));
-+void _recode_hash_free PARAMS ((Hash_table *));
-
- /* Insertion and deletion. */
--bool hash_rehash PARAMS ((Hash_table *, unsigned));
--void *hash_insert PARAMS ((Hash_table *, const void *));
--void *hash_delete PARAMS ((Hash_table *, const void *));
-+bool _recode_hash_rehash PARAMS ((Hash_table *, unsigned));
-+void *_recode_hash_insert PARAMS ((Hash_table *, const void *));
-+void *_recode_hash_delete PARAMS ((Hash_table *, const void *));
-diff -Nur recode-3.6.orig/src/html.c recode-3.6/src/html.c
---- recode-3.6.orig/src/html.c Fri Aug 18 23:34:28 2000
-+++ recode-3.6/src/html.c Sun Oct 27 12:01:29 2002
-@@ -425,14 +425,14 @@
- if (before_options || after_options)
- return false;
-
-- table = hash_initialize (0, NULL, code_hash, code_compare, NULL);
-+ table = _recode_hash_initialize (0, NULL, code_hash, code_compare, NULL);
- if (!table)
- return false;
-
- for (cursor = translations; cursor->code; cursor++)
- if (cursor->flags & mask
- && (!request->diacritics_only || cursor->code > 128))
-- if (!hash_insert (table, cursor))
-+ if (!_recode_hash_insert (table, cursor))
- return false;
-
- step->step_type = RECODE_UCS2_TO_STRING;
-@@ -516,7 +516,7 @@
- struct ucs2_to_string *entry;
-
- lookup.code = value;
-- entry = hash_lookup (table, &lookup);
-+ entry = _recode_hash_lookup (table, &lookup);
- if (entry)
- {
- const char *cursor = entry->string;
-@@ -573,7 +573,7 @@
- {
- struct ucs2_to_string const *data = void_data;
-
-- return hash_string (data->string, table_size);
-+ return _recode_hash_string (data->string, table_size);
- }
-
- /*----------------------------------------.
-@@ -606,14 +606,14 @@
- if (before_options || after_options)
- return false;
-
-- table = hash_initialize (0, NULL, string_hash, string_compare, NULL);
-+ table = _recode_hash_initialize (0, NULL, string_hash, string_compare, NULL);
- if (!table)
- return false;
-
- for (cursor = translations; cursor->code; cursor++)
- if (cursor->flags & mask
- && (!request->diacritics_only || cursor->code > 128))
-- if (!hash_insert (table, cursor))
-+ if (!_recode_hash_insert (table, cursor))
- return false;
-
- step->step_type = RECODE_STRING_TO_UCS2;
-@@ -825,7 +825,7 @@
- struct ucs2_to_string *entry;
-
- lookup.string = buffer;
-- entry = hash_lookup (subtask->step->step_table, &lookup);
-+ entry = _recode_hash_lookup (subtask->step->step_table, &lookup);
- if (entry)
- {
- put_ucs2 (entry->code, subtask);
-diff -Nur recode-3.6.orig/src/names.c recode-3.6/src/names.c
---- recode-3.6.orig/src/names.c Wed Dec 6 20:41:29 2000
-+++ recode-3.6/src/names.c Sun Oct 27 12:01:29 2002
-@@ -89,7 +89,7 @@
- {
- RECODE_CONST_ALIAS alias = void_alias;
-
-- return hash_string (alias->name, limit);
-+ return _recode_hash_string (alias->name, limit);
- }
-
- static bool
-@@ -108,7 +108,7 @@
- outer->number_of_symbols = 0;
-
- outer->alias_table
-- = hash_initialize (800, NULL, alias_hasher, alias_comparator, free);
-+ = _recode_hash_initialize (800, NULL, alias_hasher, alias_comparator, free);
- if (!outer->alias_table)
- return false;
-
-@@ -270,7 +270,7 @@
- lookup.name = name;
- if (!lookup.name)
- return NULL;
-- if (alias = hash_lookup (outer->alias_table, &lookup), alias)
-+ if (alias = _recode_hash_lookup (outer->alias_table, &lookup), alias)
- return alias;
-
- /* If we reach this point, find_type is necessarily one of SYMBOL_CREATE_*.
-@@ -296,7 +296,7 @@
- alias->name = name;
- alias->symbol = symbol;
- alias->implied_surfaces = NULL;
-- if (!hash_insert (outer->alias_table, alias))
-+ if (!_recode_hash_insert (outer->alias_table, alias))
- {
- free (symbol);
- free (alias);
-@@ -328,7 +328,7 @@
- symbol = alias->symbol;
-
- lookup.name = name;
-- if (alias = hash_lookup (outer->alias_table, &lookup), alias)
-+ if (alias = _recode_hash_lookup (outer->alias_table, &lookup), alias)
- {
- if (alias->symbol == symbol)
- return alias;
-@@ -344,7 +344,7 @@
- alias->name = name;
- alias->symbol = symbol;
- alias->implied_surfaces = NULL;
-- if (!hash_insert (outer->alias_table, alias))
-+ if (!_recode_hash_insert (outer->alias_table, alias))
- {
- free (alias);
- return NULL;
-@@ -446,7 +446,7 @@
- struct make_argmatch_walk walk; /* wanderer's data */
-
- #if HASH_STATS
-- hash_print_statistics (outer->alias_table, stderr);
-+ _recode_hash_print_statistics (outer->alias_table, stderr);
- #endif
-
- /* It may happen that new modules are added only once all initialisation
-@@ -468,7 +468,7 @@
- walk.outer = outer;
- walk.charset_counter = 0;
- walk.surface_counter = 0;
-- hash_do_for_each (outer->alias_table, make_argmatch_walker_1, &walk);
-+ _recode_hash_do_for_each (outer->alias_table, make_argmatch_walker_1, &walk);
-
- /* Allocate the argmatch and realname arrays, each with a NULL sentinel. */
-
-@@ -500,7 +500,7 @@
-
- walk.charset_counter = 0;
- walk.surface_counter = 0;
-- hash_do_for_each (outer->alias_table, make_argmatch_walker_2, &walk);
-+ _recode_hash_do_for_each (outer->alias_table, make_argmatch_walker_2, &walk);
-
- return true;
- }
-@@ -655,7 +655,7 @@
- /* Count how many symbols we have. */
-
- walk.number = 0;
-- hash_do_for_each (outer->alias_table, list_symbols_walker_1, &walk);
-+ _recode_hash_do_for_each (outer->alias_table, list_symbols_walker_1, &walk);
-
- /* Allocate a structure to hold them. */
-
-@@ -665,7 +665,7 @@
- /* Copy all symbols in it. */
-
- walk.number = 0;
-- hash_do_for_each (outer->alias_table, list_symbols_walker_2, &walk);
-+ _recode_hash_do_for_each (outer->alias_table, list_symbols_walker_2, &walk);
-
- /* Sort it. */
-
-diff -Nur recode-3.6.orig/src/outer.c recode-3.6/src/outer.c
---- recode-3.6.orig/src/outer.c Wed Aug 30 22:16:14 2000
-+++ recode-3.6/src/outer.c Sun Oct 27 12:01:53 2002
-@@ -615,7 +615,7 @@
- if (outer->pair_restriction)
- free (outer->pair_restriction);
- if (outer->alias_table)
-- hash_free (outer->alias_table);
-+ _recode_hash_free (outer->alias_table);
- if (outer->argmatch_charset_array)
- free (outer->argmatch_charset_array);
- if (outer->one_to_same)
-diff -Nur recode-3.6.orig/src/recode.c recode-3.6/src/recode.c
---- recode-3.6.orig/src/recode.c Sat Jul 1 20:22:55 2000
-+++ recode-3.6/src/recode.c Sun Oct 27 12:01:29 2002
-@@ -419,14 +419,14 @@
- if (before_options || after_options)
- return false;
-
-- table = hash_initialize (0, NULL,
-+ table = _recode_hash_initialize (0, NULL,
- ucs2_to_byte_hash, ucs2_to_byte_compare, NULL);
- if (!table)
- return false;
-
- if (!ALLOC (data, 256, struct ucs2_to_byte))
- {
-- hash_free (table);
-+ _recode_hash_free (table);
- return false;
- }
-
-@@ -434,9 +434,9 @@
- {
- data[counter].code = code_to_ucs2 (step->after, counter);
- data[counter].byte = counter;
-- if (!hash_insert (table, data + counter))
-+ if (!_recode_hash_insert (table, data + counter))
- {
-- hash_free (table);
-+ _recode_hash_free (table);
- free (data);
- return false;
- }
-@@ -457,7 +457,7 @@
- while (get_ucs2 (&input_value, subtask))
- {
- lookup.code = input_value;
-- entry = hash_lookup (table, &lookup);
-+ entry = _recode_hash_lookup (table, &lookup);
- if (entry)
- put_byte (entry->byte, subtask);
- else
-diff -Nur recode-3.6.orig/src/testdump.c recode-3.6/src/testdump.c
---- recode-3.6.orig/src/testdump.c Thu Jun 29 17:23:52 2000
-+++ recode-3.6/src/testdump.c Sun Oct 27 12:01:29 2002
-@@ -152,7 +152,7 @@
- size_t size; /* number of different characters */
- struct ucs2_to_count **array; /* array into hash table items */
-
-- table = hash_initialize (0, NULL,
-+ table = _recode_hash_initialize (0, NULL,
- ucs2_to_count_hash, ucs2_to_count_compare, free);
- if (!table)
- return false;
-@@ -168,21 +168,21 @@
- struct ucs2_to_count *entry;
-
- lookup.code = character;
-- entry = hash_lookup (table, &lookup);
-+ entry = _recode_hash_lookup (table, &lookup);
- if (entry)
- entry->count++;
- else
- {
- if (!ALLOC (entry, 1, struct ucs2_to_count))
- {
-- hash_free (table);
-+ _recode_hash_free (table);
- return false;
- }
- entry->code = character;
- entry->count = 1;
-- if (!hash_insert (table, entry))
-+ if (!_recode_hash_insert (table, entry))
- {
-- hash_free (table);
-+ _recode_hash_free (table);
- free (entry);
- return false;
- }
-@@ -192,14 +192,14 @@
-
- /* Sort results. */
-
-- size = hash_get_n_entries (table);
-+ size = _recode_hash_get_n_entries (table);
-
- if (!ALLOC (array, size, struct ucs2_to_count *))
- {
-- hash_free (table);
-+ _recode_hash_free (table);
- return false;
- }
-- hash_get_entries (table, (void **) array, size);
-+ _recode_hash_get_entries (table, (void **) array, size);
-
- qsort (array, size, sizeof (struct ucs2_to_count *), compare_item);
-
-@@ -260,7 +260,7 @@
- /* Clean-up. */
-
- free (array);
-- hash_free (table);
-+ _recode_hash_free (table);
-
- SUBTASK_RETURN (subtask);
- }
diff --git a/recode-use_malloc_realloc.patch b/recode-use_malloc_realloc.patch
deleted file mode 100644
index 3e2cf66..0000000
--- a/recode-use_malloc_realloc.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am
---- recode-3.6.orig/src/Makefile.am Wed Dec 6 17:36:12 2000
-+++ recode-3.6/src/Makefile.am Sun Oct 27 10:56:18 2002
-@@ -43,11 +43,11 @@
- L_SURFACES =
-
- recode_SOURCES = main.c freeze.c mixed.c
--recode_LDADD = librecode.la ../lib/libreco.a
-+recode_LDADD = librecode.la
-
- librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \
- hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \
--recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
-+recode.c request.c strip-pool.c task.c $(C_STEPS)
- librecode_la_LDFLAGS = -version-info 0:0:0
-
- INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
-diff -Nur recode-3.6.orig/src/main.c recode-3.6/src/main.c
---- recode-3.6.orig/src/main.c Wed Dec 6 20:44:59 2000
-+++ recode-3.6/src/main.c Sun Oct 27 10:58:04 2002
-@@ -510,7 +510,7 @@
- unsigned counter;
-
- header_name++;
-- buffer = (char *) xmalloc ((size_t) (header_name - optarg));
-+ buffer = (char *) malloc ((size_t) (header_name - optarg));
- if (*header_name == NUL)
- header_name = NULL;
- for (counter = 0; optarg[counter] != '/'; counter++)
-@@ -782,7 +782,7 @@
- {
- char *cursor2;
-
-- rewritten_request = (char *) xmalloc (strlen (user_request) + 2);
-+ rewritten_request = (char *) malloc (strlen (user_request) + 2);
- cursor2 = rewritten_request;
- for (cursor = user_request; *cursor != ':'; cursor++)
- *cursor2++ = *cursor;
-diff -Nur recode-3.6.orig/src/quotearg.c recode-3.6/src/quotearg.c
---- recode-3.6.orig/src/quotearg.c Thu Aug 3 03:21:15 2000
-+++ recode-3.6/src/quotearg.c Sun Oct 27 10:58:53 2002
-@@ -25,7 +25,7 @@
-
- #include <sys/types.h>
- #include <quotearg.h>
--#include <xalloc.h>
-+#include <stdlib.h>
-
- #include <ctype.h>
- #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-@@ -110,7 +110,7 @@
- clone_quoting_options (struct quoting_options *o)
- {
- struct quoting_options *p
-- = (struct quoting_options *) xmalloc (sizeof (struct quoting_options));
-+ = (struct quoting_options *) malloc (sizeof (struct quoting_options));
- *p = *(o ? o : &default_quoting_options);
- return p;
- }
-@@ -339,7 +339,7 @@
- size_t s = n1 * sizeof (struct slotvec);
- if (! (0 < n1 && n1 == s / sizeof (struct slotvec)))
- abort ();
-- slotvec = (struct slotvec *) xrealloc (slotvec, s);
-+ slotvec = (struct slotvec *) realloc (slotvec, s);
- memset (slotvec + nslots, 0, (n1 - nslots) * sizeof (struct slotvec));
- nslots = n;
- }
-@@ -352,7 +352,7 @@
- if (size <= qsize)
- {
- slotvec[n].size = size = qsize + 1;
-- slotvec[n].val = val = xrealloc (val, size);
-+ slotvec[n].val = val = realloc (val, size);
- quotearg_buffer (val, size, arg, (size_t) -1, options);
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/recode.git/commitdiff/81922d7387732d41aac1518fbdccf355fe590752
More information about the pld-cvs-commit
mailing list