Patch so Inkscape will compile on Solaris 10 from LP https://bugs.launchpad.net/inksc...

diff --git a/configure.ac b/configure.ac
index 852970ba8d2a579c020035ef60d6fff147f2e70c..98b8889775a5dff06c3f611eaffb619cc2234946 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -257,19 +257,20 @@ esac
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 
-AC_MSG_CHECKING([for Solaris 2.8 platform])
+AC_MSG_CHECKING([for Solaris platform])
 case "$host" in
-  *-solaris2.8)
-    platform_solaris_2_8=yes
-    CFLAGS="$CFLAGS -DSOLARIS_2_8"
-    CXXFLAGS="$CXXFLAGS -DSOLARIS_2_8"
+  *-solaris2.*)
+    platform_solaris=yes
+    solaris_version=`echo $host|sed -e 's/^.*-solaris2\.//' -e s'/\..*$//'`
+    CFLAGS="$CFLAGS -DSOLARIS=$solaris_version"
+    CXXFLAGS="$CXXFLAGS -DSOLARIS=$solaris_version"
     ;;
   *)
-    platform_solaris_2_8=no
+    platform_solaris=no
     ;;
 esac
-AC_MSG_RESULT([$platform_solaris_2_8])
-AM_CONDITIONAL(PLATFORM_SOLARIS_2_8, test "$platform_solaris_2_8" = "yes")
+AC_MSG_RESULT([$platform_solaris])
+AM_CONDITIONAL(PLATFORM_SOLARIS, test "$platform_solaris" = "yes")
 
 dnl ******************************
 dnl Xft checking

diff --git a/src/2geom/isnan.h b/src/2geom/isnan.h
index 6b94daa6e5c61826784c2799af54ee1226a37df5..d95a45f10d721d655d4a4e958a67ee321858b9fe 100644 (file)
--- a/src/2geom/isnan.h
+++ b/src/2geom/isnan.h
@@ -34,7 +34,7 @@
 # define IS_NAN(_a) (_isnan(_a))       /* Win32 definition */
 #elif defined(isnan) || defined(__FreeBSD__) || defined(__osf__)
 # define IS_NAN(_a) (isnan(_a))                /* GNU definition */
-#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
+#elif defined (SOLARIS)
 # define IS_NAN(_a) (isnan(_a))                /* GNU definition */
 #else
 # define IS_NAN(_a) (std::isnan(_a))
@@ -55,7 +55,7 @@
 # define IS_FINITE(_a) (isfinite(_a))
 #elif defined(__osf__)
 # define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a))
-#elif defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
+#elif defined (SOLARIS)
 #include  <ieeefp.h>
 #define IS_FINITE(_a) (finite(_a) && !IS_NAN(_a))
 #else

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 23ac82fb60d692419cd90a2912b120c00caef404..a84909382ae313332760f9611f03d29cc8b35702 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -305,15 +305,15 @@ FOREACH(dirlistsrc ${libfolders})
   ADD_SUBDIRECTORY(${dirlistsrc})\r
 ENDFOREACH(dirlistsrc)\r
 
-
+message(status "${INKSCAPE_LIBS}")
 ADD_LIBRARY(sp STATIC ${SP_SRC})\r
 TARGET_LINK_LIBRARIES(sp \r
-       "${INKSCAPE_LIBS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp\r
+        2geom avoid cola croco gdl nr nrtype vpsc livarot\r
 )\r
 # make executable for INKSCAPE\r
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})\r
 TARGET_LINK_LIBRARIES(inkscape\r
-       "${INKSCAPE_LIBS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp\r
+        2geom avoid cola croco gdl nr nrtype vpsc livarot sp\r
 )
 
 # make executable for INKVIEW

diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 62b3893c2297e726cd7bc5b805962c7e441daca8..f7a04fd50383541d17dbd62f395b26ff993299a5 100644 (file)
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -46,7 +46,7 @@
 #include "libnr/nr-scale.h"
 #include "svg/svg-length.h"
 #include "sp-filter-units.h"
-#if defined (SOLARIS_2_8)
+#if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
 using Inkscape::round;
 #endif 

diff --git a/src/display/pixblock-transform.cpp b/src/display/pixblock-transform.cpp
index 730f0ad4318e1987678b09e8a13bef13bb72a1d4..74ded2ae0bf24731cc6fe5ae92d525360d7bf9c2 100644 (file)
--- a/src/display/pixblock-transform.cpp
+++ b/src/display/pixblock-transform.cpp
@@ -13,7 +13,7 @@
 
 #include <glib.h>
 #include <cmath>
-#if defined (SOLARIS_2_8)
+#if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
 using Inkscape::round;
 #endif 

diff --git a/src/isinf.h b/src/isinf.h
index 92c885701d1bfcc36369648c3095c65ae784f92b..7799d2876cdccbeaf824354b216c613eb9ad724c 100644 (file)
--- a/src/isinf.h
+++ b/src/isinf.h
@@ -5,7 +5,7 @@
  * Fix for missing std::isnormal with SOLARIS8/GCC3.2
  */
  
-#if defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
+#if defined (SOLARIS)
 
        #include <ieeefp.h>
        #define isinf(x) ((fpclass(x) == FP_NINF) || (fpclass(x) == FP_PINF))

diff --git a/src/isnormal.h b/src/isnormal.h
index 6587331c362c86a382ba329b54639eb7876b8097..d5310592624dbddea50752ea13d1ecf3bcca6266 100644 (file)
--- a/src/isnormal.h
+++ b/src/isnormal.h
@@ -5,7 +5,7 @@
  * Fix for missing std::isnormal with SOLARIS8/GCC3.2
  */
  
-#if defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
+#if defined (SOLARIS)
 
        #include <ieeefp.h>
        #define isnormal(x) (fpclass(x) >= FP_NZERO)

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index c6e36aa8e076b81213efdb8ef5ed91c25342f0ad..8744a4be0aa80ae1da7242cb520ef22d3d9b16bd 100644 (file)
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -62,7 +62,7 @@
 #include "box3d-context.h"
 #include "sp-image.h"
 
-#if defined (SOLARIS_2_8)
+#if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
 using Inkscape::round;
 #endif