diff --git a/texlive-stdc++11.patch b/texlive-stdc++11.patch new file mode 100644 index 0000000..4b03cf5 --- /dev/null +++ b/texlive-stdc++11.patch @@ -0,0 +1,12 @@ +diff -up texlive-2012/source/texk/dvisvgm/dvisvgm-1.0.12/src/DVIToSVG.cpp.stdc++11 texlive-2012/source/texk/dvisvgm/dvisvgm-1.0.12/src/DVIToSVG.cpp +--- texlive-2012/source/texk/dvisvgm/dvisvgm-1.0.12/src/DVIToSVG.cpp.stdc++11 2012-11-07 14:24:46.000000000 +0100 ++++ texlive-2012/source/texk/dvisvgm/dvisvgm-1.0.12/src/DVIToSVG.cpp 2012-11-07 20:49:12.440647310 +0100 +@@ -185,7 +185,7 @@ void DVIToSVG::beginPage (unsigned n, In + Message::mstream().indent(0); + Message::mstream(false, Message::MC_PAGE_NUMBER) << "processing page " << n << " [" << c[0] << ']'; + Message::mstream().indent(1); +- _svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm "VERSION_STR" ")); ++ _svg.appendToDoc(new XMLCommentNode(" This file was generated by dvisvgm ")); + _svg.appendToDoc(new XMLCommentNode(" " + datetime() + " ")); + } + } diff --git a/texlive.spec b/texlive.spec index 9abb2d1..723b857 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,6 +1,6 @@ -%global source_date 20121024_r28063 +%global source_date 20121107_r28202 %global tl_version 2012 -%global tl_rel 5 +%global tl_rel 6 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -40,6 +40,7 @@ Obsoletes: texlive-texmf-errata-east-asian < %{tl_version}, texlive-texmf-errata Obsoletes: texlive-texmf-errata-latex < %{tl_version}, texlive-texmf-errata-xetex < %{tl_version} Conflicts: texlive-dvips = 2007 Patch1: tl-kpfix.patch +Patch2: texlive-stdc++11.patch Source0: %{source_name}.tar.xz Source1: tl2rpm.c Source2: texlive.tlpdb @@ -173124,13 +173125,14 @@ distribution. xz -dc %{SOURCE0} | tar x [ -e %{source_name} ] && mv %{source_name} source %patch1 -p0 +%patch2 -p1 for l in `unxz -c %{SOURCE3} | tar t`; do ln -s %{_texdir}/licenses/$l $l done %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11" cd source PREF=`pwd`/inst mkdir -p work @@ -297862,6 +297864,10 @@ fi %{_libdir}/*.so %changelog +* Wed Nov 7 2012 Jindrich Novy 2012-6-20121107 +- use -std=c++11 for all C++ apps in texlive to avoid symbol problems +(thanks to Jakub Jelinek) + * Sun Nov 4 2012 Jindrich Novy 2012-5-20121024 - don't conflict with latexmk (#868996) - unify versioning for both binary and noarch subpackages