[arch-commits] Commit in python-pynest2d/trunk (PKGBUILD fix-cpp-version.patch)

[Jelle van der Waa]

    Date: Friday, January 1, 2021 @ 15:32:04
  Author: jelle
Revision: 802669

upgpkg: python-pynest2d 4.8.0-1

Modified:
  python-pynest2d/trunk/PKGBUILD
  python-pynest2d/trunk/fix-cpp-version.patch

-----------------------+
 PKGBUILD              |   16 +++++++++-------
 fix-cpp-version.patch |   12 ++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-01 15:30:12 UTC (rev 802668)
+++ PKGBUILD	2021-01-01 15:32:04 UTC (rev 802669)
@@ -7,23 +7,25 @@
 arch=(x86_64)
 url="https://github.com/Ultimaker/pynest2d"
 license=("LGPL")
-depends=(libnest2d python)
-makedepends=(sip cmake)
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/Ultimaker/pynest2d/archive/${pkgver}.tar.gz)
-sha512sums=('1304450f94589b5212f11d83fb228f0deb919698b44b1651f248105c23b65cf3d233e67526bbfb47df74b9b18d0c465f4188d02a0a6941564b551f50d9a3c84f')
+depends=(python)
+makedepends=(sip cmake boost)
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/Ultimaker/pynest2d/archive/${pkgver}.tar.gz fix-cpp-version.patch)
+sha512sums=('1304450f94589b5212f11d83fb228f0deb919698b44b1651f248105c23b65cf3d233e67526bbfb47df74b9b18d0c465f4188d02a0a6941564b551f50d9a3c84f'
+            '0d01349a110bc2cde6b7279ba8b8d60cd71c599fe10054e4082aac86bf4e30184959dcfcc795a63ae7517845c014b14db029a6070833696191d874dbfa24ed30')
 
 prepare() {
-  cd ${pkgname}
+  cd pynest2d-${pkgver}
+  patch -Np1 -i ${srcdir}/fix-cpp-version.patch
 
   mkdir build
 }
 
 build() {
-  cd ${pkgname}/build
+  cd pynest2d-${pkgver}/build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 }
 
 package() {
-  cd ${pkgname}/build
+  cd pynest2d-${pkgver}/build
   make DESTDIR="${pkgdir}" install
 }

Modified: fix-cpp-version.patch
===================================================================
--- fix-cpp-version.patch	2021-01-01 15:30:12 UTC (rev 802668)
+++ fix-cpp-version.patch	2021-01-01 15:32:04 UTC (rev 802669)
@@ -1,11 +1,11 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
+@@ -17,7 +17,7 @@ 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.
 
- project(Libnest2D)
-
+ # Some build options.
 -set(CMAKE_CXX_STANDARD 11)
 +set(CMAKE_CXX_STANDARD 14)
- set(CMAKE_CXX_STANDARD_REQUIRED)
-
- # Add our own cmake module path.
+ if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+ endif()