diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch index 670c83cc48..a27b4c7578 100644 --- a/srcpkgs/scribus/patches/cmake-build-type-none.patch +++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch @@ -2,7 +2,7 @@ Index: CMakeLists.txt =================================================================== --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -35,11 +35,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) +@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) #RPATH setup - more below too @@ -14,10 +14,10 @@ Index: CMakeLists.txt set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_SKIP_RULE_DEPENDENCY TRUE) set(CMAKE_SKIP_BUILD_RPATH TRUE) -@@ -309,16 +304,6 @@ include (CMakeLists_Directories.cmake) +@@ -330,15 +325,6 @@ include (CMakeLists_Directories.cmake) + #Convert our simpler command line option to the CMake style #None, Debug, Release, .. or custom ones - # set(WANT_DEBUG ON) -if(WANT_DEBUG) - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Set Debug Build Type" FORCE) -endif() @@ -27,7 +27,6 @@ Index: CMakeLists.txt -if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG) - set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set Release Build Type" FORCE) -endif() -- - #Based on our build type, setup our build options + diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index 868ec55590..9c7b0bfaa8 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus -version=1.5.6.1 -revision=1 +version=1.5.7 +revision=2 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3" @@ -14,9 +14,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://scribus.net" distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz" -checksum=d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab +checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce python_version=3 - -post_install() { - rm -rf ${DESTDIR}/usr/include -}