Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scidavis for openSUSE:Factory checked in at 2025-05-08 18:22:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scidavis (Old) and /work/SRC/openSUSE:Factory/.scidavis.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scidavis" Thu May 8 18:22:47 2025 rev:10 rq:1275374 version:2.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/scidavis/scidavis.changes 2024-02-28 19:47:10.105915957 +0100 +++ /work/SRC/openSUSE:Factory/.scidavis.new.30101/scidavis.changes 2025-05-08 18:25:33.573929427 +0200 @@ -1,0 +2,11 @@ +Tue May 6 11:27:05 UTC 2025 - Atri Bhattacharya <badshah...@gmail.com> + +- Switch to building with cmake and ninja; this magically fixes + the python linking issues causing build failures in TW. +- Explicitly specify qwtplot3d library to use for build: since the + library is suffixed with '-qt5' on openSUSE, cmake fails to find + it otherwise. +- Switch over BuildRequires to pkgconfig based ones where + possible. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scidavis.spec ++++++ --- /var/tmp/diff_new_pack.1grkSo/_old 2025-05-08 18:25:34.109951787 +0200 +++ /var/tmp/diff_new_pack.1grkSo/_new 2025-05-08 18:25:34.113951954 +0200 @@ -1,7 +1,7 @@ # # spec file for package scidavis # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2012 Quentin Denis <quen...@links2linux.de> # # All modifications and additions to the file contributed by third parties @@ -17,6 +17,7 @@ # +%define __builder ninja Name: scidavis Version: 2.9.0 Release: 0 @@ -33,25 +34,27 @@ Patch2: scidavis-specify-std-namespace.patch # PATCH-FIX-UPSTREAM scidavis-grabFrameBuffer.patch badshah...@gmail.com -- Use grabFrameBuffer instead of grabFramebuffer, https://sourceforge.net/p/scidavis/scidavis-bugs/441 Patch3: scidavis-grabFrameBuffer.patch -BuildRequires: glu-devel +BuildRequires: cmake BuildRequires: hicolor-icon-theme -BuildRequires: liborigin-devel +BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-qt5-devel BuildRequires: python3-sip4 BuildRequires: python3-sip4-devel -BuildRequires: qwt-devel BuildRequires: qwtplot3d-devel -BuildRequires: zlib-devel BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gsl) +BuildRequires: pkgconfig(liborigin) BuildRequires: pkgconfig(muparser) +BuildRequires: pkgconfig(qwt5-qt5) +BuildRequires: pkgconfig(zlib) ExcludeArch: aarch64 %description @@ -74,32 +77,26 @@ %patch -P 3 -p1 %build -export PYTHON=python3 -%qmake5 CONFIG+=python \ - CONFIG+=liborigin \ -%if "%{_lib}" == "lib64" - 64BITS=1 -%endif - -%make_jobs +export PYTHON=%{_bindir}/python%{python3_version} +%cmake \ + -DBUILD_QWTPLOT3D=OFF \ + -DORIGIN_IMPORT=ON \ + -DQWTPLOT3D_LIBRARY=%{_libqt5_libdir}/libqwtplot3d-qt5.so \ + -Wno-dev \ + %{nil} +%cmake_build %install -%qmake5_install - -mkdir -p %{buildroot}%{_datadir}/%{name}/translations -cp %{name}/translations/%{name}_*.qm %{buildroot}%{_datadir}/%{name}/translations/ +%cmake_install %find_lang %{name} --with-qt # Remove unneeded files. -rm -rf %{buildroot}%{_datadir}/doc/%{name} +rm -rf %{buildroot}%{_docdir}/%{name} # mimelnk is deprecated in favor of %%{_datadir}/mime/packages/ for a long time rm -Rf %{buildroot}%{_datadir}/mimelnk -# Not a config file, not used on Linux -rm %{buildroot}%{_sysconfdir}/scidavis/scidavisrc.py - %files lang -f %{name}.lang %dir %{_datadir}/scidavis %dir %{_datadir}/scidavis/translations @@ -115,7 +112,7 @@ %dir %{_datadir}/icons/locolor/32x32 %dir %{_datadir}/icons/locolor/32x32/apps %{_bindir}/%{name} -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/*/*/apps/%{name}.* %{_datadir}/mime/packages/%{name}.xml
