* [gentoo-commits] repo/gentoo:master commit in: dev-python/pivy/, dev-python/pivy/files/
@ 2021-04-10 13:29 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-04-10 13:29 UTC (permalink / raw
To: gentoo-commits
commit: fb2447cf50b561a3a7d9381f1cecb4ffbb269a7a
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Apr 10 09:12:38 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 13:28:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2447cf
dev-python/pivy: bump to 0.6.6
Closes: https://bugs.gentoo.org/780117
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20326
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-python/pivy/Manifest | 1 +
...01-fix-CMakeLists.txt-for-distutils_cmake.patch | 24 +++++++++++
...o-specific-clear-swig-deprecation-warning.patch | 26 ++++++++++++
dev-python/pivy/pivy-0.6.6.ebuild | 47 ++++++++++++++++++++++
4 files changed, 98 insertions(+)
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 3b1437a5bd1..49189d75a6a 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1 +1,2 @@
DIST pivy-0.6.5.tar.gz 6614159 BLAKE2B 2652feb26137b2deda8b76083d3bd9018303ca0a0236ea97e83e9ff24ddeda30462a25ac1b20b0d3e718fc9f83ae5ebf7116a5c0d94debcc5b6d729792230655 SHA512 6cf0b1ac348336609f42f6a72df7ffdc3e1042a4f8fc6e2b725ca38f09476c70bafa14c1f083d1badeb5b37b974a0fbf5806ea71d44d734b9ab9b125ce7f8695
+DIST pivy-0.6.6.tar.gz 6618471 BLAKE2B 5bcf2479bf26628e3dfe59c1440901368442de2f32a5680ef1af10d49239d8c73b79809495d7227937fd7784af1e1ded27f93f0255793e713add0c1cc35b8e5d SHA512 e260c6abd0aede7621d5fed66eeceb98a32634af84370ef713d70d583ec017cded4be682fd7e70e5faa19988a5e032a9d2f2308b8ae6dd9495d76e884de1d80c
diff --git a/dev-python/pivy/files/pivy-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch b/dev-python/pivy/files/pivy-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
new file mode 100644
index 00000000000..a2e97027b58
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
@@ -0,0 +1,24 @@
+From 44e8dd5b2252c7639021506202df60d6664153d7 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 10 Apr 2021 10:27:55 +0200
+Subject: [PATCH] fix CMakeLists.txt for distutils_cmake
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ distutils_cmake/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/distutils_cmake/CMakeLists.txt b/distutils_cmake/CMakeLists.txt
+index 976be6a..ccc54e4 100644
+--- a/distutils_cmake/CMakeLists.txt
++++ b/distutils_cmake/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.5)
+-project(pivy_cmake_setup NONE)
++project(pivy_cmake_setup)
+
+
+ find_package(Coin CONFIG REQUIRED)
+--
+2.31.1
+
diff --git a/dev-python/pivy/files/pivy-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch b/dev-python/pivy/files/pivy-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
new file mode 100644
index 00000000000..f3e7c8f0fd7
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
@@ -0,0 +1,26 @@
+From 8fd388dd17f8bfa7df62cbea86d077c1d0d0cb66 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 10 Apr 2021 10:49:57 +0200
+Subject: [PATCH] [Gentoo-specific] clear swig deprecation warning
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 14f0f1b..b1f9a8f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -144,7 +144,7 @@ class pivy_build(build):
+ SWIG = ((sys.platform == "win32" and "swig.exe") or "swig")
+
+ SWIG_SUPPRESS_WARNINGS = "-w302,306,307,312,314,325,361,362,467,389,503,509,510"
+- SWIG_PARAMS = "-c++ -python -includeall -modern -D__PIVY__ " + \
++ SWIG_PARAMS = "-c++ -python -includeall -D__PIVY__ " + \
+ "-I. -Ifake_headers -I\"%s\" %s -o %s_wrap.cpp " + \
+ "interfaces" + os.sep + "%s.i"
+ if sys.version_info.major >= 3:
+--
+2.31.1
+
diff --git a/dev-python/pivy/pivy-0.6.6.ebuild b/dev-python/pivy/pivy-0.6.6.ebuild
new file mode 100644
index 00000000000..840079762e2
--- /dev/null
+++ b/dev-python/pivy/pivy-0.6.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Coin3D bindings for Python"
+HOMEPAGE="https://github.com/coin3d/pivy"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
+else
+ SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+quarter soqt"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( quarter soqt )
+"
+
+RDEPEND="
+ >=media-libs/coin-4.0.0
+ quarter? ( media-libs/quarter )
+ soqt? ( >=media-libs/SoQt-1.6.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/swig
+ dev-util/cmake
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
+ "${FILESDIR}"/${P}-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
+)
+
+DOCS=( AUTHORS HACKING NEWS README.md THANKS )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pivy/, dev-python/pivy/files/
@ 2021-05-10 10:57 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-05-10 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 18a6b5cf49f1c2fe42a7a53dc5455bffc9da5bf6
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon May 10 10:57:06 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May 10 10:57:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a6b5cf
dev-python/pivy: removed obsolete 0.6.5
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-python/pivy/Manifest | 1 -
dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch | 31 ------------------
dev-python/pivy/pivy-0.6.5.ebuild | 41 ------------------------
3 files changed, 73 deletions(-)
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 49189d75a6a..4c03580a9fd 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1,2 +1 @@
-DIST pivy-0.6.5.tar.gz 6614159 BLAKE2B 2652feb26137b2deda8b76083d3bd9018303ca0a0236ea97e83e9ff24ddeda30462a25ac1b20b0d3e718fc9f83ae5ebf7116a5c0d94debcc5b6d729792230655 SHA512 6cf0b1ac348336609f42f6a72df7ffdc3e1042a4f8fc6e2b725ca38f09476c70bafa14c1f083d1badeb5b37b974a0fbf5806ea71d44d734b9ab9b125ce7f8695
DIST pivy-0.6.6.tar.gz 6618471 BLAKE2B 5bcf2479bf26628e3dfe59c1440901368442de2f32a5680ef1af10d49239d8c73b79809495d7227937fd7784af1e1ded27f93f0255793e713add0c1cc35b8e5d SHA512 e260c6abd0aede7621d5fed66eeceb98a32634af84370ef713d70d583ec017cded4be682fd7e70e5faa19988a5e032a9d2f2308b8ae6dd9495d76e884de1d80c
diff --git a/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch b/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch
deleted file mode 100644
index 4d8a6fdd888..00000000000
--- a/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1c9ffef4d85327fe517bdcf7e11c339a4862ba2e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 12 Jun 2019 21:21:34 +0200
-Subject: [PATCH] CMakeLists.txt: remove NONE keyword for languages from
- project definition. This solves a bug where SoQt is not found on Gentoo
- systems (see https://github.com/waebbl/waebbl-gentoo/issues/42)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to QÍN Yuhào for coming up with this fix.
-
-Suggested-by: QÍN Yuhào <qinyh18@mails.tsinghua.edu.cn>
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 76d0d06..48bd3c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--project(pivy_cmake_setup NONE)
-+project(pivy_cmake_setup)
- cmake_minimum_required(VERSION 3.5)
-
-
---
-2.21.0
-
diff --git a/dev-python/pivy/pivy-0.6.5.ebuild b/dev-python/pivy/pivy-0.6.5.ebuild
deleted file mode 100644
index d72586655e3..00000000000
--- a/dev-python/pivy/pivy-0.6.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Coin3D bindings for Python"
-HOMEPAGE="https://github.com/coin3d/pivy"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
-else
- SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="+quarter soqt"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( quarter soqt )
-"
-
-RDEPEND="
- >=media-libs/coin-4.0.0
- quarter? ( media-libs/quarter )
- soqt? ( >=media-libs/SoQt-1.6.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.4-find-SoQt.patch" )
-
-DOCS=( AUTHORS HACKING NEWS README.md THANKS )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pivy/, dev-python/pivy/files/
@ 2023-11-20 15:06 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-11-20 15:06 UTC (permalink / raw
To: gentoo-commits
commit: 518767b927e5443e5dcc803023126946cd1980eb
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 13:20:36 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 15:06:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518767b9
dev-python/pivy: enable py3.12
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-python/pivy/Manifest | 1 +
dev-python/pivy/files/pivy-0.6.8-python312.patch | 23 +++++++++++++++++++++++
dev-python/pivy/pivy-0.6.8.ebuild | 11 +++++++++--
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index c7ff605c4fef..02d933036402 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1 +1,2 @@
+DIST pivy-0.6.8-python312-unittests.patch 39874 BLAKE2B e63be84da3b852c89e04cf7baa61b44e175414245dc20799a6463fecb6896082dfb03a365540880e37b30cde99c0124bd5b2aacf9d011d580cda2c1add917922 SHA512 3cb3980b31b2d6ff957a38b028319c32bfc0398cd08048171f1fe7a0b3e25a6a6096960fdfc2ada1b4adf184c381537214a7110569e91e75ede7b951a4e3ac98
DIST pivy-0.6.8.tar.gz 6618458 BLAKE2B 08c57f0d7bff15a7f9d49b56b75b44c587416eb0feb2b237db48d7e2edd478f9212d7e898f4dd102b9d5dd10046dd652f37a9974861598c7ba91d7fdb1145c91 SHA512 723b09028f2e3075056b9588cebad0ddccbc98d0c15552b9565c177b0de764b9645f88ea2bc534ccf606f2e0b59f91e1d03551b55ece66c0654ce9cdf09a1a7c
diff --git a/dev-python/pivy/files/pivy-0.6.8-python312.patch b/dev-python/pivy/files/pivy-0.6.8-python312.patch
new file mode 100644
index 000000000000..6742d7579521
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.8-python312.patch
@@ -0,0 +1,23 @@
+From d3faf04b8770c60ca9b2186059ee82201e3620ad Mon Sep 17 00:00:00 2001
+From: lorenz <looooo@users.noreply.github.com>
+Date: Thu, 13 Jul 2023 23:59:17 +0200
+Subject: [PATCH] python 3.12 support
+
+PyUnicode_GET_SIZE -> PyUnicode_GET_LENGTH
+---
+ Inventor/SoInput.i | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Inventor/SoInput.i b/Inventor/SoInput.i
+index 0925ab50..f0be6383 100644
+--- a/Inventor/SoInput.i
++++ b/Inventor/SoInput.i
+@@ -10,7 +10,7 @@
+ if (PyUnicode_Check($input))
+ {
+ $1 = (void *) PyUnicode_AsUTF8($input);
+- $2 = PyUnicode_GET_SIZE($input);
++ $2 = PyUnicode_GET_LENGTH($input);
+ }
+ else if (PyBytes_Check($input))
+ {
diff --git a/dev-python/pivy/pivy-0.6.8.ebuild b/dev-python/pivy/pivy-0.6.8.ebuild
index 908db8e6742c..014e40cb9cbc 100644
--- a/dev-python/pivy/pivy-0.6.8.ebuild
+++ b/dev-python/pivy/pivy-0.6.8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
@@ -16,7 +16,10 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
else
- SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="
+ https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~andrewammerlaan/${P}-python312-unittests.patch
+ "
KEYWORDS="amd64 x86"
fi
@@ -46,6 +49,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
"${FILESDIR}"/${PN}-0.6.7-find-qmake.patch
+ # https://github.com/coin3d/pivy/issues/105
+ "${FILESDIR}"/${PN}-0.6.8-python312.patch
+ # https://github.com/coin3d/pivy/pull/109
+ "${DISTDIR}"/${PN}-0.6.8-python312-unittests.patch
)
DOCS=( AUTHORS HACKING NEWS README.md THANKS )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pivy/, dev-python/pivy/files/
@ 2024-11-08 13:54 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-11-08 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 1b3adbf3f0555f461325df2b64cc3398b66bf02b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 13:52:58 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 13:53:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3adbf3
dev-python/pivy: Fix build if media-libs/SoQt is installed
This is at least dealing with the immediate issue.
Bug: https://bugs.gentoo.org/920482
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch | 14 ++++++++++++++
dev-python/pivy/pivy-0.6.8.ebuild | 8 ++++----
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch b/dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch
new file mode 100644
index 000000000000..2150f9806139
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.8-SoQtViewer-w-cmath.patch
@@ -0,0 +1,14 @@
+From a5fad6bb07d994d6e727d5759965611c6e4d57d6 Mon Sep 17 00:00:00 2001
+From: Konstantin Podsvirov <konstantin@podsvirov.pro>
+Date: Fri, 24 Nov 2023 21:09:53 +0300
+Subject: [PATCH] Add fake header for recently introduced cmath include in
+ SoQtViewer.h
+
+---
+ fake_headers/cmath | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 fake_headers/cmath
+
+diff --git a/fake_headers/cmath b/fake_headers/cmath
+new file mode 100644
+index 00000000..e69de29b
diff --git a/dev-python/pivy/pivy-0.6.8.ebuild b/dev-python/pivy/pivy-0.6.8.ebuild
index 73dc11cf83dd..3095dba32c74 100644
--- a/dev-python/pivy/pivy-0.6.8.ebuild
+++ b/dev-python/pivy/pivy-0.6.8.ebuild
@@ -49,10 +49,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
"${FILESDIR}"/${PN}-0.6.7-find-qmake.patch
- # https://github.com/coin3d/pivy/issues/105
- "${FILESDIR}"/${PN}-0.6.8-python312.patch
- # https://github.com/coin3d/pivy/pull/109
- "${DISTDIR}"/${PN}-0.6.8-python312-unittests.patch
+ # in 0.6.9:
+ "${FILESDIR}"/${P}-python312.patch # https://github.com/coin3d/pivy/issues/105
+ "${DISTDIR}"/${P}-python312-unittests.patch # https://github.com/coin3d/pivy/pull/109
+ "${FILESDIR}"/${P}-SoQtViewer-w-cmath.patch # bug 920482
)
DOCS=( AUTHORS HACKING NEWS README.md THANKS )
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-08 13:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-10 10:57 [gentoo-commits] repo/gentoo:master commit in: dev-python/pivy/, dev-python/pivy/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 13:54 Andreas Sturmlechner
2023-11-20 15:06 Andrew Ammerlaan
2021-04-10 13:29 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox