Attachment 949268 Details for Bug 1154436 – texi2html-EastAsianWidth-libintl.patch

[patch] texi2html-EastAsianWidth-libintl.patch

texi2html-EastAsianWidth-libintl.patch (text/plain), 6.80 KB, created by Jens Petersen on 2014-10-22 07:26:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2014-10-22 07:26:55 UTC

Size: 6.80 KB

patch

obsolete

>diff --git a/texi2html-5.0-external-EastAsianWidth-libintl.patch b/texi2html-5.0-external-EastAsianWidth-libintl.patch
>new file mode 100644
>index 0000000..b293ae2
>--- /dev/null
>+++ b/texi2html-5.0-external-EastAsianWidth-libintl.patch
>@@ -0,0 +1,113 @@
>+--- texi2html-5.0/Makefile.in~	2010-07-01 05:33:28.000000000 +0900
>++++ texi2html-5.0/Makefile.in	2014-10-22 13:03:43.243138013 +0900
>+@@ -88,7 +88,6 @@
>+ 	examples/bib-example.texi \
>+ 	examples/glossary.texi \
>+ 	examples/style_example.css \
>+-	lib \
>+ 	po_messages/Makevars.in \
>+ 	po_messages/POTFILES.in.in \
>+ 	po_document/Makevars.in \
>+@@ -259,17 +259,6 @@
>+ install-data-local: i18n
>+ 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/i18n
>+ 	$(INSTALL_DATA) i18n/*.thl  $(DESTDIR)$(pkgdatadir)/i18n
>+-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
>+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
>+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \
>+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale
>+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \
>+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
>+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \
>+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
>+-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
>+-	$(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
>+-	 $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
>+ 
>+ uninstall-local:
>+ 	rm -rf $(DESTDIR)$(pkgdatadir)/lib/ $(DESTDIR)$(pkgdatadir)/i18n
>+--- texi2html-5.0/texi2html.pl~	2010-07-01 07:01:27.000000000 +0900
>++++ texi2html-5.0/texi2html.pl	2014-10-22 14:18:58.253899462 +0900
>+@@ -1944,51 +1944,14 @@
>+ 
>+ if (Texi2HTML::Config::get_conf('use_nls'))
>+ {
>+-    if ($0 =~ /\.pl$/)
>+-    { # use in-source libintl when testing
>+-        unshift @INC, "$T2H_HOME/lib/libintl-perl/lib";
>+-    }
>+-    elsif ($ENV{T2H_SOURCE_LIBINTL})
>+-    {
>+-        unshift @INC, $ENV{T2H_SOURCE_LIBINTL};
>+-    }
>+-    elsif ('@USE_EXTERNAL_LIBINTL@' ne 'yes')
>+-    {
>+-        unshift @INC, "$pkgdatadir/lib/libintl-perl/lib";
>+-    }
>+-    else
>+-    {
>+-        eval {
>+-            require Locale::Messages;
>+-        };
>+-        if ($@)
>+-        {
>+-            unshift @INC, "$pkgdatadir/lib/libintl-perl/lib";
>+-        }
>+-    }
>+     # gettext-like translations
>+     #require Locale::TextDomain;
>+     require Locale::Messages;
>+     # we want a reliable way to switch locale, so we don't use the system 
>+     # gettext.
>+     Locale::Messages->select_package ('gettext_pp');
>+-    if ($0 =~ /\.pl$/)
>+-    {
>+-         # in case of out of source build, the locales directory should 
>+-         # be two levels below. $T2H_HOME is in srcdir.
>+-         foreach my $locales_dir ("$T2H_HOME/locales", "../../locales")
>+-         {
>+-             if (-d $locales_dir)
>+-             {
>+-                  Locale::Messages::bindtextdomain ($strings_textdomain, $locales_dir);
>+-                  last;
>+-             }
>+-        }
>+-    }
>+-    else
>+-    { # match where gettext installs
>++    # match where gettext installs
>+         Locale::Messages::bindtextdomain ($strings_textdomain, "$datadir/locale");
>+-    }
>+     # simply bind error messages to the installation directory.
>+     # Messages should be untranslated for tests.
>+     Locale::Messages::bindtextdomain ($messages_textdomain, "$datadir/locale");
>+@@ -4137,29 +4100,6 @@
>+     require Unicode::Normalize;
>+     Encode->import('encode');
>+ 
>+-    # use EastAsianWidth if USE_UNICODE is set
>+-    if ($0 =~ /\.pl$/)
>+-    { # use in-source EastAsianWidth when testing
>+-        unshift @INC, "$T2H_HOME/lib/Unicode-EastAsianWidth/lib";
>+-    }
>+-    elsif ($ENV{T2H_SOURCE_EASTASIANWIDTH})
>+-    {
>+-        unshift @INC, $ENV{T2H_SOURCE_EASTASIANWIDTH};
>+-    }
>+-    elsif ('@USE_EXTERNAL_EASTASIANWIDTH@' ne 'yes')
>+-    {
>+-        unshift @INC, "$pkgdatadir/lib/Unicode-EastAsianWidth/lib";
>+-    }
>+-    else
>+-    {
>+-        eval {
>+-            require Unicode::EastAsianWidth;
>+-        };
>+-        if ($@)
>+-        {
>+-            unshift @INC, "$pkgdatadir/lib/Unicode-EastAsianWidth/lib";
>+-        }
>+-    }
>+     # unicode east asian character width tables.
>+     require Unicode::EastAsianWidth;
>+ }
>diff --git a/texi2html.spec b/texi2html.spec
>index 2389cae..3bfe7cf 100644
>--- a/texi2html.spec
>+++ b/texi2html.spec
>@@ -1,6 +1,6 @@
> Name: texi2html
> Version: 5.0
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> # GPLv2+ is for the code
> # OFSFDL (Old FSF Documentation License) for the documentation
> # CC-BY-SA or GPLv2 for the images
>@@ -8,6 +8,7 @@ License: GPLv2+ and OFSFDL and (CC-BY-SA or GPLv2)
> Group: Applications/Text
> Summary: A highly customizable texinfo to HTML and other formats translator
> Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.bz2
>+Patch0: texi2html-5.0-external-EastAsianWidth-libintl.patch
> URL: http://www.nongnu.org/texi2html/
> Requires(post): /sbin/install-info
> Requires(preun): /sbin/install-info
>@@ -15,9 +16,17 @@ Requires: perl >= 5.004
> Requires: latex2html
> BuildRequires: latex2html tetex-tex4ht gettext
> BuildRequires: perl(Data::Dumper) perl(Text::Unidecode)
>+%if 0%{?fedora} >= 21
>+BuildRequires: perl(Locale::Messages)
>+BuildRequires: perl(Unicode::EastAsianWidth)
>+%endif
> # not detected automatically because it is required at runtime based on
> # user configuration
> Requires: perl(Text::Unidecode)
>+%if 0%{?fedora} >= 21
>+Requires: perl(Locale::Messages)
>+Requires: perl(Unicode::EastAsianWidth)
>+%endif
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch: noarch
> 
>@@ -30,7 +39,15 @@ output not specified in the Texinfo input file to be specified.
> %prep
> %setup -q
> 
>+%if 0%{?fedora} >= 21
>+%patch0 -p1 -b .orig
>+# remove bundled libs
>+rm -r lib
>+%endif
>+
> %build
>+# --with-external-Unicode-EastAsianWidth and --with-external-libintl-perl
>+# still install the libs, so they don't really help enough
> %configure
> make %{?_smp_mflags}
> 
>@@ -72,12 +89,18 @@ fi
> %{_datadir}/%{name}/i18n/*
> %dir %{_datadir}/%{name}/images/
> %{_datadir}/%{name}/images/*
>+%if 0%{?fedora} < 21
> %dir %{_datadir}/%{name}/lib
> %{_datadir}/%{name}/lib/*
>+%endif
> %dir %{_datadir}/texinfo
> %dir %{_sysconfdir}/texinfo
> 
> %changelog
>+* Wed Oct 22 2014 Jens Petersen <petersen@redhat.com> - 5.0-2
>+- use perl-Unicode-EastAsianWidth and perl-libintl on F21+
>+  instead of bundled libs (#1154436)
>+
> * Mon Sep 08 2014 Phil Knirsch <pknirsch@redhat.com> - 5.0-1
> - Update to texi2html-5.0 (#820697)
> 
>@@ -170,5 +193,5 @@ fi
> * Mon Jan 10 2005 MATSUURA Takanori <t-matsuu@estyle.ne.jp> - 1.72-1.fc3
> - initial build for Fedora Core 3 based on spec file in source tarball
> 
>-* Mon Mar 23 2004 Patrice Dumas <pertusus@free.fr> 0:1.69-0.fdr.1
>+* Tue Mar 23 2004 Patrice Dumas <pertusus@free.fr> 0:1.69-0.fdr.1
> - Initial build.

Actions: View | Diff

Attachments on bug 1154436: 949268