Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2021-08-27 21:44:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacity" Fri Aug 27 21:44:13 2021 rev:95 rq:914618 version:3.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2021-07-07 18:31:48.738363507 +0200 +++ /work/SRC/openSUSE:Factory/.audacity.new.1899/audacity.changes 2021-08-27 21:45:23.546075236 +0200 @@ -1,0 +2,24 @@ +Fri Aug 27 12:48:46 UTC 2021 - Dave Plater <davejpla...@gmail.com> + +- Update to version 3.0.4 +- Add git patches: + 0001-Adds-an-option-to-disable-Conan.patch, + 0001-Scope-libraries-required-by-the-optional-features.patch + 0001-Fixes-wxwidgets-fixup-script.patch +- Added patch adapted from git, Fixes-GCC11-compatibility.patch +- Removed obsolete patches, audacity-remove-wx-test.patch and + b4b5cc8.patch +- Upstream changes: + *This is a hotfix release that fixes a bug with envelope points, + which could multiply uncontrollably and cause Audacity to crash. + *In particular: + #1476: Envelope points are multiplied when using + Filter Curve EQ or Graphic EQ + #1477: Filter Curve EQ will crash if there is an envelope + point outside of the selection + *This fix re-introduces an earlier, but way less destructive bug: + bugzilla 208 / #1500: Some effects delete Envelope Control Points + or do not move them when timeline changes + *Other than that, this release is identical to Version 3.0.3. + +------------------------------------------------------------------- Old: ---- Audacity-3.0.2.tar.gz audacity-remove-wx-test.patch b4b5cc8.patch New: ---- 0001-Adds-an-option-to-disable-Conan.patch 0001-Fixes-wxwidgets-fixup-script.patch 0001-Scope-libraries-required-by-the-optional-features.patch Audacity-3.0.4.tar.gz Fixes-GCC11-compatibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.li4e1N/_old 2021-08-27 21:45:25.026077002 +0200 +++ /var/tmp/diff_new_pack.li4e1N/_new 2021-08-27 21:45:25.030077007 +0200 @@ -17,7 +17,7 @@ Name: audacity -Version: 3.0.2 +Version: 3.0.4 Release: 0 Summary: A Multi Track Digital Audio Editor License: GPL-2.0-or-later @@ -29,11 +29,13 @@ Source2: audacity-rpmlintrc # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch davejpla...@gmail.com -- Remove the buildstamp. Patch0: audacity-no_buildstamp.patch -Patch2: audacity-misc-errors.patch +Patch1: audacity-misc-errors.patch # PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch - Fix false positive errors Two new gcc10 ones ignoring assert -Patch3: audacity-no_return_in_nonvoid.patch -Patch4: audacity-remove-wx-test.patch -Patch5: https://github.com/audacity/audacity/commit/b4b5cc8.patch +Patch2: audacity-no_return_in_nonvoid.patch +Patch3: 0001-Adds-an-option-to-disable-Conan.patch +Patch4: 0001-Scope-libraries-required-by-the-optional-features.patch +Patch5: 0001-Fixes-wxwidgets-fixup-script.patch +Patch6: Fixes-GCC11-compatibility.patch BuildRequires: cmake >= 3.15 BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -45,11 +47,13 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(flac) >= 1.3.1 BuildRequires: pkgconfig(flac++) +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(id3tag) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libavcodec) >= 51.53 BuildRequires: pkgconfig(libavformat) >= 52.12 BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(lilv-0) >= 0.24.6 BuildRequires: pkgconfig(lv2) >= 1.16.0 BuildRequires: pkgconfig(mad) @@ -63,6 +67,7 @@ BuildRequires: pkgconfig(sratom-0) >= 0.6.4 BuildRequires: pkgconfig(suil-0) >= 0.10.6 BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vamp-hostsdk) BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) @@ -123,9 +128,14 @@ then export PKG_CONFIG_PATH="`echo $PWD`:%{_libdir}/pkgconfig" fi -export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb" +export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)" export CXXFLAGS="$CFLAGS -std=gnu++11" %cmake \ + -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(wx-config --libs)" \ + -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(wx-config --libs)" \ + -Daudacity_conan_enabled=Off \ + -Daudacity_has_networking:BOOL=Off \ + -Daudacity_lib_preference:STRING=system \ -Duse_lame:STRING=system \ -Daudacity_use_ffmpeg:STRING=linked @@ -151,7 +161,7 @@ rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_core-suse-nostl.so.* rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_html-suse-nostl.so.* rm -f %{buildroot}%{_libdir}/audacity/libwx_gtk3u_qa-suse-nostl.so.* - +rm -f %{buildroot}%{_prefix}/%{name} %find_lang %{name} %files @@ -159,15 +169,15 @@ %doc README.txt %license LICENSE.txt LICENSE_NYQUIST.txt portmixer.LICENSE.txt %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/mod-script-pipe.so +%{_libdir}/%{name} +#%%{_libdir}/%%{name}/modules/mod-script-pipe.so %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/* %{_datadir}/mime/packages/%{name}.xml %{_mandir}/man?/%{name}.?%{?ext_man} -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/%{name}.appdata.xml %files lang -f %{name}.lang %defattr(-,root,root) ++++++ 0001-Adds-an-option-to-disable-Conan.patch ++++++ >From 1968e81c79d21dafbc47c07214cac45865c58ac1 Mon Sep 17 00:00:00 2001 From: Dmitry Vedenko <vede...@gmail.com> Date: Fri, 18 Jun 2021 20:26:26 +0300 Subject: [PATCH] Adds an option to disable Conan --- BUILDING.md | 5 + CMakeLists.txt | 8 +- .../cmake-modules/AudacityDependencies.cmake | 156 ++++++++++-------- 3 files changed, 102 insertions(+), 67 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 62f6a0d62..7acd4ebec 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -187,3 +187,8 @@ $ docker run --rm -v ${pwd}:/audacity/audacity/ -v ${pwd}/../build/linux-system: ``` To find system packages, we rely on `pkg-config`. There are several packages that have broken `*.pc` or do not use `pkg-config` at all. For the docker image - we handle this issue by installing the correct [`pc` files](linux/build-environment/pkgconfig/). + +### Disabling Conan + +Conan can be disabled completely using `-Daudacity_conan_enabled=Off` during the configuration. +This option implies `-Daudacity_obey_system_dependencies=On` and disables `local` for packages that are managed with Conan. \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index f6f52118b..014c3dfcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,6 +138,12 @@ include( AudacityFunctions ) set_from_env(AUDACITY_ARCH_LABEL) # e.g. x86_64 +# Allow user to globally set the library preference +cmd_option( ${_OPT}conan_enabled + "Use Conan package manager for 3d party dependencies" + On +) + # Allow user to globally set the library preference cmd_option( ${_OPT}lib_preference "Library preference [system (if available), local]" @@ -510,7 +516,7 @@ resolve_conan_dependencies() add_subdirectory( "help" ) if(${_OPT}has_crashreports) -add_subdirectory( "crashreports" ) + add_subdirectory( "crashreports" ) endif() add_subdirectory( "images" ) add_subdirectory( "libraries" ) diff --git a/cmake-proxies/cmake-modules/AudacityDependencies.cmake b/cmake-proxies/cmake-modules/AudacityDependencies.cmake index 8fad83465..8d0cbb05c 100644 --- a/cmake-proxies/cmake-modules/AudacityDependencies.cmake +++ b/cmake-proxies/cmake-modules/AudacityDependencies.cmake @@ -1,10 +1,13 @@ # 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 ) @@ -13,23 +16,29 @@ 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 @@ -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) - - # Retrieve the package information - get_package_interface( PKG_${package} ) + if( PKG_${package}_FOUND ) + message( STATUS "Using '${package}' system library" ) - # 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() + # 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() + 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(MSVC OR XCODE) - foreach(TYPE ${CMAKE_CONFIGURATION_TYPES}) - _conan_install(${TYPE}) - endforeach() - else() - _conan_install(${CMAKE_BUILD_TYPE}) - endif() + 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() - 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") -- 2.26.2 ++++++ 0001-Fixes-wxwidgets-fixup-script.patch ++++++ >From 65886f5c2c568572602f6d82f4717508cb720f10 Mon Sep 17 00:00:00 2001 From: Dmitry Vedenko <vede...@gmail.com> Date: Fri, 18 Jun 2021 20:29:22 +0300 Subject: [PATCH] Fixes wxwidgets fixup script --- .../cmake-modules/dependencies/wxwidgets.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake index 2def9ae85..4b35e8947 100644 --- a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake +++ b/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() @@ -74,6 +80,8 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" ) set( toolkit "${wxWidgets_LIBRARIES}" ) + message(STATUS "Trying to retrieve GTK version from ${toolkit}") + if( "${toolkit}" MATCHES ".*gtk2.*" ) set( gtk gtk+-2.0 ) set( glib glib-2.0 ) -- 2.26.2 ++++++ 0001-Scope-libraries-required-by-the-optional-features.patch ++++++ >From eb2df2c0f68f3086085001207ff17a12a2523e9f Mon Sep 17 00:00:00 2001 From: Dmitry Vedenko <vede...@gmail.com> Date: Fri, 18 Jun 2021 20:26:58 +0300 Subject: [PATCH] Scope libraries, required by the optional features --- cmake-proxies/CMakeLists.txt | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) Index: b/cmake-proxies/CMakeLists.txt =================================================================== --- a/cmake-proxies/CMakeLists.txt 2021-08-18 12:21:37.000000000 +0200 +++ b/cmake-proxies/CMakeLists.txt 2021-08-26 08:14:23.274727098 +0200 @@ -87,6 +87,7 @@ add_conan_lib( REQUIRED INTERFACE_NAME libmp3lame::libmp3lame PKG_CONFIG "lame >= 3.100" + ALLOW_FIND_PACKAGE ) add_conan_lib( @@ -113,16 +114,16 @@ else() set ( curl_ssl "openssl" ) endif () -add_conan_lib( - ThreadPool - threadpool/20140926 - REQUIRED - ALWAYS_ALLOW_CONAN_FALLBACK -) - if( ${_OPT}has_networking ) add_conan_lib( + ThreadPool + threadpool/20140926 + REQUIRED + ALWAYS_ALLOW_CONAN_FALLBACK + ) + + add_conan_lib( CURL libcurl/7.75.0 REQUIRED @@ -148,11 +149,13 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwi ) 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() ++++++ Audacity-3.0.2.tar.gz -> Audacity-3.0.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/audacity/Audacity-3.0.2.tar.gz /work/SRC/openSUSE:Factory/.audacity.new.1899/Audacity-3.0.4.tar.gz differ: char 14, line 1 ++++++ Fixes-GCC11-compatibility.patch ++++++ From: Dave Plater davejpla...@gmail.com Date: Fri 27 Aug 15:03:07 SAST 2021 Subject: [PATCH] Fix build by adding #include <limits> ---Index: b/libraries/lib-utility/MemoryX.h =================================================================== --- a/libraries/lib-utility/MemoryX.h 2021-08-18 12:21:37.000000000 +0200 +++ b/libraries/lib-utility/MemoryX.h 2021-08-27 07:52:26.723479327 +0200 @@ -10,6 +10,7 @@ #endif #include <functional> +#include <limits> /* * ArrayOf<X> ++++++ audacity-no_buildstamp.patch ++++++ --- /var/tmp/diff_new_pack.li4e1N/_old 2021-08-27 21:45:25.178077183 +0200 +++ /var/tmp/diff_new_pack.li4e1N/_new 2021-08-27 21:45:25.178077183 +0200 @@ -1,7 +1,7 @@ -Index: audacity-Audacity-3.0.2/lib-src/portaudio-v19/qa/loopback/src/paqa.c +Index: b/lib-src/portaudio-v19/qa/loopback/src/paqa.c =================================================================== ---- audacity-Audacity-3.0.2.orig/lib-src/portaudio-v19/qa/loopback/src/paqa.c -+++ audacity-Audacity-3.0.2/lib-src/portaudio-v19/qa/loopback/src/paqa.c +--- a/lib-src/portaudio-v19/qa/loopback/src/paqa.c 2021-08-26 08:15:19.261006566 +0200 ++++ b/lib-src/portaudio-v19/qa/loopback/src/paqa.c 2021-08-26 08:15:26.829312186 +0200 @@ -1460,7 +1460,7 @@ int main( int argc, char **argv ) int justMath = 0; char *executableName = argv[0]; @@ -11,11 +11,11 @@ if( argc > 1 ){ printf("running with arguments:"); -Index: audacity-Audacity-3.0.2/src/AboutDialog.cpp +Index: b/src/AboutDialog.cpp =================================================================== ---- audacity-Audacity-3.0.2.orig/src/AboutDialog.cpp -+++ audacity-Audacity-3.0.2/src/AboutDialog.cpp -@@ -69,7 +69,7 @@ hold information about one contributor t +--- a/src/AboutDialog.cpp 2021-08-26 08:15:19.261006566 +0200 ++++ b/src/AboutDialog.cpp 2021-08-26 08:15:26.833312347 +0200 +@@ -71,7 +71,7 @@ hold information about one contributor t #endif #ifdef REV_LONG @@ -24,7 +24,7 @@ #else #define REV_IDENT (XO("No revision identifier was provided").Translation()) #endif -@@ -575,8 +575,8 @@ void AboutDialog::PopulateInformationPag +@@ -597,8 +597,8 @@ void AboutDialog::PopulateInformationPag << XO("The Build") << wxT("</h3>\n<table>"); // start build info table ++++++ audacity-no_return_in_nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.li4e1N/_old 2021-08-27 21:45:25.194077202 +0200 +++ /var/tmp/diff_new_pack.li4e1N/_new 2021-08-27 21:45:25.194077202 +0200 @@ -1,7 +1,7 @@ Index: b/src/widgets/NumericTextCtrl.cpp =================================================================== ---- a/src/widgets/NumericTextCtrl.cpp 2021-03-09 12:19:38.000000000 +0200 -+++ b/src/widgets/NumericTextCtrl.cpp 2021-04-08 10:00:19.126519391 +0200 +--- a/src/widgets/NumericTextCtrl.cpp 2021-08-26 08:15:19.157002365 +0200 ++++ b/src/widgets/NumericTextCtrl.cpp 2021-08-26 08:15:38.545784197 +0200 @@ -677,6 +677,7 @@ static const BuiltinFormatString Bandwid case NumericConverter::BANDWIDTH: return WXSIZEOF(BandwidthConverterFormats_); @@ -12,8 +12,8 @@ Index: b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c =================================================================== ---- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2021-03-09 12:19:38.000000000 +0200 -+++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2021-04-08 10:00:19.174520965 +0200 +--- a/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2021-08-26 08:15:19.157002365 +0200 ++++ b/lib-src/libnyquist/nyquist/xlisp/xlbfun.c 2021-08-26 08:15:38.545784197 +0200 @@ -603,7 +603,10 @@ LVAL xcleanup(void) { xllastarg(); @@ -28,9 +28,9 @@ /* xtoplevel - special form 'top-level' */ Index: b/lib-src/portsmf/allegro.cpp =================================================================== ---- a/lib-src/portsmf/allegro.cpp 2021-03-09 12:19:38.000000000 +0200 -+++ b/lib-src/portsmf/allegro.cpp 2021-04-08 10:00:19.186521359 +0200 -@@ -2885,6 +2885,9 @@ Alg_event_ptr &Alg_seq::operator[](int i +--- a/lib-src/portsmf/allegro.cpp 2021-08-26 08:15:19.157002365 +0200 ++++ b/lib-src/portsmf/allegro.cpp 2021-08-26 08:15:38.545784197 +0200 +@@ -2905,6 +2905,9 @@ Alg_event_ptr &Alg_seq::operator[](int i tr++; } assert(false); // out of bounds @@ -42,8 +42,8 @@ Index: b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c =================================================================== ---- a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c 2021-03-09 12:19:38.000000000 +0200 -+++ b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c 2021-04-08 11:22:54.394897011 +0200 +--- a/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c 2021-08-26 08:15:19.157002365 +0200 ++++ b/lib-src/libnyquist/nyquist/cmupv/src/cmupv.c 2021-08-26 08:15:38.545784197 +0200 @@ -600,6 +600,7 @@ double pv_get_effective_pos(Phase_vocode return -(pv->ratio * pv->fftsize / 2.0); } // I can't think of any other case.
