Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv28259
Modified Files:
root5-devel.info root5-devel.patch
Log Message:
New upstream version, use conditionals in shlibs field, and re-fix building
against cernlib-g77 on ppc
Index: root5-devel.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/root5-devel.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- root5-devel.info 16 May 2007 13:42:34 -0000 1.4
+++ root5-devel.info 14 Jun 2007 21:30:22 -0000 1.5
@@ -1,6 +1,6 @@
Info3: <<
Package: root5-devel%type_pkg[-cernlib]%type_pkg[-geant4]%type_pkg[-qt]
-Version: 5.15.06
+Version: 5.15.08
Revision: 1
Type: -cernlib (boolean), -geant4 (boolean), -qt (boolean)
GCC: 4.0
@@ -11,7 +11,7 @@
%n-shlibs (=%v-%r)
<<
BuildDepends: <<
- fink (>= 0.25.00),
+ fink (>= 0.27.02),
x11-dev,
libjpeg,
libpng3,
@@ -50,10 +50,10 @@
<<
#BuildConflicts: freetype
Source: ftp://root.cern.ch/root/root_v%v.source.tar.gz
-Source-MD5: 36dd18f108b3b0f06a1cd9332027fb43
+Source-MD5: f6b58e2addfebe7e65dbd5c1ce9977d6
SourceDirectory: root
PatchFile: root5-devel.patch
-PatchFile-MD5: 4224e9299dabb782941c6644083a3b96
+PatchFile-MD5: e7e61fde258e5b71a12e49dc2ee7c319
PatchScript: <<
#!/bin/sh -ev
/usr/bin/patch -p0 < %{PatchFile}
@@ -244,6 +244,8 @@
lib/root/libGui.5.dylib
lib/root/libGuiBld.5.15.dylib
lib/root/libGuiBld.5.dylib
+ lib/root/libGuiHtml.5.15.dylib
+ lib/root/libGuiHtml.5.dylib
(%type_pkg[-cernlib]) lib/root/libHbook.5.15.dylib
(%type_pkg[-cernlib]) lib/root/libHbook.5.dylib
lib/root/libHist.5.15.dylib
@@ -292,6 +294,8 @@
lib/root/libQuadp.5.dylib
lib/root/libReflex.5.15.dylib
lib/root/libReflex.5.dylib
+ lib/root/libReflexDict.5.15.dylib
+ lib/root/libReflexDict.5.dylib
lib/root/libRGL.5.15.dylib
lib/root/libRGL.5.dylib
lib/root/libRLDAP.5.15.dylib
@@ -306,6 +310,8 @@
lib/root/libRIO.5.dylib
lib/root/libRooFit.5.15.dylib
lib/root/libRooFit.5.dylib
+ lib/root/libRooFitCore.5.15.dylib
+ lib/root/libRooFitCore.5.dylib
lib/root/libRootAuth.5.15.dylib
lib/root/libRootAuth.5.dylib
lib/root/libRuby.5.15.dylib
@@ -413,12 +419,12 @@
%p/lib/root/libCintex.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libCore.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libEG.5.dylib 5.0.0 %n (>=5.02.00-1)
- %p/lib/root/libEGPythia6.5.dylib 5.0.0 %n (>=5.02.00-1)
+ (%type_pkg[-cernlib]) %p/lib/root/libEGPythia6.5.dylib 5.0.0 %n
(>=5.02.00-1)
%p/lib/root/libFFTW.5.dylib 5.0.0 %n (>=5.11.02-1)
%p/lib/root/libFitPanel.5.dylib 5.0.0 %n (>=5.13.06-1)
%p/lib/root/libFoam.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libFumili.5.dylib 5.0.0 %n (>=5.02.00-1)
- %p/lib/root/libG4root.5.dylib 5.0.0 %n (>=5.14.00-1)
+ (%type_pkg[-geant4]) %p/lib/root/libG4root.5.dylib 5.0.0 %n (>=5.14.00-1)
%p/lib/root/libGdml.5.dylib 5.0.0 %n (>=5.13.06-1)
%p/lib/root/libGed.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libGeom.5.dylib 5.0.0 %n (>=5.02.00-1)
@@ -429,10 +435,11 @@
%p/lib/root/libGraf3d.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libGui.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libGuiBld.5.dylib 5.0.0 %n (>=5.02.00-1)
- %p/lib/root/libGQt.5.dylib 5.0.0 %n (>=5.15.04-2)
+ %p/lib/root/libGuiHtml.5.dylib 5.0.0 %n (>=5.15.08-1)
+ (%type_pkg[-qt]) %p/lib/root/libGQt.5.dylib 5.0.0 %n (>=5.15.04-2)
%p/lib/root/libGX11.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libGX11TTF.5.dylib 5.0.0 %n (>=5.02.00-1)
- %p/lib/root/libHbook.5.dylib 5.0.0 %n (>=5.02.00-1)
+ (%type_pkg[-cernlib]) %p/lib/root/libHbook.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libHist.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libHistPainter.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libHtml.5.dylib 5.0.0 %n (>=5.02.00-1)
@@ -452,17 +459,19 @@
%p/lib/root/libProofPlayer.5.dylib 5.0.0 %n (>=5.15.04-1)
%p/lib/root/libProofx.5.dylib 5.0.0 %n (>=5.08.00-1)
%p/lib/root/libPyROOT.5.dylib 5.0.0 %n (>=5.02.00-1)
- %p/lib/root/libQtGSI.5.dylib 5.0.0 %n (>=5.15.04-2)
- %p/lib/root/libQtRoot.5.dylib 5.0.0 %n (>=5.15.04-2)
+ (%type_pkg[-qt]) %p/lib/root/libQtGSI.5.dylib 5.0.0 %n (>=5.15.04-2)
+ (%type_pkg[-qt]) %p/lib/root/libQtRoot.5.dylib 5.0.0 %n (>=5.15.04-2)
%p/lib/root/libQuadp.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libRGL.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libReflex.5.dylib 5.0.0 %n (>=5.02.00-1)
+ %p/lib/root/libReflexDict.5.dylib 5.0.0 %n (>=5.15.08-1)
%p/lib/root/libRint.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libRIO.5.dylib 5.0.0 %n (>=5.15.04-1)
%p/lib/root/libRLDAP.5.dylib 5.0.0 %n (>=5.02.00-1)
%p/lib/root/libRMySQL.5.dylib 5.0.0 %n (>=5.13.06-1)
%p/lib/root/libRODBC.5.dylib 5.0.0 %n (>=5.11.02-1)
%p/lib/root/libRooFit.5.dylib 5.0.0 %n (>=5.02.00-1)
+ %p/lib/root/libRooFitCore.5.dylib 5.0.0 %n (>=5.15.08-1)
%p/lib/root/libRootAuth.5.dylib 5.0.0 %n (>=5.04.00-1)
%p/lib/root/libRuby.5.dylib 5.0.0 %n (>=5.11.02-1)
%p/lib/root/libSessionViewer.5.dylib 5.0.0 %n (>=5.15.04-1)
@@ -554,11 +563,6 @@
run root interactively and it does not make sense to single the header
files out into another split-off (root5-dev for example) which
cannot be declared BuildDependsOnly anyway.
-
-The Shlibs field lists all potentially built dylib. Not all dylib are
-built by all variants. This is a bug and causes the validator to fail.
-However, there is no straight forward way to do it correctly (see
-email exchange on fink-devel from May 6/7, 2007).
<<
Homepage: http://root.cern.ch
Maintainer: Remi Mommsen <[EMAIL PROTECTED]>
Index: root5-devel.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/root5-devel.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- root5-devel.patch 9 May 2007 22:17:53 -0000 1.3
+++ root5-devel.patch 14 Jun 2007 21:30:23 -0000 1.4
@@ -1,6 +1,6 @@
---- configure 2 Apr 2007 10:24:23 -0000 1.392
-+++ configure 7 May 2007 22:54:39 -0000
-@@ -2428,21 +2428,21 @@
+--- configure 29 May 2007 15:18:03 -0000 1.398
++++ configure 1 Jun 2007 03:34:49 -0000
+@@ -2478,21 +2478,21 @@
# for a system library, then see if we have various headers needed.
if test "x$enable_builtin_afterimage" = "xyes" ; then
check_header "jpeglib.h" "" $ASIMAGE $ASIMAGE/include \
@@ -26,7 +26,7 @@
asgifincdir=$found_dir
asextralib=""
-@@ -2460,7 +2460,7 @@
+@@ -2510,7 +2510,7 @@
fi
for k in $aslibs ; do
check_library $k "$enable_shared" "" \
@@ -36,7 +36,7 @@
found_libz=$found_lib
found_dirz=$found_dir
--- build/unix/makelib.sh 29 Jan 2007 10:34:36 -0000 1.53
-+++ build/unix/makelib.sh 7 May 2007 22:54:39 -0000
++++ build/unix/makelib.sh 1 Jun 2007 03:34:49 -0000
@@ -201,7 +201,7 @@
ln -fs $SONAME.$MAJOR $LIB
elif [ -f $LIBVERS ]; then
@@ -46,9 +46,9 @@
LIBNOMAJORMINOR=`echo $LIB|sed 's,\.'$MAJOR'\.'$MINOR',,'`
if [ $LIB != $LIBNOMAJORMINOR ]; then
LIBNOMINOR=`echo $LIB|sed 's,\.'$MINOR',,'`
---- config/Makefile.depend 2 Apr 2007 10:27:31 -0000 1.130
-+++ config/Makefile.depend 7 May 2007 22:55:54 -0000
-@@ -258,65 +258,77 @@
+--- config/Makefile.depend 17 May 2007 14:15:26 -0000 1.138
++++ config/Makefile.depend 1 Jun 2007 03:35:26 -0000
+@@ -267,68 +267,82 @@
NETLIBEXTRA = -Llib -lRIO
HISTLIBEXTRA = -Llib -lMatrix
GRAFLIBEXTRA = -Llib -lHist -lMatrix -lRIO
@@ -119,7 +119,7 @@
GEOMLIBEXTRA = -Llib -lRIO
-GEOMPAINTERLIBEXTRA = -Llib -lGeom -lTree -lGraf3d -lHist -lGpad
-GEOMBUILDERLIBEXTRA = -Llib -lGeom -lGraf3d -lGpad -lGraf -lGui -lGed
--ASIMAGELIBEXTRA = -Llib -lGraf -lHist -lGpad
+-ASIMAGELIBEXTRA = -Llib -lGraf
-ASIMAGEGUILIBEXTRA = -Llib -lGraf -lHist -lGui -lASImage -lRIO
-ASIMAGEGSLIBEXTRA = -Llib -lGraf -lASImage
+GEOMPAINTERLIBEXTRA = -Llib -lGeom -lTree -lGraf3d -lHist -lGpad \
@@ -146,16 +146,23 @@
QUADPLIBEXTRA = -Llib -lMatrix
-RUBYLIBEXTRA = -Llib -lHist
-GUIBLDLIBEXTRA = -Llib -lGui -lGraf
+-GUIHTMLLIBEXTRA = -Llib -lGui -lGraf -lNet
+RUBYLIBEXTRA = -Llib -lHist -lMatrix
+GUIBLDLIBEXTRA = -Llib -lGui -lGraf -lGpad -lRIO -lHist -lMatrix
++GUIHTMLLIBEXTRA = -Llib -lGui -lGraf -lNet -lGpad -lRIO -lHist
-lMatrix
XMLLIBEXTRA = -Llib -lRIO
-FOAMLIBEXTRA = -Llib -lHist
+FOAMLIBEXTRA = -Llib -lHist -lMatrix
ALIENLIBEXTRA = -Llib -lXMLIO -lNetx -lTree -lProof
--ROOFITLIBEXTRA = -Llib -lHist -lGraf -lMatrix -lTree -lMinuit -lHtml
-lRIO
-+ROOFITLIBEXTRA = -Llib -lHist -lGraf -lMatrix -lTree -lMinuit -lHtml
-lRIO -lNet
+-ROOFITCORELIBEXTRA = -Llib -lHist -lGraf -lMatrix -lTree -lMinuit -lHtml
-lRIO
+-ROOFITLIBEXTRA = -Llib -lRooFitCore -lTree -lRIO
++ROOFITCORELIBEXTRA = -Llib -lHist -lGraf -lMatrix -lTree -lMinuit -lHtml
\
++ -lRIO -lNet
++ROOFITLIBEXTRA = -Llib -lRooFitCore -lTree -lRIO -lHist -lGraf
-lMatrix \
++ -lMinuit -lHtml -lNet
CINT7LIBEXTRA = -Llib -lReflex
CINTEXLIBEXTRA = -Llib -lReflex
+ REFLEXDICTLIBEXTRA = -Llib -lReflex
RAUTHLIBEXTRA = -Llib -lNet -lRIO
-KRB5AUTHLIBEXTRA = -Llib -lRootAuth -lNet
-SRVAUTHLIBEXTRA = -Llib -lNet
@@ -169,7 +176,7 @@
RFIOLIBEXTRA = -Llib -lRIO
SQLLIBEXTRA = -Llib -lNet -lRIO
ODBCLIBEXTRA = -Llib -lNet -lRIO
-@@ -325,8 +337,8 @@
+@@ -337,8 +351,8 @@
CASTORLIBEXTRA = -Llib -lNet -lRIO
PGSQLLIBEXTRA = -Llib -lNet -lRIO
MYSQLLIBEXTRA = -Llib -lNet -lRIO
@@ -181,7 +188,7 @@
endif
--- xrootd/Module.mk 24 Mar 2007 14:06:26 -0000 1.31
-+++ xrootd/Module.mk 9 May 2007 16:06:06 -0000
++++ xrootd/Module.mk 1 Jun 2007 03:35:27 -0000
@@ -77,6 +77,16 @@
gunzip -c $(XROOTDVERS).src.tgz | tar xf -; \
etag=`basename $(XROOTDETAG)` ; \
@@ -199,3 +206,21 @@
fi)
ifeq ($(PLATFORM),win32)
@(if [ -d $(XROOTDDIRD)/pthreads-win32 ]; then \
+--- config/Makefile.macosx 2007-03-05 09:35:31.000000000 -0600
++++ config/Makefile.macosx 2007-03-30 15:34:01.000000000 -0500
+@@ -103,12 +103,9 @@
+ F77LIBS =
+ endif
+
+-# We add libg2c only in case of ppc because then we probably have cernlib
+-# compiled with g77. In case of Intel Mac it should be compiled with the
+-# same fortran we use.
+-ifeq ($(MACOSX_CPU),powerpc)
+-F77LIBS += -L$(FINK_DIR)/lib -lg2c
+-endif
++# We add the g77 library libg2c.a only if it exists. In this case it
++# is likely that the CERNLIB was compiled with g77.
++F77LIBS += $(shell [ -r $(FINK_DIR)/lib/libg2c.a ] && echo -L$(FINK_DIR)/lib
-lg2c)
+
+ ifeq ($(shell find $(FINK_DIR)/bin -name $(F77)),)
+ BUILDHBOOK := no
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
