From 57e8c20a997f50a76be060cc4284aa14114f0b92 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Aug 20 2014 03:24:01 +0000 Subject: Update to 5.34.20 - Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4) - Do not depend on wine's fonts - Drop patch root-gccopt.patch --- diff --git a/.gitignore b/.gitignore index 5c35620..9ff0650 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /*.tar.gz /*.tar.xz +/usa.root diff --git a/root-doc-latex.patch b/root-doc-latex.patch index c3150a0..c66850f 100644 --- a/root-doc-latex.patch +++ b/root-doc-latex.patch @@ -1,25 +1,25 @@ -diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/src/TEfficiency.cxx ---- root-5.34.09.orig/hist/hist/src/TEfficiency.cxx 2013-06-26 17:05:06.000000000 +0200 -+++ root-5.34.09/hist/hist/src/TEfficiency.cxx 2013-06-27 07:06:03.769693346 +0200 -@@ -2498,7 +2498,7 @@ +diff -ur root-5.34.20.orig/hist/hist/src/TEfficiency.cxx root-5.34.20/hist/hist/src/TEfficiency.cxx +--- root-5.34.20.orig/hist/hist/src/TEfficiency.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/hist/hist/src/TEfficiency.cxx 2014-08-16 22:50:04.139089920 +0200 +@@ -2668,7 +2668,7 @@ //the same process. // //The new weight is set according to: -- //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex -+ //Begin_Latex #frac{1}{w_{new}} = #sum_{i} #frac{1}{w_{i}}End_Latex - - if(!pList->IsEmpty()) { +- //Begin_Latex #frac{1}{w_{new}} = #sum_{i} \frac{1}{w_{i}}End_Latex ++ //Begin_Latex #frac{1}{w_{new}} = #sum_{i} #frac{1}{w_{i}}End_Latex + + if(!pList->IsEmpty()) { TIter next(pList); -@@ -2558,7 +2558,7 @@ +@@ -2728,7 +2728,7 @@ //calculates a new weight: //current weight of this TEfficiency object = Begin_Latex w_{1} End_Latex //weight of rhs = Begin_Latex w_{2} End_Latex - //Begin_Latex w_{new} = \frac{w_{1} \times w_{2}}{w_{1} + w_{2}}End_Latex + //Begin_Latex w_{new} = #frac{w_{1} #times w_{2}}{w_{1} + w_{2}}End_Latex - - if (fTotalHistogram == 0 && fPassedHistogram == 0) { -@@ -2971,11 +2971,11 @@ + + if (fTotalHistogram == 0 && fPassedHistogram == 0) { +@@ -3050,11 +3050,11 @@ //______________________________________________________________________________ void TEfficiency::SetBetaAlpha(Double_t alpha) { @@ -33,10 +33,10 @@ diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/ //End_Latex // //Note: - both shape parameters have to be positive (i.e. > 0) -@@ -2989,11 +2989,11 @@ +@@ -3068,11 +3068,11 @@ //______________________________________________________________________________ void TEfficiency::SetBetaBeta(Double_t beta) - { + { - //sets the shape parameter Begin_Latex \beta End_Latex + //sets the shape parameter Begin_Latex #beta End_Latex // @@ -47,16 +47,14 @@ diff -ur root-5.34.09.orig/hist/hist/src/TEfficiency.cxx root-5.34.09/hist/hist/ //End_Latex // //Note: - both shape parameters have to be positive (i.e. > 0) -@@ -3007,12 +3007,12 @@ +@@ -3086,12 +3086,12 @@ //______________________________________________________________________________ void TEfficiency::SetBetaBinParameters(Int_t bin, Double_t alpha, Double_t beta) { - //sets different shape parameter Begin_Latex \alpha and \beta End_Latex -- // for the prior distribution for each bin. By default the global parameter are used if they are not set -- // for the specific bin -+ //sets different shape parameter Begin_Latex #alpha and #beta End_Latex -+ //for the prior distribution for each bin. By default the global parameter are used if they are not set -+ //for the specific bin ++ //sets different shape parameter Begin_Latex #alpha and #beta End_Latex + // for the prior distribution for each bin. By default the global parameter are used if they are not set + // for the specific bin //The prior probability of the efficiency is given by the beta distribution: //Begin_Latex - // f(\varepsilon;\alpha;\beta) = \frac{1}{B(\alpha,\beta)} \varepsilon^{\alpha-1} (1 - \varepsilon)^{\beta-1} diff --git a/root-fontconfig.patch b/root-fontconfig.patch index 4a5621f..620dffa 100644 --- a/root-fontconfig.patch +++ b/root-fontconfig.patch @@ -1,6 +1,6 @@ -diff -ur root-5.34.18.orig/core/base/src/TApplication.cxx root-5.34.18/core/base/src/TApplication.cxx ---- root-5.34.18.orig/core/base/src/TApplication.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/core/base/src/TApplication.cxx 2014-03-15 18:15:22.756445235 +0100 +diff -ur root-5.34.20.orig/core/base/src/TApplication.cxx root-5.34.20/core/base/src/TApplication.cxx +--- root-5.34.20.orig/core/base/src/TApplication.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/core/base/src/TApplication.cxx 2014-08-16 19:24:53.337132201 +0200 @@ -265,22 +265,11 @@ LoadGraphicsLibs(); @@ -34,9 +34,9 @@ diff -ur root-5.34.18.orig/core/base/src/TApplication.cxx root-5.34.18/core/base // Create WM dependent application environment if (fAppImp) -diff -ur root-5.34.18.orig/graf2d/graf/inc/TTF.h root-5.34.18/graf2d/graf/inc/TTF.h ---- root-5.34.18.orig/graf2d/graf/inc/TTF.h 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf2d/graf/inc/TTF.h 2014-03-15 18:15:22.757445223 +0100 +diff -ur root-5.34.20.orig/graf2d/graf/inc/TTF.h root-5.34.20/graf2d/graf/inc/TTF.h +--- root-5.34.20.orig/graf2d/graf/inc/TTF.h 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf2d/graf/inc/TTF.h 2014-08-16 19:24:53.338132209 +0200 @@ -70,9 +70,8 @@ static FT_BBox fgCBox; // string control box static FT_CharMap fgCharMap[kTTMaxFonts]; // font character map @@ -48,9 +48,9 @@ diff -ur root-5.34.18.orig/graf2d/graf/inc/TTF.h root-5.34.18/graf2d/graf/inc/TT static FT_Face fgFace[kTTMaxFonts]; // font face static TTGlyph fgGlyphs[kMaxGlyphs]; // glyphs static Bool_t fgHinting; // use hinting (true by default) -diff -ur root-5.34.18.orig/graf2d/graf/Module.mk root-5.34.18/graf2d/graf/Module.mk ---- root-5.34.18.orig/graf2d/graf/Module.mk 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf2d/graf/Module.mk 2014-03-15 18:15:22.757445223 +0100 +diff -ur root-5.34.20.orig/graf2d/graf/Module.mk root-5.34.20/graf2d/graf/Module.mk +--- root-5.34.20.orig/graf2d/graf/Module.mk 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf2d/graf/Module.mk 2014-08-16 19:24:53.338132209 +0200 @@ -46,7 +46,7 @@ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ "$(SOFLAGS)" libGraf.$(SOEXT) $@ \ @@ -60,9 +60,9 @@ diff -ur root-5.34.18.orig/graf2d/graf/Module.mk root-5.34.18/graf2d/graf/Module $(GRAFDS): $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP) $(MAKEDIR) -diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/TTF.cxx ---- root-5.34.18.orig/graf2d/graf/src/TTF.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf2d/graf/src/TTF.cxx 2014-03-20 14:27:01.700346310 +0100 +diff -ur root-5.34.20.orig/graf2d/graf/src/TTF.cxx root-5.34.20/graf2d/graf/src/TTF.cxx +--- root-5.34.20.orig/graf2d/graf/src/TTF.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf2d/graf/src/TTF.cxx 2014-08-16 20:48:07.427205257 +0200 @@ -17,15 +17,13 @@ // // ////////////////////////////////////////////////////////////////////////// @@ -299,10 +299,11 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/ - "$(ROOTSYS)/fonts" -# endif - ); + +- char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission); + char *ttfont = NULL; + int ttindex = 0; -- char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission); + if (fontid >= 16 && fontid <= 28) { + // Use the texlive-stix fonts if they exist + // Texlive-stix not packaged correctly - can not be found through fontconfig @@ -350,7 +351,6 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/ + break; + } + } - if (!ttfont) { - Error("TTF::SetTextFont", "font file %s not found in path", fontname); - if (fgFontCount) { @@ -616,38 +616,38 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/ - // Table of Microsoft and (for non-MSFT operating systems) backup - // FreeFont TTF fonts. - static const char *fonttable[][2] = { -- { "Root.TTFont.0", "FreeSansBold.otf" }, -- { "Root.TTFont.1", "FreeSerifItalic.otf" }, -- { "Root.TTFont.2", "FreeSerifBold.otf" }, -- { "Root.TTFont.3", "FreeSerifBoldItalic.otf" }, -- { "Root.TTFont.4", "FreeSans.otf" }, -- { "Root.TTFont.5", "FreeSansOblique.otf" }, -- { "Root.TTFont.6", "FreeSansBold.otf" }, -- { "Root.TTFont.7", "FreeSansBoldOblique.otf" }, -- { "Root.TTFont.8", "FreeMono.otf" }, -- { "Root.TTFont.9", "FreeMonoOblique.otf" }, -- { "Root.TTFont.10", "FreeMonoBold.otf" }, -- { "Root.TTFont.11", "FreeMonoBoldOblique.otf" }, -- { "Root.TTFont.12", "symbol.ttf" }, -- { "Root.TTFont.13", "FreeSerif.otf" }, -- { "Root.TTFont.14", "wingding.ttf" }, -- { "Root.TTFont.15", "symbol.ttf" }, -- { "Root.TTFont.STIXGen", "STIXGeneral.otf" }, -- { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" }, -- { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" }, -- { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" }, -- { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" }, -- { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" }, -- { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" }, -- { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" }, -- { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" }, -- { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" }, -- { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" }, -- { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" }, -- { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" }, -- { "Root.TTFont.ME", "DroidSansFallback.ttf" }, -- { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" }, -- { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" } +- { "Root.TTFont.0", "FreeSansBold.otf" }, +- { "Root.TTFont.1", "FreeSerifItalic.otf" }, +- { "Root.TTFont.2", "FreeSerifBold.otf" }, +- { "Root.TTFont.3", "FreeSerifBoldItalic.otf" }, +- { "Root.TTFont.4", "FreeSans.otf" }, +- { "Root.TTFont.5", "FreeSansOblique.otf" }, +- { "Root.TTFont.6", "FreeSansBold.otf" }, +- { "Root.TTFont.7", "FreeSansBoldOblique.otf" }, +- { "Root.TTFont.8", "FreeMono.otf" }, +- { "Root.TTFont.9", "FreeMonoOblique.otf" }, +- { "Root.TTFont.10", "FreeMonoBold.otf" }, +- { "Root.TTFont.11", "FreeMonoBoldOblique.otf" }, +- { "Root.TTFont.12", "symbol.ttf" }, +- { "Root.TTFont.13", "FreeSerif.otf" }, +- { "Root.TTFont.14", "wingding.ttf" }, +- { "Root.TTFont.15", "symbol.ttf" }, +- { "Root.TTFont.STIXGen", "STIXGeneral.otf" }, +- { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" }, +- { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" }, +- { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" }, +- { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" }, +- { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" }, +- { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" }, +- { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" }, +- { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" }, +- { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" }, +- { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" }, +- { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" }, +- { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" }, +- { "Root.TTFont.ME", "DroidSansFallback.ttf" }, +- { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" }, +- { "Root.TTFont.CJKGothic", "DroidSansFallback.ttf" } - }; - - static int fontset = -1; @@ -685,9 +685,9 @@ diff -ur root-5.34.18.orig/graf2d/graf/src/TTF.cxx root-5.34.18/graf2d/graf/src/ } //______________________________________________________________________________ -diff -ur root-5.34.18.orig/graf2d/postscript/Module.mk root-5.34.18/graf2d/postscript/Module.mk ---- root-5.34.18.orig/graf2d/postscript/Module.mk 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf2d/postscript/Module.mk 2014-03-15 18:15:22.758445211 +0100 +diff -ur root-5.34.20.orig/graf2d/postscript/Module.mk root-5.34.20/graf2d/postscript/Module.mk +--- root-5.34.20.orig/graf2d/postscript/Module.mk 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf2d/postscript/Module.mk 2014-08-16 19:24:53.363132437 +0200 @@ -50,7 +50,7 @@ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ "$(SOFLAGS)" libPostscript.$(SOEXT) $@ \ @@ -697,9 +697,9 @@ diff -ur root-5.34.18.orig/graf2d/postscript/Module.mk root-5.34.18/graf2d/posts $(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP) $(MAKEDIR) -diff -ur root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.18/graf2d/postscript/src/TPostScript.cxx ---- root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf2d/postscript/src/TPostScript.cxx 2014-03-15 18:15:22.759445199 +0100 +diff -ur root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.20/graf2d/postscript/src/TPostScript.cxx +--- root-5.34.20.orig/graf2d/postscript/src/TPostScript.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf2d/postscript/src/TPostScript.cxx 2014-08-16 20:30:03.271041920 +0200 @@ -238,6 +238,7 @@ #include #include @@ -708,43 +708,43 @@ diff -ur root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.18/gr #include "Riostream.h" #include "Byteswap.h" -@@ -1511,78 +1512,258 @@ +@@ -1511,63 +1512,244 @@ { // Embed font in PS file. - static const char *fonttable[32][2] = { -- { "Root.TTFont.0", "FreeSansBold.otf" }, -- { "Root.TTFont.1", "FreeSerifItalic.otf" }, -- { "Root.TTFont.2", "FreeSerifBold.otf" }, -- { "Root.TTFont.3", "FreeSerifBoldItalic.otf" }, -- { "Root.TTFont.4", "FreeSans.otf" }, -- { "Root.TTFont.5", "FreeSansOblique.otf" }, -- { "Root.TTFont.6", "FreeSansBold.otf" }, -- { "Root.TTFont.7", "FreeSansBoldOblique.otf" }, -- { "Root.TTFont.8", "FreeMono.otf" }, -- { "Root.TTFont.9", "FreeMonoOblique.otf" }, -- { "Root.TTFont.10", "FreeMonoBold.otf" }, -- { "Root.TTFont.11", "FreeMonoBoldOblique.otf" }, -- { "Root.TTFont.12", "symbol.ttf" }, -- { "Root.TTFont.13", "FreeSerif.otf" }, -- { "Root.TTFont.14", "wingding.ttf" }, -- { "Root.TTFont.15", "symbol.ttf" }, -- { "Root.TTFont.STIXGen", "STIXGeneral.otf" }, -- { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" }, -- { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" }, -- { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" }, -- { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" }, -- { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" }, -- { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" }, -- { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" }, -- { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" }, -- { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" }, -- { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" }, -- { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" }, -- { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" }, -- { "Root.TTFont.ME", "DroidSansFallback.ttf" }, -- { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" }, -- { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" } +- { "Root.TTFont.0", "FreeSansBold.otf" }, +- { "Root.TTFont.1", "FreeSerifItalic.otf" }, +- { "Root.TTFont.2", "FreeSerifBold.otf" }, +- { "Root.TTFont.3", "FreeSerifBoldItalic.otf" }, +- { "Root.TTFont.4", "FreeSans.otf" }, +- { "Root.TTFont.5", "FreeSansOblique.otf" }, +- { "Root.TTFont.6", "FreeSansBold.otf" }, +- { "Root.TTFont.7", "FreeSansBoldOblique.otf" }, +- { "Root.TTFont.8", "FreeMono.otf" }, +- { "Root.TTFont.9", "FreeMonoOblique.otf" }, +- { "Root.TTFont.10", "FreeMonoBold.otf" }, +- { "Root.TTFont.11", "FreeMonoBoldOblique.otf" }, +- { "Root.TTFont.12", "symbol.ttf" }, +- { "Root.TTFont.13", "FreeSerif.otf" }, +- { "Root.TTFont.14", "wingding.ttf" }, +- { "Root.TTFont.15", "symbol.ttf" }, +- { "Root.TTFont.STIXGen", "STIXGeneral.otf" }, +- { "Root.TTFont.STIXGenIt", "STIXGeneralItalic.otf" }, +- { "Root.TTFont.STIXGenBd", "STIXGeneralBol.otf" }, +- { "Root.TTFont.STIXGenBdIt", "STIXGeneralBolIta.otf" }, +- { "Root.TTFont.STIXSiz1Sym", "STIXSiz1Sym.otf" }, +- { "Root.TTFont.STIXSiz1SymBd", "STIXSiz1SymBol.otf" }, +- { "Root.TTFont.STIXSiz2Sym", "STIXSiz2Sym.otf" }, +- { "Root.TTFont.STIXSiz2SymBd", "STIXSiz2SymBol.otf" }, +- { "Root.TTFont.STIXSiz3Sym", "STIXSiz3Sym.otf" }, +- { "Root.TTFont.STIXSiz3SymBd", "STIXSiz3SymBol.otf" }, +- { "Root.TTFont.STIXSiz4Sym", "STIXSiz4Sym.otf" }, +- { "Root.TTFont.STIXSiz4SymBd", "STIXSiz4SymBol.otf" }, +- { "Root.TTFont.STIXSiz5Sym", "STIXSiz5Sym.otf" }, +- { "Root.TTFont.ME", "DroidSansFallback.ttf" }, +- { "Root.TTFont.CJKMing", "DroidSansFallback.ttf" }, +- { "Root.TTFont.CJKCothic", "DroidSansFallback.ttf" } - }; - PrintStr("%%IncludeResource: ProcSet (FontSetInit)@"); @@ -752,308 +752,288 @@ diff -ur root-5.34.18.orig/graf2d/postscript/src/TPostScript.cxx root-5.34.18/gr - // try to load font (font must be in Root.TTFontPath resource) - const char *ttpath = gEnv->GetValue("Root.TTFontPath", -#ifdef TTFFONTDIR -- TTFFONTDIR +- TTFFONTDIR -#else // TTFFONTDIR -- "$(ROOTSYS)/fonts" +- "$(ROOTSYS)/fonts" -#endif // TTFFONTDIR -- ); +- ); - for (Int_t fontid = 1; fontid < 30; fontid++) { -- if (fontid != 15) { -- const char *filename = gEnv->GetValue( -- fonttable[fontid][0], fonttable[fontid][1]); -- char *ttfont = gSystem->Which(ttpath, filename, -- kReadPermission); -- -- if(!ttfont) { -- Error("TPostScript::FontEmbed", -- "font %d (filename `%s') not found in path", -- fontid, filename); -- } else { -- if (FontEmbedType2(ttfont)) { -- // nothing -- } else if(FontEmbedType1(ttfont)) { -- // nothing -- } else if(FontEmbedType42(ttfont)) { -- // nothing -- } else { -- Error("TPostScript::FontEmbed", -- "failed to embed font %d (filename `%s')", -- fontid, filename); -- } -- delete [] ttfont; -- } -- } -+ if (fontid != 15) { + if (fontid != 15) { +- const char *filename = gEnv->GetValue( +- fonttable[fontid][0], fonttable[fontid][1]); +- char *ttfont = gSystem->Which(ttpath, filename, +- kReadPermission); + -+ char *ttfont = NULL; ++ char *ttfont = NULL; + -+ if (fontid >= 16 && fontid <= 28) { -+ // Use the texlive-stix fonts if they exist -+ // Texlive-stix not packaged correctly - can not be found through fontconfig -+ // Use hardcoded path -+ const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix"; -+ switch (fontid) { -+ case 16: -+ ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission); -+ break; -+ case 17: -+ ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission); -+ break; -+ case 18: -+ ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission); -+ break; -+ case 19: -+ ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission); -+ break; -+ case 20: -+ ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission); -+ break; -+ case 21: -+ ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission); -+ break; -+ case 22: -+ ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission); -+ break; -+ case 23: -+ ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission); -+ break; -+ case 24: -+ ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission); -+ break; -+ case 25: -+ ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission); -+ break; -+ case 26: -+ ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission); -+ break; -+ case 27: -+ ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission); -+ break; -+ case 28: -+ ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission); -+ break; -+ } -+ } -+ -+ if (!ttfont) { -+ FcPattern *pat, *match; -+ FcCharSet *set = NULL; -+ FcResult result; ++ if (fontid >= 16 && fontid <= 28) { ++ // Use the texlive-stix fonts if they exist ++ // Texlive-stix not packaged correctly - can not be found through fontconfig ++ // Use hardcoded path ++ const char *ttpath = "/usr/share/texlive/texmf-dist/fonts/opentype/public/stix"; ++ switch (fontid) { ++ case 16: ++ ttfont = gSystem->Which(ttpath, "STIXGeneral.otf", kReadPermission); ++ break; ++ case 17: ++ ttfont = gSystem->Which(ttpath, "STIXGeneralItalic.otf", kReadPermission); ++ break; ++ case 18: ++ ttfont = gSystem->Which(ttpath, "STIXGeneralBol.otf", kReadPermission); ++ break; ++ case 19: ++ ttfont = gSystem->Which(ttpath, "STIXGeneralBolIta.otf", kReadPermission); ++ break; ++ case 20: ++ ttfont = gSystem->Which(ttpath, "STIXSizOneSymReg.otf", kReadPermission); ++ break; ++ case 21: ++ ttfont = gSystem->Which(ttpath, "STIXSizOneSymBol.otf", kReadPermission); ++ break; ++ case 22: ++ ttfont = gSystem->Which(ttpath, "STIXSizTwoSymReg.otf", kReadPermission); ++ break; ++ case 23: ++ ttfont = gSystem->Which(ttpath, "STIXSizTwoSymBol.otf", kReadPermission); ++ break; ++ case 24: ++ ttfont = gSystem->Which(ttpath, "STIXSizThreeSymReg.otf", kReadPermission); ++ break; ++ case 25: ++ ttfont = gSystem->Which(ttpath, "STIXSizThreeSymBol.otf", kReadPermission); ++ break; ++ case 26: ++ ttfont = gSystem->Which(ttpath, "STIXSizFourSymReg.otf", kReadPermission); ++ break; ++ case 27: ++ ttfont = gSystem->Which(ttpath, "STIXSizFourSymBol.otf", kReadPermission); ++ break; ++ case 28: ++ ttfont = gSystem->Which(ttpath, "STIXSizFiveSymReg.otf", kReadPermission); ++ break; ++ } ++ } + -+ pat = FcPatternCreate (); ++ if (!ttfont) { ++ FcPattern *pat, *match; ++ FcCharSet *set = NULL; ++ FcResult result; + -+ switch (fontid) { -+ case 1: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 2: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 3: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 4: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 5: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 6: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 7: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 8: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 9: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 10: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 11: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 12: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 13: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 14: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 16: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 17: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 18: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 19: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); -+ break; -+ case 20: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ // set = FcCharSetCreate (); -+ // FcCharSetAddChar (set, 0x239b); // Bracket pieces -+ // FcPatternAddCharSet (pat, FC_CHARSET, set); -+ break; -+ case 21: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ // set = FcCharSetCreate (); -+ // FcCharSetAddChar (set, 0x239b); // Bracket pieces -+ // FcPatternAddCharSet (pat, FC_CHARSET, set); -+ break; -+ case 22: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 23: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 24: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 25: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 26: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 27: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 28: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym"); -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ break; -+ case 29: -+ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback"); -+ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); -+ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); -+ set = FcCharSetCreate (); -+ FcCharSetAddChar (set, 0x0410); // Cyrillic -+ FcCharSetAddChar (set, 0x4e00); // CJK -+ FcPatternAddCharSet (pat, FC_CHARSET, set); -+ break; -+ } ++ pat = FcPatternCreate (); + -+ FcConfigSubstitute (NULL, pat, FcMatchPattern); -+ FcDefaultSubstitute (pat); -+ match = FcFontMatch (NULL, pat, &result); -+ char *ttfnt; -+ FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt); -+ ttfont = StrDup(ttfnt); -+ FcPatternDestroy (match); -+ FcPatternDestroy (pat); -+ if (set) FcCharSetDestroy (set); -+ } ++ switch (fontid) { ++ case 1: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 2: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 3: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 4: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 5: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 6: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 7: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"arial"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 8: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 9: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 10: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 11: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"courier new"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 12: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 13: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"times new roman"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 14: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"wingdings"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 16: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 17: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 18: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 19: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixgeneral"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC); ++ break; ++ case 20: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ // set = FcCharSetCreate (); ++ // FcCharSetAddChar (set, 0x239b); // Bracket pieces ++ // FcPatternAddCharSet (pat, FC_CHARSET, set); ++ break; ++ case 21: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizeonesym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize1"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ // set = FcCharSetCreate (); ++ // FcCharSetAddChar (set, 0x239b); // Bracket pieces ++ // FcPatternAddCharSet (pat, FC_CHARSET, set); ++ break; ++ case 22: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 23: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizetwosym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize2"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 24: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize13"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 25: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizethreesym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize3"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 26: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 27: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefoursym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize4"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_BOLD); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 28: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsizefivesym"); ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"stixsize5"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ break; ++ case 29: ++ FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"droidsansfallback"); ++ FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR); ++ FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN); ++ set = FcCharSetCreate (); ++ FcCharSetAddChar (set, 0x0410); // Cyrillic ++ FcCharSetAddChar (set, 0x4e00); // CJK ++ FcPatternAddCharSet (pat, FC_CHARSET, set); ++ break; ++ } + -+ if(!ttfont) { -+ Error("TPostScript::FontEmbed", "font %d not found in path", -+ fontid); -+ } else { -+ if (FontEmbedType2(ttfont)) { -+ // nothing -+ } else if(FontEmbedType1(ttfont)) { -+ // nothing -+ } else if(FontEmbedType42(ttfont)) { -+ // nothing -+ } else { -+ Error("TPostScript::FontEmbed", "failed to embed font %d)", -+ fontid); -+ } -+ delete [] ttfont; -+ } -+ } - } - PrintStr("%%IncludeResource: font Times-Roman@"); - PrintStr("%%IncludeResource: font Times-Italic@"); ++ FcConfigSubstitute (NULL, pat, FcMatchPattern); ++ FcDefaultSubstitute (pat); ++ match = FcFontMatch (NULL, pat, &result); ++ char *ttfnt; ++ FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt); ++ ttfont = StrDup(ttfnt); ++ FcPatternDestroy (match); ++ FcPatternDestroy (pat); ++ if (set) FcCharSetDestroy (set); ++ } + + if(!ttfont) { +- Error("TPostScript::FontEmbed", +- "font %d (filename `%s') not found in path", +- fontid, filename); ++ Error("TPostScript::FontEmbed", "font %d not found in path", ++ fontid); + } else { + if (FontEmbedType2(ttfont)) { + // nothing +@@ -1576,9 +1758,8 @@ + } else if(FontEmbedType42(ttfont)) { + // nothing + } else { +- Error("TPostScript::FontEmbed", +- "failed to embed font %d (filename `%s')", +- fontid, filename); ++ Error("TPostScript::FontEmbed", "failed to embed font %d)", ++ fontid); + } + delete [] ttfont; + } @@ -2571,10 +2752,10 @@ - { "Root.PSFont.5", "/Helvetica-Oblique" }, - { "Root.PSFont.6", "/Helvetica-Bold" }, - { "Root.PSFont.7", "/Helvetica-BoldOblique" }, -- { "Root.PSFont.8", "/Courrier" }, -- { "Root.PSFont.9", "/Courrier-Oblique" }, -- { "Root.PSFont.10", "/Courrier-Bold" }, -- { "Root.PSFont.11", "/Courrier-BoldOblique" }, -+ { "Root.PSFont.8", "/Courier" }, -+ { "Root.PSFont.9", "/Courier-Oblique" }, -+ { "Root.PSFont.10", "/Courier-Bold" }, -+ { "Root.PSFont.11", "/Courier-BoldOblique" }, - { "Root.PSFont.12", "/Symbol" }, - { "Root.PSFont.13", "/Times-Roman" }, - { "Root.PSFont.14", "/ZapfDingbats" }, -diff -ur root-5.34.18.orig/graf3d/gl/Module.mk root-5.34.18/graf3d/gl/Module.mk ---- root-5.34.18.orig/graf3d/gl/Module.mk 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf3d/gl/Module.mk 2014-03-15 18:15:22.760445187 +0100 + { "Root.PSFont.5", "/Helvetica-Oblique" }, + { "Root.PSFont.6", "/Helvetica-Bold" }, + { "Root.PSFont.7", "/Helvetica-BoldOblique" }, +- { "Root.PSFont.8", "/Courrier" }, +- { "Root.PSFont.9", "/Courrier-Oblique" }, +- { "Root.PSFont.10", "/Courrier-Bold" }, +- { "Root.PSFont.11", "/Courrier-BoldOblique" }, ++ { "Root.PSFont.8", "/Courier" }, ++ { "Root.PSFont.9", "/Courier-Oblique" }, ++ { "Root.PSFont.10", "/Courier-Bold" }, ++ { "Root.PSFont.11", "/Courier-BoldOblique" }, + { "Root.PSFont.12", "/Symbol" }, + { "Root.PSFont.13", "/Times-Roman" }, + { "Root.PSFont.14", "/ZapfDingbats" }, +diff -ur root-5.34.20.orig/graf3d/gl/Module.mk root-5.34.20/graf3d/gl/Module.mk +--- root-5.34.20.orig/graf3d/gl/Module.mk 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf3d/gl/Module.mk 2014-08-16 19:24:53.377132564 +0200 @@ -78,7 +78,7 @@ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \ @@ -1063,9 +1043,9 @@ diff -ur root-5.34.18.orig/graf3d/gl/Module.mk root-5.34.18/graf3d/gl/Module.mk $(GLDS): $(GLH2) $(GLL) $(ROOTCINTTMPDEP) $(MAKEDIR) -diff -ur root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.18/graf3d/gl/src/TGLFontManager.cxx ---- root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf3d/gl/src/TGLFontManager.cxx 2014-03-22 09:22:22.715637375 +0100 +diff -ur root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.20/graf3d/gl/src/TGLFontManager.cxx +--- root-5.34.20.orig/graf3d/gl/src/TGLFontManager.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf3d/gl/src/TGLFontManager.cxx 2014-08-16 19:24:53.378132573 +0200 @@ -36,6 +36,7 @@ # include "FTGLBitmapFont.h" #endif @@ -1388,9 +1368,9 @@ diff -ur root-5.34.18.orig/graf3d/gl/src/TGLFontManager.cxx root-5.34.18/graf3d/ fgFontFileArray.Add(new TObjString("STIXGeneral.otf")); // 200 fgFontFileArray.Add(new TObjString("STIXGeneralItalic.otf")); // 210 fgFontFileArray.Add(new TObjString("STIXGeneralBol.otf")); // 220 -diff -ur root-5.34.18.orig/graf3d/gl/src/TGLText.cxx root-5.34.18/graf3d/gl/src/TGLText.cxx ---- root-5.34.18.orig/graf3d/gl/src/TGLText.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/graf3d/gl/src/TGLText.cxx 2014-03-22 09:15:17.075732162 +0100 +diff -ur root-5.34.20.orig/graf3d/gl/src/TGLText.cxx root-5.34.20/graf3d/gl/src/TGLText.cxx +--- root-5.34.20.orig/graf3d/gl/src/TGLText.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/graf3d/gl/src/TGLText.cxx 2014-08-16 19:24:53.378132573 +0200 @@ -34,6 +34,8 @@ # include "FTGLBitmapFont.h" #endif @@ -1530,9 +1510,9 @@ diff -ur root-5.34.18.orig/graf3d/gl/src/TGLText.cxx root-5.34.18/graf3d/gl/src/ - delete [] ttfont; + Error("SetGLTextFont","Cannot set FTGL::FaceSize"); } -diff -ur root-5.34.18.orig/gui/gui/src/TGApplication.cxx root-5.34.18/gui/gui/src/TGApplication.cxx ---- root-5.34.18.orig/gui/gui/src/TGApplication.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/gui/gui/src/TGApplication.cxx 2014-03-15 18:15:22.761445175 +0100 +diff -ur root-5.34.20.orig/gui/gui/src/TGApplication.cxx root-5.34.20/gui/gui/src/TGApplication.cxx +--- root-5.34.20.orig/gui/gui/src/TGApplication.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/gui/gui/src/TGApplication.cxx 2014-08-16 19:24:53.379132582 +0200 @@ -83,25 +83,12 @@ gROOT->SetBatch(kFALSE); @@ -1560,9 +1540,9 @@ diff -ur root-5.34.18.orig/gui/gui/src/TGApplication.cxx root-5.34.18/gui/gui/sr } // Create the canvas colors early so they are allocated before -diff -ur root-5.34.18.orig/gui/gui/src/TGSpeedo.cxx root-5.34.18/gui/gui/src/TGSpeedo.cxx ---- root-5.34.18.orig/gui/gui/src/TGSpeedo.cxx 2014-03-14 16:21:52.000000000 +0100 -+++ root-5.34.18/gui/gui/src/TGSpeedo.cxx 2014-03-15 18:15:22.761445175 +0100 +diff -ur root-5.34.20.orig/gui/gui/src/TGSpeedo.cxx root-5.34.20/gui/gui/src/TGSpeedo.cxx +--- root-5.34.20.orig/gui/gui/src/TGSpeedo.cxx 2014-08-13 15:03:22.000000000 +0200 ++++ root-5.34.20/gui/gui/src/TGSpeedo.cxx 2014-08-16 19:24:53.379132582 +0200 @@ -119,8 +119,7 @@ TString sc; diff --git a/root-gccopt.patch b/root-gccopt.patch deleted file mode 100644 index 5fb3cb6..0000000 --- a/root-gccopt.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ur root-5.34.19.orig/bindings/pyroot/Module.mk root-5.34.19/bindings/pyroot/Module.mk ---- root-5.34.19.orig/bindings/pyroot/Module.mk 2014-07-09 16:50:16.000000000 +0200 -+++ root-5.34.19/bindings/pyroot/Module.mk 2014-07-18 16:26:11.682503438 +0200 -@@ -123,14 +123,15 @@ - $(PYTHON64O): CFLAGS += $(PYTHONINCDIR:%=-I%) - ifeq ($(GCC_MAJOR),4) - $(PYROOTO): CXXFLAGS += -fno-strict-aliasing --endif --ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),) --# Building with clang or GCC -+ifeq ($(subst $(GCC_MINOR),,0 1),0 1) -+# GCC >= 4.2 - $(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-error=format - endif -+endif - - ifneq ($(CLANG_MAJOR),) - # Building with clang - $(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-ignored-attributes -+$(PYROOTO) $(PYTHON64O) $(PYROOTDO): CXXFLAGS += -Wno-error=format - endif - -diff -ur root-5.34.19.orig/io/dcache/Module.mk root-5.34.19/io/dcache/Module.mk ---- root-5.34.19.orig/io/dcache/Module.mk 2014-07-09 16:50:16.000000000 +0200 -+++ root-5.34.19/io/dcache/Module.mk 2014-07-18 14:41:34.700841953 +0200 -@@ -68,7 +68,10 @@ - - ##### extra rules ###### - $(DCACHEO) $(DCACHEDO): CXXFLAGS := $(filter-out -Wall,$(CXXFLAGS)) $(DCAPINCDIR:%=-I%) --ifneq ($(CXX:g++=),$(CXX)) -+ifeq ($(GCC_MAJOR),4) -+ifeq ($(subst $(GCC_MINOR),,0 1 2),0 1 2) -+# GCC >= 4.3 - $(DCACHEO) $(DCACHEDO): CXXFLAGS += -Wno-ignored-qualifiers - endif -+endif - diff --git a/root-usa.patch b/root-usa.patch new file mode 100644 index 0000000..4b5a380 --- /dev/null +++ b/root-usa.patch @@ -0,0 +1,13 @@ +diff -ur root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx root-5.34.19/hist/histpainter/src/THistPainter.cxx +--- root-5.34.19.orig/hist/histpainter/src/THistPainter.cxx 2014-07-09 16:50:16.000000000 +0200 ++++ root-5.34.19/hist/histpainter/src/THistPainter.cxx 2014-07-26 23:01:20.083002118 +0200 +@@ -2305,7 +2305,8 @@ + TH2Poly *p = new TH2Poly("USA","USA Population",lon1,lon2,lat1,lat2); + + TFile *f; +- f = TFile::Open("http://root.cern.ch/files/usa.root"); ++ // f = TFile::Open("http://root.cern.ch/files/usa.root"); ++ f = TFile::Open("$(ROOTSYS)/tutorials/hist/usa.root"); + + TMultiGraph *mg; + TKey *key; diff --git a/root.spec b/root.spec index 69dc5bb..028e0f7 100644 --- a/root.spec +++ b/root.spec @@ -29,17 +29,12 @@ %global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) %endif -# Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4) -%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7 -%global xrootd 0 -%else %global xrootd 1 -%endif %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: root -Version: 5.34.19 +Version: 5.34.20 %global libversion %(cut -d. -f 1-2 <<< %{version}) Release: 1%{?dist} Summary: Numerical data analysis framework @@ -62,6 +57,8 @@ Source2: root-html.C Source3: http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png Source4: http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png Source5: http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png +# Use local copy of input file during documentation generation +Source6: http://root.cern.ch/files/usa.root # Patch for ftgl older than version 2.1.3: Patch0: %{name}-ftgl.patch # Use system fonts: @@ -83,8 +80,8 @@ Patch7: %{name}-hdfs.patch Patch8: %{name}-dont-link-jvm.patch # Avoid deprecated __USE_BSD Patch9: %{name}-bsd-misc.patch -# Don't use new gcc options for old gcc versions -Patch10: %{name}-gccopt.patch +# Use local copy of input file during documentation generation +Patch10: %{name}-usa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # The build segfaults on ppc64 during an invocation of cint: # https://savannah.cern.ch/bugs/index.php?70542 @@ -176,20 +173,7 @@ BuildRequires: font(liberationmono) %else BuildRequires: liberation-fonts %endif -%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 -%ifarch %{ix86} x86_64 -BuildRequires: font(symbol) -%else -BuildRequires: urw-fonts -%endif -%else BuildRequires: urw-fonts -%endif -%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7 -%ifarch %{ix86} x86_64 -BuildRequires: font(wingdings) -%endif -%endif %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: font(droidsansfallback) %endif @@ -278,7 +262,7 @@ Summary: ROOT core libraries Group: Applications/Engineering License: LGPLv2+ and BSD Requires: %{name}-icons = %{version}-%{release} -Requires: %{name}-graf-asimage = %{version}-%{release} +Requires: %{name}-graf-asimage%{?_isa} = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6 Requires: font(liberationsans) @@ -287,20 +271,7 @@ Requires: font(liberationmono) %else Requires: liberation-fonts %endif -%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 -%ifarch %{ix86} x86_64 -Requires: font(symbol) -%else -Requires: urw-fonts -%endif -%else Requires: urw-fonts -%endif -%if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7 -%ifarch %{ix86} x86_64 -Requires: font(wingdings) -%endif -%endif %if %{?fedora}%{!?fedora:0} >= 11 || %{?rhel}%{!?rhel:0} >= 6 Requires: font(droidsansfallback) %endif @@ -361,8 +332,11 @@ with CINT with any class for which a Reflex dictionary is provided. %package proofd Summary: Parallel ROOT Facility - distributed, parallel computing Group: Applications/Engineering -Requires: %{name}-net-rpdutils = %{version}-%{release} -Requires: %{name}-proof = %{version}-%{release} +Requires: %{name}-net-rpdutils%{?_isa} = %{version}-%{release} +Requires: %{name}-proof%{?_isa} = %{version}-%{release} +%if %{xrootd} +Requires: xrootd-server%{?_isa} +%endif Requires(preun): chkconfig Requires(preun): initscripts Requires(post): chkconfig @@ -379,7 +353,7 @@ transparent interface. %package rootd Summary: ROOT remote file server Group: Applications/Engineering -Requires: %{name}-net-rpdutils = %{version}-%{release} +Requires: %{name}-net-rpdutils%{?_isa} = %{version}-%{release} Requires(preun): chkconfig Requires(preun): initscripts Requires(post): chkconfig @@ -471,7 +445,7 @@ System (FITS) data format in root. %package graf-gpad Summary: Canvas and pad library for ROOT Group: Applications/Engineering -Requires: %{name}-graf-postscript = %{version}-%{release} +Requires: %{name}-graf-postscript%{?_isa} = %{version}-%{release} %description graf-gpad This package contains a library for canvas and pad manipulations. @@ -552,8 +526,8 @@ a low quality 3D viewer for ROOT defined geometries. %package gui Summary: GUI library for ROOT Group: Applications/Engineering -Requires: %{name}-graf-x11 = %{version}-%{release} -Requires: %{name}-gui-ged = %{version}-%{release} +Requires: %{name}-graf-x11%{?_isa} = %{version}-%{release} +Requires: %{name}-gui-ged%{?_isa} = %{version}-%{release} %description gui This package contains a library for defining graphical user interfaces. @@ -569,7 +543,7 @@ various kinds of data. %package gui-ged Summary: GUI element for editing various ROOT objects Group: Applications/Engineering -Requires: %{name}-tree-player = %{version}-%{release} +Requires: %{name}-tree-player%{?_isa} = %{version}-%{release} %description gui-ged This package contains a library to show a pop-up window for editing @@ -615,7 +589,7 @@ access legacy Hbook files (NTuples and Histograms from PAW). %package hist Summary: Histogram library for ROOT Group: Applications/Engineering -Requires: %{name}-hist-painter = %{version}-%{release} +Requires: %{name}-hist-painter%{?_isa} = %{version}-%{release} %description hist This package contains a library for histogramming in ROOT. @@ -749,7 +723,7 @@ a generalized vector library. %package mathcore Summary: Core mathematics library for ROOT Group: Applications/Engineering -Requires: %{name}-minuit = %{version}-%{release} +Requires: %{name}-minuit%{?_isa} = %{version}-%{release} %description mathcore This package contains the MathCore library for ROOT. @@ -1402,8 +1376,8 @@ make OPTFLAGS="%{optflags}" \ %endif %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} # Move python modules to the sitelib mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch} @@ -1586,6 +1560,7 @@ echo Cint.Includes: 0 >> .rootrc echo Root.StacktraceScript: ${PWD}/etc/gdb-backtrace.sh >> .rootrc echo Gui.MimeTypeFile: ${PWD}/etc/root.mimes >> .rootrc sed "s!@PWD@!${PWD}!g" %{SOURCE2} > html.C +install -m 644 -p %{SOURCE6} tutorials/hist/usa.root LD_LIBRARY_PATH=${PWD}/lib:${PWD}/cint/cint/include:${PWD}/cint/cint/stl \ ROOTSYS=${PWD} ./bin/root.exe -l -b -q html.C rm .rootrc @@ -1610,16 +1585,16 @@ cat includelist-net-netx* > includelist-netx %if "%{?rhel}" == "5" # Python byte code compilation -%{__python} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{_libdir}/%{name}/python"'", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null -%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{_libdir}/%{name}/python"'", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null -%{__python} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python_sitearch}"'", 10, "%{python_sitearch}", 1)' > /dev/null -%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python_sitearch}"'", 10, "%{python_sitearch}", 1)' > /dev/null -%{__python26} -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python26_sitearch}"'", 10, "%{python26_sitearch}", 1)' > /dev/null -%{__python26} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{python26_sitearch}"'", 10, "%{python26_sitearch}", 1)' > /dev/null +%{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null +%{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{_libdir}/%{name}/python", 10, "%{_libdir}/%{name}/python", 1)' > /dev/null +%{__python} -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}", 10, "%{python_sitearch}", 1)' > /dev/null +%{__python} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}", 10, "%{python_sitearch}", 1)' > /dev/null +%{__python26} -c 'import compileall; compileall.compile_dir("%{buildroot}%{python26_sitearch}", 10, "%{python26_sitearch}", 1)' > /dev/null +%{__python26} -O -c 'import compileall; compileall.compile_dir("%{buildroot}%{python26_sitearch}", 10, "%{python26_sitearch}", 1)' > /dev/null %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor >/dev/null 2>&1 || : @@ -1924,6 +1899,7 @@ fi %dir %{_datadir}/%{name} %{_datadir}/%{name}/class.rules %{_datadir}/%{name}/gdb-backtrace.sh +%{_datadir}/%{name}/helgrind-root.supp %{_datadir}/%{name}/Makefile.arch %{_datadir}/%{name}/root.mimes %{_datadir}/%{name}/system.rootauthrc @@ -2459,6 +2435,12 @@ fi %{emacs_lispdir}/root/*.el %changelog +* Sat Aug 16 2014 Mattias Ellert - 5.34.20-1 +- Update to 5.34.20 +- Re-enable xrootd support for F21+ and EPEL7 (now ported to xrootd 4) +- Do not depend on wine's fonts +- Drop patch root-gccopt.patch + * Mon Jul 14 2014 Mattias Ellert - 5.34.19-1 - Update to 5.34.19 - Disable xrootd support for F21+ and EPEL7 (root not yet ported to xrootd 4) diff --git a/sources b/sources index bcc042a..ba6bec6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -3c68587354619c0a2d3bb9f77381b1b9 root-5.34.19.tar.xz +7ac7d0cdb28c2afe44be4c74a7cecb33 root-5.34.20.tar.xz +afb35390554c43a7d92576a6d9d3ae8a usa.root