From 06d101eca82b21daca3848f43525c4e9073c4b47 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Fri, 19 Oct 2018 01:04:45 -0700 Subject: [PATCH] libArcus: update to 3.6.0 --- .../patches/cmake-cross-find-sip.patch | 18 ------------------ srcpkgs/libArcus/template | 8 ++++---- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/libArcus/patches/cmake-cross-find-sip.patch diff --git a/srcpkgs/libArcus/patches/cmake-cross-find-sip.patch b/srcpkgs/libArcus/patches/cmake-cross-find-sip.patch deleted file mode 100644 index bf2a123962c..00000000000 --- a/srcpkgs/libArcus/patches/cmake-cross-find-sip.patch +++ /dev/null @@ -1,18 +0,0 @@ -When cross compiling in void, FIND_FILE fails to find the python -script used to configure SIP. - -diff --git cmake/FindSIP.cmake cmake/FindSIP.cmake ---- cmake/FindSIP.cmake -+++ cmake/FindSIP.cmake -@@ -37,10 +37,8 @@ IF(SIP_VERSION) - SET(SIP_FOUND TRUE) - ELSE(SIP_VERSION) - -- FIND_FILE(_find_sip_py FindSIP.py PATHS ${CMAKE_MODULE_PATH}) -- - SET(ENV{PYTHONPATH} ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_DIR}) -- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} -+ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/FindSIP.py - OUTPUT_VARIABLE sip_config - RESULT_VARIABLE sip_config_returncode) - IF(sip_config_returncode EQUAL 0) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 23019c1f78b..7a1f73a6c38 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,18 +1,18 @@ # Template file for 'libArcus' pkgname=libArcus -version=3.4.1 -revision=3 +version=3.6.0 +revision=1 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" -makedepends="protobuf-devel python3-devel" +makedepends="protobuf-devel python3-devel python3-sip-devel" depends="python3-sip" short_desc="Communication library for Ultimaker software components" maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/libArcus" distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz" -checksum=c72e20bf7dc95fb5d2b2fd8c7773e40feca3c5cdf894a35f7e03effb4249503a +checksum=d9dee21a558e3a13b23f5ee5f264e08ec8f231a0b6a6354f6eabb081a9e5da9f libArcus-devel_package() { depends="${sourcepkg}>=${version}_${revision}"