Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] imath: update to 3.1.11.
@ 2024-03-06 19:19 motorto
  2024-03-07  0:21 ` [PR REVIEW] " sgn
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: motorto @ 2024-03-06 19:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

There is a new pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages imath-3.1.10
https://github.com/void-linux/void-packages/pull/49153

imath: update to 3.1.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

@sgn just noticed now the added patch, is it okay to remove it ? `kio-extra` doesn't seem to depend at ,least directly ,on `imath`.

A patch file from https://github.com/void-linux/void-packages/pull/49153.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imath-3.1.10-49153.patch --]
[-- Type: text/x-diff, Size: 3870 bytes --]

From 12c529383c85d4fbddc7126abd0cbcb103a8f67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 6 Mar 2024 19:04:24 +0000
Subject: [PATCH] imath: update to 3.1.11.

---
 .../patches/split-pyimath-cmake-target.patch  | 39 -------------------
 srcpkgs/imath/template                        | 12 +++---
 2 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/imath/patches/split-pyimath-cmake-target.patch

diff --git a/srcpkgs/imath/patches/split-pyimath-cmake-target.patch b/srcpkgs/imath/patches/split-pyimath-cmake-target.patch
deleted file mode 100644
index 94d8b9ca65ccfd..00000000000000
--- a/srcpkgs/imath/patches/split-pyimath-cmake-target.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/config/ImathConfig.cmake.in
-+++ b/config/ImathConfig.cmake.in
-@@ -4,4 +4,7 @@
- @PACKAGE_INIT@
- 
- include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-+if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/PyImathTargets.cmake")
-+  include("${CMAKE_CURRENT_LIST_DIR}/PyImathTargets.cmake")
-+endif()
- check_required_components("@PROJECT_NAME@")
---- a/src/python/config/ModuleDefine.cmake
-+++ b/src/python/config/ModuleDefine.cmake
-@@ -52,7 +52,7 @@ function(PYIMATH_ADD_LIBRARY_PRIV libnam
-   add_library(${PROJECT_NAME}::${libname} ALIAS ${libname})
- 
-   install(TARGETS ${libname}
--    EXPORT ${PROJECT_NAME}
-+    EXPORT PyImath
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
---- a/src/python/config/CMakeLists.txt
-+++ b/src/python/config/CMakeLists.txt
-@@ -7,8 +7,14 @@
- add_library(PyImathConfig INTERFACE)
- target_include_directories(PyImathConfig INTERFACE
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
--install(TARGETS PyImathConfig EXPORT ${PROJECT_NAME})
-+install(TARGETS PyImathConfig EXPORT PyImath)
- add_library(PyImath::Config ALIAS PyImathConfig)
-+install(EXPORT PyImath
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PyImath
-+  FILE PyImathTargets.cmake
-+  NAMESPACE Imath::
-+  EXPORT_LINK_INTERFACE_LIBRARIES
-+)
- 
- if(IMATH_INSTALL_PKG_CONFIG)
-   # use a helper function to avoid variable pollution, but pretty simple
diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template
index b4a47b59073b8c..ff20a00935ce35 100644
--- a/srcpkgs/imath/template
+++ b/srcpkgs/imath/template
@@ -1,7 +1,7 @@
 # Template file for 'imath'
 pkgname=imath
-version=3.1.9
-revision=3
+version=3.1.11
+revision=1
 build_style=cmake
 configure_args="-DPYTHON=ON"
 hostmakedepends="python3-numpy"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://imath.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/AcademySoftwareFoundation/Imath/main/CHANGES.md"
 distfiles="https://github.com/AcademySoftwareFoundation/Imath/archive/v${version}/imath-${version}.tar.gz"
-checksum=f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3
+checksum=9057849585e49b8b85abe7cc1e76e22963b01bfdc3b6d83eac90c499cd760063
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=ON"
@@ -34,7 +34,8 @@ imath-python3_package() {
 	short_desc+=" - Python module"
 	pkg_install() {
 		vmove "usr/lib/libPyImath*.so.*"
-		vmove "${py3_sitelib}"
+		vmove "${py3_sitelib}/imath.so"
+		vmove "${py3_sitelib}/imathnumpy.so"
 	}
 }
 
@@ -44,7 +45,6 @@ imath-python3-devel_package() {
 	short_desc+=" - Python module - development files"
 	pkg_install() {
 		vmove "usr/include/Imath/Py*"
-		vmove "usr/lib/cmake/PyImath*"
 		vmove usr/lib/pkgconfig/PyImath.pc
 		vmove "usr/lib/libPyImath*.so"
 	}
@@ -56,7 +56,7 @@ imath-devel_package() {
 	pkg_install() {
 		vmove "usr/include/Imath/half*"
 		vmove "usr/include/Imath/Imath*"
-		vmove "usr/lib/cmake/Imath*"
+		vmove "usr/lib/cmake"
 		vmove usr/lib/pkgconfig/Imath.pc
 		vmove "usr/lib/libImath*.so"
 	}

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR REVIEW] imath: update to 3.1.11.
  2024-03-06 19:19 [PR PATCH] imath: update to 3.1.11 motorto
@ 2024-03-07  0:21 ` sgn
  2024-03-07  0:22 ` sgn
  2024-03-07  0:25 ` sgn
  2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2024-03-07  0:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/49153#discussion_r1515324230

Comment:
This is the reason, PyImath needs to be split. Otherwise, `find_package(imath)` will not found if pyimath is not installed.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR REVIEW] imath: update to 3.1.11.
  2024-03-06 19:19 [PR PATCH] imath: update to 3.1.11 motorto
  2024-03-07  0:21 ` [PR REVIEW] " sgn
@ 2024-03-07  0:22 ` sgn
  2024-03-07  0:25 ` sgn
  2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2024-03-07  0:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/49153#discussion_r1515324345

Comment:
So, no it's not ok to be removed

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR REVIEW] imath: update to 3.1.11.
  2024-03-06 19:19 [PR PATCH] imath: update to 3.1.11 motorto
  2024-03-07  0:21 ` [PR REVIEW] " sgn
  2024-03-07  0:22 ` sgn
@ 2024-03-07  0:25 ` sgn
  2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2024-03-07  0:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/49153#discussion_r1515326316

Comment:
Why do we need to revert this change?

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-03-07  0:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-06 19:19 [PR PATCH] imath: update to 3.1.11 motorto
2024-03-07  0:21 ` [PR REVIEW] " sgn
2024-03-07  0:22 ` sgn
2024-03-07  0:25 ` sgn

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).