Attachment #89277 for bug #126177

View | Details | Raw Unified | Return to bug 126177
Collapse All | Expand All




#

PORTNAME=	qutim
PORTVERSION=	0.1.1
CATEGORIES=	net-im
MASTER_SITES=	http://qutim.org/download/ \
		http://dl.kibab.com/distfiles/qutim/ \
		ftp://ftp.inferra.ru/pub/qutIM/
DISTNAME=	qutim_${PORTVERSION}

MAINTAINER=	webmaster@kibab.com
COMMENT=	A Qt4-based lightweight ICQ client with advanced features

WRKSRC=		${WRKDIR}/qutIM
USE_BZIP2=	yes
USE_GMAKE=	yes
USE_QT_VER=	4
QT_COMPONENTS=	gui network xml moc_build qmake_build rcc_build uic_build

	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o Makefile qutIM.pro

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/build/bin/qutIM ${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/home/kibab/repos/ports-mine/qutim/distinfo (-3 / +3 lines)
1	MD5 (qutIM-0.1.tar.bz2) = da28697dfba1d345b0cc45e0cc3e7cad	1	MD5 (qutim_0.1.1.tar.gz) = 0c43b30c1f428d0557f9d68f6cb4cff2
2	SHA256 (qutIM-0.1.tar.bz2) = cc67e9c19a0dbf52826550b4f98bdf50d50c905785e0d66e54a28a53d95a66f6	2	SHA256 (qutim_0.1.1.tar.gz) = db62de671d9d6d5462dc2330ba9039cc1db74169eeefad8a2d3bc5609967df3c
3	SIZE (qutIM-0.1.tar.bz2) = 359666	3	SIZE (qutim_0.1.1.tar.gz) = 805600




--- protocol/oscar/icq/contactlist.cpp.orig	2008-07-22 19:34:21.000000000 +0400
+++ protocol/oscar/icq/contactlist.cpp	2008-07-22 20:14:46.000000000 +0400
@@ -16,6 +16,7 @@
 //#include <QtGui>
 #include <QTcpSocket>
 #include <QNetworkProxy>
+#include <sys/time.h>
 #include "treegroupitem.h"
 #include "treebuddyitem.h"
 #include "icqmessage.h"
@@ -1559,8 +1560,14 @@
 		msg->message = codec->toUnicode(socket->read(length - 1));
 		
 		QDateTime curTime = QDateTime::currentDateTime();
+		
+		// Use POSIX-compatible way to get daylight saving correction
+		struct timeval tp;
+		struct timezone tzp;
+		gettimeofday(&tp, &tzp);
+		
 		int offset = (curTime.toLocalTime().time().hour() - curTime.toUTC().time().hour()) * 3600 + 
-			(curTime.toLocalTime().time().minute() - curTime.toUTC().time().minute()) * 60 - daylight * 3600;
+			(curTime.toLocalTime().time().minute() - curTime.toUTC().time().minute()) * 60 - tzp.tz_dsttime * 3600;
 		offlineDateTime = offlineDateTime.addSecs(offset);
 		
 		msg->date = offlineDateTime;




diff -ur qutIM/src/qutim.cpp qutIM.mine/src/qutim.cpp
--- src/qutim.cpp	2008-06-11 16:11:00.000000000 +0400
+++ src/qutim.cpp	2008-06-15 21:49:52.000000000 +0400
@@ -59,10 +59,10 @@
 	offlineList = NULL;
 	setAttribute(Qt::WA_AlwaysShowToolTips, true);
 	setFocus(Qt::ActiveWindowFocusReason);
+	createActions();
+	createTrayIcon();
 	if ( QSystemTrayIcon::isSystemTrayAvailable() )
 	{
-		createActions();
-		createTrayIcon();
 		trayIcon->show();
 		connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
 	             this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));

Return to bug 126177

Lines 6-22 Link Here

(-)/home/kibab/repos/ports-mine/qutim/Makefile (-7 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= qutim	8	PORTNAME= qutim
9	PORTVERSION= 0.1	9	PORTVERSION= 0.1.1
10	CATEGORIES= net-im	10	CATEGORIES= net-im
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= http://qutim.org/download/ \
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	http://dl.kibab.com/distfiles/qutim/ \
13	DISTNAME= qutIM-${PORTVERSION}	13	ftp://ftp.inferra.ru/pub/qutIM/
		14	DISTNAME= qutim_${PORTVERSION}
14		15
15	MAINTAINER= webmaster@kibab.com	16	MAINTAINER= webmaster@kibab.com
16	COMMENT= A Qt4-based lightweight ICQ client with advanced features	17	COMMENT= A Qt4-based lightweight ICQ client with advanced features
17		18
18	WRKSRC= ${WRKDIR}/qutIM
19	USE_BZIP2= yes
20	USE_GMAKE= yes	19	USE_GMAKE= yes
21	USE_QT_VER= 4	20	USE_QT_VER= 4
22	QT_COMPONENTS= gui network xml moc_build qmake_build rcc_build uic_build	21	QT_COMPONENTS= gui network xml moc_build qmake_build rcc_build uic_build
Lines 27-32 Link Here
27	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o Makefile qutIM.pro	26	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o Makefile qutIM.pro
28		27
29	do-install:	28	do-install:
30	@${INSTALL_PROGRAM} ${WRKSRC}/qutIM ${PREFIX}/bin	29	@${INSTALL_PROGRAM} ${WRKSRC}/build/bin/qutIM ${PREFIX}/bin
31		30
32	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Line 0 Link Here

(-)/home/kibab/repos/ports-mine/qutim/files/patch-protocol-oscar-icq-contactlist.cpp (+26 lines)
	1	--- protocol/oscar/icq/contactlist.cpp.orig 2008-07-22 19:34:21.000000000 +0400
	2	+++ protocol/oscar/icq/contactlist.cpp 2008-07-22 20:14:46.000000000 +0400
	3	@@ -16,6 +16,7 @@
	4	//#include <QtGui>
	5	#include <QTcpSocket>
	6	#include <QNetworkProxy>
	7	+#include <sys/time.h>
	8	#include "treegroupitem.h"
	9	#include "treebuddyitem.h"
	10	#include "icqmessage.h"
	11	@@ -1559,8 +1560,14 @@
	12	msg->message = codec->toUnicode(socket->read(length - 1));
	13
	14	QDateTime curTime = QDateTime::currentDateTime();
	15	+
	16	+ // Use POSIX-compatible way to get daylight saving correction
	17	+ struct timeval tp;
	18	+ struct timezone tzp;
	19	+ gettimeofday(&tp, &tzp);
	20	+
	21	int offset = (curTime.toLocalTime().time().hour() - curTime.toUTC().time().hour()) * 3600 +
	22	- (curTime.toLocalTime().time().minute() - curTime.toUTC().time().minute()) * 60 - daylight * 3600;
	23	+ (curTime.toLocalTime().time().minute() - curTime.toUTC().time().minute()) * 60 - tzp.tz_dsttime * 3600;
	24	offlineDateTime = offlineDateTime.addSecs(offset);
	25
	26	msg->date = offlineDateTime;

Lines 1-16 Link Here

(-)/home/kibab/repos/ports-mine/qutim/files/patch-src-qutim.cpp (-16 lines)
1	diff -ur qutIM/src/qutim.cpp qutIM.mine/src/qutim.cpp
2	--- src/qutim.cpp 2008-06-11 16:11:00.000000000 +0400
3	+++ src/qutim.cpp 2008-06-15 21:49:52.000000000 +0400
4	@@ -59,10 +59,10 @@
5	offlineList = NULL;
6	setAttribute(Qt::WA_AlwaysShowToolTips, true);
7	setFocus(Qt::ActiveWindowFocusReason);
8	+ createActions();
9	+ createTrayIcon();
10	if ( QSystemTrayIcon::isSystemTrayAvailable() )
11	{
12	- createActions();
13	- createTrayIcon();
14	trayIcon->show();
15	connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
16	this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));