Dr. Werner Fink 2019-05-14 11:18:44 +00:00 committed by Git OBS Bridge
parent 426f8dc69c
commit cde74b90f7
3 changed files with 1139 additions and 3 deletions

1120
source-poppler0.59.0.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 14 10:15:40 UTC 2019 - Dr. Werner Fink <werner@suse.de>
- Add patch source-poppler0.59.0.patch to support older systems
as well
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 14 08:29:47 UTC 2019 - Dr. Werner Fink <werner@suse.de> Tue May 14 08:29:47 UTC 2019 - Dr. Werner Fink <werner@suse.de>

View File

@ -261,8 +261,10 @@ Patch42: biblatex-encoding.dif
Patch44: biber-certs.dif Patch44: biber-certs.dif
# PATCH-FIX-SUSE Make biber work with perl 5.18.2 # PATCH-FIX-SUSE Make biber work with perl 5.18.2
Patch47: biber-perl-5.18.2.dif Patch47: biber-perl-5.18.2.dif
# PATCH-FIX-SUSE Support older poppler version as well
Patch53: source-poppler0.59.0.patch
# PATCH-FIX-TEXLIVE # PATCH-FIX-TEXLIVE
Patch53: source-fix-const-poppler0.66.0.patch Patch54: source-fix-const-poppler0.66.0.patch
# PATCH-FIX-TEXLIVE # PATCH-FIX-TEXLIVE
Patch55: source-fix-bool-poppler.patch Patch55: source-fix-bool-poppler.patch
# PATCH-FIX-TEXLIVE # PATCH-FIX-TEXLIVE
@ -3648,8 +3650,9 @@ rm -vf t/*.fastsort
popd popd
%endif %endif
%patch53 -p0 -b .poppler0590
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.59.0}}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.59.0}}%{!?pkg_vcmp:0}
%patch53 -p0 -b .poppler %patch54 -p0 -b .poppler
%patch55 -p1 -b .popplerbool %patch55 -p1 -b .popplerbool
%endif %endif
%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.72.0}}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.72.0}}%{!?pkg_vcmp:0}
@ -3661,13 +3664,20 @@ popd
if pkg-config --atleast-version=0.59 poppler if pkg-config --atleast-version=0.59 poppler
then then
for cc in $(find -name '*newpoppler.cc') for cc in $(find -name '*-newpoppler.cc')
do do
test -e "$cc" || continue test -e "$cc" || continue
old=${cc/-newpoppler/} old=${cc/-newpoppler/}
test -e "$old" && mv -fv $old $old.oldpoppler || : test -e "$old" && mv -fv $old $old.oldpoppler || :
mv -fv $cc $old mv -fv $cc $old
done done
for cc in $(find -name '*-poppler0.59.0.cc')
do
test -e "$cc" || continue
old=${cc/-poppler0.59.0/}
test -e "$old" && mv -fv $old $old.oldpoppler || :
mv -fv $cc $old
done
pver=$(pkg-config --modversion poppler) pver=$(pkg-config --modversion poppler)
for cc in $(find -name "*-poppler${pver}.cc") for cc in $(find -name "*-poppler${pver}.cc")
do do