<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/29c27be9e82efd6d9d465e176bc1b1dd5677bb69">https://github.com/macports/macports-ports/commit/29c27be9e82efd6d9d465e176bc1b1dd5677bb69</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 29c27be9e82 i2pchat: initial support with Qt4
</span>29c27be9e82 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 29c27be9e82efd6d9d465e176bc1b1dd5677bb69
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Apr 24 19:35:39 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> i2pchat: initial support with Qt4
</span>---
net/i2pchat/Portfile | 44 ++++++++++----
net/i2pchat/files/patch-qt4.diff | 121 +++++++++++++++++++++++++++++++++++++++
2 files changed, 153 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/i2pchat/Portfile b/net/i2pchat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bbd0e25726..9669374e16d 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/i2pchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/i2pchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,14 +2,8 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake5 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component qtmultimedia qtsvg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: find a version working with Qt4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/vituperative/i2pchat/issues/31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup vituperative i2pchat 0.2.37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name i2pchat
</span> categories net security aqua
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +11,39 @@ description Anonymous private secure open-source chat
</span> long_description {*}${description} using end-to-end encrypted transport.
license GPL-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 aed05ec0b191872404ff7dd1da770a411c3e34b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Initial support for Qt4. TODO: update this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # # https://github.com/vituperative/i2pchat/issues/31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup vituperative i2pchat 0.2.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4f2654f001fea7a89b64737ad372895a7b09da5c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 024edabd47bed9d73d463bc0ac789bea6aa0122ee433150dfc50ea8084203c9b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 435397
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/I2P-Messenger.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtmultimedia qtsvg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup vituperative i2pchat 0.2.37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 aed05ec0b191872404ff7dd1da770a411c3e34b1 \
</span> sha256 7cab4d689fefbf60fd8ff13853126c76f7b70e5a90d38430ffb0b1c1ab88877e \
size 1679202
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/I2PChat.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.tarball_from archive
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +51,3 @@ compiler.cxx_standard 2011
</span> # Avoid a silly error:
# https://github.com/vituperative/i2pchat/issues/32
patchfiles-append 0001-Patch-gitversion.pri.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/I2PChat.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/i2pchat/files/patch-qt4.diff b/net/i2pchat/files/patch-qt4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..93972d68ca1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/i2pchat/files/patch-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,121 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/backend/Main.cpp 2020-06-15 06:47:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/backend/Main.cpp 2024-04-24 19:08:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QSettings>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QTime>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QDir>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QStandardPaths>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDesktopServices>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <getopt.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,8 +38,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString debugLogDir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void enableDebugLogging(QString configPath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//void myMessageHandler(QtMsgType type, const char *msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void myMessageHandler(QtMsgType type,const QMessageLogContext &context,const QString &msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void myMessageHandler(QtMsgType type, const char *msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//void myMessageHandler(QtMsgType type,const QMessageLogContext &context,const QString &msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void help(void){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef ANDROID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QStringList loc = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QStringList loc = QDesktopServices::standardLocations(QDesktopServices::GenericDataLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(loc.size()<=0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMessageBox::critical(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,9 +114,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configPath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configPath = QDesktopServices::storageLocation(QDesktopServices::AppDataLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configPath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+NameOfConfigDirectoryOnLinux;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ configPath = QDesktopServices::storageLocation(QDesktopServices::HomeLocation)+NameOfConfigDirectoryOnLinux;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,7 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //configPath=QApplication::applicationDirPath();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(QFile::exists(configPath+"/UseHomeForConfigStore")==true){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QStringList tmp=QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString tmp=QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(tmp.size()>=1){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configPath=tmp.at(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configPath+="/.I2PChat";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,13 +208,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QSettings settings(configPath+"/application.ini",QSettings::IniFormat);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ settings.beginGroup("General");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(settings.value("DebugLogging","true").toBool()==true){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qInstallMessageHandler(myMessageHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qInstallMsgHandler(myMessageHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ settings.endGroup();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ settings.sync();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void myMessageHandler(QtMsgType type,const QMessageLogContext &context,const QString &msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void myMessageHandler(QtMsgType type,const char *msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString txt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,23 +222,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (type) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QtDebugMsg:{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- txt.append(QString(" Debug: %1 (%2:%3, %4)\n").arg(msg).arg(context.file).arg(context.line).arg(context.function));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ txt.append(QString(" Debug: %1 (%2:%3, %4)\n").arg(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QtWarningMsg:{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- txt.append(QString(" Warning: %1 (%2:%3, %4)\n").arg(msg).arg(context.file).arg(context.line).arg(context.function));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ txt.append(QString(" Warning: %1 (%2:%3, %4)\n").arg(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QtCriticalMsg:{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- txt.append(QString(" Critical: %1 (%2:%3, %4)\n").arg(msg).arg(context.file).arg(context.line).arg(context.function));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ txt.append(QString(" Critical: %1 (%2:%3, %4)\n").arg(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case QtFatalMsg:{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- txt.append(QString(" Fatal: %1 (%2:%3, %4)\n").arg(msg).arg(context.file).arg(context.line).arg(context.function));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ txt.append(QString(" Fatal: %1 (%2:%3, %4)\n").arg(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- txt.append(QString(" Message: %1 (%2:%3, %4)\n").arg(msg).arg(context.file).arg(context.line).arg(context.function));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ txt.append(QString(" Message: %1 (%2:%3, %4)\n").arg(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/backend/Core.cpp 2020-06-15 06:47:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/backend/Core.cpp 2024-04-24 18:20:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtGlobal>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QMessageBox>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <QStandardPaths>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QDesktopServices>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CCore::CCore(QString configPath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/backend/TextEmotionChanger.cpp 2020-06-15 06:47:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/backend/TextEmotionChanger.cpp 2024-04-24 18:32:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(tmp.isNull())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = QPixmap(dirPath + "/" + fileName.at(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString text = emoticonString.text().toHtmlEscaped();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString text = Qt::escape(emoticonString.text());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_urls.insert(text,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString("<img src=\"%1\" width=\"%2\" height=\"%3\" alt=\"%4\" title=\"%4\"/>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .arg(dirPath + "/" + fileName.at(0)).arg(tmp.size().width())
</span></pre><pre style='margin:0'>
</pre>