.
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=225
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
44e2b8c1d4
commit
0fc1f48954
@ -3,7 +3,7 @@ With perl-5.18.2 macros like
|
||||
{\v S}
|
||||
\s S
|
||||
|
||||
do not work. Also fastsort causes trouble.
|
||||
do not work.
|
||||
|
||||
---
|
||||
t/sort-order.t | 24 +-----------------------
|
||||
@ -38,50 +38,3 @@ do not work. Also fastsort causes trouble.
|
||||
}
|
||||
|
||||
@BOOK{L23,
|
||||
--- t/sort-order.t
|
||||
+++ t/sort-order.t 2016-06-14 14:21:07.085073233 +0000
|
||||
@@ -4,7 +4,7 @@ use warnings;
|
||||
use utf8;
|
||||
no warnings 'utf8';
|
||||
|
||||
-use Test::More tests => 15;
|
||||
+use Test::More tests => 14;
|
||||
|
||||
use Biber;
|
||||
use Biber::Output::bbl;
|
||||
@@ -32,7 +32,6 @@ $biber->set_output_obj(Biber::Output::bb
|
||||
# Options - we could set these in the control file but it's nice to see what we're
|
||||
# relying on here for tests
|
||||
Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
|
||||
-Biber::Config->setoption('fastsort', 1);
|
||||
Biber::Config->setblxoption('labelyear', undef);
|
||||
Biber::Config->setblxoption('labelalpha', 0);
|
||||
|
||||
@@ -482,27 +481,6 @@ $section = $biber->sections->get_section
|
||||
is_deeply([$main->get_keys], ['L9','L6','L7','L8','L5','L4','L3','L2','L1B','L1A','L1'], 'nty with descending n');
|
||||
|
||||
|
||||
-# testing case sensitive with fastsort
|
||||
-# In alphabetic, all uppercase comes before lower so the
|
||||
-# "sortcase => 1" on location means that "edinburgh" sorts at the end after "London"
|
||||
-# Take this out of the location sorting spec and it fails as it should
|
||||
-$S = { spec => [
|
||||
- [
|
||||
- {sortcase => 1},
|
||||
- {'location' => {}}
|
||||
- ]
|
||||
- ]};
|
||||
-
|
||||
-$main->set_sortscheme($S);
|
||||
-
|
||||
-$biber->set_output_obj(Biber::Output::bbl->new());
|
||||
-# Have to set locale to something which understands lexical/case differences for this test
|
||||
-# otherwise testing on Windows doesn't work ...
|
||||
-Biber::Config->setoption('sortlocale', 'C.UTF-8');
|
||||
-$biber->prepare;
|
||||
-$section = $biber->sections->get_section(0);
|
||||
-is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
|
||||
-
|
||||
# Test nosort option
|
||||
$S = { spec => [
|
||||
[
|
||||
|
||||
53
biber-perl-pre5.22.0.dif
Normal file
53
biber-perl-pre5.22.0.dif
Normal file
@ -0,0 +1,53 @@
|
||||
Also fastsort causes trouble.
|
||||
|
||||
---
|
||||
t/sort-order.t | 24 +-----------------------
|
||||
1 file changed, 1 insertion(+), 23 deletions(-)
|
||||
|
||||
--- t/sort-order.t
|
||||
+++ t/sort-order.t 2016-06-14 14:21:07.085073233 +0000
|
||||
@@ -4,7 +4,7 @@ use warnings;
|
||||
use utf8;
|
||||
no warnings 'utf8';
|
||||
|
||||
-use Test::More tests => 15;
|
||||
+use Test::More tests => 14;
|
||||
|
||||
use Biber;
|
||||
use Biber::Output::bbl;
|
||||
@@ -32,7 +32,6 @@ $biber->set_output_obj(Biber::Output::bb
|
||||
# Options - we could set these in the control file but it's nice to see what we're
|
||||
# relying on here for tests
|
||||
Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
|
||||
-Biber::Config->setoption('fastsort', 1);
|
||||
Biber::Config->setblxoption('labelyear', undef);
|
||||
Biber::Config->setblxoption('labelalpha', 0);
|
||||
|
||||
@@ -482,27 +481,6 @@ $section = $biber->sections->get_section
|
||||
is_deeply([$main->get_keys], ['L9','L6','L7','L8','L5','L4','L3','L2','L1B','L1A','L1'], 'nty with descending n');
|
||||
|
||||
|
||||
-# testing case sensitive with fastsort
|
||||
-# In alphabetic, all uppercase comes before lower so the
|
||||
-# "sortcase => 1" on location means that "edinburgh" sorts at the end after "London"
|
||||
-# Take this out of the location sorting spec and it fails as it should
|
||||
-$S = { spec => [
|
||||
- [
|
||||
- {sortcase => 1},
|
||||
- {'location' => {}}
|
||||
- ]
|
||||
- ]};
|
||||
-
|
||||
-$main->set_sortscheme($S);
|
||||
-
|
||||
-$biber->set_output_obj(Biber::Output::bbl->new());
|
||||
-# Have to set locale to something which understands lexical/case differences for this test
|
||||
-# otherwise testing on Windows doesn't work ...
|
||||
-Biber::Config->setoption('sortlocale', 'C.UTF-8');
|
||||
-$biber->prepare;
|
||||
-$section = $biber->sections->get_section(0);
|
||||
-is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
|
||||
-
|
||||
# Test nosort option
|
||||
$S = { spec => [
|
||||
[
|
||||
@ -2,7 +2,8 @@
|
||||
Tue Jun 14 13:03:21 UTC 2016 - werner@suse.de
|
||||
|
||||
- Avoid stack smashing deteted on i586 in upmendex/fwrite.c
|
||||
- With perl 5.18 fastsort does not work
|
||||
- Add patch biber-perl-pre5.22.0.dif
|
||||
as with perl 5.18 and below fastsort does not work
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 7 11:35:15 UTC 2016 - werner@suse.de
|
||||
|
||||
14
texlive.spec
14
texlive.spec
@ -19,7 +19,7 @@
|
||||
%define texlive_version 2016
|
||||
%define texlive_previous 2015
|
||||
%define texlive_release 20160523
|
||||
%define texlive_noarch 105
|
||||
%define texlive_noarch 108
|
||||
%define texlive_source texlive-20160523-source
|
||||
|
||||
%define __perl_requires %{nil}
|
||||
@ -253,6 +253,8 @@ Patch20: source-missed-scripts.dif
|
||||
Patch42: biblatex-encoding.dif
|
||||
# PATCH-FIX-SUSE Old problem back: we do not use internal Certs!
|
||||
Patch44: biber-certs.dif
|
||||
# PATCH-FIX-SUSE Make biber work with perl pre 5.22.0
|
||||
Patch45: biber-perl-pre5.22.0.dif
|
||||
# PATCH-FIX-SUSE Make biber work with perl 5.18.2
|
||||
Patch47: biber-perl-5.18.2.dif
|
||||
Prefix: %{_bindir}
|
||||
@ -3297,11 +3299,13 @@ This package is required by the package texlive-biber-bin.
|
||||
pushd ../biblatex-biber-*
|
||||
/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
|
||||
%patch42 -p0 -b .en
|
||||
%patch44 -p0 -b .noica
|
||||
%patch45 -p0 -b .fastsort
|
||||
%if 0%{perl_versnum} < 5200
|
||||
%patch47 -p0 -b .518
|
||||
%endif
|
||||
%patch44 -p0 -b .noica
|
||||
rm -vf bin/biber.noica
|
||||
rm -vf t/*.fastsort
|
||||
popd
|
||||
%endif
|
||||
|
||||
@ -3411,8 +3415,10 @@ popd
|
||||
--enable-shared \
|
||||
%if %{with LuaJIT}
|
||||
--enable-luajittex \
|
||||
--enable-mfluajit \
|
||||
%else
|
||||
--disable-luajittex \
|
||||
--disable-mfluajit \
|
||||
%endif
|
||||
--with-gnu-ld \
|
||||
--with-gnu-libc \
|
||||
@ -4433,8 +4439,12 @@ rm -f /var/run/texlive/run-update
|
||||
%defattr(-,root,root,755)
|
||||
%{_bindir}/mflua
|
||||
%{_bindir}/mflua-nowin
|
||||
%if %{with LuaJIT}
|
||||
%{_bindir}/mfluajit
|
||||
%endif
|
||||
%if %{with LuaJIT}
|
||||
%{_bindir}/mfluajit-nowin
|
||||
%endif
|
||||
|
||||
%files mfware-bin
|
||||
%defattr(-,root,root,755)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user