From owner-cvs-all@FreeBSD.ORG Mon May 21 18:15:33 2012 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CBAE1065690; Mon, 21 May 2012 18:15:33 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EE348FC17; Mon, 21 May 2012 18:15:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q4LIFWKC091078; Mon, 21 May 2012 18:15:32 GMT (envelope-from rakuco@repoman.freebsd.org) Received: (from rakuco@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q4LIFW5w091077; Mon, 21 May 2012 18:15:32 GMT (envelope-from rakuco) Message-Id: <201205211815.q4LIFW5w091077@repoman.freebsd.org> From: Raphael Kubo da Costa Date: Mon, 21 May 2012 18:15:32 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/emulators/aqemu/files patch-Embedded_Display__vncview.cpp X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2012 18:15:33 -0000 rakuco 2012-05-21 18:15:32 UTC FreeBSD ports repository Added files: emulators/aqemu/files patch-Embedded_Display__vncview.cpp Log: Make the port build with the upcoming Qt 4.8.1. vncview.cpp defines a macro called "error" (which is ugly), and qfile.h, which is included later, defined a class method called error, and conflicts arise. Fix it by moving the macro definition after the Qt headers are included. Revision Changes Path 1.1 +26 -0 ports/emulators/aqemu/files/patch-Embedded_Display__vncview.cpp (new)