git: a182c6819d1f - main - deskutils/notes: improve FreeBSD support and disable self-updating

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a182c6819d1f1dce0085935358b42a716ccdfd67

commit a182c6819d1f1dce0085935358b42a716ccdfd67
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-10-29 03:51:36 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-10-29 03:51:36 +0000

    deskutils/notes: improve FreeBSD support and disable self-updating
    
    Perhaps it makes sense when software is built by user and installed
    locally, but for the software installed normally all updates should
    be handled by the system package manager.
---
 deskutils/notes/Makefile                       |  17 ++--
 deskutils/notes/distinfo                       |   4 +-
 deskutils/notes/files/patch-src_Notes.pro      |  37 ++++++++
 deskutils/notes/files/patch-src_mainwindow.cpp | 124 +++++++++++++++++++++++++
 deskutils/notes/files/patch-src_mainwindow.h   |  34 +++++++
 5 files changed, 206 insertions(+), 10 deletions(-)

diff --git a/deskutils/notes/Makefile b/deskutils/notes/Makefile
index aac4a8753d1c..9dc336ae6bbb 100644
--- a/deskutils/notes/Makefile
+++ b/deskutils/notes/Makefile
@@ -1,8 +1,12 @@
 PORTNAME=	notes
 PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	deskutils
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	eda71ecf0a9cd7122e8bacf895fb8214dcecb503.patch:-p1
+
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Beautiful and powerful note-taking application
 WWW=		https://www.get-notes.com/
@@ -13,16 +17,13 @@ USES=		qmake qt:5
 USE_QT=		buildtools:build concurrent core gui network sql widgets
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	nuttyartist alex-spataru:qsu b00f:qas pbek:qmdte
-GH_PROJECT=	QSimpleUpdater:qsu qautostart:qas qmarkdowntextedit:qmdte
-GH_TAGNAME=	62567ee:qsu 5be8fea:qas f69e622:qmdte
-GH_SUBDIR=	3rdParty/QSimpleUpdater:qsu 3rdParty/qautostart:qas \
-		3rdParty/qmarkdowntextedit:qmdte
+GH_ACCOUNT=	nuttyartist b00f:qas pbek:qmdte
+GH_PROJECT=	qautostart:qas qmarkdowntextedit:qmdte
+GH_TAGNAME=	5be8fea:qas f69e622:qmdte
+GH_SUBDIR=	3rdParty/qautostart:qas 3rdParty/qmarkdowntextedit:qmdte
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^OBJECTS_DIR = obj/d' ${WRKSRC}/src/Notes.pro
-	@${REINPLACE_CMD} -e 's,Q_OS_LINUX,Q_OS_UNIX,' \
-		${WRKSRC}/src/updaterwindow.cpp
+	@${RM} ${WRKSRC}/src/updaterwindow.*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/Notes \
diff --git a/deskutils/notes/distinfo b/deskutils/notes/distinfo
index e85c798d8e79..f2d52111f676 100644
--- a/deskutils/notes/distinfo
+++ b/deskutils/notes/distinfo
@@ -1,9 +1,9 @@
 TIMESTAMP = 1662537566
 SHA256 (nuttyartist-notes-v2.0.0_GH0.tar.gz) = 0240a3b4e9f3cf9027e2a6c9d04f02c3b0dadf07de02cd0b90e7fdad0b5a8e07
 SIZE (nuttyartist-notes-v2.0.0_GH0.tar.gz) = 6285787
-SHA256 (alex-spataru-QSimpleUpdater-62567ee_GH0.tar.gz) = b99d4ae20aaa82bcc6450f69757840ba07a9e75f177037f3419abf124fcf131d
-SIZE (alex-spataru-QSimpleUpdater-62567ee_GH0.tar.gz) = 455283
 SHA256 (b00f-qautostart-5be8fea_GH0.tar.gz) = 72ab1cdf4cdeeade12d7aed2a0d15994e8a1b8a59d590be0000067b0c3f8e949
 SIZE (b00f-qautostart-5be8fea_GH0.tar.gz) = 3587
 SHA256 (pbek-qmarkdowntextedit-f69e622_GH0.tar.gz) = 40e9fb63c4b65d71c97707bceb54cbd1b7a07432726e2a487ab49436136c08a7
 SIZE (pbek-qmarkdowntextedit-f69e622_GH0.tar.gz) = 300541
+SHA256 (eda71ecf0a9cd7122e8bacf895fb8214dcecb503.patch) = c5f100e8c4b7f0dd886b0855a6f1a98e6fde80227964b7617e7828f244e2c8b4
+SIZE (eda71ecf0a9cd7122e8bacf895fb8214dcecb503.patch) = 6382
diff --git a/deskutils/notes/files/patch-src_Notes.pro b/deskutils/notes/files/patch-src_Notes.pro
new file mode 100644
index 000000000000..839d23573bda
--- /dev/null
+++ b/deskutils/notes/files/patch-src_Notes.pro
@@ -0,0 +1,37 @@
+--- src/Notes.pro.orig	2022-09-07 07:59:26 UTC
++++ src/Notes.pro
+@@ -17,10 +17,8 @@ RCC_DIR = qrc
+ UI_DIR = uic
+ MOC_DIR = moc
+ RCC_DIR = qrc
+-OBJECTS_DIR = obj
+ 
+ include ($$PWD/../3rdParty/qxt/qxt.pri)
+-include ($$PWD/../3rdParty/QSimpleUpdater/QSimpleUpdater.pri)
+ include ($$PWD/../3rdParty/qmarkdowntextedit/qmarkdowntextedit.pri)
+ include ($$PWD/../3rdParty/qautostart/src/qautostart.pri)
+ 
+@@ -44,7 +42,6 @@ SOURCES += \
+     tagpool.cpp \
+     tagtreedelegateeditor.cpp \
+     trashbuttondelegateeditor.cpp \
+-    updaterwindow.cpp \
+     dbmanager.cpp \
+     aboutwindow.cpp \
+     customdocument.cpp \
+@@ -83,7 +80,6 @@ HEADERS  += \
+     tagpool.h \
+     tagtreedelegateeditor.h \
+     trashbuttondelegateeditor.h \
+-    updaterwindow.h \
+     dbmanager.h \
+     aboutwindow.h \
+     customDocument.h \
+@@ -104,7 +100,6 @@ FORMS += \
+ 
+ FORMS += \
+     $$PWD/mainwindow.ui \
+-    $$PWD/updaterwindow.ui \
+     aboutwindow.ui \
+     styleeditorwindow.ui
+ 
diff --git a/deskutils/notes/files/patch-src_mainwindow.cpp b/deskutils/notes/files/patch-src_mainwindow.cpp
new file mode 100644
index 000000000000..d95dc30c5874
--- /dev/null
+++ b/deskutils/notes/files/patch-src_mainwindow.cpp
@@ -0,0 +1,124 @@
+--- src/mainwindow.cpp.orig	2022-09-07 07:59:26 UTC
++++ src/mainwindow.cpp
+@@ -8,7 +8,6 @@
+ #include "ui_mainwindow.h"
+ #include "notelistdelegate.h"
+ #include "qxtglobalshortcut.h"
+-#include "updaterwindow.h"
+ #include "treeviewlogic.h"
+ #include "listviewlogic.h"
+ #include "noteeditorlogic.h"
+@@ -79,7 +78,6 @@ MainWindow::MainWindow(QWidget *parent) :
+     m_isTemp(false),
+     m_isListViewScrollBarHidden(true),
+     m_isOperationRunning(false),
+-    m_dontShowUpdateWindow(false),
+     m_alwaysStayOnTop(false),
+     m_useNativeWindowFrame(false),
+     m_listOfSerifFonts({QStringLiteral("Trykker"), QStringLiteral("PT Serif"), QStringLiteral("Mate")}),
+@@ -123,7 +121,6 @@ MainWindow::MainWindow(QWidget *parent) :
+     setupTextEdit();
+     restoreStates();
+     setupSignalsSlots();
+-    autoCheckForUpdates();
+ 
+     QTimer::singleShot(200,this, SLOT(InitData()));
+ }
+@@ -587,7 +584,6 @@ void MainWindow::setupSignalsSlots()
+  */
+ void MainWindow::setupSignalsSlots()
+ {
+-    connect(&m_updater, &UpdaterWindow::dontShowUpdateWindowChanged, this, [=](bool state){m_dontShowUpdateWindow = state;});
+     // Style Editor Window
+     connect(&m_styleEditorWindow, &StyleEditorWindow::changeFontType, this, [=](FontTypeface fontType){changeEditorFontTypeFromStyleButtons(fontType);});
+     connect(&m_styleEditorWindow, &StyleEditorWindow::changeFontSize, this, [=](FontSizeAction fontSizeAction){changeEditorFontSizeFromStyleButtons(fontSizeAction);});
+@@ -728,6 +724,7 @@ void MainWindow::setupSignalsSlots()
+             m_dbManager, &DBManager::onChangeDatabasePathRequested, Qt::QueuedConnection);
+ }
+ 
++#if 0
+ /*!
+  * \brief MainWindow::autoCheckForUpdates
+  * Checks for updates, if an update is found, then the updater dialog will show
+@@ -739,6 +736,7 @@ void MainWindow::autoCheckForUpdates()
+     m_updater.setShowWindowDisable(m_dontShowUpdateWindow);
+     m_updater.checkForUpdates(false);
+ }
++#endif
+ 
+ void MainWindow::setSearchEditStyleSheet(bool isFocused = false)
+ {
+@@ -988,8 +986,10 @@ void MainWindow::initializeSettingsDatabase()
+     if(m_settingsDatabase->value(QStringLiteral("version"), "NULL") == "NULL")
+         m_settingsDatabase->setValue(QStringLiteral("version"), qApp->applicationVersion());
+ 
++#if 0
+     if(m_settingsDatabase->value(QStringLiteral("dontShowUpdateWindow"), "NULL") == "NULL")
+         m_settingsDatabase->setValue(QStringLiteral("dontShowUpdateWindow"), m_dontShowUpdateWindow);
++#endif
+ 
+     if(m_settingsDatabase->value(QStringLiteral("windowGeometry"), "NULL") == "NULL"){
+         int initWidth = 870;
+@@ -1169,8 +1169,10 @@ void MainWindow::restoreStates()
+     //    }
+ #endif
+ 
++#if 0
+     if(m_settingsDatabase->value(QStringLiteral("dontShowUpdateWindow"), "NULL") != "NULL")
+         m_dontShowUpdateWindow = m_settingsDatabase->value(QStringLiteral("dontShowUpdateWindow")).toBool();
++#endif
+ 
+     m_splitter->setCollapsible(0, true);
+     m_splitter->resize(width() - m_layoutMargin, height() - m_layoutMargin);
+@@ -1448,9 +1450,11 @@ void MainWindow::onDotsButtonClicked()
+         }
+     });
+ 
++#if 0
+     // Check for update action
+     QAction* checkForUpdatesAction = mainMenu.addAction(tr("Check For Updates"));
+     connect (checkForUpdatesAction, &QAction::triggered, this, &MainWindow::checkForUpdates);
++#endif
+ 
+     // Autostart
+     QAction* autostartAction = mainMenu.addAction(tr("Start automatically"));
+@@ -1937,6 +1941,7 @@ void MainWindow::QuitApplication()
+     MainWindow::close();
+ }
+ 
++#if 0
+ /*!
+  * \brief MainWindow::checkForUpdates
+  * Called when the "Check for Updates" menu item is clicked, this function
+@@ -1948,6 +1953,7 @@ void MainWindow::checkForUpdates(const bool clicked)
+     Q_UNUSED (clicked)
+     m_updater.checkForUpdates(true);
+ }
++#endif
+ 
+ /*!
+  * \brief MainWindow::importNotesFile
+@@ -2282,7 +2288,6 @@ void MainWindow::closeEvent(QCloseEvent* event)
+ 
+     m_noteEditorLogic->saveNoteToDB();
+ 
+-    m_settingsDatabase->setValue(QStringLiteral("dontShowUpdateWindow"), m_dontShowUpdateWindow);
+     m_settingsDatabase->setValue(QStringLiteral("splitterSizes"), m_splitter->saveState());
+ 
+     QString currentFontTypefaceString;
+@@ -3174,6 +3179,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *
+ 
+         //        alignTextEditText();
+     }
++#if 0
+     case QEvent::Show:
+         if(object == &m_updater){
+ 
+@@ -3187,6 +3193,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *
+             m_updater.setGeometry(QRect(x, y, rect.width(), rect.height()));
+         }
+         break;
++#endif
+     case QEvent::MouseButtonPress:
+     case QEvent::MouseButtonDblClick:
+         // Only allow double click (maximise/minimise) or dragging (move)
diff --git a/deskutils/notes/files/patch-src_mainwindow.h b/deskutils/notes/files/patch-src_mainwindow.h
new file mode 100644
index 000000000000..09f7fd8ba6d8
--- /dev/null
+++ b/deskutils/notes/files/patch-src_mainwindow.h
@@ -0,0 +1,34 @@
+--- src/mainwindow.h.orig	2022-09-07 07:59:26 UTC
++++ src/mainwindow.h
+@@ -29,7 +29,6 @@
+ #include "notelistmodel.h"
+ #include "notelistview.h"
+ #include "nodetreemodel.h"
+-#include "updaterwindow.h"
+ #include "styleeditorwindow.h"
+ #include "dbmanager.h"
+ #include "customDocument.h"
+@@ -151,7 +150,6 @@ public slots: (private)
+     DBManager* m_dbManager;
+     QThread* m_dbThread;
+     SpliterStyle* m_spliterStyle;
+-    UpdaterWindow m_updater;
+     StyleEditorWindow m_styleEditorWindow;
+     AboutWindow m_aboutWindow;
+     StretchSide m_stretchSide;
+@@ -170,7 +168,6 @@ public slots: (private)
+     bool m_isTemp;
+     bool m_isListViewScrollBarHidden;
+     bool m_isOperationRunning;
+-    bool m_dontShowUpdateWindow;
+     bool m_alwaysStayOnTop;
+     bool m_useNativeWindowFrame;
+ 
+@@ -262,7 +259,6 @@ private slots:
+     void maximizeWindow();
+     void minimizeWindow();
+     void QuitApplication();
+-    void checkForUpdates (const bool clicked);
+     void collapseNoteList();
+     void expandNoteList();
+     void toggleNoteList();