Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2020-02-14 16:40:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio" Fri Feb 14 16:40:42 2020 rev:6 rq:774290 version:1.2.5033 Changes: -------- --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2020-01-31 23:56:15.187619314 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/rstudio.changes 2020-02-14 16:40:57.571705620 +0100 @@ -1,0 +2,32 @@ +Thu Feb 13 15:51:35 UTC 2020 - Dan Čermák <[email protected]> + +- Drop 0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch + + Rebase patches: + * 0001-First-pass-at-Boost-1.70-support.patch + * 0002-Bump-bundled-gwt-version.patch + * 0003-Remove-boost-signals-from-the-required-Boost-librari.patch + * 0004-Unbundle-mathjax-and-pandoc.patch + + Drop patches: + * 0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch + (dropped) + * 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch + (rebased as 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch) + * 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch + (rebased as 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch) + * 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch + (rebased as 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch) + * 0009-Don-t-install-pandoc-and-mathjax.patch + (rebased as 0008-Don-t-install-pandoc-and-mathjax.patch) + * 0010-Fix-rstudio-exec-path.patch + (rebased as 0009-Fix-rstudio-exec-path.patch) + + Added patches: + * 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch + * 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch + * 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch + * 0008-Don-t-install-pandoc-and-mathjax.patch + * 0009-Fix-rstudio-exec-path.patch + +------------------------------------------------------------------- Old: ---- 0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch 0009-Don-t-install-pandoc-and-mathjax.patch 0010-Fix-rstudio-exec-path.patch New: ---- 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch 0008-Don-t-install-pandoc-and-mathjax.patch 0009-Fix-rstudio-exec-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstudio.spec ++++++ --- /var/tmp/diff_new_pack.rNYuHJ/_old 2020-02-14 16:41:00.131707046 +0100 +++ /var/tmp/diff_new_pack.rNYuHJ/_new 2020-02-14 16:41:00.135707048 +0100 @@ -52,19 +52,18 @@ Source4: %{name}-server-user.conf Source99: %{name}-rpmlintrc Patch0: 0003-Remove-boost-signals-from-the-required-Boost-librari.patch -Patch1: 0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch -Patch2: 0002-Bump-bundled-gwt-version.patch +Patch1: 0002-Bump-bundled-gwt-version.patch # Tumbleweed and Leap 15.2 only patch -Patch3: 0001-First-pass-at-Boost-1.70-support.patch +Patch2: 0001-First-pass-at-Boost-1.70-support.patch # main ubundling patch -Patch4: 0004-Unbundle-mathjax-and-pandoc.patch +Patch3: 0004-Unbundle-mathjax-and-pandoc.patch # patches for Leap 15.1 & 15.0 -Patch5: 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch -Patch6: 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch -Patch7: 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch +Patch4: 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch +Patch5: 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch +Patch6: 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch # shorten the installation time a bit by not installing mathjax -Patch8: 0009-Don-t-install-pandoc-and-mathjax.patch -Patch9: 0010-Fix-rstudio-exec-path.patch +Patch7: 0008-Don-t-install-pandoc-and-mathjax.patch +Patch8: 0009-Fix-rstudio-exec-path.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel BuildRequires: ant @@ -131,6 +130,7 @@ Requires: ghc-pandoc-citeproc Requires: mathjax Requires: pandoc +Recommends: git Suggests: rstudio-desktop Suggests: rstudio-server Provides: bundled(gin) = %{bundled_gin_version} @@ -174,19 +174,18 @@ %autosetup -N %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch4 -p1 +%patch3 -p1 +%patch7 -p1 %patch8 -p1 -%patch9 -p1 # TW & Leap 15.2 specific patches %if 0%{?suse_version} > 1500 || 0%{?sle_version} == 150200 -%patch3 -p1 +%patch2 -p1 # Leap 15.1 & 15.0 patches: %else +%patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %endif # unpack common-dictionaries @@ -209,7 +208,12 @@ export RSTUDIO_VERSION_PATCH=%{rstudio_version_patch} export RSTUDIO_GIT_REVISION_HASH=%{rstudio_git_revision_hash} export GIT_COMMIT=%{rstudio_git_revision_hash} -%cmake -DRSTUDIO_TARGET=Desktop -DRSTUDIO_SERVER=TRUE -DCMAKE_BUILD_TYPE=Release -DRSTUDIO_BOOST_SIGNALS_VERSION=2 -DCMAKE_INSTALL_PREFIX=%{_libexecdir}/%{name} +%cmake -DRSTUDIO_TARGET=Desktop -DRSTUDIO_SERVER=TRUE -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=%{_libexecdir}/%{name} \ + -DRSTUDIO_USE_SYSTEM_BOOST=TRUE \ + -DRSTUDIO_BOOST_SIGNALS_VERSION=2 \ + -DBOOST_ROOT=%{_prefix} -DBOOST_LIBRARYDIR=%{_lib} \ + -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt5 # dirty hack: # gwtc compilation runs via make -> ant -> java and something in that chain ++++++ 0001-First-pass-at-Boost-1.70-support.patch ++++++ --- /var/tmp/diff_new_pack.rNYuHJ/_old 2020-02-14 16:41:00.147707055 +0100 +++ /var/tmp/diff_new_pack.rNYuHJ/_new 2020-02-14 16:41:00.151707057 +0100 @@ -1,7 +1,7 @@ From 1fb2258dc456ecbbdecc9b366ba4a6758e4e0421 Mon Sep 17 00:00:00 2001 From: Kevin Ushey <[email protected]> Date: Tue, 3 Sep 2019 13:23:23 -0700 -Subject: [PATCH 01/10] First pass at Boost 1.70 support +Subject: [PATCH 1/9] First pass at Boost 1.70 support --- src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp | 6 ++++-- ++++++ 0002-Bump-bundled-gwt-version.patch ++++++ --- /var/tmp/diff_new_pack.rNYuHJ/_old 2020-02-14 16:41:00.155707059 +0100 +++ /var/tmp/diff_new_pack.rNYuHJ/_new 2020-02-14 16:41:00.155707059 +0100 @@ -1,7 +1,7 @@ From 6ec5616ce3dbbd059aff4012599f2706f6e6fb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 10:43:27 +0100 -Subject: [PATCH 02/10] Bump bundled gwt version +Subject: [PATCH 2/9] Bump bundled gwt version --- src/gwt/build.xml | 2 +- ++++++ 0003-Remove-boost-signals-from-the-required-Boost-librari.patch ++++++ --- /var/tmp/diff_new_pack.rNYuHJ/_old 2020-02-14 16:41:00.167707066 +0100 +++ /var/tmp/diff_new_pack.rNYuHJ/_new 2020-02-14 16:41:00.167707066 +0100 @@ -1,7 +1,7 @@ From 933b8de98363f190033b78febe6c0fce0845c592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 10:45:46 +0100 -Subject: [PATCH 03/10] Remove boost-signals from the required Boost libraries +Subject: [PATCH 3/9] Remove boost-signals from the required Boost libraries --- src/cpp/CMakeLists.txt | 1 - ++++++ 0004-Unbundle-mathjax-and-pandoc.patch ++++++ --- /var/tmp/diff_new_pack.rNYuHJ/_old 2020-02-14 16:41:00.187707078 +0100 +++ /var/tmp/diff_new_pack.rNYuHJ/_new 2020-02-14 16:41:00.191707079 +0100 @@ -1,7 +1,7 @@ From 281a613295988be038f61b4198b6f513aad9f963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 11:27:06 +0100 -Subject: [PATCH 04/10] Unbundle mathjax and pandoc +Subject: [PATCH 4/9] Unbundle mathjax and pandoc Use find_file() & find_program() functions to find the dependencies in the dependencies/ subdirectory first. If they are not there, use the system paths ++++++ 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch -> 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch 2020-01-27 20:19:13.824588198 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch 2020-02-14 16:40:56.147704826 +0100 @@ -1,8 +1,7 @@ -From abe4dd26e0cbfbf0811a59b04d018c0786ea18b4 Mon Sep 17 00:00:00 2001 +From 5682be6d2e4c7020bf8395486dfeba81b16ab9f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 15:05:12 +0100 -Subject: [PATCH 06/10] Use std::thread instead of QThread for Qt < 5.10 - support +Subject: [PATCH 5/9] Use std::thread instead of QThread for Qt < 5.10 support --- src/cpp/desktop/DesktopInfo.cpp | 12 ++++++------ ++++++ 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch -> 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch 2020-01-27 20:19:13.952588276 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch 2020-02-14 16:40:56.551705051 +0100 @@ -1,7 +1,7 @@ -From fa95348822ab87aee7a6504fac64a707bc415493 Mon Sep 17 00:00:00 2001 +From 4c41e7d8cb820da3d57036ec894103a1c54606d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 15:22:35 +0100 -Subject: [PATCH 07/10] Add explicit #include <mutex> for gcc 7 to +Subject: [PATCH 6/9] Add explicit #include <mutex> for gcc 7 to DesktopWebpage.cpp --- ++++++ 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch -> 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch 2020-01-27 20:19:14.088588359 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch 2020-02-14 16:40:56.795705187 +0100 @@ -1,7 +1,7 @@ -From 3d0059cf41e5dbb30d809b6b5fb5ff121e4403d8 Mon Sep 17 00:00:00 2001 +From 9c45e92e88d1efb405c60f0d5907f3a38f4a63e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 15:48:54 +0100 -Subject: [PATCH 08/10] Remove PauseChanged related handler from DownloadHelper +Subject: [PATCH 7/9] Remove PauseChanged related handler from DownloadHelper for Qt < 5.10 --- ++++++ 0009-Don-t-install-pandoc-and-mathjax.patch -> 0008-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0009-Don-t-install-pandoc-and-mathjax.patch 2020-01-27 20:19:14.228588444 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/0008-Don-t-install-pandoc-and-mathjax.patch 2020-02-14 16:40:56.975705287 +0100 @@ -1,7 +1,7 @@ -From 7a76822069916fb2f9d733fed925c46603dc3a6e Mon Sep 17 00:00:00 2001 +From 04536f1a133a5f2958919b7a85bc344d77e99f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Tue, 14 Jan 2020 14:20:40 +0100 -Subject: [PATCH 09/10] Don't install pandoc and mathjax +Subject: [PATCH 8/9] Don't install pandoc and mathjax Because we use the system wide version, there's no need to waste time installing the files. ++++++ 0010-Fix-rstudio-exec-path.patch -> 0009-Fix-rstudio-exec-path.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0010-Fix-rstudio-exec-path.patch 2020-01-27 20:19:14.408588554 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/0009-Fix-rstudio-exec-path.patch 2020-02-14 16:40:57.231705430 +0100 @@ -1,7 +1,7 @@ -From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001 +From 66bd4b40e24d67068ac4b326a011aa862bf22c0b Mon Sep 17 00:00:00 2001 From: Marco Varlese <[email protected]> Date: Mon, 27 Jan 2020 14:29:40 +0100 -Subject: [PATCH 10/10] Fix rstudio exec path +Subject: [PATCH 9/9] Fix rstudio exec path Fix the path to the rstudio executable in the rstudio.desktop file. ---
