Attachment 157164 Details for Bug 200441 – enable password plugins, remove obsolete patch and empty post-install target

[patch] enable password plugins, remove obsolete patch and empty post-install target

trojita-0.5_1_new.patch (text/plain), 2.11 KB, created by Marco Bröder on 2015-05-26 15:21:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Bröder

Created: 2015-05-26 15:21:57 UTC

Size: 2.11 KB

patch

obsolete

>diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
>index d55a738..cc7b822 100644
>--- a/mail/trojita/Makefile
>+++ b/mail/trojita/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	trojita
> PORTVERSION=	0.5
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	SF/${PORTNAME}/src/
> 
>@@ -17,9 +18,9 @@ USE_LDCONFIG=	yes
> USES=		cmake compiler:c++11-lib cpe desktop-file-utils tar:bzip2
> CPE_PROJECT=	trojita_project
> CMAKE_ARGS+=	-DCMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make \
>-		-DWITH_CLEARTEXT_PLUGIN:STRING=OFF -DWITH_DBUS:STRING=ON \
>+		-DWITH_CLEARTEXT_PLUGIN:STRING=ON -DWITH_DBUS:STRING=ON \
> 		-DWITH_DESKTOP:STRING=ON -DWITH_HARMATTAN:STRING=OFF \
>-		-DWITH_QTKEYCHAIN_PLUGIN:STRING=OFF -DWITH_RAGEL:STRING=OFF \
>+		-DWITH_QTKEYCHAIN_PLUGIN:STRING=ON -DWITH_RAGEL:STRING=OFF \
> 		-DWITH_SHARED_PLUGINS:STRING=ON -DWITH_TESTS:STRING=OFF \
> 		-DWITH_ZLIB:STRING=ON
> 
>@@ -28,21 +29,17 @@ INSTALLS_ICONS=	yes
> 
> .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
> CONFLICTS_INSTALL=	trojita-[0-9]*
>+LIB_DEPENDS+=	libqtkeychain.so:${PORTSDIR}/security/qtkeychain-qt4
> CMAKE_ARGS+=	-DWITH_QT5:STRING=OFF
> USE_QT4=	linguisttools_build moc_build qmake_build rcc_build uic_build \
> 		corelib dbus gui network opengl sql sql-sqlite3 webkit
> .else
> CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
>+LIB_DEPENDS+=	libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5
> CMAKE_ARGS+=	-DWITH_QT5:STRING=ON
> USE_QT5=	buildtools_build linguisttools_build qmake_build \
> 		core dbus gui network opengl printsupport \
> 		qml quick sql sql-sqlite3 webkit widgets
> .endif
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|$${LINGUIST_PATH}/bin|${QT_BINDIR}|g' \
>-		${WRKSRC}/cmake/FindQt5LinguistForTrojita.cmake
>-
>-post-install:
>-
> .include <bsd.port.mk>
>diff --git a/mail/trojita/pkg-plist b/mail/trojita/pkg-plist
>index b53b7f4..8c61031 100644
>--- a/mail/trojita/pkg-plist
>+++ b/mail/trojita/pkg-plist
>@@ -1,6 +1,8 @@
> bin/be.contacts
> bin/trojita
> lib/libtrojita_plugins.so
>+lib/trojita/trojita_plugin_ClearTextPasswordPlugin.so
>+lib/trojita/trojita_plugin_QtKeychainPasswordPlugin.so
> share/appdata/trojita.appdata.xml
> share/applications/trojita.desktop
> share/icons/hicolor/32x32/apps/trojita.png

Flags:

marco.broeder: maintainer-approval+

Actions: View | Diff

Attachments on bug 200441: 157117 | 157120 | 157121 | 157164