* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
@ 2017-12-18 13:13 Guilherme Amadio
0 siblings, 0 replies; 6+ messages in thread
From: Guilherme Amadio @ 2017-12-18 13:13 UTC (permalink / raw
To: gentoo-commits
commit: 0e405916c55dd90708cf3ae85636873df29e74e6
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 12:52:00 2017 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 13:12:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e405916
sci-physics/root: drop unused patches
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-physics/root/files/root-6.00.01-llvm.patch | 13 -----
.../root/files/root-6.00.01-nobyte-compile.patch | 33 ------------
sci-physics/root/files/root-6.02.05-xrootd4.patch | 11 ----
sci-physics/root/files/root-6.04.06-gsl2.patch | 58 ----------------------
.../root/files/root-6.04.06-prop-flags.patch | 22 --------
5 files changed, 137 deletions(-)
diff --git a/sci-physics/root/files/root-6.00.01-llvm.patch b/sci-physics/root/files/root-6.00.01-llvm.patch
deleted file mode 100644
index c6abb353ee6..00000000000
--- a/sci-physics/root/files/root-6.00.01-llvm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/interpreter/llvm/src/Makefile.config.in b/interpreter/llvm/src/Makefile.config.in
-index 7633be2..c8756b1 100644
---- a/interpreter/llvm/src/Makefile.config.in
-+++ b/interpreter/llvm/src/Makefile.config.in
-@@ -170,6 +170,8 @@ CXXFLAGS += @CXXFLAGS@
-
- # Linker flags.
- LDFLAGS += @LDFLAGS@
-+NOUNDEF := -Wl,--no-undefined
-+LDFLAGS := $(filter-out $(NOUNDEF),$(LDFLAGS))
-
- # Path to the library archiver program.
- AR_PATH = @AR@
diff --git a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch b/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
deleted file mode 100644
index aa58f20686d..00000000000
--- a/sci-physics/root/files/root-6.00.01-nobyte-compile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400
-+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400
-@@ -48,8 +48,6 @@
- ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC := $(ROOTPY:.py=.pyc)
--ROOTPYO := $(ROOTPY:.py=.pyo)
-
- # used in the main Makefile
- ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h: $(PYROOTDIRI)/%.h
- cp $< $@
-
--%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-
--$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
- $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
-
- distclean-$(MODNAME): clean-$(MODNAME)
- @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
-- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+ $(ROOTPY) $(PYROOTMAP) \
- $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
-
- distclean:: distclean-$(MODNAME)
diff --git a/sci-physics/root/files/root-6.02.05-xrootd4.patch b/sci-physics/root/files/root-6.02.05-xrootd4.patch
deleted file mode 100644
index 0b4a4bef0f2..00000000000
--- a/sci-physics/root/files/root-6.02.05-xrootd4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://sft.its.cern.ch/jira/browse/ROOT-6998
---- root-6.02.05/net/netxng/src/TNetXNGFile.cxx.orig 2015-02-09 11:59:47.000000000 +0300
-+++ root-6.02.05/net/netxng/src/TNetXNGFile.cxx 2015-04-05 11:32:31.893127758 +0300
-@@ -28,6 +28,7 @@
- #include <XrdCl/XrdClFile.hh>
- #include <XrdCl/XrdClXRootDResponses.hh>
- #include <XrdCl/XrdClDefaultEnv.hh>
-+#include <XrdVersion.hh>
- #include <iostream>
-
- //------------------------------------------------------------------------------
diff --git a/sci-physics/root/files/root-6.04.06-gsl2.patch b/sci-physics/root/files/root-6.04.06-gsl2.patch
deleted file mode 100644
index 5d9fb102b73..00000000000
--- a/sci-physics/root/files/root-6.04.06-gsl2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit ee9964210c56e7c1868618a4434c5340fef38fe4
-Author: Pere Mato <pere.mato@cern.ch>
-Date: Tue Dec 15 11:58:24 2015 +0100
-
- Fix for ROOT-7776 - Integrate GSL 2.0 in ROOT. Changed the version used when option builtin_gsl=ON to 2.1 (latest production).
-
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index 6f04dad..309a8de 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -332,7 +332,7 @@ if(mathmore OR builtin_gsl)
- endif()
- endif()
- else()
-- set(gsl_version 1.15)
-+ set(gsl_version 2.1)
- message(STATUS "Downloading and building GSL version ${gsl_version}")
- ExternalProject_Add(
- GSL
-diff --git a/math/mathmore/src/GSLMultiFit.h b/math/mathmore/src/GSLMultiFit.h
-index 1d86da5..5b5a887 100644
---- a/math/mathmore/src/GSLMultiFit.h
-+++ b/math/mathmore/src/GSLMultiFit.h
-@@ -31,6 +31,7 @@
- #include "gsl/gsl_matrix.h"
- #include "gsl/gsl_multifit_nlin.h"
- #include "gsl/gsl_blas.h"
-+#include "gsl/gsl_version.h"
- #include "GSLMultiFitFunctionWrapper.h"
-
- #include "Math/IFunction.h"
-@@ -143,7 +144,11 @@ public:
- /// gradient value at the minimum
- const double * Gradient() const {
- if (fSolver == 0) return 0;
-+#if GSL_MAJOR_VERSION > 1
-+ fType->gradient(fSolver->state, fVec);
-+#else
- gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
-+#endif
- return fVec->data;
- }
-
-@@ -154,7 +159,14 @@ public:
- unsigned int npar = fSolver->fdf->p;
- fCov = gsl_matrix_alloc( npar, npar );
- static double kEpsrel = 0.0001;
-+#if GSL_MAJOR_VERSION > 1
-+ gsl_matrix* J = gsl_matrix_alloc(npar,npar);
-+ gsl_multifit_fdfsolver_jac (fSolver, J);
-+ int ret = gsl_multifit_covar(J, kEpsrel, fCov);
-+ gsl_matrix_free(J);
-+#else
- int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
-+#endif
- if (ret != GSL_SUCCESS) return 0;
- return fCov->data;
- }
diff --git a/sci-physics/root/files/root-6.04.06-prop-flags.patch b/sci-physics/root/files/root-6.04.06-prop-flags.patch
deleted file mode 100644
index 90db15e21f6..00000000000
--- a/sci-physics/root/files/root-6.04.06-prop-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- config/Makefile.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/Makefile.in b/config/Makefile.in
-index 9243c90..a23a4d2 100644
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -64,11 +64,11 @@ HOST := @host@
- USECONFIG := @useconfig@
- MKLIBOPTIONS := @mkliboption@
-
--EXTRA_CFLAGS := -Iinclude @cflags@
-+EXTRA_CFLAGS := -Iinclude @cflags@ $(CFLAGS)
- USERCONF_CFLAGS:= @usercflags@
--EXTRA_CXXFLAGS := -Iinclude @cflags@
-+EXTRA_CXXFLAGS := -Iinclude @cflags@ $(CXXFLAGS)
- USERCONF_CXXFLAGS:= @usercxxflags@
--EXTRA_LDFLAGS := @ldflags@
-+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS)
- WERROR := @werror@
- WINRTDEBUG := @winrtdebug@
- CTORSINITARRAY := @ctorsinitarray@
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
@ 2018-04-05 15:36 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2018-04-05 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 1877d5a5c48dc99aa54ed3d08a747a91cf023793
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Apr 5 10:48:33 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 15:34:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1877d5a5
sci-physics/root: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/7825
sci-physics/root/files/root-5.32.00-afs.patch | 33 -------------
sci-physics/root/files/root-6.00.01-dotfont.patch | 58 -----------------------
2 files changed, 91 deletions(-)
diff --git a/sci-physics/root/files/root-5.32.00-afs.patch b/sci-physics/root/files/root-5.32.00-afs.patch
deleted file mode 100644
index 2bf31798e6e..00000000000
--- a/sci-physics/root/files/root-5.32.00-afs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- root/net/auth/src/TAFS.cxx.orig 2011-12-04 00:56:29.405007770 +0400
-+++ root/net/auth/src/TAFS.cxx 2011-12-04 00:56:35.534709259 +0400
-@@ -138,7 +138,7 @@
- } else {
- if (isatty(0) != 0 && isatty(1) != 0) {
- Gl_config("noecho", 1);
-- pw = Getline((char *) prompt.Data());
-+ pw = const_cast<char *>( Getline((char *) prompt.Data()) );
- Gl_config("noecho", 0);
- } else {
- Warning("TAFS", "not tty: cannot prompt for passwd: failure");
---- root/core/clib/src/strlcat.c.orig 2011-12-04 01:49:26.495179487 +0400
-+++ root/core/clib/src/strlcat.c 2011-12-04 01:50:41.407524763 +0400
-@@ -38,7 +38,7 @@
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
--size_t
-+size_t __attribute__((weak))
- strlcat(char *dst, const char *src, size_t siz)
- {
- register char *d = dst;
---- root/core/clib/src/strlcpy.c.orig 2011-12-04 01:49:34.329797251 +0400
-+++ root/core/clib/src/strlcpy.c 2011-12-04 01:50:49.051151843 +0400
-@@ -36,7 +36,7 @@
- * will be copied. Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
--size_t
-+size_t __attribute__((weak))
- strlcpy(char *dst, const char *src, size_t siz)
- {
- register char *d = dst;
diff --git a/sci-physics/root/files/root-6.00.01-dotfont.patch b/sci-physics/root/files/root-6.00.01-dotfont.patch
deleted file mode 100644
index 6c765f75a50..00000000000
--- a/sci-physics/root/files/root-6.00.01-dotfont.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- root/html/src/TClassDocOutput.cxx.orig 2012-06-08 02:13:51.000000000 +0400
-+++ root/html/src/TClassDocOutput.cxx 2012-06-08 02:34:45.705436577 +0400
-@@ -625,7 +625,7 @@
- << "size=\"8,10\";" << std::endl
- << "ratio=auto;" << std::endl
- << "margin=0;" << std::endl
-- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << std::endl
-+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << std::endl
- << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << std::endl;
-
- std::stringstream ssDep;
-@@ -704,7 +704,7 @@
- outdot << ";" << std::endl;
- } else if (writeAndMoreFor) {
- outdot << " \"...andmore" << writeAndMoreFor->GetName()
-- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
-+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
- }
- }
- if (!levelExists) break;
-@@ -733,7 +733,7 @@
- << "ranksep=0.1;" << std::endl
- << "nodesep=0;" << std::endl
- << "margin=0;" << std::endl;
-- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << std::endl;
-+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << std::endl;
-
- std::stringstream ssDep;
- const int numColumns = 3;
-@@ -939,7 +939,7 @@
- << "ranksep=0;" << std::endl
- << "nodesep=0;" << std::endl
- << "size=\"8,10\";" << std::endl
-- << "node [fontsize=20,shape=plaintext];" << std::endl;
-+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << std::endl;
-
- for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
- iFile != listFilesToParse.end(); ++iFile) {
-@@ -999,7 +999,8 @@
- << "ranksep=0.7;" << std::endl
- << "nodesep=0.3;" << std::endl
- << "size=\"8,8\";" << std::endl
-- << "ratio=compress;" << std::endl;
-+ << "ratio=compress;" << std::endl
-+ << "node [fontname=\"DejaVu Serif\"];" << std::endl;
-
- TString libs(fCurrentClass->GetSharedLibs());
- outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << std::endl;
-@@ -1109,7 +1110,8 @@
-
- dotout << "digraph G {" << std::endl
- << "ratio=auto;" << std::endl
-- << "rankdir=RL;" << std::endl;
-+ << "rankdir=RL;" << std::endl
-+ << "node [fontname=\"DejaVu Serif\"];" << std::endl;
-
- // loop on all classes
- TClassDocInfo* cdi = 0;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
@ 2018-11-19 16:25 Guilherme Amadio
0 siblings, 0 replies; 6+ messages in thread
From: Guilherme Amadio @ 2018-11-19 16:25 UTC (permalink / raw
To: gentoo-commits
commit: f56c1087d27bbebf7ce65121d49a97dbf2e3dc73
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Sep 21 17:57:41 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 16:25:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56c1087
sci-physics/root: remove unused patch/files
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
Closes: https://bugs.gentoo.org/667872
sci-physics/root/files/proofd.confd | 12 -----------
sci-physics/root/files/proofd.initd | 25 -----------------------
sci-physics/root/files/root-6.14.00-http.patch | 28 --------------------------
sci-physics/root/files/rootd.confd | 8 --------
sci-physics/root/files/rootd.initd | 27 -------------------------
5 files changed, 100 deletions(-)
diff --git a/sci-physics/root/files/proofd.confd b/sci-physics/root/files/proofd.confd
deleted file mode 100644
index 81720a7eb33..00000000000
--- a/sci-physics/root/files/proofd.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# conf.d file for proof daemon
-#
-# Please refer to the proofd(1) man(1) page for more information on
-# command line parameters.
-#
-PROOFD_OPTS=
-
-# Specify your base of your PROOF directory here. If left blank, it
-# will use the system default (e.g., /usr/share/root/proof).
-# Note, however, that ROOT recommends that this directory is shared (via
-# NFS or similar) among all the nodes of the cluster.
-PROOF_DIR=
diff --git a/sci-physics/root/files/proofd.initd b/sci-physics/root/files/proofd.initd
deleted file mode 100644
index ee865133cb2..00000000000
--- a/sci-physics/root/files/proofd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need root-file-server
- use logger
-}
-
-start() {
- ebegin "Starting parallel ROOT facility server"
- start-stop-daemon --start --quiet \
- --pidfile /var/run/proofd.pid \
- --exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
- pidof /usr/bin/proofd > /var/run/proofd.pid
- eend $?
-}
-
-stop() {
- ebegin "Stopping parallel ROOT facility server"
- start-stop-daemon --stop --quiet \
- --pidfile /var/run/proofd.pid \
- --exec /usr/bin/proofd
- eend $?
-}
diff --git a/sci-physics/root/files/root-6.14.00-http.patch b/sci-physics/root/files/root-6.14.00-http.patch
deleted file mode 100644
index 04ec4bea567..00000000000
--- a/sci-physics/root/files/root-6.14.00-http.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Wed, 27 Jun 2018 15:08:07 +0200
-Subject: [PATCH] Do not exclude etc/http directory from installation
-
-This was an unintended side-effect of a previous commit:
-9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1.
----
- CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c760d0fdb..a3a0f59925 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
- PATTERN "rootd.xinetd" EXCLUDE
- PATTERN "proofd.xinetd" EXCLUDE
- PATTERN "root.mimes" EXCLUDE
-- PATTERN "cmake" EXCLUDE
-- PATTERN "http" EXCLUDE )
-+ PATTERN "cmake" EXCLUDE )
- install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR})
- install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR})
- install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
---
-2.18.0
-
diff --git a/sci-physics/root/files/rootd.confd b/sci-physics/root/files/rootd.confd
deleted file mode 100644
index 7516b8c9b6d..00000000000
--- a/sci-physics/root/files/rootd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# conf.d file for root daemon
-
-# User to run as (default is `rootd')
-ROOTD_USER="rootd"
-
-# Please refer to the rootd(1) man(1) page for more information on
-# command line parameters.
-ROOTD_OPTS=""
diff --git a/sci-physics/root/files/rootd.initd b/sci-physics/root/files/rootd.initd
deleted file mode 100644
index f808259c367..00000000000
--- a/sci-physics/root/files/rootd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
- use logger
- provide root-file-server
-}
-
-start() {
- ebegin "Starting ROOT file server"
- pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
- --pidfile /var/run/rootd.pid \
- --exec /usr/bin/rootd -- ${ROOTD_OPTS})
- retval=$?
- echo ${ROOTD_PID} > /var/run/rootd.pid
- eend ${retval}
-}
-
-stop() {
- ebegin "Stopping ROOT file server"
- start-stop-daemon --stop --quiet \
- --pidfile /var/run/rootd.pid \
- --exec /usr/bin/rootd
- eend $?
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
@ 2019-03-04 3:14 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2019-03-04 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 2d47bf03dc7d7a7e8a8e94af96124aa82381a169
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar 1 17:47:47 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 03:12:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d47bf03
sci-physics/root: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11199
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
sci-physics/root/files/root-6.13.02-hsimple.patch | 31 -----------------------
1 file changed, 31 deletions(-)
diff --git a/sci-physics/root/files/root-6.13.02-hsimple.patch b/sci-physics/root/files/root-6.13.02-hsimple.patch
deleted file mode 100644
index cab8a40afa7..00000000000
--- a/sci-physics/root/files/root-6.13.02-hsimple.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 03af62fcd3..8ec5330773 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -367,26 +367,6 @@ else()
- install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
- endif()
-
--#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
--add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
--add_dependencies(hsimple onepcm)
--if(WIN32)
-- add_custom_command(OUTPUT tutorials/hsimple.root
-- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
-- set ROOTIGNOREPREFIX=1 &&
-- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-- WORKING_DIRECTORY tutorials
-- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
--else()
-- add_custom_command(OUTPUT tutorials/hsimple.root
-- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
-- ROOTIGNOREPREFIX=1
-- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-- WORKING_DIRECTORY tutorials
-- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
--endif()
--install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
--
- #---version--------------------------------------------------------------------------------------
- if(NOT WIN32)
- add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
@ 2020-06-20 17:29 Guilherme Amadio
0 siblings, 0 replies; 6+ messages in thread
From: Guilherme Amadio @ 2020-06-20 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 288a0ff21c8e70296b485441d4d45fc9d09ed1e2
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun 20 15:40:41 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 17:29:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288a0ff2
sci-physics/root: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/16346
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/root/files/root-6.11.02-hsimple.patch | 34 ---------------
sci-physics/root/files/root-6.12.04-no-ocaml.patch | 49 ----------------------
.../root/files/root-6.12.04-no-opengl.patch | 23 ----------
sci-physics/root/files/root-6.12.04-z3.patch | 39 -----------------
sci-physics/root/files/root-6.14.06-oracle.patch | 24 -----------
5 files changed, 169 deletions(-)
diff --git a/sci-physics/root/files/root-6.11.02-hsimple.patch b/sci-physics/root/files/root-6.11.02-hsimple.patch
deleted file mode 100644
index c1e88bd55b7..00000000000
--- a/sci-physics/root/files/root-6.11.02-hsimple.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa05c02568..ef2b5e3f52 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -354,28 +354,6 @@ add_dependencies(onepcm ${__allTargets})
- install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
- install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-
--#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
--if(NOT WIN32)
--add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
--add_dependencies(hsimple onepcm)
--if(WIN32)
-- add_custom_command(OUTPUT tutorials/hsimple.root
-- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
-- set ROOTIGNOREPREFIX=1 &&
-- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-- WORKING_DIRECTORY tutorials
-- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
--else()
-- add_custom_command(OUTPUT tutorials/hsimple.root
-- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
-- ROOTIGNOREPREFIX=1
-- $<TARGET_FILE:root.exe> -l -q -b -n -x hsimple.C -e return
-- WORKING_DIRECTORY tutorials
-- DEPENDS $<TARGET_FILE:root.exe> Cling Hist Tree Gpad Graf HistPainter move_artifacts)
--endif()
--install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
--endif()
--
- #---version--------------------------------------------------------------------------------------
- if(NOT WIN32)
- add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
-
diff --git a/sci-physics/root/files/root-6.12.04-no-ocaml.patch b/sci-physics/root/files/root-6.12.04-no-ocaml.patch
deleted file mode 100644
index 1d91739f01a..00000000000
--- a/sci-physics/root/files/root-6.12.04-no-ocaml.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7405b8848e7c0d5ddcaa1f27b905b6931dc262e2 Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Mon, 18 Dec 2017 13:08:14 +0100
-Subject: [PATCH] Disable OCaml bindings in LLVM
-
----
- interpreter/llvm/src/cmake/config-ix.cmake | 28 ----------------------------
- 1 file changed, 28 deletions(-)
-
-diff --git a/interpreter/llvm/src/cmake/config-ix.cmake b/interpreter/llvm/src/cmake/config-ix.cmake
-index 6fb589cfd3..d1c9a70d10 100644
---- a/interpreter/llvm/src/cmake/config-ix.cmake
-+++ b/interpreter/llvm/src/cmake/config-ix.cmake
-@@ -575,32 +575,4 @@ if(CMAKE_HOST_APPLE AND APPLE)
- endif()
- endif()
-
--# Keep the version requirements in sync with bindings/ocaml/README.txt.
--include(FindOCaml)
--include(AddOCaml)
--if(WIN32)
-- message(STATUS "OCaml bindings disabled.")
--else()
-- find_package(OCaml)
-- if( NOT OCAML_FOUND )
-- message(STATUS "OCaml bindings disabled.")
-- else()
-- if( OCAML_VERSION VERSION_LESS "4.00.0" )
-- message(STATUS "OCaml bindings disabled, need OCaml >=4.00.0.")
-- else()
-- find_ocamlfind_package(ctypes VERSION 0.4 OPTIONAL)
-- if( HAVE_OCAML_CTYPES )
-- message(STATUS "OCaml bindings enabled.")
-- find_ocamlfind_package(oUnit VERSION 2 OPTIONAL)
-- set(LLVM_BINDINGS "${LLVM_BINDINGS} ocaml")
--
-- set(LLVM_OCAML_INSTALL_PATH "${OCAML_STDLIB_PATH}" CACHE STRING
-- "Install directory for LLVM OCaml packages")
-- else()
-- message(STATUS "OCaml bindings disabled, need ctypes >=0.4.")
-- endif()
-- endif()
-- endif()
--endif()
--
- string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")
---
-2.15.1
-
diff --git a/sci-physics/root/files/root-6.12.04-no-opengl.patch b/sci-physics/root/files/root-6.12.04-no-opengl.patch
deleted file mode 100644
index 319020222e5..00000000000
--- a/sci-physics/root/files/root-6.12.04-no-opengl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
-index a68c462eb3..1e82e57241 100644
---- a/cmake/modules/SearchInstalledSoftware.cmake
-+++ b/cmake/modules/SearchInstalledSoftware.cmake
-@@ -499,7 +499,7 @@ if(opengl)
- endif()
-
- #---Check for gl2ps ------------------------------------------------------------------
--if(NOT builtin_gl2ps)
-+if(gl2ps AND NOT builtin_gl2ps)
- message(STATUS "Looking for gl2ps")
- find_Package(gl2ps)
- if(NOT GL2PS_FOUND)
-@@ -999,7 +999,7 @@ if(globus)
- endif()
-
- #---Check for ftgl if needed----------------------------------------------------------
--if(NOT builtin_ftgl)
-+if(ftgl AND NOT builtin_ftgl)
- find_package(FTGL)
- if(NOT FTGL_FOUND)
- if(fail-on-missing)
-
diff --git a/sci-physics/root/files/root-6.12.04-z3.patch b/sci-physics/root/files/root-6.12.04-z3.patch
deleted file mode 100644
index 04f6edf2c6d..00000000000
--- a/sci-physics/root/files/root-6.12.04-z3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4445e05660493841b5fb683c7e8a8dc6c08564ac Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Mon, 18 Dec 2017 11:49:55 +0100
-Subject: [PATCH] Only look for Z3 if necessary
-
----
- interpreter/llvm/src/tools/clang/CMakeLists.txt | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/interpreter/llvm/src/tools/clang/CMakeLists.txt b/interpreter/llvm/src/tools/clang/CMakeLists.txt
-index 2667b1d689..a1559d9b15 100644
---- a/interpreter/llvm/src/tools/clang/CMakeLists.txt
-+++ b/interpreter/llvm/src/tools/clang/CMakeLists.txt
-@@ -186,8 +186,6 @@ if (LIBXML2_FOUND)
- set(CLANG_HAVE_LIBXML 1)
- endif()
-
--find_package(Z3 4.5)
--
- include(CheckIncludeFile)
- check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
-
-@@ -381,11 +379,8 @@ if(NOT CLANG_ENABLE_STATIC_ANALYZER AND (CLANG_ENABLE_ARCMT OR CLANG_ANALYZER_BU
- endif()
-
- if(CLANG_ANALYZER_BUILD_Z3)
-- if(Z3_FOUND)
-- set(CLANG_ANALYZER_WITH_Z3 1)
-- else()
-- message(FATAL_ERROR "Cannot find Z3 header file or shared library")
-- endif()
-+ find_package(Z3 4.5 REQUIRED)
-+ set(CLANG_ANALYZER_WITH_Z3 1)
- endif()
-
- if(CLANG_ENABLE_ARCMT)
---
-2.15.1
-
diff --git a/sci-physics/root/files/root-6.14.06-oracle.patch b/sci-physics/root/files/root-6.14.06-oracle.patch
deleted file mode 100644
index 232d3b08cfa..00000000000
--- a/sci-physics/root/files/root-6.14.06-oracle.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Wed, 14 Nov 2018 11:36:49 +0100
-Subject: Fix FindOracle.cmake to find version 18.x
-
----
- cmake/modules/FindOracle.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
-index b7c8cfbb99..6672cb1bbd 100644
---- a/cmake/modules/FindOracle.cmake
-+++ b/cmake/modules/FindOracle.cmake
-@@ -55,7 +55,7 @@ FIND_LIBRARY(
- )
- FIND_LIBRARY(
- ORACLE_LIBRARY_LNNZ
-- NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32
-+ NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 ociw32
- PATHS ${ORACLE_LIB_LOCATION}
- )
-
---
-2.19.1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
@ 2021-01-20 10:16 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-01-20 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 090fcd89c29bd7b014132ef1bfc9c4cbe87fc4d6
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Wed Jan 20 10:16:15 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 10:16:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090fcd89
sci-physics/root: Remove unused patch
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/root/files/root-6.22.00-rlogger.patch | 36 -----------------------
1 file changed, 36 deletions(-)
diff --git a/sci-physics/root/files/root-6.22.00-rlogger.patch b/sci-physics/root/files/root-6.22.00-rlogger.patch
deleted file mode 100644
index 8ff25c86b52..00000000000
--- a/sci-physics/root/files/root-6.22.00-rlogger.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From bea87d2cde7c490c8417a97f043eaa6905c27f08 Mon Sep 17 00:00:00 2001
-From: Axel Naumann <Axel.Naumann@cern.ch>
-Date: Wed, 3 Jun 2020 16:38:49 +0200
-Subject: [PATCH] [cmake] Fix ROOT/RLogger.hxx not found:
-
-When building without root7 but with C++14, RLogger is used.
-Make it available to the include directories.
-
-(cherry picked from commit fbe075ceedcd7d7f9993864c82ac5bd2960f3494)
----
- core/base/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
-index 66ec9a2224..95eea9b44a 100644
---- a/core/base/CMakeLists.txt
-+++ b/core/base/CMakeLists.txt
-@@ -198,6 +198,7 @@ set(BASE_SOURCES
- if(CMAKE_CXX_STANDARD GREATER 11)
- list(APPEND BASE_HEADERS ROOT/RLogger.hxx)
- list(APPEND BASE_SOURCES v7/src/RLogger.cxx)
-+ set(BASE_V7_INC ${CMAKE_SOURCE_DIR}/core/base/v7/inc)
- # TLogger.hxx may be used without root7 flag, but is placed in v7/inc/,
- # so we need to tell ROOT_INSTALL_HEADERS() where to find it
- set(BASE_HEADER_DIRS inc/ v7/inc/)
-@@ -220,6 +221,7 @@ set(Core_dict_headers ${BASE_HEADERS} PARENT_SCOPE)
- ROOT_OBJECT_LIBRARY(Base ${BASE_SOURCES})
-
- target_include_directories(Base PRIVATE
-+ ${BASE_V7_INC}
- ${PCRE_INCLUDE_DIR}
- res
- ${CMAKE_SOURCE_DIR}/core/foundation/res
---
-2.27.0
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-20 10:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-18 13:13 [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/ Guilherme Amadio
-- strict thread matches above, loose matches on Subject: below --
2018-04-05 15:36 Aaron Bauman
2018-11-19 16:25 Guilherme Amadio
2019-03-04 3:14 Aaron Bauman
2020-06-20 17:29 Guilherme Amadio
2021-01-20 10:16 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox