mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

deskutils/notes: the port had been updated to version 2.1.0

Browse Source 
- Builds itself with CMake now and has installation routine
- Drop our custom auto-update disabling patches as this is
  one of the program's standard features now
- Explicitly specify desired Qt version so it won't pick up
  the wrong one accidentally

Reported by:	portscout
This commit is contained in:
Alexey Dokuchaev 2023-03-10 16:59:18 +00:00
parent eea19244c5
commit fef6040a4d
7 changed files with 38 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
deskutils/notes/Makefile
View File

@ -1,44 +1,25 @@
PORTNAME= notes
PORTVERSION= 2.0.0
PORTVERSION= 2.1.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/
LICENSE= MPL20
USES= qmake qt:5
USE_QT= buildtools:build concurrent core gui network sql widgets
USES= cmake qt:5 xorg
USE_QT= buildtools:build qmake:build testlib:build \
concurrent core gui network sql widgets
USE_XORG= x11
USE_GITHUB= yes
GH_ACCOUNT= nuttyartist b00f:qas pbek:qmdte
GH_PROJECT= qautostart:qas qmarkdowntextedit:qmdte
GH_TAGNAME= 5be8fea:qas f69e622:qmdte
GH_TAGNAME= efdb2e5:qas b85b0f1:qmdte
GH_SUBDIR= 3rdParty/qautostart:qas 3rdParty/qmarkdowntextedit:qmdte
post-patch:
@${RM} ${WRKSRC}/src/updaterwindow.*
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/Notes \
${STAGEDIR}${PREFIX}/bin/${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/packaging/linux/common/*.desktop \
${STAGEDIR}${PREFIX}/share/applications
.for n in 16 22 24 32 48 64 128 256 512
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps
${INSTALL_DATA} \
${WRKSRC}/packaging/linux/common/icons/${n}x${n}/${PORTNAME}.png \
${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps
.endfor
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
${INSTALL_DATA} \
${WRKSRC}/packaging/linux/common/icons/scalable/${PORTNAME}.svg \
${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
CMAKE_ARGS= -DUSE_QT_VERSION:STRING=5 -DUPDATE_CHECKER:BOOL=OFF
.include <bsd.port.mk>

16
deskutils/notes/distinfo
View File

@ -1,9 +1,7 @@
TIMESTAMP = 1662537566
SHA256 (nuttyartist-notes-v2.0.0_GH0.tar.gz) = 0240a3b4e9f3cf9027e2a6c9d04f02c3b0dadf07de02cd0b90e7fdad0b5a8e07
SIZE (nuttyartist-notes-v2.0.0_GH0.tar.gz) = 6285787
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
TIMESTAMP = 1678296121
SHA256 (nuttyartist-notes-v2.1.0_GH0.tar.gz) = 8a8ae079fad6d9d5e9206acf5f4d19e1e73e1196e6c27408072b5cccf8778b95
SIZE (nuttyartist-notes-v2.1.0_GH0.tar.gz) = 6315405
SHA256 (b00f-qautostart-efdb2e5_GH0.tar.gz) = 59e83a43ea58eee5781bd9dc5e120973b75b2193d9ac2817e47fcf3e7ac11e27
SIZE (b00f-qautostart-efdb2e5_GH0.tar.gz) = 3970
SHA256 (pbek-qmarkdowntextedit-b85b0f1_GH0.tar.gz) = 9d00c7b32b163c22c62feae95f89b16a5ce417110a325fc9665228290ab40538
SIZE (pbek-qmarkdowntextedit-b85b0f1_GH0.tar.gz) = 138290

12
deskutils/notes/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,12 @@
--- CMakeLists.txt.orig 2023-03-08 17:22:01 UTC
+++ CMakeLists.txt
@@ -320,7 +320,8 @@ elseif(UNIX)
string(TOLOWER ${PROJECT_NAME} BINARY_NAME)
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${BINARY_NAME})
- target_link_libraries(${PROJECT_NAME} PUBLIC X11)
+ find_library(X11_LIBRARY X11)
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${X11_LIBRARY})
include(GNUInstallDirs)

37
deskutils/notes/files/patch-src_Notes.pro
View File

@ -1,37 +0,0 @@
--- 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

124
deskutils/notes/files/patch-src_mainwindow.cpp
View File

@ -1,124 +0,0 @@
--- 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)

34
deskutils/notes/files/patch-src_mainwindow.h
View File

@ -1,34 +0,0 @@
--- 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();

23
deskutils/notes/pkg-plist
View File

@ -1,12 +1,13 @@
bin/notes
share/applications/notes.desktop
share/icons/hicolor/128x128/apps/notes.png
share/icons/hicolor/16x16/apps/notes.png
share/icons/hicolor/22x22/apps/notes.png
share/icons/hicolor/24x24/apps/notes.png
share/icons/hicolor/256x256/apps/notes.png
share/icons/hicolor/32x32/apps/notes.png
share/icons/hicolor/48x48/apps/notes.png
share/icons/hicolor/512x512/apps/notes.png
share/icons/hicolor/64x64/apps/notes.png
share/icons/hicolor/scalable/apps/notes.svg
share/applications/io.github.nuttyartist.notes.desktop
share/icons/hicolor/16x16/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/22x22/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/24x24/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/32x32/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/48x48/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/64x64/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/128x128/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/256x256/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/512x512/apps/io.github.nuttyartist.notes.png
share/icons/hicolor/scalable/apps/io.github.nuttyartist.notes.svg
share/metainfo/io.github.nuttyartist.notes.metainfo.xml