Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2024-05-02 23:47:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio" Thu May 2 23:47:54 2024 rev:28 rq:1171310 version:2024.04.0+735 Changes: -------- --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2024-02-23 16:47:54.988965346 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1880/rstudio.changes 2024-05-03 10:46:00.244435531 +0200 @@ -1,0 +2,88 @@ +Tue Apr 30 21:25:36 UTC 2024 - Aaron Puchert <aaronpuch...@alice-dsl.net> + +- New upstream release 2024.04.0+735. (boo#1223378) + * RStudio now requires R 3.6.0 or newer. + * RStudio's auto-completion system now supports ggplot2 aesthetic + names and data columns. + * RStudio's auto-completion system now supports the display of + the "label" attribute. + * RStudio Desktop on Windows and Linux supports auto-hiding the + menu bar. + * RStudio Desktop on Windows and Linux supports full-screen mode + via F11. + * RStudio Desktop now supports pasting of file paths for files + copied to the clipboard. + * RStudio now reports a diagnostics warning when `=` (rather than + `==`) is used in `if`, `for`, and `while` conditionals. + * R projects can be given a custom display name in Project Options. + * The automatic display of Copilot code completions can now be + controlled via a user preference. + * Copilot code suggestions can now be requested via the keyboard + shortcut `Ctrl + \`. + * The next word in a Copilot code suggestion can now be accepted + via `Ctrl + Right` (`Cmd + Right` on macOS). + * RStudio now highlights and lints Quarto chunk options in Python + code chunks. + * RStudio no longer highlights `\[ \]` and `\( \)` Mathjax + equations; prefer `$$ $$` and `$ $` instead. + * Added cmake option to build RStudio without the check for + updates feature. + * Allow choosing R from non-standard location at startup. + * Add `EnvironmentFile` support to systemd service definitions. + * RStudio's GWT sources can now be built with JDKs > 11. + * Show grey background instead of solid-white during Desktop + startup. + * The 'restartSession()' API method gains the 'clean' argument. + * 'dot' chunks in R Markdown documents are now executable. + * (rstudioapi) Fixed an issue where selectFile() did not parse + filter strings in a cross-platform way. + * RStudio now reports repository validation errors (if any) when + adding secondary repositories in the Global Options -> Packages + pane. + * The working directory of a background job now defaults to the + .Rproj location when a project is open. + * Add search results copy button and search results breadcrumbs + to RStudio User Guide. + * RStudio now supports generation of a Copilot diagnostic report + from the Copilot preferences pane. + * The RStudio debugger is now better at matching debugged code to + source documents. + * RStudio no longer includes spurious chunk markers from Copilot + completion results. + * Added new commands which toggle the maximized state of Console, + Source, and Tab Group quadrants [Accessibility]. + * RStudio now prints a warning if an overly-long line of console + input is truncated when sending to R. + * RStudio now supports highlighting of inline YAML chunk options + in R Markdown / Quarto documents. + * RStudio now supports auto-completion following `@` via + `.AtNames`. + * RStudio now supports the execution and display of GraphViz + (`dot`) graphs in R Markdown / Quarto chunks. + * RStudio now supports the execution of chunks with the 'file' + option set. + * RStudio now supports `LuaLaTeX` to compile Sweave/Rnw + documents. + * RStudio now supports pasting of file paths for files copied to + the clipboard. + * Improved support for development documentation when a package + has been loaded via `devtools::load_all()`. + * Better error message when user preferences fail to save due to + folder permissions. + * With screen reader support enabled, hitting ESC key allows + Tabbing away from editor. +- Rebase patches: + * 0002-Don-t-install-pandoc-and-mathjax.patch + * old-boost.patch + * remove-panmirror.patch +- Set RSTUDIO_BOOST_REQUESTED_VERSION on all Leap versions. +- Relax Java version requirement, Java > 11 is now supported. +- Add fix-boost-1.85-build.patch to fix build with Boost 1.85. +- Add fix-boost-1.66-build.patch from Michael Pujos to fix build + with Leap's older Boost 1.66. We can't use Boost 1.75 because it + conflicts with Boost 1.66 required by soci-devel. +- Add respect-system-yaml-cpp.patch to make sure our choice of + RSTUDIO_USE_SYSTEM_YAML_CPP=TRUE is respected. +- Add skip-osrelease.patch to skip parsing of /etc/os-release. + +------------------------------------------------------------------- Old: ---- v2023.09.1+494.tar.gz New: ---- fix-boost-1.66-build.patch fix-boost-1.85-build.patch respect-system-yaml-cpp.patch skip-osrelease.patch v2024.04.0+735.tar.gz BETA DEBUG BEGIN: New:- Add fix-boost-1.85-build.patch to fix build with Boost 1.85. - Add fix-boost-1.66-build.patch from Michael Pujos to fix build with Leap's older Boost 1.66. We can't use Boost 1.75 because it New:- Relax Java version requirement, Java > 11 is now supported. - Add fix-boost-1.85-build.patch to fix build with Boost 1.85. - Add fix-boost-1.66-build.patch from Michael Pujos to fix build New: conflicts with Boost 1.66 required by soci-devel. - Add respect-system-yaml-cpp.patch to make sure our choice of RSTUDIO_USE_SYSTEM_YAML_CPP=TRUE is respected. New: RSTUDIO_USE_SYSTEM_YAML_CPP=TRUE is respected. - Add skip-osrelease.patch to skip parsing of /etc/os-release. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstudio.spec ++++++ --- /var/tmp/diff_new_pack.paoGzV/_old 2024-05-03 10:46:08.728743842 +0200 +++ /var/tmp/diff_new_pack.paoGzV/_new 2024-05-03 10:46:08.728743842 +0200 @@ -19,20 +19,20 @@ # Bundled dependencies from NOTICE: # - Qt (LGPL v2.1) => undbundled # - QtSingleApplication => bundled at some version, using BSD-3-Clause -# - Ace (LGPL v2.1) => bundled at version 1.4.5 (see ./src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace-uncompressed.js), license is BSD-3-Clause -%global bundled_ace_version 1.4.5 +# - Ace (LGPL v2.1) => bundled (see ./src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace-uncompressed.js), license is BSD-3-Clause +%global bundled_ace_version 1.32.5 # - Stan Ace Mode (LGPL 2.1) => bundled in ./src/gwt/acesupport/acemode/stan.js # - Boost => unbundled # - RapidXml => bundled in ./src/cpp/core/include/core/rapidxml/rapidxml.hpp at version 1.13, license is (BSL-1.0 OR MIT) %global bundled_rapidxml_version 1.13 # - fmt => unbundled -# - Google Web Toolkit => bundled as gwt-rstudio (version 1.3), new upstream https://github.com/rstudio/gwt, license is Apache-2.0 -%global bundled_gwt_rstudio_version 1.3 -# - Guice => bundled in ./src/gwt/lib/gin/%%{bundled_gin_version}/, version 3.0, license is Apache-2.0 -%global bundled_guice_version 3.0 +# - Google Web Toolkit => bundled as gwt-rstudio, new upstream https://github.com/rstudio/gwt, license is Apache-2.0 +%global bundled_gwt_rstudio_version 2.10.0 +# - Guice => bundled in ./src/gwt/lib/gin/%%{bundled_gin_version}/, license is Apache-2.0 +%global bundled_guice_version 6.0.0 # - GIN => bundled in ./src/gwt/lib/gin/%%{bundled_gin_version}, license is Apache-2.0 %global bundled_gin_version 2.1.2 -# - AOP Alliance => bundled in ./src/gwt/lib/gin/2.1.2/aopalliance.jar, version 1.0, license is Public Domain +# - AOP Alliance => bundled in ./src/gwt/lib/gin/%%{bundled_gin_version}/aopalliance.jar, version 1.0, license is Public Domain %global bundled_aopalliance_version 1.0 # - RSA-JS => bundled in ./src/gwt/tools/rsa.js, however this is actually part of the jsbn library (ends up as encrypt.min.js in the rpm), version 1.1, license is MIT %global bundled_jsbn_version 1.1 @@ -86,19 +86,17 @@ # missing from NOTICE: # - Google Closure Compiler => bundled in ./src/gwt/tools/compiler/ but AFAIK only used for building, version is "compiler-latest.zip as of July 9, 2019", license is Apache-2.0 with bundled dependencies under (NPL-1.1 AND (MPL-1.1 OR GPL-2.0-or-later)) AND MIT AND CPL-1.0 AND BSD-3-Clause AND Apache-2.0 -# override upstream's choice for the boost version on Leap 15.2, -# but not on Tumbleweed and Leap >= 15.3 -%if 0%{?sle_version} == 150200 +# override upstream's choice for the boost version on Leap. +%if %{suse_version} <= 1500 %global rstudio_boost_requested_version 1.66 %endif -%define boost_version %{?rstudio_boost_requested_version}%{?!rstudio_boost_requested_version:1.69} -%global rstudio_version_major 2023 -%global rstudio_version_minor 09 -%global rstudio_version_patch 1 -%global rstudio_version_suffix 494 +%global rstudio_version_major 2024 +%global rstudio_version_minor 04 +%global rstudio_version_patch 0 +%global rstudio_version_suffix 735 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash cd7011dce393115d3a7c3db799dda4b1c7e88711 +%global rstudio_git_revision_hash a00d0e775dbc93e0d79a1bf474e3e8e8de677383 Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}+%{rstudio_version_suffix} Release: 0 @@ -141,11 +139,17 @@ Patch6: remove-panmirror.patch # Leap 15.2 only patch Patch7: 0008-Add-support-for-RapidJSON-1.1.0-in-Leap-15.2.patch +# We don't want do depend on /etc/os-release, because that changes frequently in Tumbleweed. +# And it doesn't seem right that the package depends on the distribution it is a part of. +Patch8: skip-osrelease.patch Patch9: unbundle-fmt.patch +Patch10: respect-system-yaml-cpp.patch +Patch11: fix-boost-1.85-build.patch +Patch12: fix-boost-1.66-build.patch Patch100: old-boost.patch BuildRequires: Mesa-devel -BuildRequires: R-core-devel +BuildRequires: R-core-devel >= 3.6.0 BuildRequires: ant BuildRequires: clang-devel BuildRequires: cmake @@ -211,7 +215,6 @@ BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(websocketpp) BuildRequires: pkgconfig(zlib) -BuildConflicts: java-devel >= 12 Requires: R-base Requires: R-core-libs Recommends: gcc ++++++ 0002-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /var/tmp/diff_new_pack.paoGzV/_old 2024-05-03 10:46:08.760745005 +0200 +++ /var/tmp/diff_new_pack.paoGzV/_new 2024-05-03 10:46:08.772745441 +0200 @@ -9,9 +9,11 @@ src/cpp/session/CMakeLists.txt | 41 ----------------------------------------- 1 file changed, 41 deletions(-) +diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt +index 0202e84..ec525d4 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt -@@ -664,47 +664,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) +@@ -692,53 +692,12 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") @@ -19,6 +21,12 @@ - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - + # install node + install( + DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}/" + DESTINATION "${RSTUDIO_INSTALL_BIN}/node" + USE_SOURCE_PERMISSIONS) + - # install quarto (or pandoc if quarto disabled) - if(QUARTO_ENABLED) - # install some quarto folders into Resources, as needed ++++++ fix-boost-1.66-build.patch ++++++ --- rstudio-2024.04.0-735.orig/src/cpp/shared_core/FilePath.cpp +++ rstudio-2024.04.0-735/src/cpp//shared_core/FilePath.cpp @@ -50,6 +50,8 @@ #include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/predicate.hpp> +#include <boost/version.hpp> + #include <shared_core/Logger.hpp> #include <shared_core/Error.hpp> #include <shared_core/SafeConvert.hpp> @@ -806,11 +808,19 @@ { try { +#if BOOST_VERSION >= 107500 using boost::filesystem::copy_options; boost::filesystem::copy_file( m_impl->Path, in_targetPath.m_impl->Path, overwrite ? copy_options::overwrite_existing : copy_options::none); +#else + using boost::filesystem::copy_option; + boost::filesystem::copy_file( + m_impl->Path, + in_targetPath.m_impl->Path, + overwrite ? copy_option::overwrite_if_exists : copy_option::fail_if_exists); +#endif return Success(); } catch(const boost::filesystem::filesystem_error& e) --- rstudio-2024.04.0-735.orig/src/cpp/session/modules/environment/SessionEnvironment.cpp +++ rstudio-2024.04.0-735/src/cpp/session/modules/environment/SessionEnvironment.cpp @@ -229,7 +229,7 @@ if (!r::internal::isImmediateBinding(frameSEXP)) { SEXP valueSEXP = CAR(frameSEXP); - bool canBeSerialized = s_serializationCache.contains(valueSEXP) + bool canBeSerialized = s_serializationCache.find(valueSEXP) != s_serializationCache.end() ? s_serializationCache.at(valueSEXP) : isSerializable(valueSEXP); newCache[valueSEXP] = canBeSerialized; ++++++ fix-boost-1.85-build.patch ++++++ Adapt to https://github.com/boostorg/function/commit/af8e66d03b4366c7039a138306470567c2243130. diff --git a/src/cpp/core/json/JsonRpc.cpp b/src/cpp/core/json/JsonRpc.cpp index d034ffe..060f886 100644 --- a/src/cpp/core/json/JsonRpc.cpp +++ b/src/cpp/core/json/JsonRpc.cpp @@ -193,7 +193,7 @@ void JsonRpcResponse::setAfterResponse( bool JsonRpcResponse::hasAfterResponse() const { - return afterResponse_; + return bool(afterResponse_); } ++++++ old-boost.patch ++++++ --- /var/tmp/diff_new_pack.paoGzV/_old 2024-05-03 10:46:08.856748494 +0200 +++ /var/tmp/diff_new_pack.paoGzV/_new 2024-05-03 10:46:08.860748639 +0200 @@ -1,23 +1,14 @@ -Index: rstudio-2022.07.2-576/src/cpp/CMakeLists.txt +Index: rstudio-2024.04.0-735/src/cpp/CMakeLists.txt =================================================================== ---- rstudio-2022.07.2-576.orig/src/cpp/CMakeLists.txt -+++ rstudio-2022.07.2-576/src/cpp/CMakeLists.txt -@@ -233,7 +233,7 @@ endif() - - # default Boost versions - if(NOT RSTUDIO_BOOST_REQUESTED_VERSION) -- set(RSTUDIO_BOOST_REQUESTED_VERSION 1.78.0) -+ set(RSTUDIO_BOOST_REQUESTED_VERSION 1.66.0) - endif() - - # disable system boost if we're not using it. -@@ -281,7 +281,7 @@ if(UNIX) - else() - add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost) - find_package(Boost ${RSTUDIO_BOOST_REQUESTED_VERSION} REQUIRED) +--- rstudio-2024.04.0-735.orig/src/cpp/CMakeLists.txt ++++ rstudio-2024.04.0-735/src/cpp/CMakeLists.txt +@@ -281,7 +281,7 @@ + set(Boost_USE_STATIC_LIBS ON) + set(BOOST_INCLUDEDIR ${RSTUDIO_TOOLS_BOOST}/include) + find_package(Boost ${RSTUDIO_BOOST_REQUESTED_VERSION} HINTS "${RSTUDIO_TOOLS_BOOST}" EXACT REQUIRED) - if(NOT Boost_VERSION LESS 106900) + if(NOT Boost_VERSION LESS 106600) list(REMOVE_ITEM BOOST_LIBS signals) endif() - find_package(Boost ${RSTUDIO_BOOST_REQUESTED_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS}) + ++++++ remove-panmirror.patch ++++++ --- /var/tmp/diff_new_pack.paoGzV/_old 2024-05-03 10:46:08.872749076 +0200 +++ /var/tmp/diff_new_pack.paoGzV/_new 2024-05-03 10:46:08.876749220 +0200 @@ -1,34 +1,34 @@ Not easy to build. If someone can figure out how to make this work, this patch can be removed again. -diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt -index 30dd638..1a19b05 100644 ---- a/src/cpp/server/CMakeLists.txt -+++ b/src/cpp/server/CMakeLists.txt -@@ -249,12 +249,6 @@ if (UNIX AND NOT APPLE) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT} - DESTINATION ${RSERVER_SYSTEMD_DIR}) - +diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt +index a0bc394..657c2e9 100644 +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -670,12 +670,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) + install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" + DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") + - # install node - install( -- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/" +- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}/" - DESTINATION "${RSTUDIO_INSTALL_BIN}/node" - USE_SOURCE_PERMISSIONS) - - elseif(APPLE) - - # install configured admin script + # install embedded packages + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) + file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index 1178a04..9b675c7 100644 +index 27ffe33..24fd98d 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml -@@ -83,66 +83,6 @@ +@@ -83,80 +83,6 @@ <echo>Concatenated acesupport files to 'acesupport.js'</echo> </target> - <!-- panmirror typescript library --> - <!-- ensure version matches RSTUDIO_NODE_VERSION --> -- <property name="node.version" value="16.20.2"/> +- <property name="node.version" value="18.18.2"/> - <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> - <!-- use yarn from system but will prefer yarn from dependencies if available --> - <condition property="yarn.bin" value="yarn"> @@ -69,8 +69,18 @@ - file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/> - - <target name="panmirror" description="Compile panmirror library"> +- +- <!-- Make sure a default value for panmirror.minify is set --> +- <condition property="panmirror.minify" value="true"> +- <not> +- <isset property="panmirror.minify" /> +- </not> +- </condition> +- - <echo message="yarn location: ${yarn.bin}"/> - <echo message="panmirror location: ${panmirror.dir}"/> +- <echo message="panmirror minify: ${panmirror.minify}"/> +- - <mkdir dir="${panmirror.build.dir}"/> - <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> - <arg value="install"/> @@ -79,6 +89,10 @@ - </exec> - <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> - <arg value="build"/> +- <arg value="--minify"/> +- <arg value="${panmirror.minify}"/> +- <arg value="--sourcemap"/> +- <arg value="true"/> - <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/> - </exec> - <copy todir="${panmirror.build.dir}"> @@ -89,7 +103,7 @@ <target name="javac" description="Compile java source"> <mkdir dir="${build.dir}"/> <!-- Compile com.google stuff separately from org.rstudio stuff since -@@ -172,9 +112,6 @@ +@@ -186,9 +112,6 @@ </target> <target name="gwtc" depends="ext,javac" description="GWT compile to JavaScript"> @@ -99,11 +113,12 @@ <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler"> <classpath> <pathelement location="${src.dir}"/> -@@ -223,7 +160,6 @@ +@@ -237,8 +160,6 @@ <antcall target="generate-i18n"/> <antcall target="codeserver"> <param name="gwt.main.module" value="org.rstudio.studio.RStudioDesktopSuperDevMode"/> - <param name="panmirror.target" value="ide-dev"/> +- <param name="panmirror.minify" value="false"/> </antcall> </target> ++++++ respect-system-yaml-cpp.patch ++++++ Fetching should still respect RSTUDIO_USE_SYSTEM_YAML_CPP=ON. diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 5fa2649..f509421 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -197,7 +197,7 @@ endif() # yaml-cpp set(YAML_CPP_VERSION "0.8.0") set(YAML_CPP_REVISION "f7320141120f720aecc4c32be25586e7da9eb978") -if(CMAKE_VERSION VERSION_GREATER "3.14") +if(NOT RSTUDIO_USE_SYSTEM_YAML_CPP AND CMAKE_VERSION VERSION_GREATER "3.14") if(WIN32) add_definitions(-DYAML_CPP_STATIC_DEFINE) ++++++ skip-osrelease.patch ++++++ diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt index 15001b2..5e86187 100644 --- a/CMakeGlobals.txt +++ b/CMakeGlobals.txt @@ -29,11 +29,6 @@ endif() get_filename_component(ROOT_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) set(CMAKE_MODULE_PATH "${ROOT_SRC_DIR}/cmake/modules/") -# read /etc/os-release -if(LINUX) - include(OsRelease) -endif() - # version info if ("$ENV{RSTUDIO_VERSION_MAJOR}" STREQUAL "") string(TIMESTAMP CPACK_PACKAGE_VERSION_MAJOR "%Y") ++++++ v2023.09.1+494.tar.gz -> v2024.04.0+735.tar.gz ++++++ /work/SRC/openSUSE:Factory/rstudio/v2023.09.1+494.tar.gz /work/SRC/openSUSE:Factory/.rstudio.new.1880/v2024.04.0+735.tar.gz differ: char 13, line 1
