[root/f16] Update to 5.30.01 Drop patches root-lzma-searchorder.patch and root-cint-i686.patch
Mattias Ellert
ellert at fedoraproject.org
Thu Aug 18 20:30:38 UTC 2011
commit 8de03df36e144b5238fdcb62f707d3d397fc69dd
Author: Mattias Ellert <ellert at localhost.localdomain>
Date: Thu Aug 18 22:29:30 2011 +0200
Update to 5.30.01
Drop patches root-lzma-searchorder.patch and root-cint-i686.patch
root-cint-i686.patch | 189 -------------------------------------------
root-fontconfig.patch | 60 +++++++-------
root-lzma-searchorder.patch | 14 ---
root.spec | 14 ++--
sources | 2 +-
5 files changed, 37 insertions(+), 242 deletions(-)
---
diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index f4d49f4..ac4e5a4 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -1,6 +1,6 @@
-diff -ur root-trunk.orig/core/base/src/TApplication.cxx root-trunk/core/base/src/TApplication.cxx
---- root-trunk.orig/core/base/src/TApplication.cxx 2010-11-03 22:51:34.000000000 +0100
-+++ root-trunk/core/base/src/TApplication.cxx 2010-11-25 20:47:25.726705009 +0100
+diff -ur root-5.30.01.orig/core/base/src/TApplication.cxx root-5.30.01/core/base/src/TApplication.cxx
+--- root-5.30.01.orig/core/base/src/TApplication.cxx 2011-08-18 16:45:43.000000000 +0200
++++ root-5.30.01/core/base/src/TApplication.cxx 2011-08-18 19:28:45.079497320 +0200
@@ -252,20 +252,9 @@
// Try to load TrueType font renderer. Only try to load if not in batch
// mode and Root.UseTTFonts is true and Root.TTFontPath exists. Abort silently
@@ -31,9 +31,9 @@ diff -ur root-trunk.orig/core/base/src/TApplication.cxx root-trunk/core/base/src
// Create WM dependent application environment
if (fAppImp)
-diff -ur root-trunk.orig/graf2d/graf/Module.mk root-trunk/graf2d/graf/Module.mk
---- root-trunk.orig/graf2d/graf/Module.mk 2010-11-25 20:41:40.000000000 +0100
-+++ root-trunk/graf2d/graf/Module.mk 2010-11-25 20:47:25.727705004 +0100
+diff -ur root-5.30.01.orig/graf2d/graf/Module.mk root-5.30.01/graf2d/graf/Module.mk
+--- root-5.30.01.orig/graf2d/graf/Module.mk 2011-08-18 16:46:08.000000000 +0200
++++ root-5.30.01/graf2d/graf/Module.mk 2011-08-18 19:28:45.086497316 +0200
@@ -45,7 +45,7 @@
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libGraf.$(SOEXT) $@ \
@@ -43,9 +43,9 @@ diff -ur root-trunk.orig/graf2d/graf/Module.mk root-trunk/graf2d/graf/Module.mk
$(GRAFDS): $(GRAFH) $(GRAFL) $(ROOTCINTTMPDEP)
$(MAKEDIR)
-diff -ur root-trunk.orig/graf2d/graf/src/TTF.cxx root-trunk/graf2d/graf/src/TTF.cxx
---- root-trunk.orig/graf2d/graf/src/TTF.cxx 2010-11-03 22:51:58.000000000 +0100
-+++ root-trunk/graf2d/graf/src/TTF.cxx 2010-11-25 20:47:25.780705003 +0100
+diff -ur root-5.30.01.orig/graf2d/graf/src/TTF.cxx root-5.30.01/graf2d/graf/src/TTF.cxx
+--- root-5.30.01.orig/graf2d/graf/src/TTF.cxx 2011-08-18 16:46:08.000000000 +0200
++++ root-5.30.01/graf2d/graf/src/TTF.cxx 2011-08-18 19:28:45.130497322 +0200
@@ -26,6 +26,7 @@
#include "TMath.h"
#include "TError.h"
@@ -239,21 +239,21 @@ diff -ur root-trunk.orig/graf2d/graf/src/TTF.cxx root-trunk/graf2d/graf/src/TTF.
}
//______________________________________________________________________________
-diff -ur root-trunk.orig/graf3d/gl/Module.mk root-trunk/graf3d/gl/Module.mk
---- root-trunk.orig/graf3d/gl/Module.mk 2010-11-25 20:41:36.000000000 +0100
-+++ root-trunk/graf3d/gl/Module.mk 2010-11-25 20:47:25.781705003 +0100
-@@ -68,7 +68,7 @@
- $(GLLIB): $(GLO) $(GLDO) $(ORDER_) $(MAINLIBS) $(GLLIBDEP) $(FTGLLIB) $(GLEWLIB)
+diff -ur root-5.30.01.orig/graf3d/gl/Module.mk root-5.30.01/graf3d/gl/Module.mk
+--- root-5.30.01.orig/graf3d/gl/Module.mk 2011-08-18 16:45:57.000000000 +0200
++++ root-5.30.01/graf3d/gl/Module.mk 2011-08-18 19:30:30.171500251 +0200
+@@ -70,7 +70,7 @@
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
-- "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
-+ "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
+ "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) \
+- $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS)"
++ $(GLEWLIBDIR) $(GLEWLIBS) $(GLLIBS) -lfontconfig"
$(GLDS): $(GLH2) $(GLL) $(ROOTCINTTMPDEP)
$(MAKEDIR)
-diff -ur root-trunk.orig/graf3d/gl/src/TGLFontManager.cxx root-trunk/graf3d/gl/src/TGLFontManager.cxx
---- root-trunk.orig/graf3d/gl/src/TGLFontManager.cxx 2010-11-03 22:51:45.000000000 +0100
-+++ root-trunk/graf3d/gl/src/TGLFontManager.cxx 2010-11-25 20:47:25.782705002 +0100
+diff -ur root-5.30.01.orig/graf3d/gl/src/TGLFontManager.cxx root-5.30.01/graf3d/gl/src/TGLFontManager.cxx
+--- root-5.30.01.orig/graf3d/gl/src/TGLFontManager.cxx 2011-08-18 16:45:57.000000000 +0200
++++ root-5.30.01/graf3d/gl/src/TGLFontManager.cxx 2011-08-18 19:28:45.153497322 +0200
@@ -37,6 +37,8 @@
#endif
@@ -379,9 +379,9 @@ diff -ur root-trunk.orig/graf3d/gl/src/TGLFontManager.cxx root-trunk/graf3d/gl/s
ftfont->FaceSize(size);
const TGLFont &mf = fFontMap.insert(std::make_pair(TGLFont(size, fileID, mode, ftfont, 0), 1)).first->first;
out.CopyAttributes(mf);
-diff -ur root-trunk.orig/graf3d/gl/src/TGLText.cxx root-trunk/graf3d/gl/src/TGLText.cxx
---- root-trunk.orig/graf3d/gl/src/TGLText.cxx 2010-11-03 22:51:45.000000000 +0100
-+++ root-trunk/graf3d/gl/src/TGLText.cxx 2010-11-25 20:47:25.783705001 +0100
+diff -ur root-5.30.01.orig/graf3d/gl/src/TGLText.cxx root-5.30.01/graf3d/gl/src/TGLText.cxx
+--- root-5.30.01.orig/graf3d/gl/src/TGLText.cxx 2011-08-18 16:45:57.000000000 +0200
++++ root-5.30.01/graf3d/gl/src/TGLText.cxx 2011-08-18 19:28:45.162497322 +0200
@@ -34,6 +34,8 @@
# include "FTGLBitmapFont.h"
#endif
@@ -498,9 +498,9 @@ diff -ur root-trunk.orig/graf3d/gl/src/TGLText.cxx root-trunk/graf3d/gl/src/TGLT
+ FcPatternDestroy (match);
+ FcPatternDestroy (pat);
}
-diff -ur root-trunk.orig/gui/gui/src/TGApplication.cxx root-trunk/gui/gui/src/TGApplication.cxx
---- root-trunk.orig/gui/gui/src/TGApplication.cxx 2010-11-03 22:51:54.000000000 +0100
-+++ root-trunk/gui/gui/src/TGApplication.cxx 2010-11-25 20:47:25.784705001 +0100
+diff -ur root-5.30.01.orig/gui/gui/src/TGApplication.cxx root-5.30.01/gui/gui/src/TGApplication.cxx
+--- root-5.30.01.orig/gui/gui/src/TGApplication.cxx 2011-08-18 16:46:02.000000000 +0200
++++ root-5.30.01/gui/gui/src/TGApplication.cxx 2011-08-18 19:28:45.169497323 +0200
@@ -83,25 +83,12 @@
gROOT->SetBatch(kFALSE);
@@ -528,9 +528,9 @@ diff -ur root-trunk.orig/gui/gui/src/TGApplication.cxx root-trunk/gui/gui/src/TG
}
// Create the canvas colors early so they are allocated before
-diff -ur root-trunk.orig/gui/gui/src/TGSpeedo.cxx root-trunk/gui/gui/src/TGSpeedo.cxx
---- root-trunk.orig/gui/gui/src/TGSpeedo.cxx 2010-11-03 22:51:54.000000000 +0100
-+++ root-trunk/gui/gui/src/TGSpeedo.cxx 2010-11-25 20:47:25.785705002 +0100
+diff -ur root-5.30.01.orig/gui/gui/src/TGSpeedo.cxx root-5.30.01/gui/gui/src/TGSpeedo.cxx
+--- root-5.30.01.orig/gui/gui/src/TGSpeedo.cxx 2011-08-18 16:46:02.000000000 +0200
++++ root-5.30.01/gui/gui/src/TGSpeedo.cxx 2011-08-18 19:28:45.170497323 +0200
@@ -117,8 +117,7 @@
TString sc;
@@ -541,7 +541,7 @@ diff -ur root-trunk.orig/gui/gui/src/TGSpeedo.cxx root-trunk/gui/gui/src/TGSpeed
Int_t i, nexe, offset;
const TGFont *counterFont = fClient->GetFont("-*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*");
-@@ -519,8 +518,7 @@
+@@ -521,8 +520,7 @@
if (fImage2 && fImage2->IsValid())
delete fImage2;
fImage2 = (TImage*)fImage->Clone("fImage2");
@@ -551,7 +551,7 @@ diff -ur root-trunk.orig/gui/gui/src/TGSpeedo.cxx root-trunk/gui/gui/src/TGSpeed
// format counter value
Int_t nexe = 0;
Int_t ww = fCounter;
-@@ -599,8 +597,7 @@
+@@ -601,8 +599,7 @@
if (fImage2 && fImage2->IsValid())
delete fImage2;
fImage2 = (TImage*)fImage->Clone("fImage2");
diff --git a/root.spec b/root.spec
index 4263dac..08340a3 100644
--- a/root.spec
+++ b/root.spec
@@ -18,9 +18,9 @@
%endif
Name: root
-Version: 5.30.00
+Version: 5.30.01
%global libversion %(cut -d. -f 1-2 <<< %{version})
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Numerical data analysis framework
Group: Applications/Engineering
@@ -51,10 +51,6 @@ Patch2: %{name}-unuran.patch
Patch3: %{name}-cern-ppc.patch
# Fixes for external xrootd
Patch4: %{name}-xrootd.patch
-# Fix LZMA header search order (svn rev. 40127)
-Patch5: %{name}-lzma-searchorder.patch
-# Fix corrupted strings during cint compilation (svn rev. 40577)
-Patch6: %{name}-cint-i686.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
@@ -1029,8 +1025,6 @@ package to use root with GNU Emacs.
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
-name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \
@@ -2289,6 +2283,10 @@ fi
%{emacs_lispdir}/root/*.el
%changelog
+* Thu Aug 18 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.30.01-1
+- Update to 5.30.01
+- Drop patches root-lzma-searchorder.patch and root-cint-i686.patch
+
* Wed Aug 17 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.30.00-3
- Backport upstream's fix for the i686 rootcint problem
diff --git a/sources b/sources
index 92e0fea..8c2cbca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7166a6ce24cb87dcc4f233aac6c36405 root-5.30.00.tar.gz
+476965d129649d3b4a9872a9a513c3c7 root-5.30.01.tar.gz
More information about the scm-commits
mailing list