Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xyscan for openSUSE:Factory checked in at 2022-05-12 23:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xyscan (Old) and /work/SRC/openSUSE:Factory/.xyscan.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xyscan" Thu May 12 23:00:34 2022 rev:3 rq:976469 version:4.64 Changes: -------- --- /work/SRC/openSUSE:Factory/xyscan/xyscan.changes 2020-09-07 21:37:03.833428231 +0200 +++ /work/SRC/openSUSE:Factory/.xyscan.new.1538/xyscan.changes 2022-05-12 23:01:03.464852983 +0200 @@ -1,0 +2,22 @@ +Sun May 1 11:38:28 UTC 2022 - Ferdinand Thiessen <[email protected]> + +- Update to 4.6.4 (4.64): + * xyscan is now build using Qt6.3 which includes the QtPdf module + again. This makes loading PDFs faster and easier to maintain. + * The xyscan build is now universal supporting Intel and Apple M1 + architectures. + * Fixed issue related to saving data points in a ROOT macro that + caused a value of 0 to be saved instead of the correct value. + * When loading a second plot in xyscan the data table was not + properly reset. This is fixed now. + * New is the path measuring tool that allows for the measurement + of polylines in maps and technical drawings. + * A bug in storing scanned data as ROOT macro when no error bars + were present was fixed. + * Various bug fixes. +- Rebased no-build-date.patch +- Added allow-qt6-also-on-non-mac.patch (reported upstream by email) +- Upstream still supports QT5 for (only) Linux, so for Leap we stick + with QT5 and for Factory we use QT6 for smooth transition. + +------------------------------------------------------------------- Old: ---- xyscan-4.50-src.tgz New: ---- allow-qt6-also-on-non-mac.patch xyscan-4.64-src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xyscan.spec ++++++ --- /var/tmp/diff_new_pack.2QsNju/_old 2022-05-12 23:01:04.140853890 +0200 +++ /var/tmp/diff_new_pack.2QsNju/_new 2022-05-12 23:01:04.144853896 +0200 @@ -1,7 +1,7 @@ # # spec file for package xyscan # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,32 +15,53 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +%if 0%{?suse_version} >= 1550 +%bcond_without qt6 +%else +# Leap still only provides qt5 +%bcond_with qt5 +%endif Name: xyscan -Version: 4.50 +Version: 4.64 Release: 0 Summary: Data extractor for data points from graphical plots License: GPL-3.0-or-later Group: Productivity/Scientific/Math -URL: http://rhig.physics.yale.edu/~ullrich/software/xyscan/ -Source0: http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/%{version}/xyscan-%{version}-src.tgz +URL: https://rhig.physics.yale.edu/~ullrich/software/xyscan/ +Source0: https://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/%{version}/xyscan-%{version}-src.tgz # PATCH-FIX-UPSTREAM no-build-date.patch -- delete build date from source Patch0: no-build-date.patch +# PATCH-FEATURE-UPSTREAM allow-qt6-also-on-non-mac.patch -- Allow building with QT6 (already supported on Mac) +Patch1: allow-qt6-also-on-non-mac.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: libqt5-linguist BuildRequires: pkgconfig BuildRequires: update-desktop-files +%if %{with qt6} +BuildRequires: qt6-tools-linguist +BuildRequires: cmake(Qt6Charts) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6Multimedia) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6PrintSupport) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Xml) +BuildRequires: pkgconfig(poppler-qt6) +%else +BuildRequires: libqt5-linguist BuildRequires: pkgconfig(Qt5Charts) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Core) >= 5.14 +BuildRequires: pkgconfig(Qt5Gui) >= 5.14 BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(poppler-qt5) +%endif Requires: hicolor-icon-theme +Recommends: %{name}-doc = %{version} %description xyscan is a tool for scientists in need of extracting data points, @@ -59,24 +80,31 @@ This package contains the documentation and help files for %{name}. %prep -%setup -q -n %{name} -%patch0 -p1 +%autosetup -p1 -n %{name} # Change hard-coded directories to proper macros sed -i 's|/usr/local|%{_prefix}|' xyscan.pro -sed -i 's|%{_prefix}/lib|%{_libdir}|' xyscan.pro +sed -i 's|/usr/lib|%{_libdir}|' xyscan.pro sed -i 's|\$\$PREFIX/share/xyscan/docs|%{_docdir}/%{name}/html|' xyscan.pro -sed -i 's|\$\$PREFIX/share/xyscan/docs|%{_docdir}/%{name}/html|' src/*.cpp +sed -i 's|/usr/share/doc/xyscan/docs|%{_docdir}/%{name}/html|' src/*.cpp # Fix wrong-file-end-of-line-encoding sed -i 's/\r$//' license.txt %build +%if %{with qt6} +%qmake6 +%else %qmake5 +%endif %make_jobs %install +%if %{with qt6} +%qmake6_install +%else %qmake5_install +%endif %suse_update_desktop_file -c %{name} %{name} "A visualization tool for 3D datasets" %{name} %{name} Science Math ++++++ allow-qt6-also-on-non-mac.patch ++++++ diff -Nur xyscan/src/xyscanWindow.cpp new/src/xyscanWindow.cpp --- xyscan/src/xyscanWindow.cpp 2022-04-15 21:38:12.000000000 +0200 +++ new/src/xyscanWindow.cpp 2022-05-01 14:26:50.940934046 +0200 @@ -51,11 +51,13 @@ #if defined(USE_QTPDF) #include <QPdfDocument> -#elif defined(USE_POPPLER) && !defined(Q_OS_MAC) -#include <poppler-qt5.h> #elif defined(USE_POPPLER) +#if QT_VERSION < 0x060000 +#include <poppler-qt5.h> +#else #include <poppler-qt6.h> #endif +#endif using namespace std; diff -Nur xyscan/xyscan.pro new/xyscan.pro --- xyscan/xyscan.pro 2022-04-15 21:47:32.056684329 +0200 +++ new/xyscan.pro 2022-05-01 14:31:35.790326604 +0200 @@ -21,7 +21,7 @@ # They should be used since building and deploying xyscan # on these platforms is not for the faint hearted. #----------------------------------------------------------------------------- -VERSION = 4.6.2 +VERSION = 4.6.4 TEMPLATE = app CONFIG += qt warn_on release c++14 lrelease CONFIG += sdk_no_version_check @@ -55,13 +55,13 @@ # unix { !macx { - INCLUDEPATH += /usr/include/poppler/qt5/ + INCLUDEPATH += /usr/include/poppler/qt$${QT_MAJOR_VERSION}/ INCLUDEPATH += /usr/include/poppler - INCLUDEPATH += /usr/local/include/poppler/qt5/ + INCLUDEPATH += /usr/local/include/poppler/qt$${QT_MAJOR_VERSION}/ INCLUDEPATH += /usr/local/include/poppler - INCLUDEPATH += /opt/local/include/poppler/qt5/ + INCLUDEPATH += /opt/local/include/poppler/qt$${QT_MAJOR_VERSION}/ INCLUDEPATH += /opt/local/include/poppler - LIBS += -L/usr/local/lib/ -L/usr/lib/ -lpoppler -lpoppler-qt5 + LIBS += -L/usr/local/lib/ -L/usr/lib/ -lpoppler -lpoppler-qt$${QT_MAJOR_VERSION} } } ++++++ no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.2QsNju/_old 2022-05-12 23:01:04.192853960 +0200 +++ /var/tmp/diff_new_pack.2QsNju/_new 2022-05-12 23:01:04.196853966 +0200 @@ -1,10 +1,9 @@ -Index: xyscan/src/xyscanAbout.cpp -=================================================================== ---- xyscan.orig/src/xyscanAbout.cpp -+++ xyscan/src/xyscanAbout.cpp -@@ -28,7 +28,7 @@ using namespace std; - xyscanAbout::xyscanAbout(QWidget* parent, Qt::WindowFlags fl) - : QDialog(parent, fl), +diff -Nur xyscan/src/xyscanAbout.cpp new/src/xyscanAbout.cpp +--- xyscan/src/xyscanAbout.cpp 2022-01-10 22:43:26.508230323 +0100 ++++ new/src/xyscanAbout.cpp 2022-05-01 14:17:46.890274318 +0200 +@@ -28,7 +28,7 @@ + xyscanAbout::xyscanAbout(QWidget* parent) + : QDialog(parent), mTitlePixmap(":/images/xyscanSplash.png"), - mVersionText(QString(tr("Release ")) + QString(VERSION) + QString(" (") + QString(__DATE__) + QString(")")) + mVersionText(QString(tr("Release ")) + QString(VERSION)) ++++++ xyscan-4.50-src.tgz -> xyscan-4.64-src.tgz ++++++ /work/SRC/openSUSE:Factory/xyscan/xyscan-4.50-src.tgz /work/SRC/openSUSE:Factory/.xyscan.new.1538/xyscan-4.64-src.tgz differ: char 5, line 1
