Attachment 173911 Details for Bug 212030 – Patch v1

[patch] Patch v1

trojita-0.7-v1.patch (text/plain), 2.73 KB, created by Raphael Kubo da Costa on 2016-08-21 15:48:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2016-08-21 15:48:28 UTC

Size: 2.73 KB

patch

obsolete

>diff --git a/mail/trojita-qt4/Makefile b/mail/trojita-qt4/Makefile
>deleted file mode 100644
>index 10f7982..0000000
>--- a/mail/trojita-qt4/Makefile
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-# Created by: Marco Broeder <marco.broeder@posteo.eu>
>-# $FreeBSD$
>-
>-PKGNAMESUFFIX=	-qt4
>-
>-MAINTAINER=	marco.broeder@posteo.eu
>-COMMENT=	Fast cross-platform IMAP e-mail client using Qt 4 toolkit
>-
>-LICENSE=	GPLv2 GPLv3
>-LICENSE_COMB=	dual
>-
>-CONFLICTS_INSTALL=	trojita-[0-9]*
>-
>-MASTERDIR=	${.CURDIR}/../trojita
>-
>-.include "${MASTERDIR}/Makefile"
>diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
>index 3f8bc0b..7ec4b33 100644
>--- a/mail/trojita/Makefile
>+++ b/mail/trojita/Makefile
>@@ -2,41 +2,31 @@
> # $FreeBSD$
> 
> PORTNAME=	trojita
>-PORTVERSION=	0.6
>-PORTREVISION=	1
>+PORTVERSION=	0.7
> CATEGORIES=	mail
> MASTER_SITES=	SF/${PORTNAME}/src/
> 
> MAINTAINER=	marco.broeder@posteo.eu
>-COMMENT?=	Fast cross-platform IMAP e-mail client using Qt 5 toolkit
>+COMMENT=	Fast cross-platform IMAP e-mail client using Qt 5 toolkit
> 
> LICENSE=	GPLv2 GPLv3
> LICENSE_COMB=	dual
> 
>+LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain-qt5
>+
>+CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
>+INSTALLS_ICONS=	yes
> USE_LDCONFIG=	yes
> 
>-USES=		cmake compiler:c++11-lib cpe desktop-file-utils tar:bzip2
> CPE_PROJECT=	trojita_project
> CMAKE_ARGS+=	-DWITH_CLEARTEXT_PLUGIN:STRING=ON -DWITH_DBUS:STRING=ON \
> 		-DWITH_DESKTOP:STRING=ON \
> 		-DWITH_QTKEYCHAIN_PLUGIN:STRING=ON -DWITH_RAGEL:STRING=OFF \
> 		-DWITH_SHARED_PLUGINS:STRING=ON -DWITH_TESTS:STRING=OFF \
>-		-DWITH_ZLIB:STRING=ON
>-
>-INSTALLS_ICONS=	yes
>-
>-.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
>-CONFLICTS_INSTALL=	trojita-[0-9]*
>-LIB_DEPENDS+=	libqtkeychain.so: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 sql sql-sqlite3 webkit
>-.else
>-CONFLICTS_INSTALL=	trojita-qt4-[0-9]*
>-LIB_DEPENDS+=	libqt5keychain.so:security/qtkeychain-qt5
>-CMAKE_ARGS+=	-DWITH_QT5:STRING=ON
>+		-DWITH_ZLIB:STRING=ON \
>+		-DWITH_QT5:STRING=ON
>+USES=		cmake compiler:c++11-lib cpe desktop-file-utils tar:xz
> USE_QT5=	buildtools_build linguisttools_build qmake_build \
>-		core dbus gui network sql sql-sqlite3 webkit widgets
>-.endif
>+		core dbus gui network sql sql-sqlite3 svg webkit widgets
> 
> .include <bsd.port.mk>
>diff --git a/mail/trojita/distinfo b/mail/trojita/distinfo
>index c2f8321..578a1b2 100644
>--- a/mail/trojita/distinfo
>+++ b/mail/trojita/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (trojita-0.6.tar.bz2) = 4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10
>-SIZE (trojita-0.6.tar.bz2) = 1409812
>+TIMESTAMP = 1471781933
>+SHA256 (trojita-0.7.tar.xz) = e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9
>+SIZE (trojita-0.7.tar.xz) = 1038212

Flags:

vlad-fbsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 212030: 173911