Hello community, here is the log from the commit of package scidavis for openSUSE:Factory checked in at 2020-12-18 19:59:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scidavis (Old) and /work/SRC/openSUSE:Factory/.scidavis.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scidavis" Fri Dec 18 19:59:38 2020 rev:5 rq:856747 version:2.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/scidavis/scidavis.changes 2020-01-31 23:56:04.575613814 +0100 +++ /work/SRC/openSUSE:Factory/.scidavis.new.5145/scidavis.changes 2020-12-18 20:00:06.138108257 +0100 @@ -1,0 +2,16 @@ +Thu Dec 10 08:03:55 UTC 2020 - Antonio Larrosa <alarr...@suse.com> + +- Update to 2.3.0 + * No changelog provided by upstream +- Update patch to make scidavis build on openSUSE: + * 0001-Adapt-scidavis-for-openSUSE.patch + +- Update to 2.1.0 + * Qt4 support was dropped + +- Update to 1.26 + * Added simplified and traditional Chinese translations, courtesy of Anbang Li and Wen Li + * Updated Czech translation from Pavel Fric + * some bugs were fixed + +------------------------------------------------------------------- Old: ---- scidavis-1.25.tar.gz New: ---- scidavis-2.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scidavis.spec ++++++ --- /var/tmp/diff_new_pack.uT72gP/_old 2020-12-18 20:00:07.222109416 +0100 +++ /var/tmp/diff_new_pack.uT72gP/_new 2020-12-18 20:00:07.226109420 +0100 @@ -18,20 +18,25 @@ Name: scidavis -Version: 1.25 +Version: 2.3.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: 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 # PATCH-FIX-OPENSUSE Patch0: 0001-Adapt-scidavis-for-openSUSE.patch +BuildRequires: glu-devel BuildRequires: hicolor-icon-theme BuildRequires: liborigin-devel 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 @@ -43,7 +48,6 @@ BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(muparser) -BuildRequires: glu-devel Recommends: %{name}-lang = %{version} %description ++++++ 0001-Adapt-scidavis-for-openSUSE.patch ++++++ --- /var/tmp/diff_new_pack.uT72gP/_old 2020-12-18 20:00:07.254109450 +0100 +++ /var/tmp/diff_new_pack.uT72gP/_new 2020-12-18 20:00:07.254109450 +0100 @@ -17,11 +17,11 @@ libscidavis/libscidavis.pro | 1 - 7 files changed, 11 insertions(+), 16 deletions(-) -diff --git a/config.pri b/config.pri -index 377a0a3..35028d8 100644 ---- a/config.pri -+++ b/config.pri -@@ -74,6 +74,11 @@ unix:message(Building with preset $$PRESET) +Index: scidavis-2.3.0/config.pri +=================================================================== +--- scidavis-2.3.0.orig/config.pri ++++ scidavis-2.3.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,81 +59,69 @@ ################################################################################ ### Optional features # ################################################################################ -@@ -283,8 +284,8 @@ contains(PRESET, linux_package) { - ### cause problems. - - equals(QT_MAJOR_VERSION, 5) { -- exists(/usr/include/qt5/qwt5-qt5) {INCLUDEPATH+=/usr/include/qt5/qwt5-qt5} -- exists(/usr/include/qt5/qwtplot3d-qt5) {INCLUDEPATH+=/usr/include/qt5/qwtplot3d-qt5} +@@ -283,6 +284,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} + exists(/usr/include/qt5/qwt5) {INCLUDEPATH+=/usr/include/qt5/qwt5} + exists(/usr/include/qt5/qwtplot3d) {INCLUDEPATH+=/usr/include/qt5/qwtplot3d} - system (ls /usr/lib*/libqwt5-qt5.so) { - LIBS+=-lqwt5-qt5 -@@ -405,7 +406,7 @@ exists(/usr/bin/lupdate-qt4) { - LRELEASE_BIN = lrelease-qt4 - } else { - # anything else -- LUPDATE_BIN = lupdate -- LRELEASE_BIN = lrelease -+ LUPDATE_BIN = lupdate-qt5 -+ LRELEASE_BIN = lrelease-qt5 - } - -diff --git a/fitPlugins/exp_saturation/exp_saturation.pro b/fitPlugins/exp_saturation/exp_saturation.pro -index 200c14b..a4a50e1 100644 ---- a/fitPlugins/exp_saturation/exp_saturation.pro -+++ b/fitPlugins/exp_saturation/exp_saturation.pro + 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 +=================================================================== +--- scidavis-2.3.0.orig/fitPlugins/exp_saturation/exp_saturation.pro ++++ scidavis-2.3.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 -diff --git a/fitPlugins/explin/explin.pro b/fitPlugins/explin/explin.pro -index 67475e2..a633270 100644 ---- a/fitPlugins/explin/explin.pro -+++ b/fitPlugins/explin/explin.pro +Index: scidavis-2.3.0/fitPlugins/explin/explin.pro +=================================================================== +--- scidavis-2.3.0.orig/fitPlugins/explin/explin.pro ++++ scidavis-2.3.0/fitPlugins/explin/explin.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = explin -diff --git a/fitPlugins/fitRational0/fitRational0.pro b/fitPlugins/fitRational0/fitRational0.pro -index fdc4373..1e30591 100644 ---- a/fitPlugins/fitRational0/fitRational0.pro -+++ b/fitPlugins/fitRational0/fitRational0.pro +Index: scidavis-2.3.0/fitPlugins/fitRational0/fitRational0.pro +=================================================================== +--- scidavis-2.3.0.orig/fitPlugins/fitRational0/fitRational0.pro ++++ scidavis-2.3.0/fitPlugins/fitRational0/fitRational0.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = fitRational0 -diff --git a/fitPlugins/fitRational1/fitRational1.pro b/fitPlugins/fitRational1/fitRational1.pro -index e632e78..9a04421 100644 ---- a/fitPlugins/fitRational1/fitRational1.pro -+++ b/fitPlugins/fitRational1/fitRational1.pro +Index: scidavis-2.3.0/fitPlugins/fitRational1/fitRational1.pro +=================================================================== +--- scidavis-2.3.0.orig/fitPlugins/fitRational1/fitRational1.pro ++++ scidavis-2.3.0/fitPlugins/fitRational1/fitRational1.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = fitRational1 -diff --git a/fitPlugins/planck_wavelength/planck_wavelength.pro b/fitPlugins/planck_wavelength/planck_wavelength.pro -index ae22122..a7201d2 100644 ---- a/fitPlugins/planck_wavelength/planck_wavelength.pro -+++ b/fitPlugins/planck_wavelength/planck_wavelength.pro +Index: scidavis-2.3.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 @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = planck_wavelength -diff --git a/libscidavis/libscidavis.pro b/libscidavis/libscidavis.pro -index 51dbf79..0a4762b 100644 ---- a/libscidavis/libscidavis.pro -+++ b/libscidavis/libscidavis.pro +Index: scidavis-2.3.0/libscidavis/libscidavis.pro +=================================================================== +--- scidavis-2.3.0.orig/libscidavis/libscidavis.pro ++++ scidavis-2.3.0/libscidavis/libscidavis.pro @@ -47,6 +47,5 @@ include( muparser.pri ) python {include( python.pri )} @@ -141,6 +129,47 @@ - ############################################################################# ############################################################################# --- -2.21.0 - +Index: scidavis-2.3.0/libscidavis/python-sipcmd.py +=================================================================== +--- scidavis-2.3.0.orig/libscidavis/python-sipcmd.py ++++ scidavis-2.3.0/libscidavis/python-sipcmd.py +@@ -28,8 +28,8 @@ + + import os + import warnings +-import sys, sipconfig +-config = sipconfig.Configuration() ++import sys ++import sip + + try: + pyqt = sys.argv[1] +@@ -44,22 +44,22 @@ try: + except ImportError: + pass + +-sipBin = config.sip_bin +-sipDir = config.default_sip_dir+'/'+pyqt ++sipBin = '/usr/bin/sip' ++sipDir = '/usr/lib64/python3.8/site-packages/PyQt5/bindings/' + if not os.path.exists(sipDir): + if sys.version_info[0] >= 3 and sys.version_info[1] >= 8 and pyqt == 'PyQt5': + from importlib.metadata import distribution + dist = distribution(pyqt) +- sip = [p for p in dist.files if p.name == 'QtCoremod.sip'] +- assert len(sip) == 1 +- sipDir = str(dist.locate_file(sip[0]).parent.parent) ++ _sip = [p for p in dist.files if p.name == 'QtCoremod.sip'] ++ assert len(_sip) == 1 ++ sipDir = str(dist.locate_file(_sip[0]).parent.parent) + else: + warnings.warn('sipDir does not exists, %s' % sipDir) + + sipFlags = PYQT_CONFIGURATION['sip_flags'] + + flags = ["-I ../scidavis"] +-if config.sip_version >= 0x040a00: ++if sip.SIP_VERSION >= 0x040a00: + # make use of docstring generation feature in SIP >= 4.10 + flags.append("-o") + ++++++ scidavis-1.25.tar.gz -> scidavis-2.3.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/scidavis/scidavis-1.25.tar.gz /work/SRC/openSUSE:Factory/.scidavis.new.5145/scidavis-2.3.0.tar.gz differ: char 14, line 1 _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
