Attachment 227903 Details for Bug 258107 – Upgrade to audacity 3.0.4 from 3.0.2

[patch] Upgrade to audacity 3.0.4 from 3.0.2

audacity.txt (text/plain), 21.45 KB, created by Jack on 2021-09-14 19:17:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2021-09-14 19:17:33 UTC

Size: 21.45 KB

patch

obsolete

>diff -urN audacity/Makefile audacity-new/Makefile
>--- audacity/Makefile	2021-08-27 15:51:06.971886000 -0700
>+++ audacity-new/Makefile	2021-09-14 12:12:01.335304000 -0700
>@@ -1,11 +1,9 @@
> # Created by: Marc van Woerkom <3d@FreeBSD.org>
> 
> PORTNAME=	audacity
>-DISTVERSIONPREFIX=	minsrc-
>-DISTVERSION=	3.0.2
>-PORTREVISION=	1
>+DISTVERSIONPREFIX=	Audacity-
>+DISTVERSION=	3.0.4
> CATEGORIES=	audio
>-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Audacity-${PORTVERSION}/
> 
> MAINTAINER=	xxjack12xx@gmail.com
> COMMENT=	GUI editor for digital audio waveforms
>@@ -13,15 +11,22 @@
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>+BUILD_DEPENDS=	conan:sysutils/conan
>+
>+USES=		cmake compiler:c++14-lang cpe desktop-file-utils gettext \
>+		gnome libtool python:build pkgconfig shared-mime-info
>+
> LIB_DEPENDS=	libasound.so:audio/alsa-lib \
>+		libcurl.so:ftp/curl \
> 		libexpat.so:textproc/expat2 \
>+		libevview3.so:graphics/evince \
> 		libportaudio.so:audio/portaudio \
> 		libsndfile.so:audio/libsndfile \
> 		libsoxr.so:audio/libsoxr \
>-		libsqlite3.so:databases/sqlite3
>+		libsqlite3.so:databases/sqlite3 \
>+		libuuid.so:misc/e2fsprogs-libuuid
> 
>-USES=		cmake compiler:c++14-lang cpe desktop-file-utils gettext \
>-		gnome libtool python:build pkgconfig shared-mime-info tar:xz
>+USE_GITHUB=	yes
> USE_GNOME=	cairo gtk30
> USE_WX=		3.1+
> WX_COMPS=	wx
>@@ -29,26 +34,31 @@
> PORTDOCS=	README.txt
> 
> CMAKE_ARGS=	-Daudacity_lib_preference:STRING=system \
>+		-Daudacity_use_curl:STRING=system \
> 		-Daudacity_use_expat:STRING=system \
>-		-Daudacity_use_wxwidgets:STRING=system \
>-		-Daudacity_use_soxr:STRING=system \
>-		-Daudacity_use_sndfile:STRING=system \
>+		-Daudacity_use_midi:STRING=local \
>+		-Daudacity_use_nyquist:STRING=local \
> 		-Daudacity_use_portsmf:STRING=local \
> 		-Daudacity_use_portmixer:STRING=local \
>-		-Daudacity_use_portaudio:STRING=system
>-CMAKE_OFF=	audacity_use_pch
>+		-Daudacity_use_portaudio:STRING=system \
>+		-Daudacity_use_soxr:STRING=system \
>+		-Daudacity_use_sndfile:STRING=system \
>+		-Daudacity_use_sqlite:STRING=system \
>+		-Daudacity_use_wxwidgets:STRING=system \
>+		-Daudacity_use_zlib:STRING=system
>+CMAKE_ON=	audacity_obey_system_dependencies
>+CMAKE_OFF=	audacity_use_pa_alsa audacity_use_pch
> 
> OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
>-			MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
>+			OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
> 			VORBIS VST
>-OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LV2 MAD MIDI OGG SBSMS \
>+OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LV2 MAD OGG SBSMS \
> 			SOUNDTOUCH TWOLAME VAMP VORBIS VST
> OPTIONS_EXCLUDE_i386=	SBSMS
> 
> LAME_DESC=		Use lame for import and export support
> LV2_DESC=		Add LV2 plug-in support
> MAD_DESC=		Use libmad for mp2/3 decoding support
>-MIDI_DESC=		MIDI support
> SBSMS_DESC=		Use libsbsms for pitch and tempo changing
> SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
> TWOLAME_DESC=		Use libtwolame for MP2 export support
>@@ -76,8 +86,7 @@
> LADSPA_CMAKE_BOOL=	audacity_use_ladspa
> LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa
> 
>-LAME_CMAKE_ON=		-Daudacity_use_lame:STRING=system
>-LAME_CMAKE_OFF=		-Daudacity_use_lame:STRING=local
>+LAME_CMAKE_ON=		-Daudacity_use_libmp3lame:STRING=system
> LAME_BUILD_DEPENDS=	${LOCALBASE}/include/lame/lame.h:audio/lame
> LAME_CPPFLAGS=		-I${LOCALBASE}/include/lame
> LAME_LDFLAGS=		-L${LOCALBASE}/lib
>@@ -91,13 +100,12 @@
> 			libsratom-0.so:audio/sratom \
> 			libsuil-0.so:audio/suil
> 
>-MAD_CMAKE_ON=		-Daudacity_use_mad:STRING=system
>-MAD_CMAKE_OFF=		-Daudacity_use_mad:STRING=off
>+MAD_CMAKE_ON=		-Daudacity_use_mad:STRING=system \
>+			-Daudacity_use_libmad:STRING=system
>+MAD_CMAKE_OFF=		-Daudacity_use_mad:STRING=off \
>+			-Daudacity_use_libmad:STRING=off
> MAD_LIB_DEPENDS=	libmad.so:audio/libmad
> 
>-MIDI_CMAKE_ON=		-Daudacity_use_midi:STRING=local
>-MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off
>-
> # TODO: fix NLS support properly
> PLIST_SUB+=		NLS=""
> 
>@@ -138,7 +146,7 @@
> post-install:
> 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
> 		bin/${PORTNAME} \
>-		share/audacity/modules/mod-script-pipe.so
>+		lib/${PORTNAME}/modules/mod-script-pipe.so
> 	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
> 	# delete empty directories: https://github.com/audacity/audacity/issues/808
> 	@${FIND} ${STAGEDIR} -type d -empty -delete
>diff -urN audacity/distinfo audacity-new/distinfo
>--- audacity/distinfo	2021-08-27 15:51:06.971928000 -0700
>+++ audacity-new/distinfo	2021-09-05 22:59:12.130224000 -0700
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1619066304
>-SHA256 (audacity-minsrc-3.0.2.tar.xz) = 728d6459931da006ed45a31e63b7fe6ca47a2547459a2aff3bf0880cef85c296
>-SIZE (audacity-minsrc-3.0.2.tar.xz) = 13330160
>+TIMESTAMP = 1630907952
>+SHA256 (audacity-audacity-Audacity-3.0.4_GH0.tar.gz) = 20594c8a208e08c6cc1f74f78908025f8a968a3830ec353c5d0029486f887c1b
>+SIZE (audacity-audacity-Audacity-3.0.4_GH0.tar.gz) = 63068376
>diff -urN audacity/files/patch-cmake-proxies_CMakeLists.txt audacity-new/files/patch-cmake-proxies_CMakeLists.txt
>--- audacity/files/patch-cmake-proxies_CMakeLists.txt	2021-08-27 15:51:06.971990000 -0700
>+++ audacity-new/files/patch-cmake-proxies_CMakeLists.txt	2021-08-27 15:50:56.964846000 -0700
>@@ -1,7 +1,73 @@
>---- cmake-proxies/CMakeLists.txt.orig	2021-02-04 18:52:51 UTC
>+--- cmake-proxies/CMakeLists.txt.orig	2021-08-18 10:21:37 UTC
> +++ cmake-proxies/CMakeLists.txt
>-@@ -132,7 +132,7 @@ addlib( expat              expat       EXPAT       YES
>- addlib( lame               lame        LAME        YES   YES   "lame >= 3.100" )
>+@@ -87,6 +87,7 @@ add_conan_lib(
>+    REQUIRED
>+    INTERFACE_NAME libmp3lame::libmp3lame
>+    PKG_CONFIG "lame >= 3.100"
>++   ALLOW_FIND_PACKAGE
>+ )
>+ 
>+ add_conan_lib(
>+@@ -105,24 +106,23 @@ add_conan_lib(
>+    PKG_CONFIG "mad >= 0.15.1b"
>+ )
>+ 
>+-if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
>+-   set( curl_ssl "darwinssl" )
>+-elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
>+-   set( curl_ssl "schannel")
>+-else()
>+-   set ( curl_ssl "openssl" )
>+-endif ()
>+-
>+-add_conan_lib(
>+-   ThreadPool
>+-   threadpool/20140926
>+-   REQUIRED
>+-   ALWAYS_ALLOW_CONAN_FALLBACK
>+-)
>+-
>+ if( ${_OPT}has_networking )
>++   if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
>++      set( curl_ssl "darwinssl" )
>++   elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
>++      set( curl_ssl "schannel")
>++   else()
>++      set ( curl_ssl "openssl" )
>++   endif ()
>+ 
>+    add_conan_lib(
>++      ThreadPool
>++      threadpool/20140926
>++      REQUIRED
>++      ALWAYS_ALLOW_CONAN_FALLBACK
>++   )
>++
>++   add_conan_lib(
>+       CURL
>+       libcurl/7.75.0
>+       REQUIRED
>+@@ -148,11 +148,13 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
>+    )
>+ endif()
>+ 
>+-add_conan_lib(
>+-   RapidJSON
>+-   rapidjson/1.1.0
>+-   REQUIRED
>+-)
>++if( ${_OPT}has_sentry_reporting )
>++   add_conan_lib(
>++      RapidJSON
>++      rapidjson/1.1.0
>++      REQUIRED
>++   )
>++endif()
>+ 
>+ set_conan_vars_to_parent()
>+ 
>+@@ -161,7 +163,7 @@ set_conan_vars_to_parent()
>+ #       directory          option      symbol      req   chk   version
>  addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
>  addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
> -addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )
>diff -urN audacity/files/patch-cmake-proxies_cmake-modules_AudacityDependencies.cmake audacity-new/files/patch-cmake-proxies_cmake-modules_AudacityDependencies.cmake
>--- audacity/files/patch-cmake-proxies_cmake-modules_AudacityDependencies.cmake	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-cmake-proxies_cmake-modules_AudacityDependencies.cmake	2021-08-27 15:50:56.965338000 -0700
>@@ -0,0 +1,227 @@
>+--- cmake-proxies/cmake-modules/AudacityDependencies.cmake.orig	2021-08-27 22:30:37 UTC
>++++ cmake-proxies/cmake-modules/AudacityDependencies.cmake
>+@@ -1,11 +1,14 @@
>+ # Load Conan
>+-include( conan )
>+ 
>+-conan_add_remote(NAME audacity
>+-    URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
>+-    VERIFY_SSL True
>+-)
>++if( ${_OPT}conan_enabled )
>++    include( conan )
>+ 
>++    conan_add_remote(NAME audacity
>++        URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
>++        VERIFY_SSL True
>++    )
>++endif()
>++
>+ set( CONAN_BUILD_REQUIRES )
>+ set( CONAN_REQUIRES )
>+ set( CONAN_PACKAGE_OPTIONS )
>+@@ -13,24 +16,30 @@ set( CONAN_ONLY_DEBUG_RELEASE )
>+ set( CONAN_CONFIG_OPTIONS )
>+ set( CONAN_RESOLVE_LIST )
>+ 
>+-# Add a Conan dependency
>+-# Example usage:
>+-# add_conan_lib( 
>+-#   wxWdidget 
>+-#   wxwidgets/3.1.3-audacity
>+-#   OPTION_NAME wxwidgets
>+-#   SYMBOL WXWIDGET
>+-#   REQUIRED 
>+-#   ALWAYS_ALLOW_CONAN_FALLBACK
>+-#   PKG_CONFIG "wxwidgets >= 3.1.3"
>+-#   FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
>+-#   INTERFACE_NAME wxwidgets::wxwidgets
>+-#   HAS_ONLY_DEBUG_RELEASE
>+-#   CONAN_OPTIONS 
>+-#        wxwidgets:shared=True
>+-# )
>++#[[
>++Add a Conan dependency
>+ 
>++Example usage:
>+ 
>++add_conan_lib( 
>++  wxWdidget 
>++  wxwidgets/3.1.3-audacity
>++  OPTION_NAME wxwidgets
>++  SYMBOL WXWIDGET
>++  REQUIRED 
>++  ALWAYS_ALLOW_CONAN_FALLBACK
>++  PKG_CONFIG "wxwidgets >= 3.1.3"
>++  FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
>++  INTERFACE_NAME wxwidgets::wxwidgets
>++  HAS_ONLY_DEBUG_RELEASE
>++  CONAN_OPTIONS 
>++       wxwidgets:shared=True
>++)
>++
>++PKG_CONFIG accepts a list of possible package configurations. 
>++add_conan_lib will iterate over it one by one until the library is found.
>++]]
>++
>+ function (add_conan_lib package conan_package_name )
>+     # Extract the list of packages from the function args
>+     list( SUBLIST ARGV 2 -1 options )
>+@@ -54,6 +63,8 @@ function (add_conan_lib package conan_package_name )
>+             set( list_mode on )
>+             set( allow_find_package on )
>+             set( current_var "find_package_options" )
>++        elseif ( opt STREQUAL "ALLOW_FIND_PACKAGE" )
>++            set ( allow_find_package on )
>+         elseif ( opt STREQUAL "CONAN_OPTIONS" )
>+             set( list_mode on )
>+             set( current_var "conan_package_options" )
>+@@ -93,14 +104,23 @@ function (add_conan_lib package conan_package_name )
>+ 
>+     set( option_desc "local" )
>+ 
>+-    if( pkg_config_options OR allow_find_package )
>++    if( pkg_config_options OR allow_find_package OR NOT ${_OPT}conan_enabled )
>+         set( sysopt "system" )
>+         string( PREPEND option_desc "system (if available), " )
>+-        set( default "${${_OPT}lib_preference}" )
>++
>++        if( ${_OPT}conan_enabled )
>++            set( default "${${_OPT}lib_preference}" )
>++        else()
>++            set( default "system" )
>++        endif()
>+     else()
>+         set( default "local" )
>+     endif()
>+ 
>++    if( ${_OPT}conan_enabled )
>++        set( localopt "local" )
>++    endif()
>++
>+     if( NOT required )
>+         set( reqopt "off" )
>+         string( APPEND option_desc ", off" )
>+@@ -109,7 +129,7 @@ function (add_conan_lib package conan_package_name )
>+     cmd_option( ${option_name}
>+                 "Use ${option_name_base} library [${option_desc}]"
>+                 "${default}"
>+-                STRINGS ${sysopt} "local" ${reqopt}
>++                STRINGS ${sysopt} ${localopt} ${reqopt}
>+     )
>+     
>+     # Early bail out
>+@@ -129,26 +149,28 @@ function (add_conan_lib package conan_package_name )
>+         return()
>+     endif()
>+ 
>+-    if( ${option_name} STREQUAL "system" )
>++    if( ${option_name} STREQUAL "system" OR NOT ${_OPT}conan_enabled )
>+         if( pkg_config_options )
>+-            pkg_check_modules( PKG_${package} ${pkg_config_options} )
>++            foreach(variant ${pkg_config_options})
>++                pkg_check_modules( PKG_${package} ${variant} )
>+ 
>+-            if( PKG_${package}_FOUND )
>+-                message( STATUS "Using '${package}' system library" )
>+-    
>+-                # Create the target interface library
>+-                add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
>++                if( PKG_${package}_FOUND )
>++                    message( STATUS "Using '${package}' system library" )
>+         
>+-                # Retrieve the package information
>+-                get_package_interface( PKG_${package} )
>+-        
>+-                # And add it to our target
>+-                target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
>+-                target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
>++                    # Create the target interface library
>++                    add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
>++            
>++                    # Retrieve the package information
>++                    get_package_interface( PKG_${package} )
>++            
>++                    # And add it to our target
>++                    target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
>++                    target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
>+ 
>+-                message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
>+-                return()
>+-            endif()
>++                    message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
>++                    return()
>++                endif()
>++            endforeach()
>+         endif()
>+ 
>+         if( allow_find_package )
>+@@ -160,7 +182,7 @@ function (add_conan_lib package conan_package_name )
>+             endif()
>+         endif()
>+ 
>+-        if( system_only )
>++        if( system_only OR NOT ${_OPT}conan_enabled )
>+             message( FATAL_ERROR "Failed to find the system package ${package}" )
>+         else()
>+             set( ${option_name} "local" )
>+@@ -237,34 +259,36 @@ function ( _conan_install build_type )
>+ endfunction()
>+ 
>+ macro( resolve_conan_dependencies )
>+-    message(STATUS 
>+-    "Executing Conan: \
>+-        REQUIRES ${CONAN_REQUIRES}
>+-        GENERATORS cmake_find_package_multi
>+-        BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
>+-        ${CONAN_CONFIG_OPTIONS}
>+-        OPTIONS ${CONAN_PACKAGE_OPTIONS}
>+-    ")
>++    if( ${_OPT}conan_enabled )
>++        message(STATUS 
>++        "Executing Conan: \
>++            REQUIRES ${CONAN_REQUIRES}
>++            GENERATORS cmake_find_package_multi
>++            BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
>++            ${CONAN_CONFIG_OPTIONS}
>++            OPTIONS ${CONAN_PACKAGE_OPTIONS}
>++        ")
>+ 
>+-    if(MSVC OR XCODE)
>+-        foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
>+-            _conan_install(${TYPE})
>+-        endforeach()
>+-    else()
>+-        _conan_install(${CMAKE_BUILD_TYPE})
>+-    endif()
>++        if(MSVC OR XCODE)
>++            foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
>++                _conan_install(${TYPE})
>++            endforeach()
>++        else()
>++            _conan_install(${CMAKE_BUILD_TYPE})
>++        endif()
>+ 
>+-    list( REMOVE_DUPLICATES CONAN_REQUIRES )
>++        list( REMOVE_DUPLICATES CONAN_REQUIRES )
>+ 
>+-    foreach( package ${CONAN_RESOLVE_LIST} )
>+-        message(STATUS "Resolving Conan library ${package}")
>++        foreach( package ${CONAN_RESOLVE_LIST} )
>++            message(STATUS "Resolving Conan library ${package}")
>+ 
>+-        find_package(${package} CONFIG)
>++            find_package(${package} CONFIG)
>+ 
>+-        if (NOT ${package}_FOUND)
>+-            message( FATAL_ERROR "Failed to find the conan package ${package}" )
>+-        endif()
>+-    endforeach()
>++            if (NOT ${package}_FOUND)
>++                message( FATAL_ERROR "Failed to find the conan package ${package}" )
>++            endif()
>++        endforeach()
>++    endif()
>+ 
>+     file(GLOB dependency_helpers "${AUDACITY_MODULE_PATH}/dependencies/*.cmake")
>+ 
>diff -urN audacity/files/patch-cmake-proxies_cmake-modules_Findlibmp3lame.cmake audacity-new/files/patch-cmake-proxies_cmake-modules_Findlibmp3lame.cmake
>--- audacity/files/patch-cmake-proxies_cmake-modules_Findlibmp3lame.cmake	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-cmake-proxies_cmake-modules_Findlibmp3lame.cmake	2021-08-27 15:50:56.965124000 -0700
>@@ -0,0 +1,32 @@
>+--- cmake-proxies/cmake-modules/Findlibmp3lame.cmake.orig	2021-08-27 22:30:58 UTC
>++++ cmake-proxies/cmake-modules/Findlibmp3lame.cmake
>+@@ -0,0 +1,29 @@
>++#[[
>++A module to look for libmp3lame
>++]]
>++
>++if( NOT libmp3lame_FOUND )
>++   find_path( libmp3lame_INCLUDE_DIR lame/lame.h )
>++   find_library( libmp3lame_LIBRARIES NAMES mp3lame )
>++
>++   if( libmp3lame_INCLUDE_DIR AND libmp3lame_LIBRARIES )
>++      set( libmp3lame_FOUND Yes )
>++   endif()
>++
>++   if( libmp3lame_FOUND )
>++      if( NOT libmp3lame_FIND_QUIETLY )
>++         message( STATUS "Found lame: \n\tlibmp3lame_INCLUDE_DIR: ${libmp3lame_INCLUDE_DIR}\n\tlibmp3lame_LIBRARIES: ${libmp3lame_LIBRARIES}" )
>++      endif()
>++
>++      if( NOT TARGET libmp3lame::libmp3lame )
>++         add_library( libmp3lame::libmp3lame INTERFACE IMPORTED GLOBAL)
>++
>++         target_include_directories( libmp3lame::libmp3lame INTERFACE ${libmp3lame_INCLUDE_DIR} )
>++         target_link_libraries( libmp3lame::libmp3lame INTERFACE ${libmp3lame_LIBRARIES} )
>++      endif()
>++   else()
>++      if( libmp3lame_FIND_REQUIRED )
>++         message( FATAL_ERROR "Could not find libmp3lame")
>++      endif()
>++   endif()
>++endif()
>diff -urN audacity/files/patch-cmake-proxies_cmake-modules_dependencies_wxwidgets.cmake audacity-new/files/patch-cmake-proxies_cmake-modules_dependencies_wxwidgets.cmake
>--- audacity/files/patch-cmake-proxies_cmake-modules_dependencies_wxwidgets.cmake	1969-12-31 16:00:00.000000000 -0800
>+++ audacity-new/files/patch-cmake-proxies_cmake-modules_dependencies_wxwidgets.cmake	2021-08-27 15:50:56.965262000 -0700
>@@ -0,0 +1,14 @@
>+--- cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake.orig	2021-08-27 06:00:39 UTC
>++++ cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
>+@@ -1,4 +1,10 @@
>+-if( ${_OPT}use_wxwidgets STREQUAL "system" ) 
>++if( ${_OPT}use_wxwidgets STREQUAL "system" OR NOT ${_OPT}conan_enabled )
>++    # DV: find_package will be scoped, as FindwxWidgets.cmake is rather outdated.
>++    # Still - let's perform the sanity check first.
>++    if( NOT wxWidgets_FOUND )
>++        find_package( wxWidgets REQUIRED COMPONENTS adv base core html qa xml net )
>++    endif()
>++
>+     if( NOT TARGET wxwidgets::wxwidgets )
>+         add_library( wxwidgets::wxwidgets INTERFACE IMPORTED GLOBAL)
>+     endif()
>diff -urN audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt audacity-new/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt
>--- audacity/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt	2021-08-27 15:51:06.972028000 -0700
>+++ audacity-new/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
>@@ -1,20 +0,0 @@
>---- cmake-proxies/wxWidgets/CMakeLists.txt.orig	2020-08-05 16:32:53 UTC
>-+++ cmake-proxies/wxWidgets/CMakeLists.txt
>-@@ -237,17 +237,6 @@ file(
>-       "^#define +wxVERSION_STRING +"
>- )
>- 
>--string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
>--if( NOT ours )
>--   message( FATAL_ERROR
>--      "\n########################################################################\n"
>--      "Audacity version 3.0.0 or higher requires use of a customized version of "
>--      "wxWidgets.  For details:\n"
>--      "  https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
>--      "########################################################################\n"
>--   )
>--endif()
>--
>- target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
>- target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
>- target_compile_options( ${TARGET} INTERFACE ${COPTS} )
>diff -urN audacity/files/patch-src_AboutDialog.cpp audacity-new/files/patch-src_AboutDialog.cpp
>--- audacity/files/patch-src_AboutDialog.cpp	2021-08-27 15:51:06.972180000 -0700
>+++ audacity-new/files/patch-src_AboutDialog.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/AboutDialog.cpp.orig	2020-06-28 06:25:54 UTC
>-+++ src/AboutDialog.cpp
>-@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
>- // RevisionIdent.h may contain #defines like these ones:
>- //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
>- //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
>--#include <RevisionIdent.h>
>-+//#include <RevisionIdent.h>
>- 
>- #ifndef REV_TIME
>- #define REV_TIME "unknown date and time"
>diff -urN audacity/files/patch-src_widgets_Grid.cpp audacity-new/files/patch-src_widgets_Grid.cpp
>--- audacity/files/patch-src_widgets_Grid.cpp	2021-08-27 15:51:06.972256000 -0700
>+++ audacity-new/files/patch-src_widgets_Grid.cpp	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- src/widgets/Grid.cpp.orig	2021-02-04 18:52:51 UTC
>-+++ src/widgets/Grid.cpp
>-@@ -572,7 +572,7 @@ void Grid::OnKeyDown(wxKeyEvent &event)
>-          {
>-             wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol));
>-             wxClipboard::Get()->SetData(data);
>--            SetCellValue(crow, ccol, {});
>-+            SetCellValue(crow, ccol, "");
>-             return;
>-          }
>-          break;
>diff -urN audacity/pkg-plist audacity-new/pkg-plist
>--- audacity/pkg-plist	2021-08-27 15:51:06.972404000 -0700
>+++ audacity-new/pkg-plist	2021-08-27 15:50:56.965550000 -0700
>@@ -1,9 +1,12 @@
> bin/audacity
>+lib/audacity/lib-string-utils.so
>+lib/audacity/lib-strings.so
>+lib/audacity/lib-utility.so
>+lib/audacity/lib-uuid.so
>+lib/audacity/modules/mod-script-pipe.so
> man/man1/audacity.1.gz
>-share/appdata/audacity.appdata.xml
> share/applications/audacity.desktop
> %%DATADIR%%/EQDefaultCurves.xml
>-%%DATADIR%%/modules/mod-script-pipe.so
> %%DATADIR%%/nyquist/aud-do-support.lsp
> %%DATADIR%%/nyquist/dspprims.lsp
> %%DATADIR%%/nyquist/envelopes.lsp
>@@ -141,6 +144,7 @@
> %%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo
>+share/metainfo/audacity.appdata.xml
> share/mime/packages/audacity.xml
> share/pixmaps/audacity.xpm
> share/pixmaps/audacity16.xpm

Actions: View | Diff

Attachments on bug 258107: 227497 | 227702 | 227903 | 228111 | 228129 | 228220 | 228272 | 228346 | 228347 | 228475 | 228534 | 228536 | 228551 | 228552 | 228554 | 228904