From 76912eb94076a46479a3858e981b8d4cb26dfd9d529b431cc3c111e836316688 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 5 Nov 2023 12:59:49 +0000 Subject: [PATCH 1/3] Accepting request 1123403 from home:manfred-h - Use gcc13 as Leap's default compiler does not provide "filesystem". - Add build requires for glibmm. OBS-URL: https://build.opensuse.org/request/show/1123403 OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=28 --- cpu-x.changes | 6 ++++++ cpu-x.spec | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/cpu-x.changes b/cpu-x.changes index 08f7ea4..3b29c62 100644 --- a/cpu-x.changes +++ b/cpu-x.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 5 10:29:24 UTC 2023 - Manfred Hollstein + +- Use gcc13 as Leap's default compiler does not provide "filesystem". +- Add build requires for glibmm. + ------------------------------------------------------------------- Wed Nov 1 11:09:11 UTC 2023 - Jan Engelhardt diff --git a/cpu-x.spec b/cpu-x.spec index 3f5119c..b0a422c 100644 --- a/cpu-x.spec +++ b/cpu-x.spec @@ -26,6 +26,10 @@ Group: System/X11/Utilities URL: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X Source: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/archive/refs/tags/v%version.tar.gz Patch1: no-no-pie.patch +%if 0%{suse_version} == 1500 +BuildRequires: gcc13 +BuildRequires: gcc13-c++ +%endif BuildRequires: c++_compiler BuildRequires: cmake >= 3.12 BuildRequires: gettext-tools @@ -36,6 +40,7 @@ BuildRequires: opencl-headers BuildRequires: pkgconfig(OpenCL) BuildRequires: pkgconfig(glfw3) BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 +BuildRequires: pkgconfig(gtkmm-3.0) >= 3.12.0 BuildRequires: pkgconfig(libcpuid) >= 0.6.0 BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libprocps) @@ -84,6 +89,10 @@ Shell completion definitions from %name for %name. %autosetup -p1 -n %src_name %build +%if 0%{suse_version} == 1500 +export CC=gcc-13 +export CXX=g++-13 +%endif %cmake \ -DWITH_OPENCL=1 %cmake_build From 0ec52bfcf24585e9065077f9b1d931a0046f9b03ee66444c9d10cf92fd7e4032 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 5 Nov 2023 13:00:49 +0000 Subject: [PATCH 2/3] use <1599 to capture all Leaps OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=29 --- cpu-x.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cpu-x.spec b/cpu-x.spec index b0a422c..030a74d 100644 --- a/cpu-x.spec +++ b/cpu-x.spec @@ -26,7 +26,7 @@ Group: System/X11/Utilities URL: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X Source: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/archive/refs/tags/v%version.tar.gz Patch1: no-no-pie.patch -%if 0%{suse_version} == 1500 +%if 0%{suse_version} < 1599 BuildRequires: gcc13 BuildRequires: gcc13-c++ %endif @@ -89,12 +89,10 @@ Shell completion definitions from %name for %name. %autosetup -p1 -n %src_name %build -%if 0%{suse_version} == 1500 -export CC=gcc-13 -export CXX=g++-13 +%if 0%{suse_version} < 1599 +export CC=gcc-13 CXX=g++-13 %endif -%cmake \ - -DWITH_OPENCL=1 +%cmake -DWITH_OPENCL=1 %cmake_build %install From dfc9b43d442dea6591250ea11cdb436ba3e0b8413a5a102b9761bcc6ca683f78 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 5 Nov 2023 13:03:04 +0000 Subject: [PATCH 3/3] resolve nothing provides gcc13 by going to 12 OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=30 --- cpu-x.changes | 3 ++- cpu-x.spec | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cpu-x.changes b/cpu-x.changes index 3b29c62..f0835d4 100644 --- a/cpu-x.changes +++ b/cpu-x.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Sun Nov 5 10:29:24 UTC 2023 - Manfred Hollstein -- Use gcc13 as Leap's default compiler does not provide "filesystem". +- Use newer g++, as Leap's default compiler does not provide the + header. - Add build requires for glibmm. ------------------------------------------------------------------- diff --git a/cpu-x.spec b/cpu-x.spec index 030a74d..a0ca0db 100644 --- a/cpu-x.spec +++ b/cpu-x.spec @@ -27,8 +27,8 @@ URL: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X Source: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/archive/refs/tags/v%version.tar.gz Patch1: no-no-pie.patch %if 0%{suse_version} < 1599 -BuildRequires: gcc13 -BuildRequires: gcc13-c++ +BuildRequires: gcc12 +BuildRequires: gcc12-c++ %endif BuildRequires: c++_compiler BuildRequires: cmake >= 3.12 @@ -90,7 +90,7 @@ Shell completion definitions from %name for %name. %build %if 0%{suse_version} < 1599 -export CC=gcc-13 CXX=g++-13 +export CC=gcc-12 CXX=g++-12 %endif %cmake -DWITH_OPENCL=1 %cmake_build