Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-calculator for openSUSE:Factory checked in at 2024-03-28 13:54:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-calculator (Old) and /work/SRC/openSUSE:Factory/.deepin-calculator.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deepin-calculator" Thu Mar 28 13:54:58 2024 rev:7 rq:1163229 version:5.7.21 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-calculator/deepin-calculator.changes 2022-09-01 22:10:49.476187304 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-calculator.new.1905/deepin-calculator.changes 2024-03-28 14:28:12.064075847 +0100 @@ -1,0 +2,5 @@ +Thu Mar 28 03:51:24 UTC 2024 - Hillwood Yang <hillwood@opensuse.org> + +- Add do-not-hardcode-c++-version.patch, fix build on gtest 1.14.0 + +------------------------------------------------------------------- New: ---- do-not-hardcode-c++-version.patch BETA DEBUG BEGIN: New: - Add do-not-hardcode-c++-version.patch, fix build on gtest 1.14.0 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-calculator.spec ++++++ --- /var/tmp/diff_new_pack.FxD6K8/_old 2024-03-28 14:28:21.444418445 +0100 +++ /var/tmp/diff_new_pack.FxD6K8/_new 2024-03-28 14:28:21.444418445 +0100 @@ -1,7 +1,7 @@ # # spec file for package deepin-calculator # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + +%define gtest_version %(rpm -q --queryformat '%%{VERSION}' gtest) + Name: deepin-calculator Version: 5.7.21 Release: 0 @@ -23,27 +26,29 @@ Group: Productivity/Scientific/Math URL: https://github.com/linuxdeepin/deepin-calculator Source: https://github.com/linuxdeepin/deepin-calculator/archive/%{version}/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM do-not-hardcode-c++-version.patch hillwood@opensuse.org +Patch0: do-not-hardcode-c++-version.patch %ifarch ppc ppc64 ppc64le s390 s390x BuildRequires: deepin-desktop-base %else BuildRequires: deepin-manual %endif -BuildRequires: gtest -BuildRequires: gmock BuildRequires: fdupes +BuildRequires: gmock +BuildRequires: gtest BuildRequires: hicolor-icon-theme -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: libqt5-linguist BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(dtkwidget) -BuildRequires: pkgconfig(dtkgui) -BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(dframeworkdbus) -BuildRequires: libqt5-linguist +BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(dtkgui) +BuildRequires: pkgconfig(dtkwidget) Recommends: %{name}-lang %description @@ -52,12 +57,16 @@ %lang_package %prep -%setup +%autosetup -p1 sed -i 's/lrelease/lrelease-qt5/g' translate_generation.sh %build -%cmake -%make_build +%cmake \ +%if "%{gtest_version}" >= "1.14.0" + -DCMAKE_CXX_STANDARD=14 +%endif + +%cmake_build %install %cmake_install ++++++ do-not-hardcode-c++-version.patch ++++++ diff -Nur deepin-calculator-5.7.21/CMakeLists.txt deepin-calculator-5.7.21-new/CMakeLists.txt --- deepin-calculator-5.7.21/CMakeLists.txt 2022-04-21 15:02:14.000000000 +0800 +++ deepin-calculator-5.7.21-new/CMakeLists.txt 2024-03-28 10:47:22.668192398 +0800 @@ -9,7 +9,9 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -set(CMAKE_CXX_STANDARD 11) +if (NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) +endif () set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) diff -Nur deepin-calculator-5.7.21/tests/CMakeLists.txt deepin-calculator-5.7.21-new/tests/CMakeLists.txt --- deepin-calculator-5.7.21/tests/CMakeLists.txt 2022-04-21 15:02:14.000000000 +0800 +++ deepin-calculator-5.7.21-new/tests/CMakeLists.txt 2024-03-28 11:16:55.285377531 +0800 @@ -12,7 +12,9 @@ ADD_COMPILE_OPTIONS(-fno-access-control) -set(CMAKE_CXX_STANDARD 11) +if (NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) +endif () set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON)