From owner-svn-ports-all@FreeBSD.ORG Fri Aug 30 12:11:49 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 912B864C; Fri, 30 Aug 2013 12:11:49 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6FBFC2F4A; Fri, 30 Aug 2013 12:11:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7UCBnW9006395; Fri, 30 Aug 2013 12:11:49 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7UCBmp7006387; Fri, 30 Aug 2013 12:11:48 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201308301211.r7UCBmp7006387@svn.freebsd.org> From: Chris Rees Date: Fri, 30 Aug 2013 12:11:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325674 - in head/net-p2p: transmission-cli/files transmission-qt4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Aug 2013 12:11:49 -0000 Author: crees Date: Fri Aug 30 12:11:48 2013 New Revision: 325674 URL: http://svnweb.freebsd.org/changeset/ports/325674 Log: Fix transmission-qt4 build. PR: ports/180292 Submitted by: naddy Obtained from: OpenBSD Added: head/net-p2p/transmission-cli/files/patch-qt_favicon_cc (contents, props changed) head/net-p2p/transmission-cli/files/patch-qt_file-tree_cc (contents, props changed) head/net-p2p/transmission-cli/files/patch-qt_qtr_pro (contents, props changed) head/net-p2p/transmission-cli/files/patch-qt_torrent-filter_cc (contents, props changed) Modified: head/net-p2p/transmission-qt4/Makefile Added: head/net-p2p/transmission-cli/files/patch-qt_favicon_cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/transmission-cli/files/patch-qt_favicon_cc Fri Aug 30 12:11:48 2013 (r325674) @@ -0,0 +1,28 @@ +$OpenBSD$ +--- qt/favicon.cc.orig Fri Aug 9 04:45:47 2013 ++++ qt/favicon.cc Thu Aug 22 16:39:50 2013 +@@ -14,7 +14,12 @@ + #include + #include + #include ++ ++#if QT_VERSION >= 0x050000 + #include ++#else ++#include ++#endif + + #include "favicon.h" + +@@ -40,7 +45,11 @@ Favicons :: ~Favicons( ) + QString + Favicons :: getCacheDir( ) + { ++#if QT_VERSION >= 0x050000 + const QString base = QStandardPaths::writableLocation (QStandardPaths::CacheLocation); ++#else ++ const QString base = QDesktopServices::storageLocation( QDesktopServices::CacheLocation ); ++#endif + return QDir( base ).absoluteFilePath( "favicons" ); + } + Added: head/net-p2p/transmission-cli/files/patch-qt_file-tree_cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/transmission-cli/files/patch-qt_file-tree_cc Fri Aug 30 12:11:48 2013 (r325674) @@ -0,0 +1,15 @@ +$OpenBSD$ +--- qt/file-tree.cc.orig Fri Aug 9 04:45:54 2013 ++++ qt/file-tree.cc Thu Aug 22 16:40:53 2013 +@@ -885,7 +885,11 @@ FileTreeView :: FileTreeView (QWidget * parent, bool i + for (int i=0; i= 0x050000 + header()->setSectionResizeMode(i, QHeaderView::Interactive); ++#else ++ header()->setResizeMode(i, QHeaderView::Interactive); ++#endif + } + + connect (this, SIGNAL(clicked(const QModelIndex&)), Added: head/net-p2p/transmission-cli/files/patch-qt_qtr_pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/transmission-cli/files/patch-qt_qtr_pro Fri Aug 30 12:11:48 2013 (r325674) @@ -0,0 +1,21 @@ +$OpenBSD: patch-qt_qtr_pro,v 1.4 2012/04/07 10:55:04 naddy Exp $ +--- qt/qtr.pro.orig Fri Aug 9 04:45:47 2013 ++++ qt/qtr.pro Thu Aug 22 16:37:03 2013 +@@ -8,7 +8,7 @@ target.path = /bin + INSTALLS += target + + unix: INSTALLS += man +-man.path = /share/man/man1/ ++man.path = /man/man1/ + man.files = transmission-qt.1 + + CONFIG += qt thread debug link_pkgconfig +@@ -26,7 +26,7 @@ LIBS += $${LIBUTP_LIBS} + LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a + LIBS += $${LIBUPNP_LIBS} + LIBS += $${LIBNATPMP_LIBS} +-unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt ++unix: LIBS += -L$${EVENT_TOP}/lib -lz -levent_core -levent_extra + win32:DEFINES += QT_DBUS + win32:LIBS += -levent-2.0 -lws2_32 -lintl + win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi Added: head/net-p2p/transmission-cli/files/patch-qt_torrent-filter_cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/transmission-cli/files/patch-qt_torrent-filter_cc Fri Aug 30 12:11:48 2013 (r325674) @@ -0,0 +1,12 @@ +$OpenBSD$ +--- qt/torrent-filter.cc.orig Sat Jul 6 22:21:17 2013 ++++ qt/torrent-filter.cc Sat Jul 6 22:29:10 2013 +@@ -211,7 +211,7 @@ TorrentFilter :: hiddenRowCount( ) const + void + TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const + { +- std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0); ++ std::fill_n (setmeCounts, int(FilterMode::NUM_MODES), 0); + + for (int row(0); ; ++row) + { Modified: head/net-p2p/transmission-qt4/Makefile ============================================================================== --- head/net-p2p/transmission-qt4/Makefile Fri Aug 30 12:11:16 2013 (r325673) +++ head/net-p2p/transmission-qt4/Makefile Fri Aug 30 12:11:48 2013 (r325674) @@ -9,8 +9,6 @@ COMMENT= Fast and lightweight QT4 BitTor LIB_DEPENDS= ${GEN_LIB_DEPENDS} RUN_DEPENDS= ${GEN_RUN_DEPENDS} -BROKEN= Requires newer version of Qt than in the ports tree - DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../transmission-cli PLIST= ${.CURDIR}/pkg-plist