Author: arekm Date: Tue Aug 30 17:53:06 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.21; all patches dropped (obsolete or merged); new patches from fc
---- Files affected: packages/groff: groff.spec (1.90 -> 1.91) , groff-grofferdir-auto.patch (NONE -> 1.1) (NEW), groff-grotty-wc-no-sgr.patch (NONE -> 1.1) (NEW), groff-makefile-typo.patch (NONE -> 1.1) (NEW), groff-DESTDIR.patch (1.12 -> NONE) (REMOVED), groff-ac.patch (1.1 -> NONE) (REMOVED), groff-bigendian.patch (1.1 -> NONE) (REMOVED), groff-colours.patch (1.3 -> NONE) (REMOVED), groff-devutf8.patch (1.1 -> NONE) (REMOVED), groff-do_char.patch (1.1 -> NONE) (REMOVED), groff-fix15.patch (1.1 -> NONE) (REMOVED), groff-fixminus.patch (1.2 -> NONE) (REMOVED), groff-gcc4.patch (1.2 -> NONE) (REMOVED), groff-gzext.patch (1.1 -> NONE) (REMOVED), groff-gzip.patch (1.1 -> NONE) (REMOVED), groff-info.patch (1.5 -> NONE) (REMOVED), groff-multibyte.patch (1.1 -> NONE) (REMOVED), groff-safer.patch (1.6 -> NONE) (REMOVED), groff-sectmp.patch (1.1 -> NONE) (REMOVED), groff-spacefix.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/groff/groff.spec diff -u packages/groff/groff.spec:1.90 packages/groff/groff.spec:1.91 --- packages/groff/groff.spec:1.90 Sat Jan 29 01:06:38 2011 +++ packages/groff/groff.spec Tue Aug 30 19:53:01 2011 @@ -1,11 +1,5 @@ # $Revision$, $Date$ # -# WARNING: Don't upgrade to 1.19 as that version does not support -# UTF-8 input and no patches exist to solve this issue -# -# Conditional build: -%bcond_without xditview # disable xditview (which requires X11) -# Summary: A document formatting system Summary(de.UTF-8): Ein Dokumentformatierungssystem Summary(es.UTF-8): Paquete groff GNU - formateador de texto @@ -16,46 +10,31 @@ Summary(tr.UTF-8): GNU groff metin biçemleme paketi Summary(uk.UTF-8): GNU groff - пакет для форматування тексту Name: groff -Version: 1.18.1.4 -Release: 5 +Version: 1.21 +Release: 1 Epoch: 1 License: GPL Group: Applications/Publishing Source0: http://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz -# Source0-md5: ceecb81533936d251ed015f40e5f7287 +# Source0-md5: 8b8cd29385b97616a0f0d96d0951c5bf Source1: %{name}-trofftops.sh Source2: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source2-md5: 3f8b22cc1eefb53306c8c2acf31aca29 -Source3: groff-nroff -Patch0: %{name}-safer.patch -Patch1: %{name}-DESTDIR.patch -Patch2: %{name}-info.patch -Patch3: %{name}-colours.patch -Patch4: %{name}-gcc4.patch -Patch5: %{name}-ac.patch -Patch6: %{name}-multibyte.patch -Patch7: %{name}-fix15.patch -Patch8: %{name}-devutf8.patch -Patch9: %{name}-bigendian.patch -Patch10: %{name}-do_char.patch -Patch11: %{name}-fixminus.patch -Patch12: %{name}-gzext.patch -Patch13: %{name}-gzip.patch -Patch14: %{name}-sectmp.patch -Patch15: %{name}-spacefix.patch +Source3: %{name}-nroff +Patch0: %{name}-makefile-typo.patch +Patch1: %{name}-grotty-wc-no-sgr.patch +Patch2: %{name}-grofferdir-auto.patch URL: http://www.gnu.org/software/groff/ BuildRequires: autoconf BuildRequires: libstdc++-devel -BuildRequires: texinfo >= 4.5 -%if %{with xditview} BuildRequires: netpbm-progs +BuildRequires: texinfo >= 4.5 BuildRequires: xorg-cf-files BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-util-imake -%endif Requires: mktemp -Obsoletes: groff-tools Obsoletes: groff-for-man +Obsoletes: groff-tools BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _appdefsdir /usr/share/X11/app-defaults @@ -214,19 +193,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 # makeinfo 4.7 has some problems when generating info without # saving macro expanded file??? @@ -236,19 +202,13 @@ %build %{__autoconf} -CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" +CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions" %configure \ - --enable-multibyte + --docdir=%{_docdir}/%{name}-%{version} \ + --with-appresdir=%{_datadir}/X11/app-defaults \ + --with-grofferdir=%{_datadir}/%{name}/%{version}/groffer %{__make} -j1 -%if %{with xditview} -cd src/xditview -xmkmf -%{__make} -j1 \ - CC="%{__cc}" \ - CDEBUGFLAGS="%{rpmcflags}" -%endif - %install rm -rf $RPM_BUILD_ROOT @@ -258,14 +218,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/trofftops install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/nroff -%if %{with xditview} -%{__make} -j1 -C src/xditview install install.man \ - DESTDIR=$RPM_BUILD_ROOT \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir}/man1 \ - XAPPLOADDIR=%{_appdefsdir} -%endif - ln -sf s.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/tmac/gs.tmac ln -sf mse.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/tmac/gmse.tmac ln -sf m.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/tmac/gm.tmac @@ -307,14 +259,17 @@ %defattr(644,root,root,755) %doc BUG-REPORT ChangeLog NEWS PROBLEMS PROJECTS README TODO %attr(755,root,root) %{_bindir}/addftinfo +%attr(755,root,root) %{_bindir}/chem %attr(755,root,root) %{_bindir}/eqn %attr(755,root,root) %{_bindir}/eqn2graph +%attr(755,root,root) %{_bindir}/gdiffmk %attr(755,root,root) %{_bindir}/geqn %attr(755,root,root) %{_bindir}/gindxbib %attr(755,root,root) %{_bindir}/glookbib %attr(755,root,root) %{_bindir}/gneqn %attr(755,root,root) %{_bindir}/gnroff %attr(755,root,root) %{_bindir}/gpic +%attr(755,root,root) %{_bindir}/grap2graph %attr(755,root,root) %{_bindir}/grefer %attr(755,root,root) %{_bindir}/grn %attr(755,root,root) %{_bindir}/grodvi @@ -333,26 +288,38 @@ %attr(755,root,root) %{_bindir}/lookbib %attr(755,root,root) %{_bindir}/neqn %attr(755,root,root) %{_bindir}/nroff +%attr(755,root,root) %{_bindir}/pdfroff %attr(755,root,root) %{_bindir}/pfbtops %attr(755,root,root) %{_bindir}/pic %attr(755,root,root) %{_bindir}/pic2graph %attr(755,root,root) %{_bindir}/post-grohtml %attr(755,root,root) %{_bindir}/pre-grohtml +%attr(755,root,root) %{_bindir}/preconv %attr(755,root,root) %{_bindir}/refer +%attr(755,root,root) %{_bindir}/roff2dvi +%attr(755,root,root) %{_bindir}/roff2html +%attr(755,root,root) %{_bindir}/roff2pdf +%attr(755,root,root) %{_bindir}/roff2ps +%attr(755,root,root) %{_bindir}/roff2text +%attr(755,root,root) %{_bindir}/roff2x %attr(755,root,root) %{_bindir}/soelim %attr(755,root,root) %{_bindir}/tbl %attr(755,root,root) %{_bindir}/tfmtodit %attr(755,root,root) %{_bindir}/troff +%attr(755,root,root) %{_bindir}/xtotroff %{_datadir}/groff %{_mandir}/man1/addftinfo.1* +%{_mandir}/man1/chem.1* %{_mandir}/man1/eqn.1* %{_mandir}/man1/eqn2graph.1* +%{_mandir}/man1/gdiffmk.1* %{_mandir}/man1/geqn.1* %{_mandir}/man1/gindxbib.1* %{_mandir}/man1/glookbib.1* %{_mandir}/man1/gneqn.1* %{_mandir}/man1/gnroff.1* %{_mandir}/man1/gpic.1* +%{_mandir}/man1/grap2graph.1* %{_mandir}/man1/grefer.1* %{_mandir}/man1/grn.1* %{_mandir}/man1/grodvi.1* @@ -372,14 +339,22 @@ %{_mandir}/man1/lookbib.1* %{_mandir}/man1/neqn.1* %{_mandir}/man1/nroff.1* +%{_mandir}/man1/pdfroff.1* %{_mandir}/man1/pfbtops.1* %{_mandir}/man1/pic.1* %{_mandir}/man1/pic2graph.1* %{_mandir}/man1/refer.1* +%{_mandir}/man1/roff2dvi.1* +%{_mandir}/man1/roff2html.1* +%{_mandir}/man1/roff2pdf.1* +%{_mandir}/man1/roff2ps.1* +%{_mandir}/man1/roff2text.1* +%{_mandir}/man1/roff2x.1* %{_mandir}/man1/soelim.1* %{_mandir}/man1/tbl.1* %{_mandir}/man1/tfmtodit.1* %{_mandir}/man1/troff.1* +%{_mandir}/man1/xtotroff.1* %{_mandir}/man5/* %{_mandir}/man7/[!m]* @@ -432,14 +407,13 @@ %{_infodir}/*info* -%if %{with xditview} %files gxditview %defattr(644,root,root,755) -%doc src/xditview/{ChangeLog,README,TODO} +%doc src/devices/xditview/{ChangeLog,README,TODO} %attr(755,root,root) %{_bindir}/gxditview %{_appdefsdir}/GXditview +%{_appdefsdir}/GXditview-color %{_mandir}/man1/* -%endif %files perl %defattr(644,root,root,755) @@ -462,6 +436,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.91 2011/08/30 17:53:01 arekm +- up to 1.21; all patches dropped (obsolete or merged); new patches from fc + Revision 1.90 2011/01/29 00:06:38 sparky - dropped pre-cvs changelog ================================================================ Index: packages/groff/groff-grofferdir-auto.patch diff -u /dev/null packages/groff/groff-grofferdir-auto.patch:1.1 --- /dev/null Tue Aug 30 19:53:06 2011 +++ packages/groff/groff-grofferdir-auto.patch Tue Aug 30 19:53:01 2011 @@ -0,0 +1,149 @@ +fix: groffer libdir is incorrect + +adds --with-grofferdir= configure option + +Resolves: #678572 +Author: Jan Vcelak <[email protected]> + +diff -uNPrp groff-1.21/configure groff-1.21.fixed/configure +--- groff-1.21/configure 2010-12-31 08:33:20.000000000 +0100 ++++ groff-1.21.fixed/configure 2011-03-21 10:45:25.100074487 +0100 +@@ -648,6 +648,7 @@ PSPRINT + LPQ + LP + LPR ++groffer_dir + appresdir + XLIBDIRS + XPROGDIRS +@@ -715,6 +716,7 @@ ac_user_opts=' + enable_option_checking + with_x + with_appresdir ++with_grofferdir + with_gnu_ld + enable_rpath + with_libiconv_prefix +@@ -1362,6 +1363,7 @@ Optional Packages: + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-x use the X Window System + --with-appresdir=DIR X11 application resource files ++ --with-grofferdir=DIR groffer files location + --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib + --without-libiconv-prefix don't search for libiconv in includedir and libdir +@@ -5446,6 +5448,18 @@ EOF + fi + fi + ++ ++# Check whether --with-grofferdir was given. ++if test "${with_grofferdir+set}" = set; then : ++ withval=$with_grofferdir; ++fi ++ ++if test "x$with_grofferdir" = "x"; then ++ groffer_dir=$libdir/groff/groffer ++ else ++ groffer_dir=$with_grofferdir ++ fi ++ + if test -z "$PSPRINT"; then + for ac_prog in lpr + do +diff -uNPrp groff-1.21/configure.ac groff-1.21.fixed/configure.ac +--- groff-1.21/configure.ac 2010-12-31 08:33:08.000000000 +0100 ++++ groff-1.21.fixed/configure.ac 2011-03-21 10:43:32.249906873 +0100 +@@ -59,6 +59,8 @@ GROFF_OS390 + GROFF_X11 + GROFF_APPRESDIR_OPTION + GROFF_APPRESDIR_DEFAULT ++GROFF_GROFFERDIR_OPTION ++GROFF_GROFFERDIR_DEFAULT + GROFF_PRINT + AC_PROG_EGREP + AC_PATH_PROG([PERLPATH], [perl], [/usr/bin/perl]) +diff -uNPrp groff-1.21/contrib/groffer/Makefile.sub groff-1.21.fixed/contrib/groffer/Makefile.sub +--- groff-1.21/contrib/groffer/Makefile.sub 2010-12-31 08:33:09.000000000 +0100 ++++ groff-1.21.fixed/contrib/groffer/Makefile.sub 2011-03-21 10:56:57.142842476 +0100 +@@ -63,8 +63,6 @@ GROFFER_REST=$(srcdir)/roff2.man \ + GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/perl/||g'` + GROFFER_SHELL_=`echo $(GROFFER_SHELL) | sed 's|$(srcdir)/shell||g'` + +-groffer_dir=$(libdir)/groff/groffer +- + # TODO: Add perl check to configure script. + groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \ + $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT) +@@ -75,6 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL + -e "s|@g@|$(g)|g" \ + -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ + -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ ++ -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ + -e "s|@VERSION@|$(version)$(revision)|g" \ + -e "$(SH_SCRIPT_SED_CMD)" \ + $(srcdir)/perl/groffer.pl >$@; \ +@@ -89,6 +88,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL + -e "s|@g@|$(g)|g" \ + -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ + -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ ++ -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ + -e "s|@VERSION@|$(version)$(revision)|g" \ + -e "$(SH_SCRIPT_SED_CMD)" \ + $(srcdir)/shell/groffer.sh >$@; \ +diff -uNPrp groff-1.21/contrib/groffer/perl/groffer.pl groff-1.21.fixed/contrib/groffer/perl/groffer.pl +--- groff-1.21/contrib/groffer/perl/groffer.pl 2010-12-31 08:33:09.000000000 +0100 ++++ groff-1.21.fixed/contrib/groffer/perl/groffer.pl 2011-03-21 10:20:21.865418634 +0100 +@@ -132,8 +132,7 @@ BEGIN { + $at_at{'BINDIR'} = '@BINDIR@'; + $at_at{'G'} = '@g@'; + $at_at{'LIBDIR'} = '@libdir@'; +- $groffer_libdir = +- File::Spec->catdir($at_at{'LIBDIR'}, 'groff', 'groffer'); ++ $groffer_libdir = '@groffer_dir@'; + $file_perl_test_pl = File::Spec->catfile($groffer_libdir, + 'perl_test.pl'); + $File_version_sh = File::Spec->catfile($groffer_libdir, 'version.sh'); +diff -uNPrp groff-1.21/Makefile.in groff-1.21.fixed/Makefile.in +--- groff-1.21/Makefile.in 2010-12-31 08:33:08.000000000 +0100 ++++ groff-1.21.fixed/Makefile.in 2011-03-21 10:53:51.551854122 +0100 +@@ -188,6 +188,8 @@ localtmacdir=$(dataprogramdir)/site-tmac + # gxditview. + appresdir=@appresdir@ + ++groffer_dir=@groffer_dir@ ++ + # `tmacpath' says where to look for macro files. + # The current directory will be prepended in unsafe mode only; the home + # directory will be always added. +@@ -493,6 +495,7 @@ MDEFINES= \ + "YACC=$(YACC)" \ + "YACCFLAGS=$(YACCFLAGS)" \ + "appresdir=$(appresdir)" \ ++ "groffer_dir=$(groffer_dir)" \ + "bindir=$(bindir)" \ + "common_words_file=$(common_words_file)" \ + "datadir=$(datadir)" \ +diff -uNPrp groff-1.21/m4/groff.m4 groff-1.21.fixed/m4/groff.m4 +--- groff-1.21/m4/groff.m4 2010-12-31 08:33:09.000000000 +0100 ++++ groff-1.21.fixed/m4/groff.m4 2011-03-21 10:54:17.716429483 +0100 +@@ -1193,3 +1193,19 @@ AC_DEFUN([GROFF_APPRESDIR_CHECK], + ]) + fi + fi]) ++ ++ ++# Set up the `--with-grofferdir' command line option. ++ ++AC_DEFUN([GROFF_GROFFERDIR_OPTION], ++ [AC_ARG_WITH([grofferdir], ++ AS_HELP_STRING([--with-grofferdir=DIR], ++ [groffer files location]))]) ++ ++AC_DEFUN([GROFF_GROFFERDIR_DEFAULT], ++ [if test "x$with_grofferdir" = "x"; then ++ groffer_dir=$libdir/groff/groffer ++ else ++ groffer_dir=$with_grofferdir ++ fi ++ AC_SUBST([groffer_dir])]) ================================================================ Index: packages/groff/groff-grotty-wc-no-sgr.patch diff -u /dev/null packages/groff/groff-grotty-wc-no-sgr.patch:1.1 --- /dev/null Tue Aug 30 19:53:07 2011 +++ packages/groff/groff-grotty-wc-no-sgr.patch Tue Aug 30 19:53:01 2011 @@ -0,0 +1,58 @@ +Fix handling of wide characters in no-SGR mode. + +Fixes: #712904 Japanese bold/underlined text not displayed correctly + +Patch from upstream CVS: + +2011-01-20 Colin Watson <[email protected]> + + Fix handling of wide characters in no-SGR mode. + + * src/devices/grotty/tty.cpp (tty_printer::make_underline): Only + emit a single backspace in no-SGR mode. less (at least) backspaces + over a character at a time. + (tty_printer::make_bold): Likewise. + +Index: src/devices/grotty/tty.cpp +=================================================================== +RCS file: /sources/groff/groff/src/devices/grotty/tty.cpp,v +retrieving revision 1.23 +retrieving revision 1.24 +diff -u -r1.23 -r1.24 +--- a/src/devices/grotty/tty.cpp 13 Dec 2010 17:42:28 -0000 1.23 ++++ b/src/devices/grotty/tty.cpp 20 Jan 2011 07:13:57 -0000 1.24 +@@ -1,6 +1,6 @@ + // -*- C++ -*- +-/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +- 2010 ++/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005, 2006, ++ 2009-2011 + Free Software Foundation, Inc. + Written by James Clark ([email protected]) + +@@ -311,11 +311,8 @@ + if (!w) + warning("can't underline zero-width character"); + else { +- int n = w / font::hor; +- for (int i = 0; i < n; i++) +- putchar('_'); +- for (int j = 0; j < n; j++) +- putchar('\b'); ++ putchar('_'); ++ putchar('\b'); + } + } + else { +@@ -337,10 +334,8 @@ + if (!w) + warning("can't print zero-width character in bold"); + else { +- int n = w / font::hor; + put_char(c); +- for (int i = 0; i < n; i++) +- putchar('\b'); ++ putchar('\b'); + } + } + else { ================================================================ Index: packages/groff/groff-makefile-typo.patch diff -u /dev/null packages/groff/groff-makefile-typo.patch:1.1 --- /dev/null Tue Aug 30 19:53:07 2011 +++ packages/groff/groff-makefile-typo.patch Tue Aug 30 19:53:01 2011 @@ -0,0 +1,17 @@ +Fixes a typo in Makefile.comm + +Upstream fix: +http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00002.html + +diff -ur groff-1.21.old/Makefile.comm groff-1.21/Makefile.comm +--- groff-1.21.old/Makefile.comm 2010-12-31 08:33:08.000000000 +0100 ++++ groff-1.21/Makefile.comm 2011-01-21 16:19:59.762069900 +0100 +@@ -21,7 +21,7 @@ + # + INCLUDES=-I. -I$(srcdir) \ + -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \ +- -I$(tob_builddir)/src/libs/gnulib/lib ++ -I$(top_builddir)/src/libs/gnulib/lib + ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS) + COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c + ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/groff/groff.spec?r1=1.90&r2=1.91&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
