FreeBSD Bugzilla – Attachment 184681 Details for
Bug 220984
deskutils/znotes: Fix Makefile distfile (patch).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Add Qt5 support.
add_qt5_support.patch (text/plain), 4.37 KB, created by
Alexandre C. GuimarĂ£es
on 2017-07-25 00:55:35 UTC
(
hide
)
Description:
Add Qt5 support.
Filename:
MIME Type:
Creator:
Alexandre C. GuimarĂ£es
Created:
2017-07-25 00:55:35 UTC
Size:
4.37 KB
patch
obsolete
>From cf54ef3bbcba111c4509bc14b460660c8a3f7d85 Mon Sep 17 00:00:00 2001 >From: Le Baron d'Merde <lebarondemerde@gmx.com> >Date: Mon, 24 Jul 2017 21:40:19 -0300 >Subject: [PATCH] add qt5 support/option > >--- > deskutils/znotes/Makefile | 26 ++++++++++++---------- > deskutils/znotes/distinfo | 5 +++-- > .../files/patch-single__inst_qtlocalpeer.cpp | 12 ---------- > deskutils/znotes/pkg-plist | 26 ++++++++++++++-------- > 4 files changed, 34 insertions(+), 35 deletions(-) > delete mode 100644 deskutils/znotes/files/patch-single__inst_qtlocalpeer.cpp > >diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile >index 5aeac1f38ce2a..ef1875012c215 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" \ >@@ -25,13 +34,6 @@ DESKTOP_ENTRIES="zNotes" "Notes managment" \ > OPTIONS_DEFINE= NLS > OPTIONS_SUB= yes > >-post-patch: >- @${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' \ >- ${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 <time.h> >- #endif >--#if defined(Q_OS_OS2) >- #include <unistd.h> >--#endif >- >- namespace QtLP_Private { >- #include "qtlockedfile.cpp" >diff --git a/deskutils/znotes/pkg-plist b/deskutils/znotes/pkg-plist >index b1b15dfb99ed6..a986fd7ab8004 100644 >--- a/deskutils/znotes/pkg-plist >+++ b/deskutils/znotes/pkg-plist >@@ -1,9 +1,17 @@ >-bin/znotes >-share/pixmaps/znotes.png >-%%NLS%%%%DATADIR%%/translations/znotes_cs.qm >-%%NLS%%%%DATADIR%%/translations/znotes_en.qm >-%%NLS%%%%DATADIR%%/translations/znotes_es.qm >-%%NLS%%%%DATADIR%%/translations/znotes_pt_BR.qm >-%%NLS%%%%DATADIR%%/translations/znotes_ru.qm >-%%NLS%%%%DATADIR%%/translations/znotes_sk.qm >-%%NLS%%%%DATADIR%%/translations/znotes_uk.qm >+/usr/bin/znotes >+/usr/share/applications/znotes.desktop >+/usr/share/pixmaps/znotes.png >+/usr/%%DATADIR%%/translations/znotes_cs.qm >+/usr/%%DATADIR%%/translations/znotes_de.qm >+/usr/%%DATADIR%%/translations/znotes_en.qm >+/usr/%%DATADIR%%/translations/znotes_es.qm >+/usr/%%DATADIR%%/translations/znotes_pl.qm >+/usr/%%DATADIR%%/translations/znotes_pt_BR.qm >+/usr/%%DATADIR%%/translations/znotes_ru.qm >+/usr/%%DATADIR%%/translations/znotes_sk.qm >+/usr/%%DATADIR%%/translations/znotes_sv.qm >+/usr/%%DATADIR%%/translations/znotes_uk.qm >+@dir /usr/share/applications >+@dir /usr/share/pixmaps >+@dir /usr/%%DATADIR%%/translations >+@dir /usr/%%DATADIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 220984
:
184681
|
184694
|
184839
|
194469