forked from pool/texlive
.
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=148
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
aa3cebead7
commit
61e3c33c35
194
biber-av.patch
Normal file
194
biber-av.patch
Normal file
@ -0,0 +1,194 @@
|
||||
diff --git a/Build.PL b/Build.PL
|
||||
index 104d839..ca3e00c 100644
|
||||
--- a/Build.PL
|
||||
+++ b/Build.PL
|
||||
@@ -40,9 +40,9 @@ my $builder = $class->new(
|
||||
'ExtUtils::LibBuilder' => '0.02'
|
||||
},
|
||||
requires => {
|
||||
+ 'autovivification' => 0,
|
||||
'Data::Dump' => 0,
|
||||
'Data::Compare' => 0,
|
||||
- 'Data::Diver' => 0,
|
||||
'Date::Simple' => 0,
|
||||
'File::Slurp' => 0,
|
||||
'IPC::Cmd' => 0,
|
||||
diff --git a/lib/Biber/Entry.pm b/lib/Biber/Entry.pm
|
||||
index 9c6fc4b..385c90e 100644
|
||||
--- a/lib/Biber/Entry.pm
|
||||
+++ b/lib/Biber/Entry.pm
|
||||
@@ -6,7 +6,6 @@ use warnings;
|
||||
use Biber::Utils;
|
||||
use Biber::Internals;
|
||||
use Biber::Constants;
|
||||
-use Data::Diver qw( Dive );
|
||||
use Data::Dump qw( pp );
|
||||
use Digest::MD5 qw( md5_hex );
|
||||
use Log::Log4perl qw( :no_extra_logdie_message );
|
||||
@@ -322,6 +321,7 @@ sub set_field {
|
||||
=cut
|
||||
|
||||
sub get_field {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my ($key, $form, $lang) = @_;
|
||||
return undef unless $key;
|
||||
@@ -332,9 +332,9 @@ sub get_field {
|
||||
$form = 'original';
|
||||
$lang = 'default';
|
||||
}
|
||||
- return Dive($self, 'datafields', $key, $form, $lang) //
|
||||
- Dive($self, 'derivedfields', $key, $form, $lang) //
|
||||
- Dive($self, 'rawfields', $key);
|
||||
+ return $self->{datafields}{$key}{$form}{$lang} //
|
||||
+ $self->{derivedfields}{$key}{$form}{$lang} //
|
||||
+ $self->{rawfields}{$key};
|
||||
}
|
||||
|
||||
|
||||
@@ -345,11 +345,12 @@ sub get_field {
|
||||
=cut
|
||||
|
||||
sub get_field_forms {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my $key = shift;
|
||||
return undef unless $key;
|
||||
- return Dive($self, 'datafields', $key) ||
|
||||
- Dive($self, 'derivedfields', $key);
|
||||
+ return $self->{datafields}{$key} ||
|
||||
+ $self->{derivedfields}{$key};
|
||||
}
|
||||
|
||||
=head2 get_field_form_names
|
||||
@@ -359,11 +360,12 @@ sub get_field_forms {
|
||||
=cut
|
||||
|
||||
sub get_field_form_names {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my $key = shift;
|
||||
return undef unless $key;
|
||||
- return sort keys %{Dive($self, 'datafields', $key) ||
|
||||
- Dive($self, 'derivedfields', $key) ||
|
||||
+ return sort keys %{$self->{datafields}{$key} ||
|
||||
+ $self->{derivedfields}{$key} ||
|
||||
{}};
|
||||
}
|
||||
|
||||
@@ -374,12 +376,13 @@ sub get_field_form_names {
|
||||
=cut
|
||||
|
||||
sub get_field_form_lang_names {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my ($key, $form) = @_;
|
||||
return undef unless $key;
|
||||
return undef unless $form;
|
||||
- return sort keys %{Dive($self, 'datafields', $key, $form) ||
|
||||
- Dive($self, 'derivedfields', $key, $form) ||
|
||||
+ return sort keys %{$self->{datafields}{$key}{$form} ||
|
||||
+ $self->{derivedfields}{$key}{$form} ||
|
||||
{}};
|
||||
}
|
||||
|
||||
@@ -432,9 +435,10 @@ sub set_rawfield {
|
||||
=cut
|
||||
|
||||
sub get_rawfield {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my $key = shift;
|
||||
- return Dive($self, 'rawfields', $key);
|
||||
+ return $self->{rawfields}{$key};
|
||||
}
|
||||
|
||||
|
||||
@@ -445,11 +449,12 @@ sub get_rawfield {
|
||||
=cut
|
||||
|
||||
sub get_datafield {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my ($key, $form, $lang) = @_;
|
||||
$form = $form || 'original';
|
||||
$lang = $lang || 'default';
|
||||
- return Dive($self, 'datafields', $key, $form, $lang);
|
||||
+ return $self->{datafields}{$key}{$form}{$lang};
|
||||
}
|
||||
|
||||
|
||||
@@ -489,11 +494,12 @@ sub del_datafield {
|
||||
=cut
|
||||
|
||||
sub field_exists {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my $key = shift;
|
||||
- return (Dive($self, 'datafields', $key) ||
|
||||
- Dive($self, 'derivedfields', $key) ||
|
||||
- Dive($self, 'rawfields', $key)) ? 1 : 0;
|
||||
+ return ($self->{datafields}{$key} ||
|
||||
+ $self->{derivedfields}{$key} ||
|
||||
+ $self->{rawfields}{$key}) ? 1 : 0;
|
||||
}
|
||||
|
||||
=head2 field_form_exists
|
||||
@@ -503,11 +509,12 @@ sub field_exists {
|
||||
=cut
|
||||
|
||||
sub field_form_exists {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my ($key, $form) = @_;
|
||||
$form = $form || 'original';
|
||||
- return (Dive($self, 'datafields', $key, $form) ||
|
||||
- Dive($self, 'derivedfields', $key, $form)) ? 1 : 0;
|
||||
+ return ($self->{datafields}{$key}{$form} ||
|
||||
+ $self->{derivedfields}{$key}{$form}) ? 1 : 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -583,11 +590,12 @@ sub count_fields {
|
||||
=cut
|
||||
|
||||
sub has_keyword {
|
||||
+ no autovivification;
|
||||
my $self = shift;
|
||||
my ($keyword, $form, $lang) = @_;
|
||||
$form = $form || 'original';
|
||||
$lang = $lang || 'default';
|
||||
- if (my $keywords = Dive($self, 'datafields', 'keywords', $form, $lang)) {
|
||||
+ if (my $keywords = $self->{datafields}{keywords}{$form}{$lang}) {
|
||||
return (first {$_ eq $keyword} @$keywords) ? 1 : 0;
|
||||
}
|
||||
else {
|
||||
diff --git a/lib/Biber/Internals.pm b/lib/Biber/Internals.pm
|
||||
index 0255ab1..59d7151 100644
|
||||
--- a/lib/Biber/Internals.pm
|
||||
+++ b/lib/Biber/Internals.pm
|
||||
@@ -8,7 +8,6 @@ use Biber::Constants;
|
||||
use Biber::Utils;
|
||||
use Biber::DataModel;
|
||||
use Data::Compare;
|
||||
-use Data::Diver qw( Dive );
|
||||
use List::AllUtils qw( :all );
|
||||
use Log::Log4perl qw(:no_extra_logdie_message);
|
||||
use Digest::MD5 qw( md5_hex );
|
||||
@@ -1104,6 +1103,7 @@ sub _sort_labeltitle {
|
||||
}
|
||||
|
||||
sub _sort_labeldate {
|
||||
+ no autovivification;
|
||||
my ($self, $citekey, $sortelementattributes, $args) = @_;
|
||||
my $ldc = $args->[0]; # labeldate component
|
||||
my $secnum = $self->get_current_section;
|
||||
@@ -1111,7 +1111,7 @@ sub _sort_labeldate {
|
||||
my $be = $section->bibentry($citekey);
|
||||
# re-direct to the right sorting routine for the labeldate component
|
||||
if (my $ldi = $be->get_labeldate_info) {
|
||||
- if (my $ldf = Dive($ldi, 'field', $ldc)) {
|
||||
+ if (my $ldf = $ldi->{field}{$ldc}) {
|
||||
# Don't process attributes as they will be processed in the real sub
|
||||
return $self->_dispatch_sorting($ldf, $citekey, $sortelementattributes);
|
||||
}
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 2 09:31:02 UTC 2013 - werner@suse.de
|
||||
|
||||
- Add patch biber-av.patch form upstream to avoid Data::Diver perl
|
||||
module and use autovivification
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 20 09:44:09 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
|
||||
13
texlive.spec
13
texlive.spec
@ -19,7 +19,7 @@
|
||||
%define texlive_version 2013
|
||||
%define texlive_previous 2011
|
||||
%define texlive_release 20130620
|
||||
%define texlive_noarch 75
|
||||
%define texlive_noarch 77
|
||||
%define texlive_source texlive-20130620-source
|
||||
|
||||
%define __perl_requires %{nil}
|
||||
@ -152,14 +152,14 @@ BuildRequires: zlib-devel
|
||||
BuildRequires: zziplib-devel
|
||||
%if %{with buildbiber}
|
||||
%define perl_version %(rpm -q --qf '%{VERSION}' perl)
|
||||
#BuildRequires: perl(Business::ISBN)
|
||||
BuildRequires: perl(autovivification)
|
||||
#BuildRequires: perl(Business::ISBN)
|
||||
BuildRequires: perl-Business-ISBN
|
||||
BuildRequires: perl-Business-ISBN-Data
|
||||
BuildRequires: perl(Business::ISMN)
|
||||
BuildRequires: perl(Business::ISSN)
|
||||
BuildRequires: perl(Config::AutoConf) >= 0.15
|
||||
BuildRequires: perl(Data::Compare)
|
||||
BuildRequires: perl(Data::Diver)
|
||||
BuildRequires: perl(Data::Dump)
|
||||
BuildRequires: perl(Date::Simple)
|
||||
BuildRequires: perl(Encode::EUCJPASCII)
|
||||
@ -177,7 +177,6 @@ BuildRequires: perl(List::AllUtils)
|
||||
BuildRequires: perl(List::MoreUtils)
|
||||
BuildRequires: perl(Log::Log4perl)
|
||||
BuildRequires: perl(Module::Build)
|
||||
#BuildRequires: perl(Mozilla::CA)
|
||||
BuildRequires: perl(PAR::Packer)
|
||||
BuildRequires: perl(Readonly::XS)
|
||||
BuildRequires: perl(Readonly::XS)
|
||||
@ -224,6 +223,8 @@ Patch40: biber-dev.patch
|
||||
Patch41: biber-certs.dif
|
||||
# PATCH-FIX-UPSTREAM Make biber work with out perl
|
||||
Patch42: biblatex-encoding.dif
|
||||
# PATCH-FIX-UPSTREAM Make biber work without Data::diver perl module but autovivification
|
||||
Patch43: biber-av.patch
|
||||
Prefix: %{_bindir}
|
||||
|
||||
%{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)}
|
||||
@ -2236,6 +2237,7 @@ pushd ../biblatex-biber-*
|
||||
%patch40 -p0 -b .dev
|
||||
%patch41 -p0 -b .ca
|
||||
%patch42 -p0 -b .en
|
||||
%patch43 -p1 -b .av
|
||||
popd
|
||||
%endif
|
||||
|
||||
@ -2786,8 +2788,6 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || :
|
||||
%files
|
||||
%defattr(-,root,root,755)
|
||||
%if 0%{texlive_version} >= 2013
|
||||
%dir %{_datadir}/tlpkg
|
||||
%dir %{_datadir}/tlpkg/TeXLive
|
||||
%{_datadir}/tlpkg/TeXLive/TLConfig.pm
|
||||
%{_datadir}/tlpkg/TeXLive/TLUtils.pm
|
||||
%else
|
||||
@ -3003,7 +3003,6 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || :
|
||||
|
||||
%files dvipdfmx-bin
|
||||
%defattr(-,root,root,755)
|
||||
%dir %{_texmfdistdir}/scripts/texlive
|
||||
%{_bindir}/dvipdfm
|
||||
%{_bindir}/dvipdfmx
|
||||
%{_bindir}/rungs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user