Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scidavis for openSUSE:Factory checked in at 2023-08-28 17:15:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scidavis (Old) and /work/SRC/openSUSE:Factory/.scidavis.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scidavis" Mon Aug 28 17:15:26 2023 rev:8 rq:1106121 version:2.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/scidavis/scidavis.changes 2022-03-01 17:04:06.064341923 +0100 +++ /work/SRC/openSUSE:Factory/.scidavis.new.1766/scidavis.changes 2023-08-28 17:15:33.869403311 +0200 @@ -1,0 +2,15 @@ +Fri Aug 25 16:30:53 UTC 2023 - Atri Bhattacharya <[email protected]> + +- Update to version 2.9.0: + * No release notes. +- Add patches to fix build: + * scidavis-grabFrameBuffer.patch: Use QGLWidget::grabFrameBuffer + instead of QOpenGLWidget::grabFramebuffer to fix build + (https://sourceforge.net/p/scidavis/scidavis-bugs/441/). + * scidavis-specify-std-namespace.patch: Specify std namespace + where required, patch taken from upstream + [gh#SciDAVis/scidavis#30]. +- Do not build on aarch64: no GL headers. +- Drop scidavis-rpmlintrc file: no longer needed. + +------------------------------------------------------------------- Old: ---- scidavis-2.3.0.tar.gz scidavis-rpmlintrc New: ---- scidavis-2.9.0.tar.gz scidavis-grabFrameBuffer.patch scidavis-specify-std-namespace.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scidavis.spec ++++++ --- /var/tmp/diff_new_pack.hJVoz4/_old 2023-08-28 17:15:35.517462492 +0200 +++ /var/tmp/diff_new_pack.hJVoz4/_new 2023-08-28 17:15:35.521462636 +0200 @@ -1,7 +1,7 @@ # # spec file for package scidavis # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2012 Quentin Denis <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,29 +18,29 @@ Name: scidavis -Version: 2.3.0 +Version: 2.9.0 Release: 0 Summary: An application for Scientific Data Analysis and Visualization License: GPL-2.0-only AND GPL-3.0-or-later Group: Productivity/Scientific/Math -URL: http://scidavis.sourceforge.net/ -# Source0: http://downloads.sourceforge.net/project/scidavis/SciDAVis/%%{version}/%%{name}-%%{version}.tar.gz -Source0: https://github.com/highperformancecoder/scidavis/archive/2.3.0.tar.gz#/%{name}-%{version}.tar.gz -Source1: scidavis-rpmlintrc +URL: https://scidavis.sourceforge.net/ +Source0: https://github.com/SciDAVis/scidavis/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE Patch0: 0001-Adapt-scidavis-for-openSUSE.patch # PATCH-FIX-OPENSUSE Patch1: 0001-Adapt-scidavis-for-Leap.patch +# PATCH-FIX-UPSTREAM gh#SciDAVis/scidavis#30 https://github.com/SciDAVis/scidavis/commit/afca5696c4f477dcae4a0484dad2d7314884f020 +Patch2: scidavis-specify-std-namespace.patch +# PATCH-FIX-UPSTREAM scidavis-grabFrameBuffer.patch [email protected] -- Use grabFrameBuffer instead of grabFramebuffer, https://sourceforge.net/p/scidavis/scidavis-bugs/441 +Patch3: scidavis-grabFrameBuffer.patch BuildRequires: glu-devel BuildRequires: hicolor-icon-theme BuildRequires: liborigin-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-qt5-devel -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 BuildRequires: python3-sip4 BuildRequires: python3-sip4-devel -%endif BuildRequires: qwt-devel BuildRequires: qwtplot3d-devel BuildRequires: zlib-devel @@ -52,7 +52,7 @@ BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(muparser) -Recommends: %{name}-lang = %{version} +ExcludeArch: aarch64 %description SciDAVis is an interactive application for data analysis and @@ -70,6 +70,8 @@ %if 0%{?suse_version} < 1550 %patch1 -p1 %endif +%patch2 -p1 +%patch3 -p1 %build export PYTHON=python3 @@ -92,9 +94,12 @@ # Remove unneeded files. rm -rf %{buildroot}%{_datadir}/doc/%{name} -# mimelnk is deprecated in favor of %{_datadir}/mime/packages/ for a long time +# 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 @@ -118,6 +123,5 @@ %exclude %{_datadir}/%{name}/translations %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1%{?ext_man} -%{_sysconfdir}/scidavis/ %changelog ++++++ 0001-Adapt-scidavis-for-openSUSE.patch ++++++ --- /var/tmp/diff_new_pack.hJVoz4/_old 2023-08-28 17:15:35.545463498 +0200 +++ /var/tmp/diff_new_pack.hJVoz4/_new 2023-08-28 17:15:35.549463642 +0200 @@ -17,10 +17,10 @@ libscidavis/libscidavis.pro | 1 - 7 files changed, 11 insertions(+), 16 deletions(-) -Index: scidavis-2.3.0/config.pri +Index: scidavis-2.9.0/config.pri =================================================================== ---- scidavis-2.3.0.orig/config.pri -+++ scidavis-2.3.0/config.pri +--- scidavis-2.9.0.orig/config.pri ++++ scidavis-2.9.0/config.pri @@ -74,6 +74,11 @@ unix:message(Building with preset $$PRES ### and/or copy files to the desired locations by other means. # ################################################################################ @@ -59,7 +59,7 @@ ################################################################################ ### Optional features # ################################################################################ -@@ -283,6 +284,8 @@ contains(PRESET, linux_package) { +@@ -281,6 +282,8 @@ contains(PRESET, linux_package) { exists(/usr/include/qt5/qwtplot3d-qt5) {INCLUDEPATH+=/usr/include/qt5/qwtplot3d-qt5} exists(/usr/include/qwt5-qt5) {INCLUDEPATH+=/usr/include/qwt5-qt5} exists(/usr/include/qwtplot3d) {INCLUDEPATH+=/usr/include/qwtplot3d} @@ -68,60 +68,60 @@ system (ls /usr/lib*/libqwt5-qt5.so) {LIBS+=-lqwt5-qt5} system (ls /usr/lib*/*/libqwt5-qt5.so) {LIBS+=-lqwt5-qt5} -Index: scidavis-2.3.0/fitPlugins/exp_saturation/exp_saturation.pro +Index: scidavis-2.9.0/fitPlugins/exp_saturation/exp_saturation.pro =================================================================== ---- scidavis-2.3.0.orig/fitPlugins/exp_saturation/exp_saturation.pro -+++ scidavis-2.3.0/fitPlugins/exp_saturation/exp_saturation.pro +--- scidavis-2.9.0.orig/fitPlugins/exp_saturation/exp_saturation.pro ++++ scidavis-2.9.0/fitPlugins/exp_saturation/exp_saturation.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = exp_saturation -Index: scidavis-2.3.0/fitPlugins/explin/explin.pro +Index: scidavis-2.9.0/fitPlugins/explin/explin.pro =================================================================== ---- scidavis-2.3.0.orig/fitPlugins/explin/explin.pro -+++ scidavis-2.3.0/fitPlugins/explin/explin.pro +--- scidavis-2.9.0.orig/fitPlugins/explin/explin.pro ++++ scidavis-2.9.0/fitPlugins/explin/explin.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = explin -Index: scidavis-2.3.0/fitPlugins/fitRational0/fitRational0.pro +Index: scidavis-2.9.0/fitPlugins/fitRational0/fitRational0.pro =================================================================== ---- scidavis-2.3.0.orig/fitPlugins/fitRational0/fitRational0.pro -+++ scidavis-2.3.0/fitPlugins/fitRational0/fitRational0.pro +--- scidavis-2.9.0.orig/fitPlugins/fitRational0/fitRational0.pro ++++ scidavis-2.9.0/fitPlugins/fitRational0/fitRational0.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = fitRational0 -Index: scidavis-2.3.0/fitPlugins/fitRational1/fitRational1.pro +Index: scidavis-2.9.0/fitPlugins/fitRational1/fitRational1.pro =================================================================== ---- scidavis-2.3.0.orig/fitPlugins/fitRational1/fitRational1.pro -+++ scidavis-2.3.0/fitPlugins/fitRational1/fitRational1.pro +--- scidavis-2.9.0.orig/fitPlugins/fitRational1/fitRational1.pro ++++ scidavis-2.9.0/fitPlugins/fitRational1/fitRational1.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = fitRational1 -Index: scidavis-2.3.0/fitPlugins/planck_wavelength/planck_wavelength.pro +Index: scidavis-2.9.0/fitPlugins/planck_wavelength/planck_wavelength.pro =================================================================== ---- scidavis-2.3.0.orig/fitPlugins/planck_wavelength/planck_wavelength.pro -+++ scidavis-2.3.0/fitPlugins/planck_wavelength/planck_wavelength.pro +--- scidavis-2.9.0.orig/fitPlugins/planck_wavelength/planck_wavelength.pro ++++ scidavis-2.9.0/fitPlugins/planck_wavelength/planck_wavelength.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = planck_wavelength -Index: scidavis-2.3.0/libscidavis/libscidavis.pro +Index: scidavis-2.9.0/libscidavis/libscidavis.pro =================================================================== ---- scidavis-2.3.0.orig/libscidavis/libscidavis.pro -+++ scidavis-2.3.0/libscidavis/libscidavis.pro +--- scidavis-2.9.0.orig/libscidavis/libscidavis.pro ++++ scidavis-2.9.0/libscidavis/libscidavis.pro @@ -47,6 +47,5 @@ include( muparser.pri ) python {include( python.pri )} @@ -129,10 +129,10 @@ - ############################################################################# ############################################################################# -Index: scidavis-2.3.0/libscidavis/python-sipcmd.py +Index: scidavis-2.9.0/libscidavis/python-sipcmd.py =================================================================== ---- scidavis-2.3.0.orig/libscidavis/python-sipcmd.py -+++ scidavis-2.3.0/libscidavis/python-sipcmd.py +--- scidavis-2.9.0.orig/libscidavis/python-sipcmd.py ++++ scidavis-2.9.0/libscidavis/python-sipcmd.py @@ -28,8 +28,8 @@ import os ++++++ scidavis-2.3.0.tar.gz -> scidavis-2.9.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/scidavis/scidavis-2.3.0.tar.gz /work/SRC/openSUSE:Factory/.scidavis.new.1766/scidavis-2.9.0.tar.gz differ: char 12, line 1 ++++++ scidavis-grabFrameBuffer.patch ++++++ Index: scidavis-2.9.0/libscidavis/src/Graph3D.cpp =================================================================== --- scidavis-2.9.0.orig/libscidavis/src/Graph3D.cpp +++ scidavis-2.9.0/libscidavis/src/Graph3D.cpp @@ -1945,7 +1945,7 @@ void Graph3D::print() void Graph3D::copyImage() { - QApplication::clipboard()->setPixmap(QPixmap::fromImage(sp->grabFramebuffer()), + QApplication::clipboard()->setPixmap(QPixmap::fromImage(sp->grabFrameBuffer()), QClipboard::Clipboard); sp->updateData(); } @@ -1953,7 +1953,7 @@ void Graph3D::copyImage() void Graph3D::exportImage(const QString &fileName, int quality, bool transparent) { if (transparent) { - QPixmap pic = QPixmap::fromImage(sp->grabFramebuffer()); + QPixmap pic = QPixmap::fromImage(sp->grabFrameBuffer()); sp->updateData(); QBitmap mask(pic.size()); @@ -1976,7 +1976,7 @@ void Graph3D::exportImage(const QString pic.setMask(mask); pic.save(fileName, 0, quality); } else { - QImage im = sp->grabFramebuffer(); + QImage im = sp->grabFrameBuffer(); QImageWriter iw(fileName); iw.setQuality(quality); iw.write(im); ++++++ scidavis-specify-std-namespace.patch ++++++ >From afca5696c4f477dcae4a0484dad2d7314884f020 Mon Sep 17 00:00:00 2001 From: alxpl <[email protected]> Date: Tue, 1 Aug 2023 13:43:09 +0200 Subject: [PATCH] specify namespace to which functions belong This should take care of issue [#30](https://github.com/SciDAVis/scidavis/issues/30). --- libscidavis/src/importOPJ.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libscidavis/src/importOPJ.cpp b/libscidavis/src/importOPJ.cpp index e5285859..5681193a 100644 --- a/libscidavis/src/importOPJ.cpp +++ b/libscidavis/src/importOPJ.cpp @@ -323,7 +323,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe } case Origin::Text: table->column(j)->setColumnMode(SciDAVis::ColumnMode::Text); - for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) { + for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) { scidavis_column->setTextAt(i, column.data[i].as_string()); } break; @@ -379,7 +379,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe default: format = "dd.MM.yyyy"; } - for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) + for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) scidavis_column->setValueAt(i, column.data[i].as_double()); table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime); DateTime2StringFilter *filter = @@ -423,7 +423,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe format = "hh:mm:ss.zzz"; break; } - for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) + for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) scidavis_column->setValueAt(i, column.data[i].as_double()); table->column(j)->setColumnMode(SciDAVis::ColumnMode::DateTime); DateTime2StringFilter *filter = @@ -443,7 +443,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe format = "M"; break; } - for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) + for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) scidavis_column->setValueAt(i, column.data[i].as_double()); table->column(j)->setColumnMode(SciDAVis::ColumnMode::Month); DateTime2StringFilter *filter = @@ -463,7 +463,7 @@ bool ImportOPJ::importSpreadsheet(const OriginFile &opj, const Origin::SpreadShe format = "d"; break; } - for (int i = 0; i < min((int)column.data.size(), maxrows); ++i) + for (int i = 0; i < std::min((int)column.data.size(), maxrows); ++i) scidavis_column->setValueAt(i, column.data[i].as_double()); table->column(j)->setColumnMode(SciDAVis::ColumnMode::Day); DateTime2StringFilter *filter = @@ -554,7 +554,7 @@ bool ImportOPJ::importTables(const OriginFile &opj) #endif QVector<qreal> values; values.resize(rowCount * columnCount); - for (int i = 0; i < min((int)values.size(), (int)layer.data.size()); i++) { + for (int i = 0; i < std::min((int)values.size(), (int)layer.data.size()); i++) { values[i] = layer.data[i]; } Matrix->setCells(values); @@ -1006,7 +1006,7 @@ bool ImportOPJ::importGraphs(const OriginFile &opj) grid->enableZeroLineX(0); grid->enableZeroLineY(0); - vector<Origin::GraphAxisFormat> formats; + std::vector<Origin::GraphAxisFormat> formats; formats.push_back(layer.yAxis.formatAxis[0]); // left formats.push_back(layer.yAxis.formatAxis[1]); // right formats.push_back(layer.xAxis.formatAxis[0]); // bottom @@ -1014,7 +1014,7 @@ bool ImportOPJ::importGraphs(const OriginFile &opj) graph->setXAxisTitle(parseOriginText(decodeMbcs(formats[2].label.text.c_str()))); graph->setYAxisTitle(parseOriginText(decodeMbcs(formats[0].label.text.c_str()))); - vector<Origin::GraphAxisTick> ticks; + std::vector<Origin::GraphAxisTick> ticks; ticks.push_back(layer.yAxis.tickAxis[0]); // left ticks.push_back(layer.yAxis.tickAxis[1]); // right ticks.push_back(layer.xAxis.tickAxis[0]); // bottom
