Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenBoard for openSUSE:Factory checked in at 2023-06-19 22:50:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenBoard (Old) and /work/SRC/openSUSE:Factory/.OpenBoard.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenBoard" Mon Jun 19 22:50:28 2023 rev:6 rq:1093671 version:1.7.0~git20230614.2ff8f29 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenBoard/OpenBoard.changes 2023-01-25 18:03:18.350615163 +0100 +++ /work/SRC/openSUSE:Factory/.OpenBoard.new.15902/OpenBoard.changes 2023-06-19 22:50:36.797580037 +0200 @@ -1,0 +2,13 @@ +Sun Jun 18 06:21:57 UTC 2023 - Martin Winter <[email protected]> + +- update to version 1.7.0~git20230614.2ff8f29 + * feature freeze before release +- remove upstreamed patches + * remove upstreamed 0551-common-background-drawing.patch + * remove upstreamed 0677-pdf-export-page-size.patch +- update patches to match updated sources + * update 0686-shortcut-configuration.patch + * update 0698-add-cmake-build-system.patch + * update 9117-disable-software-update.patch + +------------------------------------------------------------------- Old: ---- 0551-common-background-drawing.patch 0677-pdf-export-page-size.patch OpenBoard-9de37af2df1a7c0d88f71c94ab2db1815d082862.zip New: ---- OpenBoard-2ff8f29ce8a1227541d382e58a06dd591632d811.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenBoard.spec ++++++ --- /var/tmp/diff_new_pack.9tyBNJ/_old 2023-06-19 22:50:38.665590975 +0200 +++ /var/tmp/diff_new_pack.9tyBNJ/_new 2023-06-19 22:50:38.669590999 +0200 @@ -19,10 +19,10 @@ %define dest_dir %{_libdir}/%{name} %define namelc openboard %define fqname ch.%{namelc}.%{name} -%define githash 9de37af2df1a7c0d88f71c94ab2db1815d082862 -%define gitshort 9de37af -%define gitdate 20221129 -%define buildver 1129 +%define githash 2ff8f29ce8a1227541d382e58a06dd591632d811 +%define gitshort 2ff8f29 +%define gitdate 20230614 +%define buildver 230614 Name: OpenBoard Version: 1.7.0~git%{gitdate}.%{gitshort} Release: 0 @@ -31,12 +31,8 @@ Group: Amusements/Teaching/Other URL: https://openboard.ch Source0: https://github.com/OpenBoard-org/OpenBoard/archive/%{githash}.zip#/OpenBoard-%{githash}.zip -# https://github.com/OpenBoard-org/OpenBoard/pull/551 -Patch551: 0551-common-background-drawing.patch # https://github.com/OpenBoard-org/OpenBoard/pull/569 Patch569: 0569-scale-mirror-pixmap.patch -# https://github.com/OpenBoard-org/OpenBoard/pull/677 -Patch677: 0677-pdf-export-page-size.patch # https://github.com/OpenBoard-org/OpenBoard/pull/686 Patch686: 0686-shortcut-configuration.patch # https://github.com/OpenBoard-org/OpenBoard/pull/698 @@ -74,7 +70,7 @@ originally forked from Open-Sankoré, which was itself based on Uniboard. -This build is based on the development branch 1.7-dev and includes +This build is based on the development branch dev and includes a set of additional patches for features and bug fixes. %prep @@ -87,7 +83,7 @@ rm resources/library/applications/Calculator.wgt/.gitignore %build -%cmake +%cmake -DVERSION_TYPE=a -DVERSION_BUILD=%buildver %cmake_build %install ++++++ 0686-shortcut-configuration.patch ++++++ --- /var/tmp/diff_new_pack.9tyBNJ/_old 2023-06-19 22:50:38.693591139 +0200 +++ /var/tmp/diff_new_pack.9tyBNJ/_new 2023-06-19 22:50:38.697591163 +0200 @@ -1,4 +1,4 @@ -From d0f5b8299122654592db9e6ac7ac6578b154ff76 Mon Sep 17 00:00:00 2001 +From 92c99bf0a62f6a2d49d3c11a4850361374872479 Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Tue, 2 Mar 2021 10:57:06 +0100 Subject: [PATCH 1/8] Feature: configurable keyboard and mouse/tablet button @@ -31,10 +31,10 @@ create mode 100644 src/core/UBShortcutManager.h diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui -index 24e68040c..9d039e18b 100644 +index 56b4ba004..f5ddf7e3a 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui -@@ -1108,6 +1108,175 @@ +@@ -1105,6 +1105,175 @@ </item> </layout> </widget> @@ -211,7 +211,7 @@ <property name="enabled"> <bool>true</bool> diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp -index c076241df..c33473485 100644 +index 45365f916..8e6d39711 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -45,6 +45,7 @@ @@ -222,7 +222,7 @@ #include "board/UBBoardController.h" #include "board/UBDrawingController.h" -@@ -634,14 +635,14 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) +@@ -646,14 +647,14 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) } } @@ -239,7 +239,7 @@ { boardController->controlView()->setMultiselection(false); -@@ -659,6 +660,34 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) +@@ -671,6 +672,34 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) #endif } @@ -275,7 +275,7 @@ } diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp -index 6fcbcf491..9a9e83de2 100644 +index 798889881..e8d434173 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp @@ -37,6 +37,7 @@ @@ -286,7 +286,7 @@ #include "frameworks/UBStringUtils.h" -@@ -77,7 +78,6 @@ void UBPreferencesDialog::closeEvent(QCloseEvent* e) +@@ -72,7 +73,6 @@ void UBPreferencesDialog::closeEvent(QCloseEvent* e) } @@ -294,16 +294,16 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) : QObject(parent) , mPreferencesWindow(0) -@@ -92,6 +92,8 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) - mPreferencesUI->setupUi(mPreferencesWindow); - adjustScreens(); - connect(UBApplication::displayManager, &UBDisplayManager::availableScreenCountChanged, this, &UBPreferencesController::adjustScreens); +@@ -88,6 +88,8 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) + adjustScreensPreferences(); + + connect(UBApplication::displayManager, &UBDisplayManager::availableScreenCountChanged, this, &UBPreferencesController::adjustScreensPreferences); + mPreferencesUI->shortcutTab->installEventFilter(this); + wire(); } -@@ -107,6 +109,90 @@ UBPreferencesController::~UBPreferencesController() +@@ -103,6 +105,90 @@ UBPreferencesController::~UBPreferencesController() delete mMarkerProperties; } @@ -391,10 +391,10 @@ + return false; +} + - void UBPreferencesController::adjustScreens() + void UBPreferencesController::adjustScreensPreferences() { bool enabled = UBApplication::displayManager->numScreens() > 1; -@@ -143,6 +229,50 @@ void UBPreferencesController::adjustScreens() +@@ -139,6 +225,50 @@ void UBPreferencesController::adjustScreensPreferences() } } @@ -445,7 +445,7 @@ void UBPreferencesController::show() { init(); -@@ -301,6 +431,21 @@ void UBPreferencesController::wire() +@@ -297,6 +427,21 @@ void UBPreferencesController::wire() connect(mPreferencesUI->checkSoftwareUpdateAtLaunchCheckBox, SIGNAL(clicked(bool)), settings->appEnableAutomaticSoftwareUpdates, SLOT(setBool(bool))); connect(mPreferencesUI->checkOpenSankoreAtStartup, SIGNAL(clicked(bool)), settings->appLookForOpenSankoreInstall, SLOT(setBool(bool))); @@ -467,7 +467,7 @@ } void UBPreferencesController::init() -@@ -361,6 +506,27 @@ void UBPreferencesController::init() +@@ -357,6 +502,27 @@ void UBPreferencesController::init() mMarkerProperties->opacitySlider->setValue(settings->boardMarkerAlpha->get().toDouble() * 100); @@ -495,7 +495,7 @@ } void UBPreferencesController::close() -@@ -459,7 +625,8 @@ void UBPreferencesController::defaultSettings() +@@ -455,7 +621,8 @@ void UBPreferencesController::defaultSettings() mPreferencesUI->checkOpenSankoreAtStartup->setChecked(defaultValue); } @@ -505,7 +505,7 @@ bool defaultValue = settings->webUseExternalBrowser->reset().toBool(); mPreferencesUI->useExternalBrowserCheckBox->setChecked(defaultValue); defaultValue = settings->webShowPageImmediatelyOnMirroredScreen->reset().toBool(); -@@ -494,6 +661,23 @@ void UBPreferencesController::defaultSettings() +@@ -490,6 +657,23 @@ void UBPreferencesController::defaultSettings() lightBackgroundCrossOpacityValueChanged(lightBackgroundOpacity); } @@ -529,7 +529,7 @@ } void UBPreferencesController::darkBackgroundCrossOpacityValueChanged(int value) -@@ -716,6 +900,70 @@ void UBPreferencesController::setPdfZoomBehavior(bool checked) +@@ -712,6 +896,70 @@ void UBPreferencesController::setPdfZoomBehavior(bool checked) } } @@ -601,7 +601,7 @@ const QList<QColor>& darkBackgroundColors, const QList<QColor>& lightBackgroundSelectedColors, const QList<QColor>& darkBackgroundSelectedColors, UBPreferencesController* controller) diff --git a/src/core/UBPreferencesController.h b/src/core/UBPreferencesController.h -index 6f0522a73..708cef47b 100644 +index e260646d3..afc9b8c6f 100644 --- a/src/core/UBPreferencesController.h +++ b/src/core/UBPreferencesController.h @@ -70,6 +70,9 @@ class UBPreferencesController : public QObject @@ -633,7 +633,7 @@ + void resetClicked(); private slots: - void adjustScreens(); + void adjustScreensPreferences(); + void applyShortcutFilter(const QString& filter, int filterCol = -1); + @@ -646,7 +646,7 @@ class UBBrushPropertiesFrame : public Ui::brushProperties diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp -index 9a7a6f691..9fda51dd2 100644 +index 74962bb41..b5f9cc12b 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -544,17 +544,32 @@ void UBSettings::save() @@ -1706,7 +1706,7 @@ -From fcd39d519fa01968298a73b31915ff229607c743 Mon Sep 17 00:00:00 2001 +From a8ed1a1e2d37179f400c73afe3071c7b78e350ad Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Sat, 20 Mar 2021 08:28:35 +0100 Subject: [PATCH 2/8] update translation files, add German translation for @@ -9457,7 +9457,7 @@ <source>Improve zoom execution time (can slightly affect rendering quality)</source> <translation type="unfinished"></translation> -From 39456c6e853186b45b395f693f9b251d4d8f3456 Mon Sep 17 00:00:00 2001 +From a302f814b9429d1012f5ec75f00f564e5aa7bd33 Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Wed, 24 Mar 2021 17:58:24 +0100 Subject: [PATCH 3/8] additional fixes @@ -9484,7 +9484,7 @@ // add builtIn actions -From c2db115607c7baa274a5bb0cbdc19239c20c2d2e Mon Sep 17 00:00:00 2001 +From 3ef2e3daf22d3060f375d58cc65f06a0fb99959e Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Wed, 20 Oct 2021 18:28:41 +0200 Subject: [PATCH 4/8] add more shortcuts, fix conflicts @@ -9497,10 +9497,10 @@ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp -index 817d8c4e7..c52a5c6ae 100644 +index 848e6aa56..44acac350 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp -@@ -245,14 +245,15 @@ void UBBoardView::keyPressEvent (QKeyEvent *event) +@@ -249,14 +249,15 @@ void UBBoardView::keyPressEvent (QKeyEvent *event) switch (event->key ()) { case Qt::Key_Plus: @@ -9558,7 +9558,7 @@ controller->zoomOut (); event->accept (); -From b3617480ced3d4decc4e473226723d430229a2ec Mon Sep 17 00:00:00 2001 +From 41d1b7b3a0d6e9dc5a03d1c915ea66c92e92002b Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Sat, 23 Oct 2021 11:02:23 +0200 Subject: [PATCH 5/8] seamless switching between tools @@ -9567,28 +9567,28 @@ - new tool starts at current position - fix conflict between panning and page change --- - src/board/UBBoardView.cpp | 69 +++++++++++++++++-------------- + src/board/UBBoardView.cpp | 66 ++++++++++++++++--------------- src/board/UBDrawingController.cpp | 13 ++++-- src/board/UBDrawingController.h | 2 +- - src/domain/UBGraphicsScene.cpp | 27 +++++++----- + src/domain/UBGraphicsScene.cpp | 27 +++++++------ src/domain/UBGraphicsScene.h | 1 + - 5 files changed, 64 insertions(+), 48 deletions(-) + 5 files changed, 61 insertions(+), 48 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp -index c52a5c6ae..a711cfdd5 100644 +index 44acac350..b233e696d 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp -@@ -198,48 +198,53 @@ void UBBoardView::keyPressEvent (QKeyEvent *event) +@@ -207,43 +207,45 @@ void UBBoardView::keyPressEvent (QKeyEvent *event) if (!event->isAccepted ()) { - switch (event->key ()) -- { ++ if (event->modifiers () == 0) + { - case Qt::Key_Up: - case Qt::Key_PageUp: - case Qt::Key_Left: -+ if (event->modifiers () == 0) - { +- { - mController->previousScene (); - break; - } @@ -9628,6 +9628,12 @@ - { - mController->lastScene (); - break; +- } +- case Qt::Key_Insert: +- { +- mController->addScene (); +- break; +- } + case Qt::Key_Home: + { + mController->firstScene (); @@ -9645,20 +9651,6 @@ + } + } } -- case Qt::Key_Insert: -+ -+ switch (event->key ()) - { -- mController->addScene (); -- break; -- } - case Qt::Key_Control: - case Qt::Key_Shift: -- { - setMultiselection(true); -- }break; -+ break; - } - if (event->modifiers () & Qt::ControlModifier) // keep only ctrl/cmd keys @@ -9703,10 +9695,10 @@ int currentToolWidthIndex(); qreal currentToolWidth(); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp -index aa6734dfe..7273d9249 100644 +index afc16ebb7..cf70e0d28 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp -@@ -500,6 +500,7 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres +@@ -501,6 +501,7 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres UBStylusTool::Enum currentTool = (UBStylusTool::Enum)dc->stylusTool(); QPointF position = QPointF(scenePos); @@ -9714,7 +9706,7 @@ if (currentTool == UBStylusTool::Eraser) { -@@ -667,14 +668,9 @@ bool UBGraphicsScene::inputDeviceRelease(int tool) +@@ -668,14 +669,9 @@ bool UBGraphicsScene::inputDeviceRelease(int tool) } UBStylusTool::Enum currentTool = (UBStylusTool::Enum)tool; @@ -9730,7 +9722,7 @@ { if(mArcPolygonItem){ -@@ -2398,12 +2394,21 @@ void UBGraphicsScene::resizedMagnifier(qreal newPercent) +@@ -2402,12 +2398,21 @@ void UBGraphicsScene::resizedMagnifier(qreal newPercent) void UBGraphicsScene::stylusToolChanged(int tool, int previousTool) { @@ -9758,10 +9750,10 @@ } diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h -index e824e555f..7bbb9d1a0 100644 +index 48281418d..d0d46b20f 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h -@@ -460,6 +460,7 @@ public slots: +@@ -465,6 +465,7 @@ public slots: QPointF mPreviousPoint; qreal mPreviousWidth; qreal mDistanceFromLastStrokePoint; @@ -9770,7 +9762,7 @@ QList<UBGraphicsPolygonItem*> mPreviousPolygonItems; -From 7db64f65e3824c3b09ef1618425901404b133ddc Mon Sep 17 00:00:00 2001 +From bf565ca0799d828c6db50099270547d640747f9e Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Mon, 29 Nov 2021 19:56:42 +0100 Subject: [PATCH 6/8] fix: load ignoreCtrl setting during startup @@ -9829,7 +9821,7 @@ static UBShortcutManager* sShortcutManager; }; -From 89885f7e4aa32134c0c1c5109af5beb24d541154 Mon Sep 17 00:00:00 2001 +From e0c1a4f0510d9be61d8d653ed633162c28b60b08 Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Sun, 12 Dec 2021 11:04:56 +0100 Subject: [PATCH 7/8] feat: activate tool while a key is pressed @@ -9845,10 +9837,10 @@ 5 files changed, 146 insertions(+), 3 deletions(-) diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp -index c33473485..c3cfd5b25 100644 +index 8e6d39711..d78c4f289 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp -@@ -688,6 +688,15 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) +@@ -700,6 +700,15 @@ bool UBApplication::eventFilter(QObject *obj, QEvent *event) } } @@ -9865,10 +9857,10 @@ } diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp -index 9a9e83de2..b9d93d7f7 100644 +index e8d434173..a1be9bba3 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp -@@ -123,7 +123,7 @@ bool UBPreferencesController::handleKeyEvent(QKeyEvent *event) +@@ -119,7 +119,7 @@ bool UBPreferencesController::handleKeyEvent(QKeyEvent *event) int keys = mods; @@ -10111,7 +10103,7 @@ void UBStylusPalette::stylusToolDoubleClicked() -From 1f090911a9c69c1c8ec20a2f9ada6c008e868430 Mon Sep 17 00:00:00 2001 +From 6403ae3713e78de28505e3653667792145d373a6 Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Fri, 18 Mar 2022 18:48:39 +0100 Subject: [PATCH 8/8] fix: set icon on action instead of button @@ -10125,10 +10117,10 @@ 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/UBToolbarButtonGroup.cpp b/src/gui/UBToolbarButtonGroup.cpp -index 30f697e5e..fe17a5f31 100644 +index e68f11bf1..929c2ca08 100644 --- a/src/gui/UBToolbarButtonGroup.cpp +++ b/src/gui/UBToolbarButtonGroup.cpp -@@ -116,7 +116,11 @@ void UBToolbarButtonGroup::setIcon(const QIcon &icon, int index) +@@ -123,7 +123,11 @@ void UBToolbarButtonGroup::setIcon(const QIcon &icon, int index) QToolButton *button = qobject_cast<QToolButton*>(widget); if (button) { ++++++ 0698-add-cmake-build-system.patch ++++++ --- /var/tmp/diff_new_pack.9tyBNJ/_old 2023-06-19 22:50:38.713591256 +0200 +++ /var/tmp/diff_new_pack.9tyBNJ/_new 2023-06-19 22:50:38.717591280 +0200 @@ -1,7 +1,7 @@ -From 6830bd54d42446a4d09acc25da39113ecd808a61 Mon Sep 17 00:00:00 2001 +From 4f121a534dd844f7b66b1275aae11f26ea8bc93c Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Wed, 10 Aug 2022 10:41:15 +0200 -Subject: [PATCH 1/3] chore: add cmake build system +Subject: [PATCH 1/6] chore: add cmake build system - add a cmake based build sytem which is - easy to understand @@ -122,7 +122,7 @@ create mode 100644 src/web/CMakeLists.txt diff --git a/.gitignore b/.gitignore -index 46f6fb9f5..3b1d44dc8 100644 +index 5bd5bf9ad..d82a98268 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ Thumbs.db @@ -899,7 +899,7 @@ + UBWidgetUpgradeAdaptor.h +) diff --git a/src/adaptors/UBWidgetUpgradeAdaptor.cpp b/src/adaptors/UBWidgetUpgradeAdaptor.cpp -index 503897c15..cb9c98f18 100644 +index b3df61105..fe782975c 100644 --- a/src/adaptors/UBWidgetUpgradeAdaptor.cpp +++ b/src/adaptors/UBWidgetUpgradeAdaptor.cpp @@ -206,7 +206,7 @@ UBWidgetUpgradeAdaptor::Widget::Widget(const QString &dir) : m_path(dir), m_hasU @@ -988,10 +988,10 @@ + UBTextTools.h +) diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp -index c076241df..c1b0f6236 100644 +index 45365f916..e164d0183 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp -@@ -139,7 +139,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : Single +@@ -140,7 +140,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : Single setStyle("fusion"); @@ -1110,10 +1110,10 @@ + UBWebEngineView.h +) diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp -index 2ecad9587..53c01e9c8 100644 +index 816d6287b..429c5da4d 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp -@@ -1279,14 +1279,14 @@ void UBGraphicsW3CWidgetItem::loadNPAPIWrappersTemplates() +@@ -1283,14 +1283,14 @@ void UBGraphicsW3CWidgetItem::loadNPAPIWrappersTemplates() if (!sTemplateLoaded) { sNPAPIWrapperTemplates.clear(); @@ -1132,7 +1132,7 @@ if (htmlContent.length() > 0) { QStringList tokens = fileName.split("."); -@@ -1303,7 +1303,7 @@ void UBGraphicsW3CWidgetItem::loadNPAPIWrappersTemplates() +@@ -1307,7 +1307,7 @@ void UBGraphicsW3CWidgetItem::loadNPAPIWrappersTemplates() } } } @@ -1180,7 +1180,7 @@ + ) +endif() diff --git a/src/frameworks/UBPlatformUtils.h b/src/frameworks/UBPlatformUtils.h -index da9fd1295..2c9515a5d 100644 +index 3717f1e33..953af0cda 100644 --- a/src/frameworks/UBPlatformUtils.h +++ b/src/frameworks/UBPlatformUtils.h @@ -191,6 +191,7 @@ class UBPlatformUtils @@ -1192,18 +1192,18 @@ static void setFileType(const QString &filePath, unsigned long fileType); static void fadeDisplayOut(); diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp -index cff17b1d3..61a2d0aad 100644 +index e80dff306..117c6b7bf 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp -@@ -33,6 +33,7 @@ - #include <QApplication> +@@ -34,6 +34,7 @@ #include <QDBusConnectionInterface> #include <QDBusInterface> + #include <QDBusMetaType> +#include <QProcessEnvironment> #include <unistd.h> #include <X11/keysym.h> -@@ -50,7 +51,20 @@ void UBPlatformUtils::init() +@@ -53,7 +54,20 @@ void UBPlatformUtils::init() QString UBPlatformUtils::applicationResourcesDirectory() { @@ -1225,7 +1225,7 @@ void UBPlatformUtils::hideFile(const QString &filePath) diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm -index 4ecb705a6..14c6ed303 100644 +index 0be545ca9..d7adbcbc8 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -123,6 +123,11 @@ OSStatus emptySetSystemUIMode ( @@ -1241,10 +1241,10 @@ { FSRef ref; diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp -index c85dafa75..bb6f4c68f 100644 +index 2931b56b1..f084ba012 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp -@@ -51,6 +51,10 @@ QString UBPlatformUtils::applicationResourcesDirectory() +@@ -53,6 +53,10 @@ QString UBPlatformUtils::applicationResourcesDirectory() return QApplication::applicationDirPath(); } @@ -1577,10 +1577,10 @@ + simplebrowser/passworddialog.ui +) diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp -index df3bffba5..31e4e8616 100644 +index c57a3c454..29738daff 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp -@@ -415,7 +415,7 @@ void UBWebController::injectScripts(QWebEngineView *view) +@@ -428,7 +428,7 @@ void UBWebController::injectScripts(QWebEngineView *view) qDebug() << "Injecting qwebchannel.js"; QString src = js.readAll(); @@ -1590,10 +1590,10 @@ if (asyncwrapper.open(QIODevice::ReadOnly)) { -From 5ed9d68afc52d071135640e8da5c35308cd5d318 Mon Sep 17 00:00:00 2001 +From bfc0c6717489fd48a9d212d6045f2b6494592781 Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Sun, 30 Oct 2022 08:09:24 +0100 -Subject: [PATCH 2/3] fix: compatibility with Qt 5.12 and Qt 6 +Subject: [PATCH 2/6] fix: compatibility with Qt 5.12 and Qt 6 - use qt5_add_resources and qt5_add_translation for Qt 5.12 - add .ui and .ts files using target_sources @@ -1693,10 +1693,10 @@ simplebrowser/downloadmanagerwidget.ui simplebrowser/downloadwidget.ui -From 6ff5d2c7f339e1612a8e6e836061f0d96b03d8fc Mon Sep 17 00:00:00 2001 +From a976dc9bc7db4068ae107bf2648d3d6e0928e956 Mon Sep 17 00:00:00 2001 From: letsfindaway <[email protected]> Date: Sat, 5 Nov 2022 08:52:48 +0100 -Subject: [PATCH 3/3] chore: add cpack packaging (by @sebojolais) +Subject: [PATCH 3/6] chore: add cpack packaging (by @sebojolais) - add cpack packaging instructions - configure for deb and rpm packages @@ -1761,3 +1761,123 @@ +# create packager +include(CPack) +From 2f99f725e8640724585cdf0343fd0c1c99e39535 Mon Sep 17 00:00:00 2001 +From: letsfindaway <[email protected]> +Date: Sat, 3 Dec 2022 18:30:14 +0100 +Subject: [PATCH 4/6] fixup: remove unused UBIdleTimer + +--- + src/core/CMakeLists.txt | 2 -- + src/core/UBApplication.cpp | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index eda1052a9..2b362252e 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -15,8 +15,6 @@ target_sources(${PROJECT_NAME} PRIVATE + UBDownloadThread.h + UBForeignObjectsHandler.cpp + UBForeignObjectsHandler.h +- UBIdleTimer.cpp +- UBIdleTimer.h + UBMimeData.cpp + UBMimeData.h + UBOpenSankoreImporter.cpp +diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp +index e164d0183..d89c2009a 100644 +--- a/src/core/UBApplication.cpp ++++ b/src/core/UBApplication.cpp +@@ -43,7 +43,6 @@ + #include "UBPersistenceManager.h" + #include "UBDocumentManager.h" + #include "UBPreferencesController.h" +-#include "UBIdleTimer.h" + #include "UBApplicationController.h" + #include "UBShortcutManager.h" + + +From b69c909e9c5f68adbf24de19823a25ae4396a995 Mon Sep 17 00:00:00 2001 +From: letsfindaway <[email protected]> +Date: Wed, 21 Dec 2022 11:47:59 +0100 +Subject: [PATCH 5/6] chore: allow to set build version for build + +- make VERSION_BUILD and VERSION_TYPE CACHE variables +- this allows to overwrite them using -D when invoking cmake +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ebd94ffce..5d884045d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,8 +41,8 @@ project(openboard + LANGUAGES CXX + ) + +-set(VERSION_TYPE a) # a = alpha, b = beta, rc = release candidate, r = release, other => error +-set(VERSION_BUILD 1027) ++set(VERSION_TYPE r CACHE STRING "a = alpha, b = beta, rc = release candidate, r = release") ++set(VERSION_BUILD 1027 CACHE STRING "Build version for non-release builds") + + include(cmake/Version.cmake) + include(cmake/Platform.cmake) + +From 087f02bee16740b6886450e1c124caa8365aca9f Mon Sep 17 00:00:00 2001 +From: letsfindaway <[email protected]> +Date: Fri, 24 Mar 2023 14:15:12 +0100 +Subject: [PATCH 6/6] feat: add startup hints to cmake build + +- package startupHints directory +- use absolute paths to make webengine happy +--- + CMakeLists.txt | 2 ++ + src/frameworks/UBPlatformUtils_linux.cpp | 6 ++++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5d884045d..6d4887722 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,6 +69,7 @@ set(OPENBOARD_FONT_DIR resources/customizations resources/fonts) + set(OPENBOARD_ETC_DIR resources/etc) + set(OPENBOARD_LIBRARY_DIR resources/library) + set(OPENBOARD_TEMPLATE_DIR resources/template) ++set(OPENBOARD_STARTUP_HINTS resources/startupHints) + + set(OPENBOARD_ICON_FILE resources/images/ch.openboard.OpenBoard.svg) + +@@ -246,6 +247,7 @@ if(LINUX) + install(DIRECTORY ${OPENBOARD_ETC_DIR}/ DESTINATION ${OPENBOARD_INSTALL_SYSCONFDIR}) + install(DIRECTORY ${OPENBOARD_LIBRARY_DIR} DESTINATION ${OPENBOARD_INSTALL_DATADIR}) + install(DIRECTORY ${OPENBOARD_TEMPLATE_DIR} DESTINATION ${OPENBOARD_INSTALL_DATADIR}) ++ install(DIRECTORY ${OPENBOARD_STARTUP_HINTS} DESTINATION ${OPENBOARD_INSTALL_DATADIR}) + install(DIRECTORY ${PROJECT_BINARY_DIR}/i18n DESTINATION ${OPENBOARD_INSTALL_DATADIR}) + install(FILES ${OPENBOARD_ICON_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps) + install(FILES ${OPENBOARD_DESKTOP_FILE} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) +diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp +index 117c6b7bf..1328539de 100644 +--- a/src/frameworks/UBPlatformUtils_linux.cpp ++++ b/src/frameworks/UBPlatformUtils_linux.cpp +@@ -55,7 +55,8 @@ void UBPlatformUtils::init() + QString UBPlatformUtils::applicationResourcesDirectory() + { + #ifdef APP_PREFIX +- return QProcessEnvironment::systemEnvironment().value("APP_PREFIX", APP_PREFIX); ++ QString prefix = QProcessEnvironment::systemEnvironment().value("APP_PREFIX", APP_PREFIX); ++ return QFileInfo(prefix).absoluteFilePath(); + #else + return QApplication::applicationDirPath(); + #endif +@@ -64,7 +65,8 @@ QString UBPlatformUtils::applicationResourcesDirectory() + QString UBPlatformUtils::applicationEtcDirectory() + { + #ifdef ETC_PREFIX +- return QProcessEnvironment::systemEnvironment().value("ETC_PREFIX", ETC_PREFIX); ++ QString prefix = QProcessEnvironment::systemEnvironment().value("ETC_PREFIX", ETC_PREFIX); ++ return QFileInfo(prefix).absoluteFilePath(); + #else + return applicationResourcesDirectory() + "/etc"; + #endif + ++++++ 9117-disable-software-update.patch ++++++ --- /var/tmp/diff_new_pack.9tyBNJ/_old 2023-06-19 22:50:38.733591374 +0200 +++ /var/tmp/diff_new_pack.9tyBNJ/_new 2023-06-19 22:50:38.733591374 +0200 @@ -1,4 +1,4 @@ -From 8868eacdd913c1c5bd3040425c507fb8ef527e71 Mon Sep 17 00:00:00 2001 +From 7d50e97af79d7393d7b893bf640b6bccbcf22dd6 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 @@ -14,7 +14,7 @@ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/etc/OpenBoard.config b/resources/etc/OpenBoard.config -index 0120f922d..09c11a6dc 100644 +index e7f2e075b..67f21a58e 100644 --- a/resources/etc/OpenBoard.config +++ b/resources/etc/OpenBoard.config @@ -1,15 +1,14 @@ @@ -26,7 +26,7 @@ -EnableAutomaticSoftwareUpdates=true -EnableSoftwareUpdates=true +EnableAutomaticSoftwareUpdates=false - EnableStartupHints=false + EnableStartupHints=true FavoriteToolURIs=openboardtool://openboard/mask, openboardtool://ruler, openboardtool://compass, openboardtool://protractor, openboardtool://triangle, openboardtool://magnifier, openboardtool://cache IsInSoftwareUpdateProcess=false LastSessionDocumentUUID= @@ -37,12 +37,16 @@ PreferredLanguage=fr_CH ProductWebAddress=http://www.openboard.ch diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp -index 4e7c5612a..a5bec7b9b 100644 +index 9c7802be9..f4e85c3a6 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp -@@ -92,2 +92,4 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) +@@ -90,6 +90,8 @@ 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 - adjustScreens(); + adjustScreensPreferences(); + + connect(UBApplication::displayManager, &UBDisplayManager::availableScreenCountChanged, this, &UBPreferencesController::adjustScreensPreferences);
