aboutsummaryrefslogtreecommitdiffstats
path: root/net-im
diff options
context:
space:
mode:
authortobik <tobik@FreeBSD.org>2018-09-09 18:13:42 +0800
committertobik <tobik@FreeBSD.org>2018-09-09 18:13:42 +0800
commit0d24464205939600fbf1d5f3fe86e6df98e3e371 (patch)
treef57e8e0e196f7596a0c2f18e8694fcb6470a32c6 /net-im
parent8608d37439ca3df17f01fa1a54eba9adf3f115df (diff)
downloadfreebsd-ports-gnome-0d24464205939600fbf1d5f3fe86e6df98e3e371.tar.gz
freebsd-ports-gnome-0d24464205939600fbf1d5f3fe86e6df98e3e371.tar.zst
freebsd-ports-gnome-0d24464205939600fbf1d5f3fe86e6df98e3e371.zip
net-im/ramblercontacts: Fixup r478687
Add a patch which I forgot to svn add. http://beefy11.nyi.freebsd.org/data/head-i386-default/p479076_s338486/logs/errors/ramblercontacts-0.3.2.1030_2.log http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/ramblercontacts-0.3.2.1030_2.log Pointy hat: tobik Reported by: pkg-fallout
Diffstat (limited to 'net-im')
-rw-r--r--net-im/ramblercontacts/files/patch-src_plugins_adiummessagestyle_adiummessagestyle.cpp90
1 files changed, 90 insertions, 0 deletions
diff --git a/net-im/ramblercontacts/files/patch-src_plugins_adiummessagestyle_adiummessagestyle.cpp b/net-im/ramblercontacts/files/patch-src_plugins_adiummessagestyle_adiummessagestyle.cpp
new file mode 100644
index 000000000000..9916ef32ef19
--- /dev/null
+++ b/net-im/ramblercontacts/files/patch-src_plugins_adiummessagestyle_adiummessagestyle.cpp
@@ -0,0 +1,90 @@
+--- src/plugins/adiummessagestyle/adiummessagestyle.cpp.orig 2018-09-01 12:39:15 UTC
++++ src/plugins/adiummessagestyle/adiummessagestyle.cpp
+@@ -15,9 +15,9 @@
+ #include <QApplication>
+ #include <QTextDocument>
+
+-#define SHARED_STYLE_PATH RESOURCES_DIR"/"RSR_STORAGE_ADIUMMESSAGESTYLES"/"STORAGE_SHARED_DIR
++#define SHARED_STYLE_PATH RESOURCES_DIR "/" RSR_STORAGE_ADIUMMESSAGESTYLES "/" STORAGE_SHARED_DIR
+ #define STYLE_CONTENTS_PATH "Contents"
+-#define STYLE_RESOURCES_PATH STYLE_CONTENTS_PATH"/Resources"
++#define STYLE_RESOURCES_PATH STYLE_CONTENTS_PATH "/Resources"
+
+ #define APPEND_MESSAGE_WITH_SCROLL "checkIfScrollToBottomIsNeeded(); appendCustumMessage(\"%1\",\"appendMessage\",%2,%3); scrollToBottomIfNeeded();"
+ #define APPEND_NEXT_MESSAGE_WITH_SCROLL "checkIfScrollToBottomIsNeeded(); appendCustumMessage(\"%1\",\"appendNextMessage\",%2,%3); scrollToBottomIfNeeded();"
+@@ -56,7 +56,7 @@ AdiumMessageStyle::AdiumMessageStyle(const QString &AS
+ FDelayedAllwaysOn = true;
+ FInfo = styleInfo(AStylePath);
+ FVariants = styleVariants(AStylePath);
+- FResourcePath = AStylePath+"/"STYLE_RESOURCES_PATH;
++ FResourcePath = AStylePath+"/" STYLE_RESOURCES_PATH;
+
+ initStyleSettings();
+ loadTemplates();
+@@ -230,7 +230,7 @@ QList<QString> AdiumMessageStyle::styleVariants(const
+ QList<QString> files;
+ if (!AStylePath.isEmpty())
+ {
+- QDir dir(AStylePath+"/"STYLE_RESOURCES_PATH"/Variants");
++ QDir dir(AStylePath+"/" STYLE_RESOURCES_PATH "/Variants");
+ files = dir.entryList(QStringList("*.css"),QDir::Files,QDir::Name);
+ for (int i=0; i<files.count();i++)
+ files[i].chop(4);
+@@ -242,7 +242,7 @@ QMap<QString, QVariant> AdiumMessageStyle::styleInfo(c
+ {
+ QMap<QString, QVariant> info;
+
+- QFile file(AStylePath+"/"STYLE_CONTENTS_PATH"/Info.plist");
++ QFile file(AStylePath+"/" STYLE_CONTENTS_PATH "/Info.plist");
+ if (!AStylePath.isEmpty() && file.open(QFile::ReadOnly))
+ {
+ QDomDocument doc;
+@@ -365,13 +365,13 @@ QString AdiumMessageStyle::makeStyleTemplate(const IMe
+ if (!QFile::exists(htmlFileName))
+ {
+ FUsingCustomTemplate = false;
+- htmlFileName = qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Template.html";
++ htmlFileName = qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Template.html";
+ }
+
+ QString html = loadFileData(htmlFileName,QString::null);
+ if (!html.isEmpty())
+ {
+- static QString extendScripts = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Extension.js",QString::null);
++ static QString extendScripts = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Extension.js",QString::null);
+ html.insert(html.indexOf("<script ",0,Qt::CaseInsensitive),QString("<script type='text/javascript'>%1</script>\n").arg(extendScripts));
+
+ QString headerHTML;
+@@ -699,24 +699,24 @@ void AdiumMessageStyle::loadTemplates()
+ FOut_ContextHTML = loadFileData(FResourcePath+"/Outgoing/Context.html",FOut_ContentHTML);
+ FOut_NextContextHTML = loadFileData(FResourcePath+"/Outgoing/NextContext.html",FOut_NextContentHTML);
+
+- FIn_UnreadHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Incoming/Unread.html", QString::null);
++ FIn_UnreadHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Incoming/Unread.html", QString::null);
+ FIn_UnreadHTML = loadFileData(FResourcePath+"/Incoming/Unread.html",FIn_UnreadHTML);
+- FIn_NextUnreadHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Incoming/NextUnread.html", FIn_UnreadHTML);
++ FIn_NextUnreadHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Incoming/NextUnread.html", FIn_UnreadHTML);
+ FIn_NextUnreadHTML = loadFileData(FResourcePath+"/Incoming/NextUnread.html",FIn_NextUnreadHTML);
+
+- FIn_OfflineHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Incoming/Offline.html", QString::null);
++ FIn_OfflineHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Incoming/Offline.html", QString::null);
+ FIn_OfflineHTML = loadFileData(FResourcePath+"/Incoming/Offline.html",FIn_OfflineHTML);
+- FIn_NextOfflineHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Incoming/NextOffline.html", FIn_OfflineHTML);
++ FIn_NextOfflineHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Incoming/NextOffline.html", FIn_OfflineHTML);
+ FIn_NextOfflineHTML = loadFileData(FResourcePath+"/Incoming/NextOffline.html",FIn_NextOfflineHTML);
+
+- FOut_UnreadHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Outgoing/Unread.html", FIn_UnreadHTML);
++ FOut_UnreadHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Outgoing/Unread.html", FIn_UnreadHTML);
+ FOut_UnreadHTML = loadFileData(FResourcePath+"/Outgoing/Unread.html",FOut_UnreadHTML);
+- FOut_NextUnreadHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Outgoing/NextUnread.html", FOut_UnreadHTML);
++ FOut_NextUnreadHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Outgoing/NextUnread.html", FOut_UnreadHTML);
+ FOut_NextUnreadHTML = loadFileData(FResourcePath+"/Outgoing/NextUnread.html",FOut_NextUnreadHTML);
+
+- FOut_OfflineHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Outgoing/Offline.html", FIn_OfflineHTML);
++ FOut_OfflineHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Outgoing/Offline.html", FIn_OfflineHTML);
+ FOut_OfflineHTML = loadFileData(FResourcePath+"/Outgoing/Offline.html",FOut_OfflineHTML);
+- FOut_NextOfflineHTML = loadFileData(qApp->applicationDirPath()+"/"SHARED_STYLE_PATH"/Outgoing/NextOffline.html", FOut_OfflineHTML);
++ FOut_NextOfflineHTML = loadFileData(qApp->applicationDirPath()+"/" SHARED_STYLE_PATH "/Outgoing/NextOffline.html", FOut_OfflineHTML);
+ FOut_NextOfflineHTML = loadFileData(FResourcePath+"/Outgoing/NextOffline.html",FOut_NextOfflineHTML);
+ }
+