svn commit: r478687 - in head/net-im/ramblercontacts: . files

Tobias Kortkamp tobik at FreeBSD.org
Sat Sep 1 13:07:09 UTC 2018 

Author: tobik
Date: Sat Sep  1 13:07:08 2018
New Revision: 478687
URL: https://svnweb.freebsd.org/changeset/ports/478687

Log:
  net-im/ramblercontacts: Fix build with Clang 6
  
  messageprocessor.cpp:120:21: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
                  QRegExp mail("\\b"MAIL_NODE_PATTERN"@"JID_DOMAIN_PATTERN);
                                    ^
  
  http://beefy11.nyi.freebsd.org/data/head-i386-default/p478276_s338342/logs/errors/ramblercontacts-0.3.2.1030_2.log
  
  - Apply dos2unix to all source files

Added:
  head/net-im/ramblercontacts/files/
  head/net-im/ramblercontacts/files/patch-src_plugins_gateways_gateways.cpp   (contents, props changed)
  head/net-im/ramblercontacts/files/patch-src_plugins_messageprocessor_messageprocessor.cpp   (contents, props changed)
Modified:
  head/net-im/ramblercontacts/Makefile

Modified: head/net-im/ramblercontacts/Makefile
==============================================================================
--- head/net-im/ramblercontacts/Makefile	Sat Sep  1 13:07:01 2018	(r478686)
+++ head/net-im/ramblercontacts/Makefile	Sat Sep  1 13:07:08 2018	(r478687)
@@ -14,7 +14,7 @@ COMMENT=	Free, multi-service communication client from
 LICENSE=	GPLv3
 
 USES=		qmake dos2unix qt:4
-DOS2UNIX_FILES=	src/config.inc
+DOS2UNIX_GLOB=	*
 USE_XORG=	xscrnsaver
 USE_QT=		moc_build rcc_build uic_build designer_build \
 		webkit

Added: head/net-im/ramblercontacts/files/patch-src_plugins_gateways_gateways.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/ramblercontacts/files/patch-src_plugins_gateways_gateways.cpp	Sat Sep  1 13:07:08 2018	(r478687)
@@ -0,0 +1,101 @@
+--- src/plugins/gateways/gateways.cpp.orig	2018-09-01 12:43:54 UTC
++++ src/plugins/gateways/gateways.cpp
+@@ -18,7 +18,7 @@
+ #define GATEWAY_TIMEOUT           30000
+ #define KEEP_INTERVAL             120000
+ 
+-#define MAIL_NODE_PATTERN         "[a-zA-Z0-9_\\-\\.]+"
++#define  MAIL_NODE_PATTERN          "[a-zA-Z0-9_\\-\\.]+"
+ 
+ Gateways::Gateways()
+ {
+@@ -218,7 +218,7 @@ bool Gateways::initConnections(IPluginManager *APlugin
+ 
+ bool Gateways::initObjects()
+ {
+-	static const QString JabberContactPattern = "^"JID_NODE_PATTERN"@"JID_DOMAIN_PATTERN"$";
++	static const QString JabberContactPattern = "^" JID_NODE_PATTERN "@" JID_DOMAIN_PATTERN "$";
+ 
+ 	// !!Ïîñëåäîâàòåëüíîñòü äîáàâëåíèÿ äåñêðèïòîðîâ èìååò çíà÷åíèå!!
+ 	IGateServiceDescriptor sms;
+@@ -258,7 +258,7 @@ bool Gateways::initObjects()
+ 	magent.loginField = "username";
+ 	magent.passwordField = "password";
+ 	magent.domainSeparator = "@";
+-	magent.homeContactPattern = "^"MAIL_NODE_PATTERN"@(mail|inbox|bk|list)\\.ru$";
++	magent.homeContactPattern = "^" MAIL_NODE_PATTERN "@(mail|inbox|bk|list)\\.ru$";
+ 	magent.availContactPattern = magent.homeContactPattern;
+ 	magent.linkedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(magent);
+@@ -288,7 +288,7 @@ bool Gateways::initObjects()
+ 	gtalk.domainField = "server";
+ 	gtalk.passwordField = "password";
+ 	gtalk.domainSeparator = "@";
+-	gtalk.homeContactPattern = "^"MAIL_NODE_PATTERN"@(gmail|googlemail)\\.com$";
++	gtalk.homeContactPattern = "^" MAIL_NODE_PATTERN "@(gmail|googlemail)\\.com$";
+ 	gtalk.availContactPattern = JabberContactPattern;
+ 	gtalk.linkedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(gtalk);
+@@ -305,7 +305,7 @@ bool Gateways::initObjects()
+ 	yonline.domainField = "server";
+ 	yonline.passwordField = "password";
+ 	yonline.domainSeparator = "@";
+-	yonline.homeContactPattern = "^"MAIL_NODE_PATTERN"@(ya\\.ru|yandex\\.ru|yandex\\.net|yandex\\.com|yandex\\-co\\.ru|narod\\.ru|yandex\\.by|yandex\\.kz|yandex\\.ua)$";
++	yonline.homeContactPattern = "^" MAIL_NODE_PATTERN "@(ya\\.ru|yandex\\.ru|yandex\\.net|yandex\\.com|yandex\\-co\\.ru|narod\\.ru|yandex\\.by|yandex\\.kz|yandex\\.ua)$";
+ 	yonline.availContactPattern = JabberContactPattern;
+ 	yonline.linkedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(yonline);
+@@ -324,7 +324,7 @@ bool Gateways::initObjects()
+ 	qip.domainField = "server";
+ 	qip.passwordField = "password";
+ 	qip.domainSeparator = "@";
+-	qip.homeContactPattern = "^"MAIL_NODE_PATTERN"@qip\\.ru$";
++	qip.homeContactPattern = "^" MAIL_NODE_PATTERN "@qip\\.ru$";
+ 	qip.availContactPattern = JabberContactPattern;
+ 	qip.linkedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(qip);
+@@ -343,7 +343,7 @@ bool Gateways::initObjects()
+ 	//vkontakte.domainField = "server";
+ 	vkontakte.passwordField = "password";
+ 	//vkontakte.domainSeparator = "@";
+-	vkontakte.homeContactPattern = "^"MAIL_NODE_PATTERN"@vk\\.com$";
++	vkontakte.homeContactPattern = "^" MAIL_NODE_PATTERN "@vk\\.com$";
+ 	vkontakte.availContactPattern = JabberContactPattern;
+ 	vkontakte.blockedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(vkontakte);
+@@ -362,7 +362,7 @@ bool Gateways::initObjects()
+ 	facebook.domainField = "server";
+ 	facebook.passwordField = "password";
+ 	facebook.domainSeparator = "@";
+-	facebook.homeContactPattern = "^"MAIL_NODE_PATTERN"@chat\\.facebook\\.com$";
++	facebook.homeContactPattern = "^" MAIL_NODE_PATTERN "@chat\\.facebook\\.com$";
+ 	facebook.availContactPattern = JabberContactPattern;
+ 	facebook.blockedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(facebook);
+@@ -379,7 +379,7 @@ bool Gateways::initObjects()
+ 	livejournal.domainField = "server";
+ 	livejournal.passwordField = "password";
+ 	livejournal.domainSeparator = "@";
+-	livejournal.homeContactPattern = "^"MAIL_NODE_PATTERN"@livejournal\\.com$";
++	livejournal.homeContactPattern = "^" MAIL_NODE_PATTERN "@livejournal\\.com$";
+ 	livejournal.availContactPattern = JabberContactPattern;
+ 	livejournal.blockedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(livejournal);
+@@ -396,7 +396,7 @@ bool Gateways::initObjects()
+ 	rambler.domainField = "server";
+ 	rambler.passwordField = "password";
+ 	rambler.domainSeparator = "@";
+-	rambler.homeContactPattern = "^"MAIL_NODE_PATTERN"@(rambler|lenta|myrambler|autorambler|ro|r0)\\.ru$";
++	rambler.homeContactPattern = "^" MAIL_NODE_PATTERN "@(rambler|lenta|myrambler|autorambler|ro|r0)\\.ru$";
+ 	rambler.availContactPattern = JabberContactPattern;
+ 	rambler.linkedDescriptors.append(GSID_MAIL);
+ 	FGateDescriptors.append(rambler);
+@@ -428,7 +428,7 @@ bool Gateways::initObjects()
+ 	mail.loginLabel = tr("Mail");
+ 	mail.loginField = "username";
+ 	mail.passwordField = "password";
+-	mail.homeContactPattern = "^"MAIL_NODE_PATTERN"@"JID_DOMAIN_PATTERN"$";
++	mail.homeContactPattern = "^" MAIL_NODE_PATTERN "@" JID_DOMAIN_PATTERN "$";
+ 	mail.availContactPattern = mail.homeContactPattern;
+ 	FGateDescriptors.append(mail);
+ 

Added: head/net-im/ramblercontacts/files/patch-src_plugins_messageprocessor_messageprocessor.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/ramblercontacts/files/patch-src_plugins_messageprocessor_messageprocessor.cpp	Sat Sep  1 13:07:08 2018	(r478687)
@@ -0,0 +1,11 @@
+--- src/plugins/messageprocessor/messageprocessor.cpp.orig	2018-09-01 12:37:59 UTC
++++ src/plugins/messageprocessor/messageprocessor.cpp
+@@ -117,7 +117,7 @@ void MessageProcessor::writeText(int AOrder, Message &
+ 			}
+ 		}
+ 
+-		QRegExp mail("\\b"MAIL_NODE_PATTERN"@"JID_DOMAIN_PATTERN);
++		QRegExp mail("\\b" MAIL_NODE_PATTERN "@" JID_DOMAIN_PATTERN);
+ 		mail.setCaseSensitivity(Qt::CaseInsensitive);
+ 		for (QTextCursor cursor = ADocument->find(mail); !cursor.isNull();  cursor = ADocument->find(mail,cursor))
+ 		{

More information about the svn-ports-all mailing list