Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenBoard for openSUSE:Factory checked in at 2024-11-19 22:23:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenBoard (Old) and /work/SRC/openSUSE:Factory/.OpenBoard.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenBoard" Tue Nov 19 22:23:59 2024 rev:12 rq:1225120 version:1.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenBoard/OpenBoard.changes 2024-08-14 14:16:02.327518445 +0200 +++ /work/SRC/openSUSE:Factory/.OpenBoard.new.28523/OpenBoard.changes 2024-11-19 22:24:37.963742449 +0100 @@ -1,0 +2,17 @@ +Mon Nov 18 14:08:50 UTC 2024 - Martin Winter <[email protected]> + +- update to release version 1.7.2 +- remove upstreamed patches + * remove 0569-scale-mirror-pixmap.patch + * remove 0961-use-cpp20.patch + * remove 0962-fix-cpp20-compatibility.patch + * remove 1010-fix-qapp-cast.patch + * remove 1017-ffmpeg7.patch +- adjust patches to new version + * adjust 0955-shortcut-configuration.patch + * adjust 9117-disable-software-update.patch +- add patch to circumvent some problems on wayland + * add 1165-fix-some-wayland-problems.patch +- switch from Qt5 to Qt6 + +------------------------------------------------------------------- Old: ---- 0569-scale-mirror-pixmap.patch 0961-use-cpp20.patch 0962-fix-cpp20-compatibility.patch 1010-fix-qapp-cast.patch 1017-ffmpeg7.patch OpenBoard-1.7.1.tar.gz New: ---- 1165-fix-some-wayland-problems.patch OpenBoard-1.7.2.tar.gz BETA DEBUG BEGIN: Old:- remove upstreamed patches * remove 0569-scale-mirror-pixmap.patch * remove 0961-use-cpp20.patch Old: * remove 0569-scale-mirror-pixmap.patch * remove 0961-use-cpp20.patch * remove 0962-fix-cpp20-compatibility.patch Old: * remove 0961-use-cpp20.patch * remove 0962-fix-cpp20-compatibility.patch * remove 1010-fix-qapp-cast.patch Old: * remove 0962-fix-cpp20-compatibility.patch * remove 1010-fix-qapp-cast.patch * remove 1017-ffmpeg7.patch Old: * remove 1010-fix-qapp-cast.patch * remove 1017-ffmpeg7.patch - adjust patches to new version BETA DEBUG END: BETA DEBUG BEGIN: New:- add patch to circumvent some problems on wayland * add 1165-fix-some-wayland-problems.patch - switch from Qt5 to Qt6 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenBoard.spec ++++++ --- /var/tmp/diff_new_pack.Cb0erR/_old 2024-11-19 22:24:39.991826955 +0100 +++ /var/tmp/diff_new_pack.Cb0erR/_new 2024-11-19 22:24:40.007827622 +0100 @@ -19,46 +19,42 @@ %define namelc openboard %define fqname ch.%{namelc}.%{name} Name: OpenBoard -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: Interactive whiteboard for schools and universities License: GPL-3.0-or-later Group: Amusements/Teaching/Other URL: https://openboard.ch Source0: https://github.com/OpenBoard-org/OpenBoard/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# https://github.com/OpenBoard-org/OpenBoard/pull/569 -Patch569: 0569-scale-mirror-pixmap.patch # https://github.com/OpenBoard-org/OpenBoard/pull/955 Patch955: 0955-shortcut-configuration.patch -# https://github.com/OpenBoard-org/OpenBoard/pull/961 -Patch961: 0961-use-cpp20.patch -# https://github.com/OpenBoard-org/OpenBoard/pull/962 -Patch962: 0962-fix-cpp20-compatibility.patch -# https://github.com/OpenBoard-org/OpenBoard/pull/1010 -Patch1010: 1010-fix-qapp-cast.patch -# https://github.com/OpenBoard-org/OpenBoard/pull/1017 -Patch1017: 1017-ffmpeg7.patch +# https://github.com/OpenBoard-org/OpenBoard/pull/1165 +Patch1165: 1165-fix-some-wayland-problems.patch # https://github.com/letsfindaway/OpenBoard/pull/117 Patch9117: 9117-disable-software-update.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Multimedia) -BuildRequires: cmake(Qt5MultimediaWidgets) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5UiTools) -BuildRequires: cmake(Qt5WebEngineWidgets) -BuildRequires: cmake(Qt5Xml) +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Multimedia) +BuildRequires: cmake(Qt6MultimediaWidgets) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6PrintSupport) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6UiTools) +BuildRequires: cmake(Qt6WebEngineWidgets) +BuildRequires: cmake(Qt6Xml) BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(poppler) -BuildRequires: pkgconfig(quazip1-qt5) +BuildRequires: pkgconfig(quazip1-qt6) Recommends: onboard +%if 0%{?suse_version} < 1600 +BuildRequires: gcc10-c++ +%endif %description OpenBoard is an open source cross-platform interactive white board @@ -71,6 +67,7 @@ %build %if 0%{?suse_version} < 1600 +export CXX=%{_bindir}/g++-10 %cmake %else %cmake -DCMAKE_CXX_STANDARD=20 @@ -84,6 +81,10 @@ %files %license LICENSE %doc COPYRIGHT +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/scalable +%dir %{_datadir}/icons/hicolor/scalable/apps +%dir %{_datadir}/icons/hicolor/scalable/mimetypes %{_datadir}/applications/%{fqname}.desktop %{_datadir}/icons/hicolor/scalable %{_datadir}/mime/packages/* ++++++ 0955-shortcut-configuration.patch ++++++ ++++ 10014 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/OpenBoard/0955-shortcut-configuration.patch ++++ and /work/SRC/openSUSE:Factory/.OpenBoard.new.28523/0955-shortcut-configuration.patch ++++++ 1165-fix-some-wayland-problems.patch ++++++ >From 487fb384e2fe9c3c5752c31a1cdb24cd1718b72c Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Mon, 18 Nov 2024 08:20:33 +0100 Subject: [PATCH] fix: avoid some wayland problems - use QT_QPA_PLATFORM=xcb when running on wayland - avoids crash when using the screen configuration list - avoids invisible window on Qt 6.8 --- src/core/main.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/core/main.cpp b/src/core/main.cpp index f9dbce5b1..2a978ff8e 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -96,6 +96,14 @@ int main(int argc, char *argv[]) if (qEnvironmentVariableIsSet("QT_NO_GLIB")) qunsetenv("QT_NO_GLIB"); + // force using xwayland when running on wayland +#ifdef Q_OS_LINUX + if (qgetenv("XDG_SESSION_TYPE") == "wayland") + { + qputenv("QT_QPA_PLATFORM", "xcb"); + } +#endif + Q_INIT_RESOURCE(OpenBoard); qInstallMessageHandler(ub_message_output); ++++++ 9117-disable-software-update.patch ++++++ --- /var/tmp/diff_new_pack.Cb0erR/_old 2024-11-19 22:24:40.439845623 +0100 +++ /var/tmp/diff_new_pack.Cb0erR/_new 2024-11-19 22:24:40.459846457 +0100 @@ -1,25 +1,23 @@ -From 7d50e97af79d7393d7b893bf640b6bccbcf22dd6 Mon Sep 17 00:00:00 2001 +From cc89f09bbc7f464ad79eaa82a74d490d507e4756 Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Wed, 16 Nov 2022 08:31:29 +0100 -Subject: [PATCH] feat: disable software and document update check +Subject: [PATCH] feat: disable software update check - for packages maintained by a Linux distribution, a software update check is not relevant -- also the import of ancient OpenSankore documents is not necessary -- disable the checks in the settings -- hide the associated checkboxes in the preferences +- disable the check in the settings +- hide the associated checkbox in the preferences --- - resources/etc/OpenBoard.config | 7 +++---- - src/core/UBPreferencesController.cpp | 2 ++ - 2 files changed, 5 insertions(+), 4 deletions(-) + resources/etc/OpenBoard.config | 5 ++--- + src/core/UBPreferencesController.cpp | 1 + + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/etc/OpenBoard.config b/resources/etc/OpenBoard.config -index e7f2e075b..67f21a58e 100644 +index ce77e232e..a3c8bf04e 100644 --- a/resources/etc/OpenBoard.config +++ b/resources/etc/OpenBoard.config -@@ -1,15 +1,14 @@ +@@ -1,8 +1,7 @@ [App] - AngleTolerance=4 -HideCheckForSoftwareUpdate=false +HideCheckForSoftwareUpdate=true HideSwapDisplayScreens=true @@ -29,23 +27,15 @@ EnableStartupHints=true FavoriteToolURIs=openboardtool://openboard/mask, openboardtool://ruler, openboardtool://compass, openboardtool://protractor, openboardtool://triangle, openboardtool://magnifier, openboardtool://cache IsInSoftwareUpdateProcess=false - LastSessionDocumentUUID= - LastSessionPageIndex=0 --LookForOpenSankoreInstall=true -+LookForOpenSankoreInstall=false - PageCacheSize=20 - PreferredLanguage=fr_CH - ProductWebAddress=http://www.openboard.ch diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp -index 9c7802be9..f4e85c3a6 100644 +index ed0e393d8..b67c415c3 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp -@@ -90,6 +90,8 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) +@@ -85,6 +85,7 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) mPreferencesWindow = new UBPreferencesDialog(this,parent, Qt::Dialog); mPreferencesUI = new Ui::preferencesDialog(); // deleted in destructor mPreferencesUI->setupUi(mPreferencesWindow); + mPreferencesUI->softwareUpdateGroupBox->hide(); // disable check for software update -+ mPreferencesUI->sankoreImporterGroupBox->hide(); // disable check for OpenSankore documents adjustScreensPreferences(); connect(UBApplication::displayManager, &UBDisplayManager::availableScreenCountChanged, this, &UBPreferencesController::adjustScreensPreferences); ++++++ OpenBoard-1.7.1.tar.gz -> OpenBoard-1.7.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/OpenBoard/OpenBoard-1.7.1.tar.gz /work/SRC/openSUSE:Factory/.OpenBoard.new.28523/OpenBoard-1.7.2.tar.gz differ: char 13, line 1
