[pkgsrc/trunk]: pkgsrc/graphics/kipi-plugins-kde3 Fix build with glib2>=2.25

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/734249d0ea1a
branches:  trunk
changeset: 583870:734249d0ea1a
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Jan 03 20:47:01 2011 +0000

description:
Fix build with glib2>=2.25

diffstat:

 graphics/kipi-plugins-kde3/distinfo         |   4 ++--
 graphics/kipi-plugins-kde3/patches/patch-ab |  10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 594d4a1b7925 -r 734249d0ea1a graphics/kipi-plugins-kde3/distinfo
--- a/graphics/kipi-plugins-kde3/distinfo       Mon Jan 03 20:45:27 2011 +0000
+++ b/graphics/kipi-plugins-kde3/distinfo       Mon Jan 03 20:47:01 2011 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/02/15 14:37:57 wiz Exp $
+$NetBSD: distinfo,v 1.2 2011/01/03 20:47:01 markd Exp $
 
 SHA1 (kipi-plugins-0.1.7.tar.bz2) = 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216
 RMD160 (kipi-plugins-0.1.7.tar.bz2) = f66473c11e66f9e06aa6772c7952b640b565def9
 Size (kipi-plugins-0.1.7.tar.bz2) = 8836654 bytes
 SHA1 (patch-aa) = 02e5cb365c7fb4e24c7236b592af3d00eeab1fdf
-SHA1 (patch-ab) = db8b5ecc602026d3d6dd39297311d693537b68ce
+SHA1 (patch-ab) = 777834238d49c0b02c7e1d5c63dbdf0d27f13e24
 SHA1 (patch-ac) = 0022166061696e3db820c97be64e2780a63e8b4c
diff -r 594d4a1b7925 -r 734249d0ea1a graphics/kipi-plugins-kde3/patches/patch-ab
--- a/graphics/kipi-plugins-kde3/patches/patch-ab       Mon Jan 03 20:45:27 2011 +0000
+++ b/graphics/kipi-plugins-kde3/patches/patch-ab       Mon Jan 03 20:47:01 2011 +0000
@@ -1,19 +1,21 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/02/15 14:37:58 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2011/01/03 20:47:01 markd Exp $
 
 --- kipi-plugins/ipodexport/ipodexportdialog.cpp.orig  2008-12-13 11:20:05.000000000 +0000
 +++ kipi-plugins/ipodexport/ipodexportdialog.cpp
-@@ -47,6 +47,10 @@
+@@ -47,6 +47,12 @@
  #include <libkipi/imagedialog.h>
  #endif
  
 +extern "C" {
++#undef signals
 +#include <gdk-pixbuf/gdk-pixbuf.h>
++#define signals protected
 +}
 +
  #define debug() kdDebug()
  
  using namespace IpodExport;
-@@ -344,9 +348,13 @@ UploadDialog::ipodItemSelected( QListVie
+@@ -344,9 +350,13 @@ UploadDialog::ipodItemSelected( QListVie
          return;
  
      Itdb_Artwork *artwork = item->artwork();
@@ -29,7 +31,7 @@
      {
          debug() << "no thumb was found" << endl;
          return;
-@@ -361,6 +369,9 @@ UploadDialog::ipodItemSelected( QListVie
+@@ -361,6 +371,9 @@ UploadDialog::ipodItemSelected( QListVie
  //     QPixmap pix;
  //     pix.convertFromImage( image );
  //     m_ipodPreview->setPixmap( pix );