Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python3-pynest2d for
openSUSE:Factory checked in at 2022-03-10 22:45:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-pynest2d (Old)
and /work/SRC/openSUSE:Factory/.python3-pynest2d.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-pynest2d"
Thu Mar 10 22:45:02 2022 rev:6 rq:960604 version:4.12.0
Wed Mar 9 18:48:02 2022 rev:5 rq:960430 version:4.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-pynest2d/python3-pynest2d.changes
2020-12-17 17:09:03.853956519 +0100
+++
/work/SRC/openSUSE:Factory/.python3-pynest2d.new.2349/python3-pynest2d.changes
2022-03-11 11:34:31.278144458 +0100
@@ -1,0 +2,19 @@
+Wed Mar 9 18:41:03 UTC 2022 - Stefan Br??ns <[email protected]>
+
+- Restore Retrieve-required-flags-from-Libnest2D-target.patch,
+ which is not upstream, and rebase.
+ This fixes building for Leap 15.3 and 15.4.
+
+-------------------------------------------------------------------
+Wed Mar 9 08:47:24 UTC 2022 - Dirk Stoecker <[email protected]>
+
+- update to 4.12.0 (no changelog provided)
+- Drop upstream patch: Retrieve-required-flags-from-Libnest2D-target.patch
+- Rebase pynest2d-PyQt5.sip.patch (partially upstreamed)
+
+-------------------------------------------------------------------
+Sat Feb 26 14:22:54 UTC 2022 - Max Lin <[email protected]>
+
+- Use BuildRequires python3-qt5-sip for Leap 15.4
+
+-------------------------------------------------------------------
Old:
----
pynest2d-4.8.0.tar.gz
New:
----
pynest2d-4.12.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-pynest2d.spec ++++++
--- /var/tmp/diff_new_pack.7e4wY3/_old 2022-03-11 11:34:31.766145031 +0100
+++ /var/tmp/diff_new_pack.7e4wY3/_new 2022-03-11 11:34:31.774145040 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-pynest2d
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
Name: python3-pynest2d
-%define sversion 4.8
-Version: 4.8.0
+Version: 4.12.0
Release: 0
Summary: CPython bindings for libnest2d
License: LGPL-3.0-only
Group: Development/Libraries/C and C++
URL: https://github.com/Ultimaker/pynest2d
-Source:
https://github.com/Ultimaker/pynest2d/archive/%{sversion}.tar.gz#/pynest2d-%{version}.tar.gz
+Source:
https://github.com/Ultimaker/pynest2d/archive/refs/tags/%{version}.tar.gz#/pynest2d-%{version}.tar.gz
# PATCH-FIX-OPENSUSE -- add PyQt5 namespace
Patch0: pynest2d-PyQt5.sip.patch
# PATCH-FIX-UPSTREAM -- https://github.com/Ultimaker/pynest2d/pull/3
@@ -33,7 +32,7 @@
BuildRequires: gcc-c++
BuildRequires: libnest2d-devel
BuildRequires: python3-sip-devel < 5
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300
# The PyQt5.sip module. NOT a dependency on (Py)Qt5
BuildRequires: python3-qt5-sip
Requires: python3-qt5-sip
@@ -47,7 +46,7 @@
Binding allowing libnest2d to be called from Python using Numpy.
%prep
-%autosetup -n pynest2d-%{sversion} -p1
+%autosetup -n pynest2d-%{version} -p1
%build
%cmake
++++++ Retrieve-required-flags-from-Libnest2D-target.patch ++++++
--- /var/tmp/diff_new_pack.7e4wY3/_old 2022-03-11 11:34:31.810145082 +0100
+++ /var/tmp/diff_new_pack.7e4wY3/_new 2022-03-11 11:34:31.814145087 +0100
@@ -16,22 +16,22 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,11 +10,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- find_package(PythonInterp 3.5 REQUIRED) # Dependency of SIP.
- find_package(PythonLibs 3.5 REQUIRED) # Dependency of SIP.
+ endif()
+
find_package(SIP REQUIRED) # To create Python bindings.
-find_package(libnest2d REQUIRED) # The library we're creating bindings for.
-find_package(Clipper REQUIRED) # Dependency of libnest2d.
-find_package(NLopt REQUIRED) # Dependency of libnest2d.
-find_package(Boost REQUIRED) # Dependency of libnest2d.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper
-DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std") # Tell libnest2d to
use Clipper and NLopt, and standard threads.
-+find_package(Libnest2D REQUIRED) # The library we're creating bindings for.
++find_package(Libnest2D REQUIRED CONFIG COMPONENTS libnest2d_headeronly) #
The library we're creating bindings for.
# Some build options.
- set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD 17)
@@ -45,5 +41,5 @@ set(SIP_EXTRA_FILES_DEPEND
)
- set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL
before calling C++ methods.
+ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # Always release the GIL before
calling C++ methods. -n PyQt5.sip is required to not get the PyCapsule error
-include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}
${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
-add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES}
${NLopt_LIBRARIES})
+include_directories(src/ ${SIP_INCLUDE_DIRS})
++++++ pynest2d-4.8.0.tar.gz -> pynest2d-4.12.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pynest2d-4.8/CMakeLists.txt
new/pynest2d-4.12.0/CMakeLists.txt
--- old/pynest2d-4.8/CMakeLists.txt 2020-11-06 17:00:14.000000000 +0100
+++ new/pynest2d-4.12.0/CMakeLists.txt 2021-07-16 14:45:51.000000000 +0200
@@ -7,8 +7,19 @@
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
# Requirements.
-find_package(PythonInterp 3.5 REQUIRED) # Dependency of SIP.
-find_package(PythonLibs 3.5 REQUIRED) # Dependency of SIP.
+# FIXME: Remove the code for CMake <3.12 once we have switched over completely.
+# FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp
and FindPythonLibs.
+if(${CMAKE_VERSION} VERSION_LESS 3.12)
+ # FIXME: Use FindPython3 to find Python, new in CMake 3.12.
+ # However currently on our CI server it finds the wrong Python version and
then doesn't find the headers.
+ find_package(PythonInterp 3.5 REQUIRED)
+ find_package(PythonLibs 3.5 REQUIRED)
+
+else()
+ # Use FindPython3 for CMake >=3.12
+ find_package(Python3 3.5 REQUIRED COMPONENTS Interpreter Development)
+endif()
+
find_package(SIP REQUIRED) # To create Python bindings.
find_package(libnest2d REQUIRED) # The library we're creating bindings for.
find_package(Clipper REQUIRED) # Dependency of libnest2d.
@@ -17,7 +28,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLIBNEST2D_GEOMETRIES_clipper
-DLIBNEST2D_OPTIMIZERS_nlopt -DLIBNEST2D_THREADING_std") # Tell libnest2d to
use Clipper and NLopt, and standard threads.
# Some build options.
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
@@ -44,6 +55,6 @@
src/String.sip
)
-set(SIP_EXTRA_OPTIONS -g) # Always release the GIL before calling C++ methods.
+set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # Always release the GIL before
calling C++ methods. -n PyQt5.sip is required to not get the PyCapsule error
include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}
${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES}
${NLopt_LIBRARIES})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pynest2d-4.8/README.md new/pynest2d-4.12.0/README.md
--- old/pynest2d-4.8/README.md 2020-11-06 17:00:14.000000000 +0100
+++ new/pynest2d-4.12.0/README.md 2021-07-16 14:45:51.000000000 +0200
@@ -1,6 +1,6 @@
Introduction and Scope
====
-This repository contains CPython bindings for
[libnest2d](https://github.com/tamasmeszaros/libnest2d), a library to pack 2D
polygons into a small space. Libnest2d implements the 2D bin packing problem.
+This repository contains CPython bindings for
[libnest2d](https://github.com/tamasmeszaros/libnest2d) (though note that we
may use as of yet unmerged work done on [our own fork of libnest2d,
here](https://github.com/Ultimaker/libnest2d) whenever convenient), a library
to pack 2D polygons into a small space. Libnest2d implements the 2D bin packing
problem.
The objective of this repository is to allow libnest2d to be called from
Python using Numpy. There is a [competing
solution](https://github.com/markfink/nest2D) to provide Python bindings to
this end. However this solution is licensed under AGPL. Since
[Cura](https://github.com/Ultimaker/Cura) uses an LGPL license, it could not
use that solution. This implementation is also too limited for Cura's purposes,
so a new bindings project was set up that allows more configuration of the
nesting algorithm.
++++++ pynest2d-PyQt5.sip.patch ++++++
--- /var/tmp/diff_new_pack.7e4wY3/_old 2022-03-11 11:34:31.894145181 +0100
+++ /var/tmp/diff_new_pack.7e4wY3/_new 2022-03-11 11:34:31.898145186 +0100
@@ -10,15 +10,4 @@
RESULT_VARIABLE _process_status
OUTPUT_VARIABLE _process_output
OUTPUT_STRIP_TRAILING_WHITESPACE
-diff -up a/CMakeLists.txt.sip b/CMakeLists.txt
---- a/CMakeLists.txt.sip 2019-04-10 02:00:57.000000000 -0500
-+++ b/CMakeLists.txt 2019-09-16 10:53:36.334104707 -0500
-@@ -44,6 +44,6 @@ endif()
- src/String.sip
- )
-
--set(SIP_EXTRA_OPTIONS -g) # Always release the GIL before calling C++
methods.
-+set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL
before calling C++ methods.
- include_directories(src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}
${CLIPPER_INCLUDE_DIRS} ${NLopt_INCLUDE_DIRS} ${LIBNEST2D_INCLUDE_DIRS})
- add_sip_python_module(pynest2d src/Pynest2D.sip ${CLIPPER_LIBRARIES}
${NLopt_LIBRARIES})
