Date: Sun, 2 Aug 2009 03:54:19 +1100 From: "Dima Panov" <fluffy@fluffy.khv.ru> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/137339: deskutils/qorganizer: fix build with qt-4.5 Message-ID: <1249145659.69003@Fluffy.Khv.RU> Resent-Message-ID: <200908011700.n71H0CnW018006@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1249145659.69003>