From owner-svn-ports-head@freebsd.org Mon Jan 11 11:56:29 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F82AA6C42C; Mon, 11 Jan 2016 11:56:29 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6DD21A5C; Mon, 11 Jan 2016 11:56:28 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0BBuRQQ032356; Mon, 11 Jan 2016 11:56:27 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0BBuRvh032355; Mon, 11 Jan 2016 11:56:27 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201601111156.u0BBuRvh032355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 11 Jan 2016 11:56:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405776 - head/www/otter-browser/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jan 2016 11:56:29 -0000 Author: rakuco Date: Mon Jan 11 11:56:27 2016 New Revision: 405776 URL: https://svnweb.freebsd.org/changeset/ports/405776 Log: Fix build on 9.x after r405485. Add a patch to work around base GCC's stupidity. See the patch itself for more information. Added: head/www/otter-browser/files/patch-src_ui_CertificateDialog.h (contents, props changed) Added: head/www/otter-browser/files/patch-src_ui_CertificateDialog.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/otter-browser/files/patch-src_ui_CertificateDialog.h Mon Jan 11 11:56:27 2016 (r405776) @@ -0,0 +1,20 @@ +Workaround for base GCC, which is too stupid to understand the declaration +below: + +/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: expected ',' or '...' before '>' token +/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: wrong number of template arguments (1, should be 2) +/usr/local/include/qt5/QtCore/qcontainerfwd.h:46: error: provided for 'template class QMap' +/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: default argument missing for parameter 4 of 'QStandardItem* Otter::CertificateDialog::createField(Otter::CertificateDialog::CertificateField, QStandardItem*, const QMap&, QVariant)' +/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.cpp:388: error: prototype for 'QStandardItem* Otter::CertificateDialog::createField(Otter::CertificateDialog::CertificateField, QStandardItem*, const QMap&)' does not match any in class 'Otter::CertificateDialog' +/wrkdirs/usr/ports/www/otter-browser/work/otter-browser-0.9.09/src/ui/CertificateDialog.h:66: error: candidate is: QStandardItem* Otter::CertificateDialog::createField(Otter::CertificateDialog::CertificateField, QStandardItem*, const QMap&, QVariant) +--- src/ui/CertificateDialog.h.orig 2016-01-11 10:50:08 UTC ++++ src/ui/CertificateDialog.h +@@ -63,7 +63,7 @@ public: + + protected: + void changeEvent(QEvent *event); +- QStandardItem* createField(CertificateField field, QStandardItem *parent = NULL, const QMap &data = QMap()); ++ QStandardItem* createField(CertificateField field, QStandardItem *parent = NULL, const QMap &data = (QMap())); + QString formatHex(const QString &source, const QChar &separator = QLatin1Char(' ')); + + protected slots: