Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=10acf41ca2ba717ddfbe411b02d8744c2198f8b8
commit 10acf41ca2ba717ddfbe411b02d8744c2198f8b8 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Mon Feb 25 01:43:14 2008 +0100 po4a-0.32-2-i686 added patches from cvs to fix build with perl-5.10 diff --git a/source/devel-extra/po4a/FrugalBuild b/source/devel-extra/po4a/FrugalBuild index fe223b8..7ac4638 100644 --- a/source/devel-extra/po4a/FrugalBuild +++ b/source/devel-extra/po4a/FrugalBuild @@ -4,7 +4,7 @@ pkgname=po4a pkgver=0.32 rel_id=2108 -pkgrel=1 +pkgrel=2 pkgdesc="Eases translation work, and in particular the maintenance of translations." url="http://po4a.alioth.debian.org/"; depends=('perl-gettext' 'perl-text-wrapi18n') @@ -12,5 +12,8 @@ makedepends=('perl-module-build') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://alioth.debian.org/projects/po4a/|grep ' po4a'|sed 's/.*po4a \([^ ]*\) .*/\1/'" -source=(http://alioth.debian.org/download.php/$rel_id/$pkgname-$pkgver.tar.gz) -sha1sums=('890ccfd513530f5cfda3efd5d33aab9874f7104a') +source=(http://alioth.debian.org/download.php/$rel_id/$pkgname-$pkgver.tar.gz \ + po4a-1.patch po4a-2.patch) +sha1sums=('890ccfd513530f5cfda3efd5d33aab9874f7104a' \ + 'a697b7c77edc980dbb903a83c28be6469dbf2096' \ + '0dffc7b1065dd5bb4008ba23826e6a02d9442ea2') diff --git a/source/devel-extra/po4a/po4a-1.patch b/source/devel-extra/po4a/po4a-1.patch new file mode 100644 index 0000000..6451b78 --- /dev/null +++ b/source/devel-extra/po4a/po4a-1.patch @@ -0,0 +1,64 @@ +--- po4a-0.32-ORIG/po4a 2008-01-06 16:00:14.000000000 +0100 ++++ po4a-0.32/po4a 2008-01-06 16:08:19.000000000 +0100 +@@ -440,10 +440,10 @@ + $opts{"msgmerge-opt"} .= " --previous" if $previous; + + # options to transmit to the modules +- %{$opts{"options"}} = ( ++ $opts{"options"} = { + "verbose" => $opts{"verbose"}, + "debug" => $opts{"debug"} +- ); ++ }; + foreach (@options) { + if (m/^([^=]*)=(.*)$/) { + $opts{"options"}{$1}="$2"; +@@ -498,10 +498,10 @@ + if (! defined $lang) { + $lang = "global"; + } +- if (! defined ${%$options}{$lang}) { +- ${%$options}{$lang} = $opt; ++ if (! defined $options->{$lang}) { ++ $options->{$lang} = $opt; + } else { +- ${%$options}{$lang} .= " $opt"; ++ $options->{$lang} .= " $opt"; + } + } else { + last; +@@ -638,20 +638,20 @@ + my %options; + # 1. Use the global options ([opt] ...) + %options = %{$document{''}{'options'}} +- if defined %{$document{''}{'options'}}; ++ if defined $document{''}{'options'}; + + # 2. Merge the alias options + if (defined $aliases{$1}) { + $document{$main}{'format'} = $aliases{$1}{"module"}; +- if (defined %{$aliases{$1}{"options"}}) { +- %options = %{$aliases{$1}{"options"}}; ++ if (defined $aliases{$1}{"options"}) { ++ %options = %{$aliases{$1}{"options"}}; # XXX not a merge, but overwrite + } + } + + # 3. If this file was already specified, reuse the previous + # options (no merge) + %options = %{$document{$main}{'options'}} +- if defined %{$document{$main}{'options'}}; ++ if defined $document{$main}{'options'}; + + # 4. Merge the document specific options + # separate the end of the line, which contains options. +@@ -697,7 +697,7 @@ + $o =~ s/.*?\[options\] +//; + parse_config_options("$config_file:$nb", + $o, +- \%{$document{''}{"options"}}); ++ $document{''}{"options"}); + } else { + die wrap_ref_mod("$config_file:$nb", "", + gettext("Unparsable command '%s'."), $cmd); + diff --git a/source/devel-extra/po4a/po4a-2.patch b/source/devel-extra/po4a/po4a-2.patch new file mode 100644 index 0000000..f4e5b38 --- /dev/null +++ b/source/devel-extra/po4a/po4a-2.patch @@ -0,0 +1,14 @@ +--- po4a-0.32-ORIG/lib/Locale/Po4a/Common.pm 2008-01-06 16:00:14.000000000 +0100 ++++ po4a-0.32/lib/Locale/Po4a/Common.pm 2008-01-06 16:09:59.000000000 +0100 +@@ -192,8 +192,8 @@ + BEGIN { + if (eval { require Locale::gettext }) { + import Locale::gettext; +- use POSIX; +- setlocale(LC_MESSAGES, ''); ++ require POSIX; ++ POSIX::setlocale(&POSIX::LC_MESSAGES, ''); + } else { + eval ' + sub bindtextdomain($$) { } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
