From 00d04026e20949817609449a9a731ee0e34483a2 Mon Sep 17 00:00:00 2001 From: jvcelak Date: Wed, 7 Apr 2010 14:44:37 +0000 Subject: Fixes not working groffer. Related: #468102 --- groff-1.18.1.1-bigendian.patch | 11 ----- groff-1.18.1.1-gcc41.patch | 11 ----- groff-1.18.1.1-grn.patch | 10 ---- groff-1.18.1.1-revision.patch | 5 -- groff-1.18.1.1-tempfile.patch | 28 ------------ groff-1.18.1.4-grofferpath.patch | 22 --------- groff-groffer.patch | 64 ++++++++++++++++++++++++++ groff-xlibs.patch | 19 -------- groff.spec | 98 +++++++++++++++++----------------------- 9 files changed, 106 insertions(+), 162 deletions(-) delete mode 100644 groff-1.18.1.1-bigendian.patch delete mode 100644 groff-1.18.1.1-gcc41.patch delete mode 100644 groff-1.18.1.1-grn.patch delete mode 100644 groff-1.18.1.1-revision.patch delete mode 100644 groff-1.18.1.1-tempfile.patch delete mode 100644 groff-1.18.1.4-grofferpath.patch create mode 100644 groff-groffer.patch delete mode 100644 groff-xlibs.patch diff --git a/groff-1.18.1.1-bigendian.patch b/groff-1.18.1.1-bigendian.patch deleted file mode 100644 index 1e3998b..0000000 --- a/groff-1.18.1.1-bigendian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- groff-1.18.1.1/src/libs/libdriver/input.cc.orig 2006-01-10 11:11:36.000000000 +0100 -+++ groff-1.18.1.1/src/libs/libdriver/input.cc 2006-01-10 11:11:52.000000000 +0100 -@@ -1786,7 +1786,7 @@ - if (npages <= 0) - fatal_command(command); - char *str_arg = get_string_arg(); -- size_t i = 0; -+ int i = 0; - while ((c = str_arg[i++]) != '\0') { - EnvInt w; - #ifdef ENABLE_MULTIBYTE diff --git a/groff-1.18.1.1-gcc41.patch b/groff-1.18.1.1-gcc41.patch deleted file mode 100644 index b95e3f1..0000000 --- a/groff-1.18.1.1-gcc41.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- groff-1.18.1.1/src/devices/grohtml/post-html.cc.gcc41 2006-01-05 16:01:16.000000000 +0100 -+++ groff-1.18.1.1/src/devices/grohtml/post-html.cc 2006-01-05 16:02:14.000000000 +0100 -@@ -261,7 +261,7 @@ struct char_block { - char_block *next; - - char_block(); -- char_block::char_block(int length); -+ char_block(int length); - }; - - char_block::char_block() diff --git a/groff-1.18.1.1-grn.patch b/groff-1.18.1.1-grn.patch deleted file mode 100644 index 45e4b30..0000000 --- a/groff-1.18.1.1-grn.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- groff-1.18.1.1/src/preproc/grn/hdb.cc.grn 2002-10-07 06:42:55.000000000 +0200 -+++ groff-1.18.1.1/src/preproc/grn/hdb.cc 2004-09-16 10:23:42.394486378 +0200 -@@ -115,7 +115,6 @@ - type = DBGetType(string); /* interpret element type */ - if (type < 0) { /* no more data */ - done = TRUE; -- (void) fclose(file); - } else { - #ifdef UW_FASTSCAN - (void) xscanf(file, &x, &y); /* always one point */ diff --git a/groff-1.18.1.1-revision.patch b/groff-1.18.1.1-revision.patch deleted file mode 100644 index 8e248cd..0000000 --- a/groff-1.18.1.1-revision.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- groff-1.18.1.1/REVISION.revision 2004-06-29 12:59:31.775599717 +0200 -+++ groff-1.18.1.1/REVISION 2004-06-29 12:58:34.646490040 +0200 -@@ -1 +1 @@ --1 -+1.1 diff --git a/groff-1.18.1.1-tempfile.patch b/groff-1.18.1.1-tempfile.patch deleted file mode 100644 index 0e73606..0000000 --- a/groff-1.18.1.1-tempfile.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- groff-1.18.1.1/contrib/groffer/groffer.sh.tempfile 2004-06-15 03:44:50.000000000 +0200 -+++ groff-1.18.1.1/contrib/groffer/groffer.sh 2004-10-19 13:04:35.704244526 +0200 -@@ -3228,18 +3228,13 @@ - do - if is_not_empty "$d"; then - if obj d is_dir && obj d is_writable; then -- _TMP_DIR="${d}/${_PROGRAM_NAME}${_PROCESS_ID}"; -- if obj _TMP_DIR is_dir; then -- rm -f "${_TMP_DIR}"/*; -- break; -- else -- mkdir "${_TMP_DIR}"; -- if obj _TMP_DIR is_not_dir; then -- _TMP_DIR=''; -- continue; -- fi; -- break; -- fi; -+ _TMP_DIR="`mktemp -d ${d}/${_PROGRAM_NAME}.XXXXXX`"; -+ if test $? = 0; then -+ break; -+ else -+ _TMP_DIR=''; -+ continue; -+ fi - fi; - if obj _TMP_DIR is_not_writable; then - _TMP_DIR=''; diff --git a/groff-1.18.1.4-grofferpath.patch b/groff-1.18.1.4-grofferpath.patch deleted file mode 100644 index 6f95036..0000000 --- a/groff-1.18.1.4-grofferpath.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up groff-1.18.1.4/contrib/groffer/groffer.sh.old groff-1.18.1.4/contrib/groffer/groffer.sh ---- groff-1.18.1.4/contrib/groffer/groffer.sh.old 2006-10-04 22:35:39.000000000 +0200 -+++ groff-1.18.1.4/contrib/groffer/groffer.sh 2007-10-08 09:01:29.000000000 +0200 -@@ -129,7 +129,7 @@ no) - esac; - - export _GROFFER2_SH; # file name of the script that follows up --_GROFFER2_SH="${_GROFFER_LIBDIR}"'groffer2.sh'; -+_GROFFER2_SH="${_GROFFER_LIBDIR}${_GROFF_VERSION}"'groffer2.sh'; - - export _GROFFER_SH; # file name of this shell script - case "$0" in -@@ -331,7 +331,8 @@ fi; - if test _"${_SHELL}"_ = __ - then - # no shell found, so start groffer2.sh normally -- eval . "'${_GROFFER2_SH}'" '"$@"'; -+ #eval . "'${_GROFFER2_SH}'" '"$@"'; -+ eval . "/usr/share/groff/${_GROFF_VERSION}/groffer/groffer2.sh" '"$@"'; - exit; - else - # start groffer2.sh with the found $_SHELL diff --git a/groff-groffer.patch b/groff-groffer.patch new file mode 100644 index 0000000..7bafb8a --- /dev/null +++ b/groff-groffer.patch @@ -0,0 +1,64 @@ +Author: Jan Vcelak +Related: bz#468102 + +Fixes 'groffer' tool which didn't work at all. Groffer libraries (scripts) are +in non-default location on Fedora. This patch fixes this issues. Also an +unwanted variable expansion was present in groffer2.sh. + +diff -u -urp groff-1.18.1.4/contrib/groffer/groffer.sh groff-1.18.1.4.fixed/contrib/groffer/groffer.sh +--- groff-1.18.1.4/contrib/groffer/groffer.sh 2006-10-04 22:35:39.000000000 +0200 ++++ groff-1.18.1.4.fixed/contrib/groffer/groffer.sh 2010-04-06 13:05:09.393197112 +0200 +@@ -109,7 +109,7 @@ no) + */) :; ;; + *) _AT_LIBDIR_AT="${_AT_LIBDIR_AT}/"; + esac; +- _GROFFER_LIBDIR="${_AT_LIBDIR_AT}"'groff/groffer/'; ++ _GROFFER_LIBDIR="${_AT_LIBDIR_AT}"'groff/@VERSION@/groffer/'; + ;; + esac; + +diff -u -urp groff-1.18.1.4/contrib/groffer/groffer2.sh groff-1.18.1.4.fixed/contrib/groffer/groffer2.sh +--- groff-1.18.1.4/contrib/groffer/groffer2.sh 2006-10-05 20:44:08.000000000 +0200 ++++ groff-1.18.1.4.fixed/contrib/groffer/groffer2.sh 2010-04-06 15:45:44.131323506 +0200 +@@ -4616,7 +4616,7 @@ usage() + func_check usage = 0 "$@"; + echo; + version; +- cat < - 1.18.1.4-19 +* Wed Apr 6 2010 Jan Vcelak - 1.18.1.4-20 +- Fixes not working groffer (#468102). + +* Wed Feb 3 2010 Ville Skyttä - 1.18.1.4-19 - Move grog to main package, add main package dependency to -perl (#468102). * Fri Jul 24 2009 Fedora Release Engineering - 1.18.1.4-18 -- cgit