Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

recode: fix build deps

Browse Source
This commit is contained in:
suvari
2020-01-22 00:33:14 +03:00
parent 982291df8d
commit 7fe225c09f
11 changed files with 4 additions and 39112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/recode/files/recode-3.6-getcwd.patch
-11
View File
@@ -1,11 +0,0 @@
--- recode-3.6/lib/gettext.c.orig 2005-03-07 12:18:30.000000000 +0100
+++ recode-3.6/lib/gettext.c 2005-03-07 12:23:14.000000000 +0100
@@ -1668,8 +1668,6 @@
# if !defined HAVE_GETCWD
char *getwd ();
# define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
# endif
# ifndef HAVE_STPCPY
static char *stpcpy PARAMS ((char *dest, const char *src));
office/misc/recode/files/recode-3.6-gettextfix.diff
-19
View File
@@ -1,19 +0,0 @@
--- recode-3.6/m4/gettext.m4.old 2001-01-03 11:37:56.000000000 -0500
+++ recode-3.6/m4/gettext.m4 2009-01-08 13:48:57.000000000 -0500
@@ -109,12 +109,12 @@
else
ac_items="$LINGUAS"
for ac_item in $ac_items; do
- case "$ALL_LINGUAS" in
- *$ac_item*)
+ for supported_item in $ALL_LINGUAS; do
+ if test "$ac_item" = "$supported_item"; then
ac_print="$ac_print $ac_item"
MOFILES="$MOFILES $ac_item.mo"
- ;;
- esac
+ fi
+ done
done
fi
AC_SUBST(MOFILES)
office/misc/recode/files/recode-3.6-segfault.patch
-53
View File
@@ -1,53 +0,0 @@
# Recode segfaulted on C files (bnc#503437)
# Eg. file containing just a single apostrophe ('), or openinig C comment (/*)
# This is a simple workaround.
diff -u -r recode-3.6/src/main.c recode-fajn/src/main.c
--- src/main.c.orig 2000-12-06 20:44:59.000000000 +0100
+++ src/main.c 2010-12-30 16:07:03.973840778 +0100
@@ -951,17 +951,26 @@
success = false;
if (verbose_flag)
{
- fprintf (stderr, _(" failed: %s in step `%s..%s'\n"),
+ if (task->error_at_step)
+ fprintf (stderr, _(" failed: %s in step `%s..%s'\n"),
task_perror (task),
task->error_at_step->before->name,
task->error_at_step->after->name);
+ else
+ fprintf (stderr, _(" failed: Unknown error\n"));
+
fflush (stderr);
}
else if (!quiet_flag)
- error (0, 0, _("%s failed: %s in step `%s..%s'"),
+ {
+ if (task->error_at_step)
+ error (0, 0, _("%s failed: %s in step `%s..%s'"),
input_name, task_perror (task),
task->error_at_step->before->name,
task->error_at_step->after->name);
+ else
+ error (0, 0, _("%s failed: Unknown error"), input_name);
+ }
unlink (output_name);
}
@@ -981,10 +990,15 @@
{
success = false;
if (!quiet_flag)
- error (0, 0, _("%s in step `%s..%s'"),
+ {
+ if (task->error_at_step)
+ error (0, 0, _("%s in step `%s..%s'"),
task_perror (task),
task->error_at_step->before->name,
task->error_at_step->after->name);
+ else
+ error (0, 0, _("Unknown error"));
+ }
}
}
}
Only in recode-fajn/src: tags
office/misc/recode/files/recode-automake.patch
-22
View File
@@ -1,22 +0,0 @@
--- recode-3.6.orig/configure.in 2001-01-03 16:50:54.000000000 +0100
+++ recode-3.6/configure.in 2012-07-23 14:15:28.000000000 +0200
@@ -15,7 +15,7 @@
AM_PROG_LIBTOOL
AC_ISC_POSIX
-AM_C_PROTOTYPES
+dnl AM_C_PROTOTYPES
AC_C_CONST
AC_C_INLINE
ad_AC_PROG_FLEX
--- recode-3.6.orig/src/Makefile.am 2000-12-06 17:36:12.000000000 +0100
+++ recode-3.6/src/Makefile.am 2012-07-23 14:47:07.000000000 +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
office/misc/recode/files/recode-bool-bitfield.patch
-11
View File
@@ -1,11 +0,0 @@
--- src/recodext.h.orig 2008-01-16 13:15:39.000000000 +0100
+++ src/recodext.h 2008-01-16 13:16:47.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
office/misc/recode/files/recode-flex-m4.patch
-16
View File
@@ -1,16 +0,0 @@
--- recode-3.6-orig/m4/flex.m4 2000-06-28 16:39:06.000000000 +0200
+++ recode-3.6/m4/flex.m4 2010-07-07 12:23:49.000000000 +0200
@@ -8,11 +8,8 @@
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
+AS_IF([test "$LEX" = missing], [
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])
+])])
office/misc/recode/files/recode.patch
-68
View File
@@ -1,68 +0,0 @@
--- recode-3.6.orig/src/libiconv.c
+++ recode-3.6/src/libiconv.c
@@ -1,5 +1,5 @@
/* Conversion of files between different charsets and surfaces.
- Copyright © 1999, 2000 Free Software Foundation, Inc.
+ Copyright © 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by François Pinard <pinard@iro.umontreal.ca>, 1999,
and Bruno Haible <haible@clisp.cons.org>, 2000.
@@ -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)
--- recode-3.6.orig/src/hash.h
+++ recode-3.6/src/hash.h
@@ -21,6 +21,11 @@
/* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use
obstacks instead of malloc, and recompile `hash.c' with same setting. */
+#define hash_lookup recode_hash_lookup
+#define hash_delete recode_hash_delete
+#define hash_free recode_hash_free
+#define hash_insert recode_hash_insert
+
#ifndef PARAMS
# if PROTOTYPES || __STDC__
# define PARAMS(Args) Args
office/misc/recode/files/recode_3.6-15.diff
-38868
View File
File diff suppressed because it is too large Load Diff
office/misc/recode/files/stdlib.patch
-12
View File
@@ -1,12 +0,0 @@
diff -Nur recode-3.6-old/src/argmatch.c recode-3.6/src/argmatch.c
--- recode-3.6-old/src/argmatch.c 2008-05-27 15:17:09.000000000 +0300
+++ recode-3.6/src/argmatch.c 2008-05-27 15:18:30.000000000 +0300
@@ -18,6 +18,8 @@
/* Written by David MacKenzie <djm@ai.mit.edu>
Modified by Akim Demaille <demaille@inf.enst.fr> */
+#include <stdlib.h>
+
#include "argmatch.h"
#include <stdio.h>
office/misc/recode/files/system-aclocal.diff
-12
View File
@@ -1,12 +0,0 @@
diff -Naur recode-3.6-orig/Makefile.am recode-3.6/Makefile.am
--- recode-3.6-orig/Makefile.am 2009-05-15 14:31:12.463908436 +0300
+++ recode-3.6/Makefile.am 2009-05-15 14:31:31.540660383 +0300
@@ -18,7 +18,7 @@
# 02111-1307, USA.
AUTOMAKE_OPTIONS = gnits
-ACLOCAL = ./aclocal.sh @ACLOCAL@
+ACLOCAL = /usr/bin/aclocal
ACLOCAL_AMFLAGS = -I m4
BABYL = ../rmail/* ../*/rmail/* ../*/*/RMAIL ../*/*/rmail/*
office/misc/recode/pspec.xml
+4 -20
View File
@@ -14,26 +14,10 @@
<Description>Recode can convert files to various character sets (e.g. utf8, iso-8859-1, koi8r..).</Description>
<Archive sha1sum="8c02c0c892f7f67909e993771e18f9a391b07ba1" type="targz">https://github.com/rrthomas/recode/releases/download/v3.7.6/recode-3.7.6.tar.gz</Archive>
<BuildDependencies>
<Dependency>gettext</Dependency>
<Dependency>texinfo</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>gettext-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">recode.patch</Patch> -->
<!-- <Patch level="1">recode-3.6-getcwd.patch</Patch> -->
<!-- <Patch level="0">recode-bool-bitfield.patch</Patch> -->
<!-- <Patch level="1">recode-flex-m4.patch</Patch> -->
<!-- <Patch level="1">stdlib.patch</Patch> -->
<!-- <Patch level="1">recode-3.6-gettextfix.diff</Patch> -->
<!--
<Patch level="1">recode_3.6-15.diff</Patch>
-->
<!-- <Patch level="1">system-aclocal.diff</Patch> -->
<!-- Segfault patch from SuSE -->
<!-- <Patch>recode-3.6-segfault.patch</Patch> -->
<!-- <Patch level="1">recode-automake.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -61,7 +45,7 @@
<History>
<Update release="6">
<Date>2020-01-19</Date>
<Date>2020-01-22</Date>
<Version>3.7.6</Version>
<Comment>Version bump</Comment>
<Name>Pisi Linux Community</Name>
@@ -103,4 +87,4 @@
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>