CVS commit: pkgsrc/mail/trojita

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail/trojita
From: "Hauke Fath" <hauke%netbsd.org@localhost>
Date: Wed, 15 Oct 2025 16:20:05 +0000

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Oct 15 16:20:05 UTC 2025

Modified Files:
        pkgsrc/mail/trojita: Makefile PLIST distinfo
Added Files:
        pkgsrc/mail/trojita/patches: patch-CMakeLists.txt
            patch-src_Gui_Window.cpp patch-tests_Imap_test__Imap__BodyParts.cpp

Log Message:
mail/trojita: Update to v0.7

Move from QT4 to QT5

Beyond that, upstream does not provide a changelog.

While 0.7 is nine years old, there is activity at
<https://invent.kde.org/pim/trojita>, and a trojita-current could be
packaged.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mail/trojita/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/trojita/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/trojita/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/trojita/patches/patch-CMakeLists.txt \
    pkgsrc/mail/trojita/patches/patch-src_Gui_Window.cpp \
    pkgsrc/mail/trojita/patches/patch-tests_Imap_test__Imap__BodyParts.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/trojita/Makefile
diff -u pkgsrc/mail/trojita/Makefile:1.14 pkgsrc/mail/trojita/Makefile:1.15
--- pkgsrc/mail/trojita/Makefile:1.14   Wed Aug 20 11:35:05 2025
+++ pkgsrc/mail/trojita/Makefile        Wed Oct 15 16:20:05 2025
@@ -1,27 +1,43 @@
-# $NetBSD: Makefile,v 1.14 2025/08/20 11:35:05 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2025/10/15 16:20:05 hauke Exp $
 
-DISTNAME=      trojita-0.4.1
-PKGREVISION=   11
+DISTNAME=      trojita-0.7
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=trojita/}
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://trojita.flaska.net/
 COMMENT=       Fast Qt IMAP e-mail client
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
+DEPENDS+=      ragel-[0-9]*:../../devel/ragel
 
-USE_CMAKE=     yes
-USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
+USE_LANGUAGES=         c c++
+USE_CXX_FEATURES=      c++11
+
+# Deprecation warnings burying the errors
+CFLAGS+=       -Wno-deprecated -Wno-deprecated-declarations
+CFLAGS+=       -Wno-misleading-indentation
+
+CMAKE_CONFIGURE_ARGS+= -Wno-dev
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_C_FLAGS=${CFLAGS:Q}
+
+# Not a package
+CMAKE_CONFIGURE_ARGS+= -DWITH_MIMETIC=no
+# Borken CMAKE build
+CMAKE_CONFIGURE_ARGS+= -DWITH_GPGMEPP=no
+CMAKE_CONFIGURE_ARGS+= -DWITH_CRYPTO_MESSAGES=no
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.qt4-tools+=      qt4-tools>=4.8.6nb2
-.include "../../x11/qt4-tools/buildlink3.mk"
+#.include "../../security/gpgmepp/buildlink3.mk"
+.include "../../security/qt5-qtkeychain/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/trojita/PLIST
diff -u pkgsrc/mail/trojita/PLIST:1.1 pkgsrc/mail/trojita/PLIST:1.2
--- pkgsrc/mail/trojita/PLIST:1.1       Sat Aug  9 21:24:08 2014
+++ pkgsrc/mail/trojita/PLIST   Wed Oct 15 16:20:05 2025
@@ -1,26 +1,36 @@
-@comment $NetBSD: PLIST,v 1.1 2014/08/09 21:24:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/10/15 16:20:05 hauke Exp $
 bin/be.contacts
 bin/trojita
 lib/libtrojita_plugins.so
+lib/trojita/trojita_plugin_QtKeychainPasswordPlugin.so
+share/appdata/trojita.appdata.xml
 share/applications/trojita.desktop
 share/icons/hicolor/32x32/apps/trojita.png
 share/icons/hicolor/scalable/apps/trojita.svg
+share/trojita/locale/trojita_common_ar.qm
+share/trojita/locale/trojita_common_ast.qm
 share/trojita/locale/trojita_common_bs.qm
+share/trojita/locale/trojita_common_ca.qm
+share/trojita/locale/trojita_common_ca%valencia.qm@localhost
 share/trojita/locale/trojita_common_cs.qm
 share/trojita/locale/trojita_common_da.qm
 share/trojita/locale/trojita_common_de.qm
 share/trojita/locale/trojita_common_el.qm
+share/trojita/locale/trojita_common_en_GB.qm
 share/trojita/locale/trojita_common_es.qm
 share/trojita/locale/trojita_common_et.qm
+share/trojita/locale/trojita_common_fi.qm
 share/trojita/locale/trojita_common_fr.qm
 share/trojita/locale/trojita_common_ga.qm
 share/trojita/locale/trojita_common_gl.qm
 share/trojita/locale/trojita_common_hu.qm
 share/trojita/locale/trojita_common_ia.qm
 share/trojita/locale/trojita_common_it.qm
+share/trojita/locale/trojita_common_ja.qm
 share/trojita/locale/trojita_common_lt.qm
 share/trojita/locale/trojita_common_mr.qm
 share/trojita/locale/trojita_common_nb.qm
+share/trojita/locale/trojita_common_nds.qm
 share/trojita/locale/trojita_common_nl.qm
 share/trojita/locale/trojita_common_pl.qm
 share/trojita/locale/trojita_common_pt.qm
@@ -31,6 +41,5 @@ share/trojita/locale/trojita_common_sv.q
 share/trojita/locale/trojita_common_tr.qm
 share/trojita/locale/trojita_common_ug.qm
 share/trojita/locale/trojita_common_uk.qm
-share/trojita/locale/trojita_common_x_test.qm
 share/trojita/locale/trojita_common_zh_CN.qm
 share/trojita/locale/trojita_common_zh_TW.qm

Index: pkgsrc/mail/trojita/distinfo
diff -u pkgsrc/mail/trojita/distinfo:1.4 pkgsrc/mail/trojita/distinfo:1.5
--- pkgsrc/mail/trojita/distinfo:1.4    Tue Oct 26 10:54:33 2021
+++ pkgsrc/mail/trojita/distinfo        Wed Oct 15 16:20:05 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:54:33 nia Exp $
+$NetBSD: distinfo,v 1.5 2025/10/15 16:20:05 hauke Exp $
 
-BLAKE2s (trojita-0.4.1.tar.bz2) = cfe676c4625c7a55df16654e29c98ecba41f55f754c8ee879ae2c85b6cbe7b81
-SHA512 (trojita-0.4.1.tar.bz2) = f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a
-Size (trojita-0.4.1.tar.bz2) = 1219460 bytes
+BLAKE2s (trojita-0.7.tar.xz) = 1ace940defdb47128ca26d089069a0fd36d85eaab1dc0260d4b0c411e1509244
+SHA512 (trojita-0.7.tar.xz) = fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
+Size (trojita-0.7.tar.xz) = 1038212 bytes
+SHA1 (patch-CMakeLists.txt) = 15e81ca0e105d8ad946b095be42b1db961bfd81d
+SHA1 (patch-src_Gui_Window.cpp) = 09a7deb0f2ef46c3227647c27121095bd08c4bbb
+SHA1 (patch-tests_Imap_test__Imap__BodyParts.cpp) = 56ad1d65ff8dc938b6f7d6407ffe925d5f4db407

Added files:

Index: pkgsrc/mail/trojita/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/mail/trojita/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed Oct 15 16:20:05 2025
+++ pkgsrc/mail/trojita/patches/patch-CMakeLists.txt    Wed Oct 15 16:20:05 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/10/15 16:20:05 hauke Exp $
+
+CMAKE objects, and it isn't even necessary
+
+--- CMakeLists.txt.orig        2025-10-15 14:47:22.877656047 +0000
++++ CMakeLists.txt
+@@ -13,11 +13,6 @@ if(POLICY CMP0054)
+     cmake_policy(SET CMP0054 NEW)
+ endif()
+ 
+-if(POLICY CMP0043)
+-    # We make use of CMAKE_CXXFLAGS_DEBUG...
+-    cmake_policy(SET CMP0043 OLD)
+-endif()
+-
+ # Set a default build type if none was specified. This was shamelessly stolen
+ # from VTK's cmake setup because these guys produce both CMake and a project that
+ # manipulates this variable, and the web is full of posts where people say that
Index: pkgsrc/mail/trojita/patches/patch-src_Gui_Window.cpp
diff -u /dev/null pkgsrc/mail/trojita/patches/patch-src_Gui_Window.cpp:1.1
--- /dev/null   Wed Oct 15 16:20:05 2025
+++ pkgsrc/mail/trojita/patches/patch-src_Gui_Window.cpp        Wed Oct 15 16:20:05 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Gui_Window.cpp,v 1.1 2025/10/15 16:20:05 hauke Exp $
+
+Add missing include.
+
+--- src/Gui/Window.cpp.orig    2025-10-15 14:59:15.541845017 +0000
++++ src/Gui/Window.cpp
+@@ -32,6 +32,7 @@
+ #include <QKeyEvent>
+ #include <QMenuBar>
+ #include <QMessageBox>
++#include <QPainterPath>
+ #include <QProgressBar>
+ #include <QScrollBar>
+ #include <QSplitter>
Index: pkgsrc/mail/trojita/patches/patch-tests_Imap_test__Imap__BodyParts.cpp
diff -u /dev/null pkgsrc/mail/trojita/patches/patch-tests_Imap_test__Imap__BodyParts.cpp:1.1
--- /dev/null   Wed Oct 15 16:20:05 2025
+++ pkgsrc/mail/trojita/patches/patch-tests_Imap_test__Imap__BodyParts.cpp      Wed Oct 15 16:20:05 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-tests_Imap_test__Imap__BodyParts.cpp,v 1.1 2025/10/15 16:20:05 hauke Exp $
+
+Duplicate declaration.
+
+--- tests/Imap/test_Imap_BodyParts.cpp.orig    2025-10-15 15:25:49.795007647 +0000
++++ tests/Imap/test_Imap_BodyParts.cpp
+@@ -51,6 +51,7 @@ struct Data {
+ 
+ Q_DECLARE_METATYPE(QList<Data>)
+ 
++#if 0           /* Already declared in QtTest/qtest.h */
+ namespace QTest {
+ template <>
+ char *toString(const QModelIndex &index)
+@@ -60,6 +61,7 @@ char *toString(const QModelIndex &index)
+     return qstrdup(buf.toUtf8().constData());
+ }
+ }
++#endif
+ 
+ using namespace Imap::Mailbox;
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index