r18186 by craig - Push some of the Haiku stuff to 1.5.0svn even though we only support cairo in 1.5.x and cairo doesnt work on Haiku yet

Tue Mar 5 21:23:12 UTC 2013

Author: craig
Date: Tue Mar  5 21:23:12 2013
New Revision: 18186

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18186
Log:
Push some of the Haiku stuff to 1.5.0svn even though we only support cairo in 1.5.x and cairo doesnt work on Haiku yet

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/scclocale.cpp
    trunk/Scribus/scribus/scclocale.h

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18186&path=/trunk/Scribus/CMakeLists.txt
==============================================================================

--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Tue Mar  5 21:23:12 2013
@@ -642,7 +642,7 @@
 #>>Render Library
 
 #<<CUPS
-IF(NOT WIN32)
+IF(NOT WIN32 AND NOT HAIKU)
   IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
     SET(Cups_DIR ${CMAKE_MODULE_PATH})
   ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
@@ -651,10 +651,10 @@
     SET(HAVE_CUPS 1)
     MESSAGE("CUPS Library Found OK")
   ENDIF(CUPS_FOUND)
-ELSE(NOT WIN32)
+ELSE(NOT WIN32 AND NOT HAIKU)
   # Windows doesn't use CUPS
   SET(CUPS_INCLUDE_DIR)
-ENDIF(NOT WIN32)
+ENDIF(NOT WIN32 AND NOT HAIKU)
 #>>CUPS
 
 #<<LibXML2
@@ -725,8 +725,8 @@
 IF (WANT_HUNSPELL)
   FIND_PACKAGE(HUNSPELL)
   IF (HUNSPELL_FOUND)
-    MESSAGE("Hunspell Found OK")
-    SET(HAVE_HUNSPELL 1)
+	MESSAGE("Hunspell Found OK")
+	SET(HAVE_HUNSPELL 1)
   ELSE (HUNSPELL_FOUND)
 	MESSAGE("Hunspell or its developer libraries NOT found - Disabling support for spell checking")
   ENDIF (HUNSPELL_FOUND)
@@ -835,7 +835,6 @@
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/scribus
   ${QT_INCLUDES}
-  ${CUPS_INCLUDE_DIR}
   ${FREETYPE_INCLUDE_DIR}
   ${FONTCONFIG_INCLUDE_DIR}
   ${JPEG_INCLUDE_DIR}
@@ -846,6 +845,12 @@
   ${OSG_INCLUDE_DIR}
   ${GSL_INCLUDE_DIR}
 )
+
+IF (NOT WIN32 AND NOT HAIKU)
+INCLUDE_DIRECTORIES(
+  ${CUPS_INCLUDE_DIR}
+)
+ENDIF (NOT WIN32 AND NOT HAIKU)
 
 IF (LCMS2_FOUND)
   INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18186&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Tue Mar  5 21:23:12 2013
@@ -1142,7 +1142,6 @@
 
 TARGET_LINK_LIBRARIES(${EXE_NAME}
   ${QT_LIBRARIES}
-  ${CUPS_LIBRARIES}
   ${FREETYPE_LIBRARIES}
   ${FONTCONFIG_LIBRARIES}
   ${LIBXML2_LIBRARIES}
@@ -1154,11 +1153,17 @@
   ${GMAGICK_LIBRARIES}
 )
 
+IF (NOT WIN32 AND NOT HAIKU)
+  TARGET_LINK_LIBRARIES(${EXE_NAME}
+	${CUPS_LIBRARIES}
+  )
+ENDIF (NOT WIN32 AND NOT HAIKU)
+
 # required to resolve symbols from libdl when ld is called with --no-add-needed
 # #9310 for the OpenBSD addition
-IF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+IF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
   TARGET_LINK_LIBRARIES(${EXE_NAME} dl)
-ENDIF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ENDIF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
 
 # #9311 for the OpenBSD addition
 IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")

Modified: trunk/Scribus/scribus/scclocale.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18186&path=/trunk/Scribus/scribus/scclocale.cpp
==============================================================================
--- trunk/Scribus/scribus/scclocale.cpp (original)
+++ trunk/Scribus/scribus/scclocale.cpp Tue Mar  5 21:23:12 2013
@@ -24,7 +24,7 @@
 #if defined(Q_WS_WIN)
 	cLocale = _create_locale(LC_ALL, "C");
 #else
-  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined(Q_OS_FREEBSD)
+  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined(Q_OS_FREEBSD) and not defined(Q_OS_HAIKU)
 	cLocale = newlocale(LC_ALL_MASK, "C", NULL);
   #endif
 #endif
@@ -35,7 +35,7 @@
 #if defined(Q_WS_WIN)
 	_free_locale(cLocale);
 #else
-  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined(Q_OS_FREEBSD)
+  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined(Q_OS_FREEBSD) and not defined(Q_OS_HAIKU)
 	freelocale(cLocale);
   #endif
 #endif
@@ -110,7 +110,7 @@
 #if defined(Q_WS_WIN)
 		return _strtod_l(str, endptr, that()->cLocale);
 #else
-  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD) or defined(Q_OS_FREEBSD)
+  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD) or defined(Q_OS_FREEBSD) or defined(Q_OS_HAIKU)
 		char *oldlocale=setlocale(LC_NUMERIC, NULL);
 		double result(0.0);
 		setlocale(LC_NUMERIC, "C");

Modified: trunk/Scribus/scribus/scclocale.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18186&path=/trunk/Scribus/scribus/scclocale.h
==============================================================================
--- trunk/Scribus/scribus/scclocale.h (original)
+++ trunk/Scribus/scribus/scclocale.h Tue Mar  5 21:23:12 2013
@@ -21,14 +21,14 @@
 #include <xlocale.h>
 #endif
 
-#if defined(Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined(Q_OS_FREEBSD)
+#if defined(Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
 #include <locale.h>
 #endif
 
 #if defined(Q_WS_WIN)
 #define XLocaleType _locale_t
 #else
-  #if defined (Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined(Q_OS_FREEBSD)
+  #if defined (Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
   #define XLocaleType char*   //dummy?
   #else
   #define XLocaleType locale_t


