Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=47c5af81ad62f1e012d87f7ea195ca196172e55e

commit 47c5af81ad62f1e012d87f7ea195ca196172e55e
Author: Melko <[email protected]>
Date:   Wed Apr 29 15:24:41 2015 +0200

root-6.03.04-1-x86_64

* version bump

diff --git a/source/apps-extra/root/FrugalBuild 
b/source/apps-extra/root/FrugalBuild
index c0e65a4..900a187 100644
--- a/source/apps-extra/root/FrugalBuild
+++ b/source/apps-extra/root/FrugalBuild
@@ -4,7 +4,7 @@
options+=('asneeded')

pkgname=root
-pkgver=6.03.02
+pkgver=6.03.04
pkgrel=1
pkgdesc="C++ data analysis framework and interpreter from CERN"
url="http://root.cern.ch";
@@ -18,9 +18,9 @@ _F_archive_grepv="99"
up2date="Flastarchive 'ftp://root.cern.ch/root/' '\.source\.tar\.gz'"
source=(ftp://root.cern.ch/$pkgname/${pkgname}_v${pkgver}.source.tar.gz \
$pkgname.desktop $pkgname.sh)
-sha1sums=('6be8b5655172a562478e8983244e9fa5725263aa' \
+sha1sums=('b9d3190cb386269ee2d0e39920d7dc4af4005a9a' \
'022e0a9278fb1037177c10b77a312c4555954e80' \
-         'fd9ab57da53418c91e6b7c47dd7f6076e82701a5')
+          'fd9ab57da53418c91e6b7c47dd7f6076e82701a5')

build() {
Fcd $pkgname-$pkgver
diff --git a/source/apps-extra/root/fix-build-gnuinstall.patch 
b/source/apps-extra/root/fix-build-gnuinstall.patch
deleted file mode 100644
index 44c7969..0000000
--- a/source/apps-extra/root/fix-build-gnuinstall.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 058aa8d4949b392da69ff496cfa9ac87fbec47e2 Mon Sep 17 00:00:00 2001
-From: Pere Mato <[email protected]>
-Date: Tue, 30 Sep 2014 22:31:09 +0200
-Subject: [PATCH] Fix for ROOT-6764 (Build failure with gnuinstall=ON)
-
----
- CMakeLists.txt | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a9d0336..a84834c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,6 +72,7 @@ add_custom_target(move_headers  COMMAND ${CMAKE_COMMAND} 
-DPREFIX=${CMAKE_BINARY
-                                 COMMAND ${CMAKE_COMMAND} -E copy_directory 
${CMAKE_SOURCE_DIR}/fonts ${CMAKE_BINARY_DIR}/fonts
-                                 COMMAND ${CMAKE_COMMAND} -E copy_directory 
${CMAKE_SOURCE_DIR}/macros ${CMAKE_BINARY_DIR}/macros
-                                 COMMAND ${CMAKE_COMMAND} -E copy_directory 
${CMAKE_SOURCE_DIR}/tutorials ${CMAKE_BINARY_DIR}/tutorials)
-+include_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
-
- #---Recurse into the given subdirectories.  This does not actually cause 
another cmake executable
- #  to run. The same process will walk through the project's entire directory 
structure.
-@@ -124,11 +125,13 @@ add_dependencies(onepcm ${__allTargets})
- install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION 
${CMAKE_INSTALL_SYSCONFDIR})
-
- #---hsimple.root---------(use the executable for clearer dependencies and 
proper return code)---
--add_custom_target(hsimple ALL DEPENDS hsimple.root)
--add_dependencies(hsimple onepcm)
--ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree 
Hist)
--add_custom_command(OUTPUT hsimple.root COMMAND hsimple.exe)
--install(FILES ${CMAKE_BINARY_DIR}/hsimple.root DESTINATION 
${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
-+if(NOT gnuinstall)   # TODO hsimple.root for gnuinstall
-+  add_custom_target(hsimple ALL DEPENDS hsimple.root)
-+  add_dependencies(hsimple onepcm)
-+  ROOT_EXECUTABLE(hsimple.exe test/hsimple.cxx NOINSTALL LIBRARIES RIO Tree 
Hist)
-+  add_custom_command(OUTPUT hsimple.root COMMAND hsimple.exe)
-+  install(FILES ${CMAKE_BINARY_DIR}/hsimple.root DESTINATION 
${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
-+endif()
-
- 
#---version--------------------------------------------------------------------------------------
- add_custom_target(version COMMAND 
${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to