* [PR PATCH] root: update to 6.26.10
@ 2022-11-22 1:17 BenJarg
2022-11-24 1:02 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: BenJarg @ 2022-11-22 1:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
There is a new pull request by BenJarg against master on the void-packages repository
https://github.com/BenJarg/void-packages root-62610
https://github.com/void-linux/void-packages/pull/40677
root: update to 6.26.10
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/40677.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-root-62610-40677.patch --]
[-- Type: text/x-diff, Size: 6083 bytes --]
From b78c6e712846a446ed4815e2297b028363157218 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Mon, 21 Nov 2022 16:11:10 -0800
Subject: [PATCH] root: update to 6.26.10
---
srcpkgs/root/patches/python3.11_2.patch | 81 -------------------------
srcpkgs/root/template | 6 +-
2 files changed, 3 insertions(+), 84 deletions(-)
delete mode 100644 srcpkgs/root/patches/python3.11_2.patch
diff --git a/srcpkgs/root/patches/python3.11_2.patch b/srcpkgs/root/patches/python3.11_2.patch
deleted file mode 100644
index feecf3a53c07..000000000000
--- a/srcpkgs/root/patches/python3.11_2.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Patch is from: https://github.com/root-project/root/pull/11457
-
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-index 73fb8099b5..f2eea396af 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CPPInstance.cxx
-@@ -764,7 +764,6 @@ PyTypeObject CPPInstance_Type = {
- 0, // tp_as_buffer
- Py_TPFLAGS_DEFAULT |
- Py_TPFLAGS_BASETYPE |
-- Py_TPFLAGS_HAVE_GC |
- Py_TPFLAGS_CHECKTYPES, // tp_flags
- (char*)"cppyy object proxy (internal)", // tp_doc
- 0, // tp_traverse
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-index 97ce06daa7..ed41b1637c 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-@@ -78,8 +78,7 @@ PyTypeObject TypedefPointerToClass_Type = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- (ternaryfunc)tpc_call, // tp_call
- 0, 0, 0, 0,
-- Py_TPFLAGS_DEFAULT |
-- Py_TPFLAGS_HAVE_GC, // tp_flags
-+ Py_TPFLAGS_DEFAULT, // tp_flags
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- #if PY_VERSION_HEX >= 0x02030000
- , 0 // tp_del
-diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-index f9e92f9c8c..510d65f88a 100644
---- a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-+++ b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-@@ -45,7 +45,7 @@ struct InitCPyCppyy_NoneType_t {
- ((PyVarObject&)CPyCppyy_NoneType).ob_size = 0;
-
- CPyCppyy_NoneType.tp_name = const_cast<char*>("CPyCppyy_NoneType");
-- CPyCppyy_NoneType.tp_flags = Py_TPFLAGS_HAVE_RICHCOMPARE | Py_TPFLAGS_HAVE_GC;
-+ CPyCppyy_NoneType.tp_flags = Py_TPFLAGS_HAVE_RICHCOMPARE;
-
- CPyCppyy_NoneType.tp_traverse = (traverseproc)0;
- CPyCppyy_NoneType.tp_clear = (inquiry)0;
-@@ -135,6 +135,7 @@ bool CPyCppyy::MemoryRegulator::RecursiveRemove(
- CPyCppyy_NoneType.tp_traverse = Py_TYPE(pyobj)->tp_traverse;
- CPyCppyy_NoneType.tp_clear = Py_TYPE(pyobj)->tp_clear;
- CPyCppyy_NoneType.tp_free = Py_TYPE(pyobj)->tp_free;
-+ CPyCppyy_NoneType.tp_flags = Py_TYPE(pyobj)->tp_flags;
- } else if (CPyCppyy_NoneType.tp_traverse != Py_TYPE(pyobj)->tp_traverse) {
- // TODO: SystemError?
- std::cerr << "in CPyCppyy::MemoryRegulater, unexpected object of type: "
-diff --git a/bindings/pyroot/cppyy/patches/gc_flags.patch b/bindings/pyroot/cppyy/patches/gc_flags.patch
-new file mode 100644
-index 0000000000..68f0718629
---- /dev/null
-+++ b/bindings/pyroot/cppyy/patches/gc_flags.patch
-@@ -0,0 +1,26 @@
-+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-+index 97ce06daa7..ed41b1637c 100644
-+--- a/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-++++ b/bindings/pyroot/cppyy/CPyCppyy/src/CustomPyTypes.cxx
-+@@ -78,8 +78,7 @@ PyTypeObject TypedefPointerToClass_Type = {
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ (ternaryfunc)tpc_call, // tp_call
-+ 0, 0, 0, 0,
-+- Py_TPFLAGS_DEFAULT |
-+- Py_TPFLAGS_HAVE_GC, // tp_flags
-++ Py_TPFLAGS_DEFAULT, // tp_flags
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-+ #if PY_VERSION_HEX >= 0x02030000
-+ , 0 // tp_del
-+diff --git a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-+index f9e92f9c8c..510d65f88a 100644
-+--- a/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-++++ b/bindings/pyroot/cppyy/CPyCppyy/src/MemoryRegulator.cxx
-+@@ -135,6 +135,7 @@ bool CPyCppyy::MemoryRegulator::RecursiveRemove(
-+ CPyCppyy_NoneType.tp_traverse = Py_TYPE(pyobj)->tp_traverse;
-+ CPyCppyy_NoneType.tp_clear = Py_TYPE(pyobj)->tp_clear;
-+ CPyCppyy_NoneType.tp_free = Py_TYPE(pyobj)->tp_free;
-++ CPyCppyy_NoneType.tp_flags = Py_TYPE(pyobj)->tp_flags;
-+ } else if (CPyCppyy_NoneType.tp_traverse != Py_TYPE(pyobj)->tp_traverse) {
-+ // TODO: SystemError?
-+ std::cerr << "in CPyCppyy::MemoryRegulater, unexpected object of type: "
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index a8e9644ad5c3..30e55493ffd6 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
# Template file for 'root'
pkgname=root
-version=6.26.06
-revision=2
+version=6.26.10
+revision=1
# Only i686 and x86_64 seem to be officially supported
archs="i686* x86_64*"
build_style=cmake
@@ -24,7 +24,7 @@ maintainer="Ben Jargowsky <benjar63@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://root.cern"
distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
-checksum=b1f73c976a580a5c56c8c8a0152582a1dfc560b4dd80e1b7545237b65e6c89cb
+checksum=8e56bec397104017aa54f9eb554de7a1a134474fe0b3bb0f43a70fc4fabd625f
build_options="fortran root7"
build_options_default="fortran"
python_version=3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: root: update to 6.26.10
2022-11-22 1:17 [PR PATCH] root: update to 6.26.10 BenJarg
@ 2022-11-24 1:02 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2022-11-24 1:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There's a merged pull request on the void-packages repository
root: update to 6.26.10
https://github.com/void-linux/void-packages/pull/40677
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-24 1:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-22 1:17 [PR PATCH] root: update to 6.26.10 BenJarg
2022-11-24 1:02 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).