Date: Sun, 19 Sep 2004 20:58:39 +0200 From: "Arjan van Leeuwen" <avleeuwen@piwebs.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/71913: Unbreak PixiePlus on 5.x Message-ID: <1095620319.0@vincent.piwebs.com> Resent-Message-ID: <200409191900.i8JJ0ft8055265@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 71913
>Category: ports
>Synopsis: Unbreak PixiePlus on 5.x
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 19 19:00:41 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Arjan van Leeuwen
>Release: FreeBSD 5.3-BETA5 amd64
>Organization:
>Environment:
System: FreeBSD 5.3-BETA5 #0: Sat Sep 18 20:57:02 CEST 2004
root@vincent.piwebs.com:/usr/obj/usr/src/sys/VINCENT
>Description:
This patch unbreaks Pixie Plus (graphics/pixieplus) on 5.x (it's not marked broken yet, but it is).
Thanks to Emanuel Strobl for reminding me.
>How-To-Repeat:
>Fix:
--- pixieplus.diff begins here ---
diff -urN /usr/ports/graphics/pixieplus/files/patch-app_batch.cpp pixieplus/files/patch-app_batch.cpp
--- /usr/ports/graphics/pixieplus/files/patch-app_batch.cpp Thu Jan 1 01:00:00 1970
+++ pixieplus/files/patch-app_batch.cpp Sat Sep 18 22:14:12 2004
@@ -0,0 +1,23 @@
+--- app/batch.cpp.orig Sat Sep 18 22:02:13 2004
++++ app/batch.cpp Sat Sep 18 22:03:11 2004
+@@ -618,9 +618,9 @@
+ else if(type == Equalize)
+ EqualizeImage(img);
+ else if(type == IncContrast)
+- ContrastImage(img, true);
++ ContrastImage(img, (MagickBooleanType)true);
+ else if(type == DecContrast)
+- ContrastImage(img, false);
++ ContrastImage(img, (MagickBooleanType)false);
+ else if(type == Solarize)
+ SolarizeImage(img, weight);
+ else if(type == Threshold)
+@@ -752,7 +752,7 @@
+ save = false;
+ }
+ else if(type == Shade){
+- Image *tmp = ShadeImage(img, useColor, a, e, &exception);
++ Image *tmp = ShadeImage(img, (MagickBooleanType)useColor, a, e, &exception);
+ if(tmp){
+ if(img->next)
+ DestroyImageList(img);
diff -urN /usr/ports/graphics/pixieplus/files/patch-app_ifapp.cpp pixieplus/files/patch-app_ifapp.cpp
--- /usr/ports/graphics/pixieplus/files/patch-app_ifapp.cpp Thu Jan 1 01:00:00 1970
+++ pixieplus/files/patch-app_ifapp.cpp Sat Sep 18 22:14:29 2004
@@ -0,0 +1,25 @@
+--- app/ifapp.cpp.orig Sat Sep 18 22:08:01 2004
++++ app/ifapp.cpp Sat Sep 18 22:10:56 2004
+@@ -33,18 +33,18 @@
+
+ // ImageMagick message and progress stubs
+ extern "C"{
+- unsigned int magickMonitor(const char *msg, const off_t value,
+- const long long unsigned int span, ExceptionInfo *)
++ MagickBooleanType magickMonitor(const char *msg, const MagickOffsetType value,
++ const MagickSizeType span, ExceptionInfo *)
+ {
+ if(!appPtr)
+- return(true);
++ return((MagickBooleanType)true);
+ int val = (int)((((float)value)/((float)span))*100.0);
+ if(appPtr->magickMessageProgress())
+ appPtr->magickMessageProgress()->setValue(val);
+ if(appPtr->magickMessageLabel())
+ appPtr->magickMessageLabel()->setText(msg);
+ appPtr->processEvents();
+- return(true);
++ return((MagickBooleanType)true);
+ }
+
+ void magickWarning(const ExceptionType /*warning*/, const char *reason,
diff -urN /usr/ports/graphics/pixieplus/files/patch-app_rightclick.cpp pixieplus/files/patch-app_rightclick.cpp
--- /usr/ports/graphics/pixieplus/files/patch-app_rightclick.cpp Thu Jan 1 01:00:00 1970
+++ pixieplus/files/patch-app_rightclick.cpp Sat Sep 18 22:14:46 2004
@@ -0,0 +1,11 @@
+--- app/rightclick.cpp.orig Sat Sep 18 22:05:03 2004
++++ app/rightclick.cpp Sat Sep 18 22:05:36 2004
+@@ -220,7 +220,7 @@
+ idx = -1;
+ }
+ if(idx != -1){
+- QStringList itemList(view->itemCatagories(&itemList[idx]));
++ QStringList itemList(view->itemCatagories((Thumbnail*)&itemList[idx]));
+ for(it=catList.begin(), i=1000; it != catList.end(); ++it, ++i){
+ if(itemList.findIndex((*it)) == -1)
+ addMnu->insertItem((*it), i);
diff -urN /usr/ports/graphics/pixieplus/files/patch-misc_qxcfi.cpp pixieplus/files/patch-misc_qxcfi.cpp
--- /usr/ports/graphics/pixieplus/files/patch-misc_qxcfi.cpp Thu Jan 1 01:00:00 1970
+++ pixieplus/files/patch-misc_qxcfi.cpp Sat Sep 18 22:00:54 2004
@@ -0,0 +1,11 @@
+--- misc/qxcfi.cpp.orig Sat Sep 18 21:59:48 2004
++++ misc/qxcfi.cpp Sat Sep 18 22:00:16 2004
+@@ -1342,7 +1342,7 @@
+ bool XCFImageFormat::loadProperty ( QDataStream& xcf_io, PropType& type,
+ QByteArray& bytes )
+ {
+- xcf_io >> (Q_UINT32)type;
++ xcf_io >> (Q_UINT32&)type;
+
+ if ( xcf_io.device()->status() != IO_Ok ) {
+ qDebug( "XCF: read failure on property type" );
--- pixieplus.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?1095620319.0>