From 7b3d22b5d56f5125828ee66a8d3b3f8930d2773c Mon Sep 17 00:00:00 2001 From: Le Baron d'Merde Date: Mon, 24 Jul 2017 21:40:19 -0300 Subject: [PATCH] Add Qt5 OPTION and support. --- deskutils/znotes/Makefile | 24 +++++++++++++++------- deskutils/znotes/distinfo | 5 +++-- .../files/patch-single__inst_qtlocalpeer.cpp | 12 ----------- deskutils/znotes/pkg-plist | 3 +++ 4 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 deskutils/znotes/files/patch-single__inst_qtlocalpeer.cpp diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile index 5aeac1f38ce2a..4b4dd1e3c04cf 100644 --- a/deskutils/znotes/Makefile +++ b/deskutils/znotes/Makefile @@ -3,19 +3,28 @@ PORTNAME= znotes PORTVERSION= 0.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils -MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ + +USE_GITHUB= yes +GH_ACCOUNT= proton +GH_PROJECT= zNotes +GH_TAGNAME= 6423c5e MAINTAINER= vg@FreeBSD.org -COMMENT= Simple notes managment application based on Qt 4 +COMMENT= Simple notes managment application based on Qt LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= qmake -USE_QT4= corelib gui network xml uic_build moc_build rcc_build \ - linguisttools_build +QT4_USE= QT4=uic_build,moc_build,rcc_build,linguisttools_build,corelib,gui,network,xml +QT5_USE= QT5=buildtools_build,linguisttools_build,core,gui,network,printsupport,widgets,xml + +OPTIONS_SINGLE= QT +OPTIONS_SINGLE_QT= QT4 QT5 +OPTIONS_DEFAULT= QT5 + QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} DESKTOP_ENTRIES="zNotes" "Notes managment" \ @@ -26,12 +35,13 @@ OPTIONS_DEFINE= NLS OPTIONS_SUB= yes post-patch: - @${REINPLACE_CMD} -e '/.path =/s|/usr|$$$$PREFIX|g' \ + ${REINPLACE_CMD} -e '/.path =/s|/usr|$$$$PREFIX|g' \ -e '/PREFIX = /d' \ ${WRKSRC}/${PORTNAME}.pro - @${REINPLACE_CMD} -i -e 's,QCoreApplication::applicationDirPath()+"/translations","${DATADIR}/translations",g' \ +# @${REINPLACE_CMD} -i -e 's,QCoreApplication::applicationDirPath()+"/translations","${DATADIR}/translations",g' \ ${WRKSRC}/settings.cpp + pre-configure: #Work around badly written .pro ${LRELEASE} ${WRKSRC}/${PORTNAME}.pro diff --git a/deskutils/znotes/distinfo b/deskutils/znotes/distinfo index 02e673be831ed..310893df40f8b 100644 --- a/deskutils/znotes/distinfo +++ b/deskutils/znotes/distinfo @@ -1,2 +1,3 @@ -SHA256 (znotes-0.4.5.tar.gz) = ac692253e74bda8f989db40042c26b6db2bb60a5f9c30cdbfcd824af0de1c5b2 -SIZE (znotes-0.4.5.tar.gz) = 171884 +TIMESTAMP = 1500936060 +SHA256 (proton-zNotes-0.4.5-6423c5e_GH0.tar.gz) = 93a9708a7c2522197e442d0aa28c9c20b13815c192ef8c51ced0006f6b352d2c +SIZE (proton-zNotes-0.4.5-6423c5e_GH0.tar.gz) = 725999 diff --git a/deskutils/znotes/files/patch-single__inst_qtlocalpeer.cpp b/deskutils/znotes/files/patch-single__inst_qtlocalpeer.cpp deleted file mode 100644 index aafe49c24fc70..0000000000000 --- a/deskutils/znotes/files/patch-single__inst_qtlocalpeer.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- single_inst/qtlocalpeer.cpp.orig 2011-08-27 08:25:14 UTC -+++ single_inst/qtlocalpeer.cpp -@@ -58,9 +58,7 @@ static PProcessIdToSessionId pProcessIdT - #if defined(Q_OS_UNIX) - #include - #endif --#if defined(Q_OS_OS2) - #include --#endif - - namespace QtLP_Private { - #include "qtlockedfile.cpp" diff --git a/deskutils/znotes/pkg-plist b/deskutils/znotes/pkg-plist index b1b15dfb99ed6..537c3dfda56d0 100644 --- a/deskutils/znotes/pkg-plist +++ b/deskutils/znotes/pkg-plist @@ -1,9 +1,12 @@ bin/znotes share/pixmaps/znotes.png %%NLS%%%%DATADIR%%/translations/znotes_cs.qm +%%NLS%%%%DATADIR%%/translations/znotes_de.qm %%NLS%%%%DATADIR%%/translations/znotes_en.qm %%NLS%%%%DATADIR%%/translations/znotes_es.qm +%%NLS%%%%DATADIR%%/translations/znotes_pl.qm %%NLS%%%%DATADIR%%/translations/znotes_pt_BR.qm %%NLS%%%%DATADIR%%/translations/znotes_ru.qm %%NLS%%%%DATADIR%%/translations/znotes_sk.qm +%%NLS%%%%DATADIR%%/translations/znotes_sv.qm %%NLS%%%%DATADIR%%/translations/znotes_uk.qm