diff --git a/media-sound/audacity/audacity-3.2.4.recipe b/media-sound/audacity/audacity-3.2.5.recipe similarity index 98% rename from media-sound/audacity/audacity-3.2.4.recipe rename to media-sound/audacity/audacity-3.2.5.recipe index 917c32646..4537ed2bb 100644 --- a/media-sound/audacity/audacity-3.2.4.recipe +++ b/media-sound/audacity/audacity-3.2.5.recipe @@ -8,7 +8,7 @@ COPYRIGHT="1999-2023 by Audacity Team" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/audacity/audacity/archive/refs/tags/Audacity-$portVersion.tar.gz" -CHECKSUM_SHA256="9a85b5db02e25e46672c489ffa96d2f5115ee58650bfd57c5b8a07259f4f550f" +CHECKSUM_SHA256="7ee4f6f3ea985114b8fda578c67faf163e1d2cc8b2f0bad1b259a9367d2ccb1b" SOURCE_DIR="audacity-Audacity-$portVersion" PATCHES="audacity-$portVersion.patchset" ADDITIONAL_FILES="audacity.rdef.in" diff --git a/media-sound/audacity/patches/audacity-3.2.4.patchset b/media-sound/audacity/patches/audacity-3.2.5.patchset similarity index 96% rename from media-sound/audacity/patches/audacity-3.2.4.patchset rename to media-sound/audacity/patches/audacity-3.2.5.patchset index 86f39f75c..273564c45 100644 --- a/media-sound/audacity/patches/audacity-3.2.4.patchset +++ b/media-sound/audacity/patches/audacity-3.2.5.patchset @@ -146,23 +146,6 @@ Date: Mon, 7 Nov 2022 14:33:10 +0100 Subject: Adjust install rules for Haiku -diff --git a/CMakeLists.txt b/CMakeLists.txt -index faef964..55d5a3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -400,7 +400,11 @@ endif() - - set( _DEST "${_DESTDIR}" ) - set( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ) --set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" ) -+if( CMAKE_SYSTEM_NAME MATCHES "Haiku" ) -+ set( _LIBDIR "lib" ) -+else() -+ set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" ) -+endif() - set( _DATADIR "${CMAKE_INSTALL_DATADIR}" ) - set( _PKGLIB "${_LIBDIR}/audacity" ) - set( _PKGDATA "${_DATADIR}/audacity/" ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a71cacd..129c33e 100644 --- a/src/CMakeLists.txt