Date: Wed, 1 Dec 2010 23:32:57 GMT From: Max Brazhnikov <makc@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/152760: net-im/vacuum-im: fix build with upcoming Qt-4.7 Message-ID: <201012012332.oB1NWvfl025752@red.freebsd.org> Resent-Message-ID: <201012012340.oB1Ne93Q007977@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152760
>Category: ports
>Synopsis: net-im/vacuum-im: fix build with upcoming Qt-4.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 01 23:40:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Max Brazhnikov
>Release: FreeBSD 8.2-PRERELEASE amd64
>Organization:
>Environment:
FreeBSD luna.dio.ru 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Tue Nov 30 22:58:45 MSK 2010 root@luna.dio.ru:/usr/obj/usr/freebsd/8/src/sys/LUNA amd64
>Description:
Add patch to fix build with Qt-4.7
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: files/patch-src__plugins__dataforms__dataforms.cpp
===================================================================
RCS file: files/patch-src__plugins__dataforms__dataforms.cpp
diff -N files/patch-src__plugins__dataforms__dataforms.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-src__plugins__dataforms__dataforms.cpp 1 Dec 2010 23:30:33 -0000
@@ -0,0 +1,14 @@
+--- ./src/plugins/dataforms/dataforms.cpp.orig 2010-02-04 23:15:54.000000000 +0300
++++ ./src/plugins/dataforms/dataforms.cpp 2010-12-02 00:40:53.396505897 +0300
+@@ -1087,9 +1087,11 @@
+ reply->ignoreSslErrors();
+ }
+
++#if (QT_VERSION <= QT_VERSION_CHECK(4, 7, 0))
+ uint qHash(const QUrl &key)
+ {
+ return qHash(key.toString());
+ }
++#endif
+
+ Q_EXPORT_PLUGIN2(plg_dataforms, DataForms);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012012332.oB1NWvfl025752>