diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-11 11:56:27 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-11 11:56:27 +0000 |
| commit | 2f702f2ac17499d23720703da2087df796d954f7 (patch) | |
| tree | 9748fb09e5b38fc6e078fb700ad3ecc3f2cb9f17 /www/otter-browser | |
| parent | 1ca69edf07cbc5339a4d8d10035aeb86e07e6810 (diff) | |
| download | ports-2f702f2ac17499d23720703da2087df796d954f7.tar.gz ports-2f702f2ac17499d23720703da2087df796d954f7.zip | |
Fix build on 9.x after r405485.
Add a patch to work around base GCC's stupidity. See the patch itself
for more information.
Notes
Notes:
svn path=/head/; revision=405776
Diffstat (limited to 'www/otter-browser')
| -rw-r--r-- | www/otter-browser/files/patch-src_ui_CertificateDialog.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/www/otter-browser/files/patch-src_ui_CertificateDialog.h b/www/otter-browser/files/patch-src_ui_CertificateDialog.h new file mode 100644 index 000000000000..4774ff195e28 --- /dev/null +++ b/www/otter-browser/files/patch-src_ui_CertificateDialog.h @@ -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: |