Date: Mon, 11 Jan 2016 11:56:27 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405776 - head/www/otter-browser/files Message-ID: <201601111156.u0BBuRvh032355@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 Key, class T> 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<int, QVariant>&, 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<int, QVariant>&)' 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<int, QVariant>&, 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<int, QVariant> &data = QMap<int, QVariant>()); ++ QStandardItem* createField(CertificateField field, QStandardItem *parent = NULL, const QMap<int, QVariant> &data = (QMap<int, QVariant>())); + QString formatHex(const QString &source, const QChar &separator = QLatin1Char(' ')); + + protected slots:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601111156.u0BBuRvh032355>