Date: Sun, 30 Dec 2012 06:20:27 +0000 (UTC) From: TAKATSU Tomonari <tota@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309652 - in head/devel/dbus-qt3: . files Message-ID: <201212300620.qBU6KRsM041056@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tota Date: Sun Dec 30 06:20:27 2012 New Revision: 309652 URL: http://svnweb.freebsd.org/changeset/ports/309652 Log: - Cleanup some codes - Don't use deprecated dbus symbols - Update maintainer's e-mail address - Convert to new Makefile header - Update WWW in pkg-descr PR: ports/172912 (based on) Submitted by: Maxim Samsonov (maintainer) Added: head/devel/dbus-qt3/files/ head/devel/dbus-qt3/files/patch-connection.cpp (contents, props changed) head/devel/dbus-qt3/files/patch-integrator.cpp (contents, props changed) head/devel/dbus-qt3/files/patch-message.cpp (contents, props changed) Modified: head/devel/dbus-qt3/Makefile head/devel/dbus-qt3/pkg-descr Modified: head/devel/dbus-qt3/Makefile ============================================================================== --- head/devel/dbus-qt3/Makefile Sun Dec 30 05:58:16 2012 (r309651) +++ head/devel/dbus-qt3/Makefile Sun Dec 30 06:20:27 2012 (r309652) @@ -1,9 +1,5 @@ -# New ports collection makefile for: dbus-qt3 -# Date created: 2006-10-18 -# Whom: Maxim Samsonov <xors@sendmail.ru> -# +# Created by: Maxim Samsonov <xors@sendmail.ru> # $FreeBSD$ -# PORTNAME= dbus PORTVERSION= 0.70 @@ -14,10 +10,10 @@ MASTER_SITE_SUBDIR= distfiles PKGNAMESUFFIX= -qt3 DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -MAINTAINER= xors@mne.ru +MAINTAINER= xors@mailup.net COMMENT= Qt3 bindings for the D-BUS messaging system -LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ +LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ qt-mt:${PORTSDIR}/x11-toolkits/qt33 USE_BZIP2= yes Added: head/devel/dbus-qt3/files/patch-connection.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus-qt3/files/patch-connection.cpp Sun Dec 30 06:20:27 2012 (r309652) @@ -0,0 +1,19 @@ +--- connection.cpp.orig 2006-07-18 16:15:13.000000000 +0400 ++++ connection.cpp 2008-05-30 00:09:02.000000000 +0400 +@@ -106,7 +106,7 @@ + + void Connection::close() + { +- dbus_connection_close( d->connection ); ++ dbus_connection_unref( d->connection ); + } + + void Connection::flush() +@@ -154,6 +154,7 @@ + + void* Connection::virtual_hook( int, void* ) + { ++ return (void *)NULL; + } + + void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection) Added: head/devel/dbus-qt3/files/patch-integrator.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus-qt3/files/patch-integrator.cpp Sun Dec 30 06:20:27 2012 (r309652) @@ -0,0 +1,20 @@ +--- integrator.cpp.orig 2008-05-30 00:12:59.000000000 +0400 ++++ integrator.cpp 2008-05-30 00:15:20.000000000 +0400 +@@ -190,7 +190,7 @@ + qtwatch->watch = watch; + + int flags = dbus_watch_get_flags( watch ); +- int fd = dbus_watch_get_fd( watch ); ++ int fd = dbus_watch_get_unix_fd( watch ); + + if ( flags & DBUS_WATCH_READABLE ) { + qtwatch->readSocket = new QSocketNotifier( fd, QSocketNotifier::Read, this ); +@@ -207,7 +207,7 @@ + + void Integrator::removeWatch( DBusWatch *watch ) + { +- int key = dbus_watch_get_fd( watch ); ++ int key = dbus_watch_get_unix_fd( watch ); + + Watch *qtwatch = m_watches.take( key ); + Added: head/devel/dbus-qt3/files/patch-message.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus-qt3/files/patch-message.cpp Sun Dec 30 06:20:27 2012 (r309652) @@ -0,0 +1,74 @@ +--- message.cpp.orig 2006-07-18 15:42:53.000000000 +0400 ++++ message.cpp 2008-05-30 00:09:02.000000000 +0400 +@@ -359,6 +359,7 @@ + Message Message::operator=( const Message& other ) + { + //FIXME: ref the other.d->msg instead of copying it? ++ return (Message &)(d->msg); + } + /** + * Destructs message. +@@ -508,42 +509,49 @@ + const dbus_bool_t right_size_bool = b; + dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_INT8 byte ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_INT32 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_UINT32 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_INT64 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_UINT64 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( double num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( const QString& str ) +@@ -551,11 +559,13 @@ + const char *u = str.utf8(); + dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( const QVariant& custom ) + { + //FIXME: imeplement ++ return (Message &)(d->msg); + } + + } Modified: head/devel/dbus-qt3/pkg-descr ============================================================================== --- head/devel/dbus-qt3/pkg-descr Sun Dec 30 05:58:16 2012 (r309651) +++ head/devel/dbus-qt3/pkg-descr Sun Dec 30 06:20:27 2012 (r309652) @@ -1,3 +1,3 @@ Qt3 bindings for the D-BUS interprocess messaging system. -WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings +WWW: http://www.freedesktop.org/wiki/Software/DBusBindings
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212300620.qBU6KRsM041056>