* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/files/
@ 2024-06-06 0:59 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-06-06 0:59 UTC (permalink / raw
To: gentoo-commits
commit: b1e1f05e988a019aa8be2bd5ba3f97f92f8c59d0
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jun 4 12:19:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 00:58:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e1f05e
media-gfx/alembic: 1.8.6 fix broken patch
kaputt .editorconfig broke this...
Closes: https://bugs.gentoo.org/933514
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37033
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/alembic/files/alembic-1.8.6-py312.patch | 150 ++++++++++++----------
1 file changed, 83 insertions(+), 67 deletions(-)
diff --git a/media-gfx/alembic/files/alembic-1.8.6-py312.patch b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
index 863388be22a9..499645280d9a 100644
--- a/media-gfx/alembic/files/alembic-1.8.6-py312.patch
+++ b/media-gfx/alembic/files/alembic-1.8.6-py312.patch
@@ -1,46 +1,83 @@
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-tests: use assertEqual instead of assertEquals
-tests: use assertRaises instead of failUnlessRaises
-
-diff --git a/python/PyAlembic/Tests/testCollections.py b/python/PyAlembic/Tests/testCollections.py
-index ab48a54..1745582 100644
---- a/python/PyAlembic/Tests/testCollections.py
-+++ b/python/PyAlembic/Tests/testCollections.py
-@@ -67,14 +67,14 @@ class CollectionTest(unittest.TestCase):
- prop = group.getSchema().createCollection("prop")
- prop.setValue(strVec)
-
-- self.assertEquals(group.getSchema().getNumCollections(), 1)
-+ self.assertEqual(group.getSchema().getNumCollections(), 1)
-
- # TODO passing in time sampling here causes a segfault, most likely because
- # of how createCollection currently takes an Argument &, see #274
- cool = group.getSchema().createCollection("cool", md)
- cool.setTimeSampling(ts)
-
-- self.assertEquals(
-+ self.assertEqual(
- group.getSchema().getCollection(1).getMetaData().get("coupe"),
- "de ville" )
-
-diff --git a/python/PyAlembic/Tests/testCurves.py b/python/PyAlembic/Tests/testCurves.py
-index dba9e1c..956625a 100644
---- a/python/PyAlembic/Tests/testCurves.py
-+++ b/python/PyAlembic/Tests/testCurves.py
-@@ -59,7 +59,7 @@ class CurvesTest(unittest.TestCase):
- widthSamp, uvSamp )
-
- knots = curvesSamp.getKnots()
-- self.assertEquals(len(knots), 0)
-+ self.assertEqual(len(knots), 0)
-
- newKnots = FloatArray(4)
- for ii in range(4):
-diff --git a/python/PyAlembic/Tests/testTypes.py b/python/PyAlembic/Tests/testTypes.py
-index bad9577..f0e8d26 100644
---- a/python/PyAlembic/Tests/testTypes.py
-+++ b/python/PyAlembic/Tests/testTypes.py
-@@ -60,7 +60,7 @@ class TypesTest(unittest.TestCase):
+From 3b6c04d8c02520a973c95b51ca1fa4bd5e7e8e73 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Tue, 4 Jun 2024 14:15:11 +0200
+Subject: [PATCH] python/PyAlembic/Tests: update do python3.12
+
+tests: use assertEqual instead of assertEquals
+tests: use assertRaises instead of failUnlessRaises
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ maya/Tests/AbcExport_dupRoots_test.py | 2 +-
+ python/PyAlembic/Tests/testCollections.py | 4 ++--
+ python/PyAlembic/Tests/testCurves.py | 2 +-
+ python/PyAlembic/Tests/testPropExcept.py | 2 +-
+ python/PyAlembic/Tests/testTypes.py | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/maya/Tests/AbcExport_dupRoots_test.py b/maya/Tests/AbcExport_dupRoots_test.py
+index d532c10..f864281 100644
+--- a/maya/Tests/AbcExport_dupRoots_test.py
++++ b/maya/Tests/AbcExport_dupRoots_test.py
+@@ -48,7 +48,7 @@ class AbcExport_dupRootsTest(unittest.TestCase):
+ MayaCmds.group(n='group1')
+ MayaCmds.duplicate()
+
+- self.failUnlessRaises(RuntimeError, MayaCmds.AbcExport,
++ self.assertRaises(RuntimeError, MayaCmds.AbcExport,
+ j='-root group1|cube -root group2|cube -f dupRoots.abc')
+
+ # the abc file shouldn't exist
+diff --git a/python/PyAlembic/Tests/testCollections.py b/python/PyAlembic/Tests/testCollections.py
+index ab48a54..1745582 100644
+--- a/python/PyAlembic/Tests/testCollections.py
++++ b/python/PyAlembic/Tests/testCollections.py
+@@ -67,14 +67,14 @@ class CollectionTest(unittest.TestCase):
+ prop = group.getSchema().createCollection("prop")
+ prop.setValue(strVec)
+
+- self.assertEquals(group.getSchema().getNumCollections(), 1)
++ self.assertEqual(group.getSchema().getNumCollections(), 1)
+
+ # TODO passing in time sampling here causes a segfault, most likely because
+ # of how createCollection currently takes an Argument &, see #274
+ cool = group.getSchema().createCollection("cool", md)
+ cool.setTimeSampling(ts)
+
+- self.assertEquals(
++ self.assertEqual(
+ group.getSchema().getCollection(1).getMetaData().get("coupe"),
+ "de ville" )
+
+diff --git a/python/PyAlembic/Tests/testCurves.py b/python/PyAlembic/Tests/testCurves.py
+index dba9e1c..956625a 100644
+--- a/python/PyAlembic/Tests/testCurves.py
++++ b/python/PyAlembic/Tests/testCurves.py
+@@ -59,7 +59,7 @@ class CurvesTest(unittest.TestCase):
+ widthSamp, uvSamp )
+
+ knots = curvesSamp.getKnots()
+- self.assertEquals(len(knots), 0)
++ self.assertEqual(len(knots), 0)
+
+ newKnots = FloatArray(4)
+ for ii in range(4):
+diff --git a/python/PyAlembic/Tests/testPropExcept.py b/python/PyAlembic/Tests/testPropExcept.py
+index e1a1dff..2ddf40d 100644
+--- a/python/PyAlembic/Tests/testPropExcept.py
++++ b/python/PyAlembic/Tests/testPropExcept.py
+@@ -70,5 +70,5 @@ class PropExceptTest(unittest.TestCase):
+ p = props.getProperty("myprop")
+ self.assertEqual(p.getName(), "myprop")
+
+- self.failUnlessRaises(KeyError, props.getProperty, "notfound")
++ self.assertRaises(KeyError, props.getProperty, "notfound")
+ self.assertRaises(IndexError, props.getProperty, 99)
+diff --git a/python/PyAlembic/Tests/testTypes.py b/python/PyAlembic/Tests/testTypes.py
+index bad9577..f0e8d26 100644
+--- a/python/PyAlembic/Tests/testTypes.py
++++ b/python/PyAlembic/Tests/testTypes.py
+@@ -60,7 +60,7 @@ class TypesTest(unittest.TestCase):
self.assertIsNotNone(POD.kUnknownPOD)
# If a new POD type is added, this will throw an exception
@@ -49,27 +86,6 @@ index bad9577..f0e8d26 100644
def testDataTypeWrapper(self):
# Default Constructor
-diff --git a/maya/Tests/AbcExport_dupRoots_test.py b/maya/Tests/AbcExport_dupRoots_test.py
-index d532c10..f864281 100644
---- a/maya/Tests/AbcExport_dupRoots_test.py
-+++ b/maya/Tests/AbcExport_dupRoots_test.py
-@@ -48,7 +48,7 @@ class AbcExport_dupRootsTest(unittest.TestCase):
- MayaCmds.group(n='group1')
- MayaCmds.duplicate()
-
-- self.failUnlessRaises(RuntimeError, MayaCmds.AbcExport,
-+ self.assertRaises(RuntimeError, MayaCmds.AbcExport,
- j='-root group1|cube -root group2|cube -f dupRoots.abc')
-
- # the abc file shouldn't exist
-diff --git a/python/PyAlembic/Tests/testPropExcept.py b/python/PyAlembic/Tests/testPropExcept.py
-index e1a1dff..2ddf40d 100644
---- a/python/PyAlembic/Tests/testPropExcept.py
-+++ b/python/PyAlembic/Tests/testPropExcept.py
-@@ -70,5 +70,5 @@ class PropExceptTest(unittest.TestCase):
- p = props.getProperty("myprop")
- self.assertEqual(p.getName(), "myprop")
-
-- self.failUnlessRaises(KeyError, props.getProperty, "notfound")
-+ self.assertRaises(KeyError, props.getProperty, "notfound")
- self.assertRaises(IndexError, props.getProperty, 99)
+--
+2.45.1
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/files/
@ 2024-06-22 18:54 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2024-06-22 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 0eb0f8e09e4920104101b154ea6872196ac488e7
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 18 17:23:51 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 18:50:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb0f8e0
media-gfx/alembic: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../alembic-1.8.0-0001-set-correct-libdir.patch | 57 ----------------------
1 file changed, 57 deletions(-)
diff --git a/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch b/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
deleted file mode 100644
index 3216e38d2381..000000000000
--- a/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9e877b10c05e9482ef00bda99033508cc64211fd Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 23 Apr 2021 15:20:15 +0200
-Subject: [PATCH] set correct libdir
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 8 ++++----
- lib/Alembic/CMakeLists.txt | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69fff1e..97d1e2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,12 +73,12 @@ option(DOCS_PATH
-
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (ALEMBIC_SHARED_LIBS)
- SET(LIB_TYPE SHARED)
-- SET(ARCHIVE_INSTALL_DIR lib)
-+ SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (WIN32)
- ADD_DEFINITIONS(-DALEMBIC_DLL)
- ENDIF()
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index 20acfed..9859bbe 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES(Alembic
- ${ZLIB_LIBRARY}
- )
-
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
-+SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
- INSTALL(TARGETS Alembic
- EXPORT AlembicTargets
- LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
-@@ -91,7 +91,7 @@ INSTALL(TARGETS Alembic
-
- set(alembic_targets_file "${PROJECT_NAME}Targets.cmake")
-
--SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
-+SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
- "Where to install the Alembic's cmake files")
-
- INCLUDE(CMakePackageConfigHelpers)
---
-2.31.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-22 18:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-06 0:59 [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-06-22 18:54 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox