[gentoo-commits] gentoo-x86 commit in media-libs/SoQt/files: SoQt-1.4.1-gcc44.patch

[Victor Ostorga (vostorga)]

vostorga    09/10/27 22:02:49

  Modified:             SoQt-1.4.1-gcc44.patch
  Log:
  Updating patch to compile against gcc 4.4 , detecting if >=media-libs/coin-3* is installed
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.2                  media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch?r1=1.1&r2=1.2

Index: SoQt-1.4.1-gcc44.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoQt-1.4.1-gcc44.patch	23 Aug 2009 19:02:16 -0000	1.1
+++ SoQt-1.4.1-gcc44.patch	27 Oct 2009 22:02:48 -0000	1.2
@@ -1,11 +1,22 @@
---- ./src/Inventor/Qt/SoQtComponent.cpp.orig	2006-10-30 16:09:20.000000000 -0600
-+++ ./src/Inventor/Qt/SoQtComponent.cpp	2009-08-17 08:07:57.000000000 -0500
-@@ -100,7 +100,7 @@
+diff -ru soqt-1.4.1~/src/Inventor/Qt/SoQtComponent.cpp soqt-1.4.1/src/Inventor/Qt/SoQtComponent.cpp
+--- soqt-1.4.1~/src/Inventor/Qt/SoQtComponent.cpp	2009-02-25 07:55:02.000000000 -0800
++++ soqt-1.4.1/src/Inventor/Qt/SoQtComponent.cpp	2009-02-25 07:56:36.000000000 -0800
+@@ -100,10 +100,17 @@
    this->parent->removeEventFilter(this);
  }
  
--static void delete_dict_value(unsigned long key, void * value)
-+static void delete_dict_value(SbDictKeyType key, void * value)
++#if COIN_MAJOR_VERSION >= 3
++static void delete_dict_value(SbDict::Key key, void * value)
++{
++  delete (QCursor *)value;
++}
++#else // COIN_MAJOR_VERSION >= 3
+ static void delete_dict_value(unsigned long key, void * value)
  {
    delete (QCursor *)value;
  }
++#endif // COIN_MAJOR_VERSION < 3
+ 
+ void
+ SoQtComponentP::atexit_cleanup()
+