- Fix build on 5.x

PR:		ports/71913
Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)
Approved by:	portmgr (marcus, wca)

4 files changed, 70 insertions, 0 deletions

diff --git a/graphics/pixieplus/files/patch-app_batch.cpp b/graphics/pixieplus/files/patch-app_batch.cpp
new file mode 100644
index 000000000000..a7346ea8ee5e
--- /dev/null
+++ b/graphics/pixieplus/files/patch-app_batch.cpp
@@ -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 --git a/graphics/pixieplus/files/patch-app_ifapp.cpp b/graphics/pixieplus/files/patch-app_ifapp.cpp
new file mode 100644
index 000000000000..b3a39396a0af
--- /dev/null
+++ b/graphics/pixieplus/files/patch-app_ifapp.cpp
@@ -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 --git a/graphics/pixieplus/files/patch-app_rightclick.cpp b/graphics/pixieplus/files/patch-app_rightclick.cpp
new file mode 100644
index 000000000000..637940569485
--- /dev/null
+++ b/graphics/pixieplus/files/patch-app_rightclick.cpp
@@ -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 --git a/graphics/pixieplus/files/patch-misc_qxcfi.cpp b/graphics/pixieplus/files/patch-misc_qxcfi.cpp
new file mode 100644
index 000000000000..1602b63068e5
--- /dev/null
+++ b/graphics/pixieplus/files/patch-misc_qxcfi.cpp
@@ -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" );