From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 1 17:00:12 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AC021065672 for ; Sat, 1 Aug 2009 17:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 632888FC15 for ; Sat, 1 Aug 2009 17:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n71H0C2Y018014 for ; Sat, 1 Aug 2009 17:00:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n71H0CnW018006; Sat, 1 Aug 2009 17:00:12 GMT (envelope-from gnats) Resent-Date: Sat, 1 Aug 2009 17:00:12 GMT Resent-Message-Id: <200908011700.n71H0CnW018006@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5041106564A for ; Sat, 1 Aug 2009 16:55:01 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id C2F048FC17 for ; Sat, 1 Aug 2009 16:55:00 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU ([80.83.239.5]) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id n71GsthD000308 for ; Sun, 2 Aug 2009 03:55:00 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id n71GsJfW086846 for ; Sun, 2 Aug 2009 03:54:19 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Message-Id: <1249145659.69003@Fluffy.Khv.RU> Date: Sun, 2 Aug 2009 03:54:19 +1100 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/137339: deskutils/qorganizer: fix build with qt-4.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Aug 2009 17:00:12 -0000 >Number: 137339 >Category: ports >Synopsis: deskutils/qorganizer: fix build with qt-4.5 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 01 17:00:11 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 8.0-800106-BETA2 i386 >Organization: Fluffy.Khv.RU >Environment: System: FreeBSD 8.0-800106-BETA2 #1: Thu Jul 30 17:59:30 VLAST 2009 root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: http://qtscriptgenerator.googlecode.com Patch obtained from AltLinux Sisyphus repository >How-To-Repeat: >Fix: --- qorganizer.diff begins here --- --- /dev/null 2009-08-02 03:52:01.000000000 +1100 +++ deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0 2009-08-02 03:47:56.000000000 +1100 @@ -0,0 +1,22 @@ +--- qOrganizer/src/qorganizer.cpp.orig 2009-04-06 07:56:17 +0000 ++++ qOrganizer/src/qorganizer.cpp 2009-04-06 07:56:23 +0000 +@@ -1511,7 +1511,7 @@ void CQTextEdit::insertFromMimeData( con + QImage *image = new QImage(origin); + if(!image->isNull()) + { +- document->addResource(QTextDocument::ImageResource,origin,image); ++ document->addResource(QTextDocument::ImageResource,origin,QVariant::fromValue(image)); + cursor.insertImage(origin); + } + delete image; +--- qOrganizer/src/qorganizer.h.orig 2009-04-06 07:56:12 +0000 ++++ qOrganizer/src/qorganizer.h 2009-04-06 07:56:39 +0000 +@@ -104,6 +104,8 @@ class CQTextEdit:public QTextEdit + + }; + ++Q_DECLARE_METATYPE(QImage*); ++ + //LineEdit with clear button on the right. + + class LineEdit : public QLineEdit --- qorganizer.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: