From 9cd00c02159d464b2862d571b8dadb8cc2c628e9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 29 Jun 2019 07:47:45 +0200 Subject: [PATCH] lmms: update to 1.2.0. --- srcpkgs/lmms/patches/musl.patch | 11 ----------- srcpkgs/lmms/template | 24 ++++++------------------ 2 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/lmms/patches/musl.patch diff --git a/srcpkgs/lmms/patches/musl.patch b/srcpkgs/lmms/patches/musl.patch deleted file mode 100644 index 91dd3c1cb9..0000000000 --- a/srcpkgs/lmms/patches/musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/lmms_math.h 2017-12-19 18:24:15.000000000 +0100 -+++ - 2018-03-24 13:02:25.850664825 +0100 -@@ -34,7 +34,7 @@ - #include - using namespace std; - --#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) -+#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) || !defined(__GLIBC__) - #ifndef isnanf - #define isnanf(x) isnan(x) - #endif diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index d30e44207c..a9b895068f 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -1,10 +1,7 @@ # Template file for 'lmms' pkgname=lmms -version=1.2.0rc8 -revision=3 -wrksrc="lmms-${version/r/-r}" -_x11embed_commit=022b39a1d496d72eb3e5b5188e5559f66afca957 -_rpmalloc_version=1.3.1 +version=1.2.0 +revision=1 build_style=cmake configure_args="-DWANT_QT5=ON -DWANT_WEAKJACK=OFF" hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules" @@ -18,21 +15,12 @@ short_desc="Cross-platform music production software" maintainer="Logen K. " license="GPL-2.0-or-later" homepage="https://lmms.io/" -distfiles="https://github.com/LMMS/lmms/archive/v${version/r/-r}.tar.gz - https://github.com/Lukas-W/qt5-x11embed/archive/${_x11embed_commit}.tar.gz - https://github.com/rampantpixels/rpmalloc/archive/${_rpmalloc_version}.tar.gz" -checksum="4511687e47f6159cb2a250528bcccaa38b36b78f345466d090514214888943e8 - 06159c71a5eeba5662bfb309d215e733f310c2699c8c1de83297d32d13a510bc - 9bc0013a0bf8c01540821e84fef0cef067f1d857a01ceceac36f83bd6fedc106" +distfiles="https://github.com/LMMS/lmms/releases/download/v${version}/lmms_${version}.tar.xz" +checksum=6503559c2b95fdf45ca6cf4fc5afe66544ad53f2a70ca2e08a52301ad8e42617 build_options="sndio" build_options_default="sndio" -post_extract() { - [ -d "${wrksrc}/../qt5-x11embed-${_x11embed_commit}" ] && - rm -rf src/3rdparty/qt5-x11embed && - mv "${wrksrc}/../qt5-x11embed-${_x11embed_commit}" src/3rdparty/qt5-x11embed - [ -d "${wrksrc}/../rpmalloc-${_rpmalloc_version}" ] && - rm -rf src/3rdparty/rpmalloc/rpmalloc && - mv "${wrksrc}/../rpmalloc-${_rpmalloc_version}" src/3rdparty/rpmalloc/rpmalloc +post_install() { + rm -f ${DESTDIR}/usr/lib/*.a }