From 55b5b623e091a810a9d2853e82e4d596bd77e191 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sun, 10 Apr 2016 18:08:39 +0000 Subject: Update to 0.6. Announcement: http://article.gmane.org/gmane.mail.trojita.general/1319 PR: 206587 Approved by: maintainer timeout (77 days) --- mail/trojita/Makefile | 14 +++++--------- mail/trojita/distinfo | 4 ++-- mail/trojita/files/patch-git_8a2496c2 | 30 ------------------------------ mail/trojita/pkg-plist | 2 ++ 4 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 mail/trojita/files/patch-git_8a2496c2 diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile index f7b1b6444164..dc907b62053a 100644 --- a/mail/trojita/Makefile +++ b/mail/trojita/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= trojita -PORTVERSION= 0.5 -PORTREVISION= 1 +PORTVERSION= 0.6 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/src/ @@ -17,14 +16,12 @@ 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=ON -DWITH_DBUS:STRING=ON \ - -DWITH_DESKTOP:STRING=ON -DWITH_HARMATTAN:STRING=OFF \ +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 -HAS_CONFIGURE= yes INSTALLS_ICONS= yes .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4" @@ -32,14 +29,13 @@ 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 opengl sql sql-sqlite3 webkit + 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 USE_QT5= buildtools_build linguisttools_build qmake_build \ - core dbus gui network opengl printsupport \ - qml quick sql sql-sqlite3 webkit widgets + core dbus gui network sql sql-sqlite3 webkit widgets .endif .include diff --git a/mail/trojita/distinfo b/mail/trojita/distinfo index b62680ef12c8..c2f8321e47ef 100644 --- a/mail/trojita/distinfo +++ b/mail/trojita/distinfo @@ -1,2 +1,2 @@ -SHA256 (trojita-0.5.tar.bz2) = 21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a -SIZE (trojita-0.5.tar.bz2) = 1421368 +SHA256 (trojita-0.6.tar.bz2) = 4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10 +SIZE (trojita-0.6.tar.bz2) = 1409812 diff --git a/mail/trojita/files/patch-git_8a2496c2 b/mail/trojita/files/patch-git_8a2496c2 deleted file mode 100644 index 6c54fb3f0dbc..000000000000 --- a/mail/trojita/files/patch-git_8a2496c2 +++ /dev/null @@ -1,30 +0,0 @@ -commit 8a2496c273f2b0034f0edcc525e4987938a86c50 -Author: Jan Kundrát -Date: Tue Mar 10 14:41:20 2015 +0100 - - Fix build with (unreleased) Qt 5.5 - - It is our fault for not including the headers we need, of course. - - Change-Id: Ibaa1df4a8b763bf6ae611c85cbdeeac5d2e3f9fd - ---- src/AbookAddressbook/AbookAddressbook.h -+++ src/AbookAddressbook/AbookAddressbook.h -@@ -25,6 +25,7 @@ - #ifndef ABOOK_ADDRESSBOOK - #define ABOOK_ADDRESSBOOK - -+#include - #include - #include "Gui/AbstractAddressbook.h" - ---- src/Imap/Model/MailboxMetadata.cpp -+++ src/Imap/Model/MailboxMetadata.cpp -@@ -20,6 +20,7 @@ - along with this program. If not, see . - */ - #include "MailboxMetadata.h" -+#include - - namespace Imap - { diff --git a/mail/trojita/pkg-plist b/mail/trojita/pkg-plist index 8c6103110c7d..a2a7aa4d2619 100644 --- a/mail/trojita/pkg-plist +++ b/mail/trojita/pkg-plist @@ -8,8 +8,10 @@ share/applications/trojita.desktop share/icons/hicolor/32x32/apps/trojita.png share/icons/hicolor/scalable/apps/trojita.svg %%DATADIR%%/locale/trojita_common_ar.qm +%%DATADIR%%/locale/trojita_common_ast.qm %%DATADIR%%/locale/trojita_common_bs.qm %%DATADIR%%/locale/trojita_common_ca.qm +%%DATADIR%%/locale/trojita_common_ca@valencia.qm %%DATADIR%%/locale/trojita_common_cs.qm %%DATADIR%%/locale/trojita_common_da.qm %%DATADIR%%/locale/trojita_common_de.qm -- cgit v1.2.3