SOURCES: scribus-cmake.patch (NEW) - repair broken cmake support i...
deejay1
deejay1 at pld-linux.org
Tue Dec 5 14:55:27 CET 2006
Author: deejay1 Date: Tue Dec 5 13:55:27 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- repair broken cmake support in 1.3.3.6
---- Files affected:
SOURCES:
scribus-cmake.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/scribus-cmake.patch
diff -u /dev/null SOURCES/scribus-cmake.patch:1.1
--- /dev/null Tue Dec 5 14:55:27 2006
+++ SOURCES/scribus-cmake.patch Tue Dec 5 14:55:21 2006
@@ -0,0 +1,1562 @@
+diff -Nur scribus-1.3.3.6/cmake/modules/CAIROConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/CAIROConfig.cmake
+--- scribus-1.3.3.6/cmake/modules/CAIROConfig.cmake 1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/CAIROConfig.cmake 2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,69 @@
++#
++# Find the native cairo includes and library
++#
++
++# This module defines
++# CAIRO_INCLUDE_DIR, where to find art*.h etc
++# CAIRO_LIBRARY, the libraries to link against to use LIBART.
++# CAIRO_FOUND, If false, do not try to use LIBART.
++# CAIRO_LIBS, link information
++# CAIRO_CFLAGS, cflags for include information
++
++
++INCLUDE(UsePkgConfig)
++
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_LIBRARY() calls
++PKGCONFIG(cairo _libCairoIncDir _libCairoLinkDir _libCairoLinkFlags _libCairoCflags)
++
++SET(CAIRO_LIBS ${_libCairoCflags})
++
++IF(PREFIX_CAIRO)
++ SET(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
++ SET(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
++ SET(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
++ENDIF(PREFIX_CAIRO)
++
++FIND_PATH(CAIRO_INCLUDE_DIR
++NAMES cairo.h
++PATHS ${PREFIX_CAIRO_INCLUDE} ${_libCairoIncDir} /usr/local/include /usr/include
++PATH_SUFFIXES cairo
++NO_DEFAULT_PATH
++)
++
++FIND_LIBRARY(CAIRO_LIBRARY
++NAMES cairo
++PATHS ${PREFIX_CAIRO_LIB} ${_libCairoLinkDir} /usr/local/lib /usr/lib
++NO_DEFAULT_PATH
++)
++
++#If we had no cairo prefix specify it, set PREFIX_CAIRO_LIB most importantly, for the
++# IF(NOT PREFIX_CAIRO)
++# GET_FILENAME_COMPONENT(CAIRO_DIR ${CAIRO_LIBRARY} PATH)
++# GET_FILENAME_COMPONENT(CAIRO_DIR ${CAIRO_DIR} PATH)
++# SET(PREFIX_CAIRO ${CAIRO_DIR})
++# IF(PREFIX_CAIRO)
++# SET(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
++# SET(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
++# SET(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
++# ENDIF(PREFIX_CAIRO)
++# ENDIF(NOT PREFIX_CAIRO)
++
++SET(CAIRO_FIND_QUIETLY 1)
++
++IF (CAIRO_LIBRARY)
++ IF (CAIRO_INCLUDE_DIR)
++ SET( CAIRO_FOUND "YES" )
++ IF(NOT CAIRO_FIND_QUIETLY)
++ MESSAGE(STATUS "Found cairo: ${CAIRO_LIBRARY}")
++ ENDIF(NOT CAIRO_FIND_QUIETLY)
++ SET( CAIRO_LIBRARIES ${CAIRO_LIBRARY} )
++# CB: We dont use this yet anyway
++# FIND_PROGRAM(CAIRO_CONFIG
++# NAMES pkg-config
++# PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin
++# )
++# EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--libs cairo" OUTPUT_VARIABLE CAIRO_LIBS)
++# EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--cflags cairo" OUTPUT_VARIABLE CAIRO_CFLAGS)
++ ENDIF (CAIRO_INCLUDE_DIR)
++ENDIF (CAIRO_LIBRARY)
+diff -Nur scribus-1.3.3.6/cmake/modules/CUPSConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/CUPSConfig.cmake
+--- scribus-1.3.3.6/cmake/modules/CUPSConfig.cmake 1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/CUPSConfig.cmake 2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,31 @@
++# - Try to find Cups
++# Once done this will define
++#
++# CUPS_FOUND - system has Cups
++# CUPS_INCLUDE_DIR - the Cups include directory
++# CUPS_LIBRARY - Link these to use CUPS
++#
++
++FIND_PATH(CUPS_INCLUDE_DIR cups/cups.h
++ /usr/include
++ /usr/local/include
++)
++
++FIND_LIBRARY(CUPS_LIBRARY NAMES cups PATHS /usr/lib /usr/local/lib)
++
++IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
++ SET(CUPS_FOUND TRUE)
++ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
++
++SET(Cups_FIND_QUIETLY 1)
++
++IF(CUPS_FOUND)
++ SET( CUPS_LIBRARIES ${CUPS_LIBRARY} )
++ IF(NOT Cups_FIND_QUIETLY)
++ MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARY}")
++ ENDIF(NOT Cups_FIND_QUIETLY)
++ELSE(CUPS_FOUND)
++ IF(Cups_FIND_REQUIRED)
++ MESSAGE(SEND_ERROR "Could not find Cups")
++ ENDIF(Cups_FIND_REQUIRED)
++ENDIF(CUPS_FOUND)
+\ Brak znaku nowej linii na końcu pliku
+diff -Nur scribus-1.3.3.6/cmake/modules/FindLCMS.cmake scribus-1.3.3.6-cmake/cmake/modules/FindLCMS.cmake
+--- scribus-1.3.3.6/cmake/modules/FindLCMS.cmake 1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/FindLCMS.cmake 2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,46 @@
++#
++# Find the native LCMS includes and library
++#
++
++# This module defines
++# LCMS_INCLUDE_DIR, where to find art*.h etc
++# LCMS_LIBRARY, the libraries
++# LCMS_FOUND, If false, do not try to use LCMS.
++# LIBLCMS_LIBS, link information
++# LIBLCMS_CFLAGS, cflags for include information
++
++
++# INCLUDE(UsePkgConfig)
++
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_LIBRARY() calls
++# PKGCONFIG(lcms _lcmsIncDir _lcmsLinkDir _lcmsLinkFlags _lcmsCflags)
++
++# SET(LCMS_LIBS ${_lcmsCflags})
++
++FIND_PATH(LCMS_INCLUDE_DIR lcms.h
++/usr/include
++/usr/local/include
++)
++
++FIND_LIBRARY(LCMS_LIBRARY
++ NAMES lcms liblcms
++ PATHS /usr/lib /usr/local/lib
++)
++
++IF (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
++ SET( LCMS_FOUND 1 )
++ SET( LCMS_LIBRARIES ${LCMS_LIBRARY} )
++ELSE (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
++ SET( LCMS_FOUND 0 )
++ENDIF (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
++
++IF (LCMS_FOUND)
++ IF (NOT LCMS_FIND_QUIETLY)
++ MESSAGE(STATUS "Found LittleCMS: ${LCMS_LIBRARY}")
++ ENDIF (NOT LCMS_FIND_QUIETLY)
++ELSE (LCMS_FOUND)
++ IF (LCMS_FIND_REQUIRED)
++ MESSAGE(FATAL_ERROR "Could not find LittleCMS")
++ ENDIF (LCMS_FIND_REQUIRED)
++ENDIF (LCMS_FOUND)
+\ Brak znaku nowej linii na końcu pliku
+diff -Nur scribus-1.3.3.6/cmake/modules/FindQt3.cmake scribus-1.3.3.6-cmake/cmake/modules/FindQt3.cmake
+--- scribus-1.3.3.6/cmake/modules/FindQt3.cmake 1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/FindQt3.cmake 2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,302 @@
++# - Locate Qt include paths and libraries
++# This module defines:
++# QT_INCLUDE_DIR - where to find qt.h, etc.
++# QT_LIBRARIES - the libraries to link against to use Qt.
++# QT_DEFINITIONS - definitions to use when
++# compiling code that uses Qt.
++# QT_FOUND - If false, don't try to use Qt.
++#
++# If you need the multithreaded version of Qt, set QT_MT_REQUIRED to TRUE
++#
++# Also defined, but not for general use are:
++# QT_MOC_EXECUTABLE, where to find the moc tool.
++# QT_UIC_EXECUTABLE, where to find the uic tool.
++# QT_QT_LIBRARY, where to find the Qt library.
++# QT_QTMAIN_LIBRARY, where to find the qtmain
++# library. This is only required by Qt3 on Windows.
++
++# These are around for backwards compatibility
++# they will be set
++# QT_WRAP_CPP, set true if QT_MOC_EXECUTABLE is found
++# QT_WRAP_UI set true if QT_UIC_EXECUTABLE is found
++
++FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/)
++FIND_PATH(QT_INCLUDE_DIR qt.h
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
++ $ENV{QTDIR}/include
++ ${GLOB_PATHS_BIN}
++ /usr/local/qt/include
++ /usr/local/include
++ /usr/lib/qt/include
++ /usr/include/qt
++ /usr/include
++ /usr/share/qt3/include
++ C:/Progra~1/qt/include
++ /usr/include/qt3
++ /usr/X11R6/include
++ )
++
++# if qglobal.h is not in the qt_include_dir then set
++# QT_INCLUDE_DIR to NOTFOUND
++IF(NOT EXISTS ${QT_INCLUDE_DIR}/qglobal.h)
++ SET(QT_INCLUDE_DIR QT_INCLUDE_DIR-NOTFOUND CACHE PATH "path to qt3 include directory" FORCE)
++ENDIF(NOT EXISTS ${QT_INCLUDE_DIR}/qglobal.h)
++
++IF(QT_INCLUDE_DIR)
++ #extract the version string from qglobal.h
++ FILE(READ ${QT_INCLUDE_DIR}/qglobal.h QGLOBAL_H)
++ STRING(REGEX MATCH "#define[\t ]+QT_VERSION_STR[\t ]+\"([0-9]+.[0-9]+.[0-9]+)\"" QGLOBAL_H "${QGLOBAL_H}")
++ STRING(REGEX REPLACE ".*\"([0-9]+.[0-9]+.[0-9]+)\".*" "\\1" qt_version_str "${QGLOBAL_H}")
++
++ # Under windows the qt library (MSVC) has the format qt-mtXYZ where XYZ is the
++ # version X.Y.Z, so we need to remove the dots from version
++ STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${qt_version_str}")
++ELSE(QT_INCLUDE_DIR)
++ENDIF(QT_INCLUDE_DIR)
++
++FILE(GLOB GLOB_PATHS_LIB /usr/lib/qt-3*/lib/)
++IF (QT_MT_REQUIRED)
++ FIND_LIBRARY(QT_QT_LIBRARY
++ NAMES
++ qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
++ qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321
++ PATHS
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
++ $ENV{QTDIR}/lib
++ ${GLOB_PATHS_LIB}
++ /usr/local/qt/lib
++ /usr/local/lib
++ /usr/lib/qt/lib
++ /usr/lib
++ /usr/share/qt3/lib
++ C:/Progra~1/qt/lib
++ /usr/X11R6/lib
++ )
++
++ELSE (QT_MT_REQUIRED)
++ FIND_LIBRARY(QT_QT_LIBRARY
++ NAMES
++ qt qt-${qt_version_str_lib} qt-edu${qt_version_str_lib}
++ qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
++ qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321
++ PATHS
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
++ $ENV{QTDIR}/lib
++ ${GLOB_PATHS_LIB}
++ /usr/local/qt/lib
++ /usr/local/lib
++ /usr/lib/qt/lib
++ /usr/lib
++ /usr/share/qt3/lib
++ C:/Progra~1/qt/lib
++ /usr/X11R6/lib
++ )
++ENDIF (QT_MT_REQUIRED)
++
++IF(QT_QT_LIBRARY)
++ELSE(QT_QT_LIBRARY)
++ENDIF(QT_QT_LIBRARY)
++
++
++FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
++ NAMES qassistantclient
++ PATHS
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
++ $ENV{QTDIR}/lib
++ ${GLOB_PATHS_LIB}
++ /usr/local/qt/lib
++ /usr/local/lib
++ /usr/lib
++ /usr/share/qt3/lib
++ C:/Progra~1/qt/lib
++ /usr/X11R6/lib
++ )
++
++# qt 3 should prefer QTDIR over the PATH
++FIND_PROGRAM(QT_MOC_EXECUTABLE
++ NAMES moc moc-qt3
++ PATHS
++ $ENV{QTDIR}/bin
++ NO_DEFAULT_PATH
++)
++
++FIND_PROGRAM(QT_MOC_EXECUTABLE
++ NAMES moc moc-qt3
++ PATHS
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
++ $ENV{QTDIR}/bin
++ ${GLOB_PATHS_BIN}
++ /usr/local/qt/bin
++ /usr/lib/qt/bin
++ /usr/share/qt3/bin
++ C:/Progra~1/qt/bin
++ /usr/X11R6/bin
++ )
++
++IF(QT_MOC_EXECUTABLE)
++ SET ( QT_WRAP_CPP "YES")
++ELSE(QT_MOC_EXECUTABLE)
++ENDIF(QT_MOC_EXECUTABLE)
++
++# qt 3 should prefer QTDIR over the PATH
++FIND_PROGRAM(QT_UIC_EXECUTABLE uic
++ PATHS
++ $ENV{QTDIR}/bin
++ NO_DEFAULT_PATH
++)
++FIND_PROGRAM(QT_UIC_EXECUTABLE uic
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
++ $ENV{QTDIR}/bin
++ ${GLOB_PATHS_BIN}
++ /usr/local/qt/bin
++ /usr/lib/qt/bin
++ /usr/share/qt3/bin
++ C:/Progra~1/qt/bin
++ /usr/X11R6/bin
++ )
++
++IF(QT_UIC_EXECUTABLE)
++ SET ( QT_WRAP_UI "YES")
++ELSE(QT_UIC_EXECUTABLE)
++ENDIF(QT_UIC_EXECUTABLE)
++
++IF (WIN32)
++ FIND_LIBRARY(QT_QTMAIN_LIBRARY qtmain
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
++ "$ENV{ProgramFiles}/qt/lib"
++ $ENV{QTDIR}/lib "C:/Program Files/qt/lib"
++ DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
++ )
++ENDIF (WIN32)
++
++
++IF (QT_MIN_VERSION)
++
++ STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" qt_major_vers "${qt_version_str}")
++ STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" qt_minor_vers "${qt_version_str}")
++ STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" qt_patch_vers "${qt_version_str}")
++
++ #now parse the parts of the user given version string into variables
++ STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" req_qt_major_vers "${QT_MIN_VERSION}")
++ IF (NOT req_qt_major_vers)
++ MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"3.1.5\"")
++ ENDIF (NOT req_qt_major_vers)
++
++ STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
++ STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
++ STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
++
++ # req = "6.5.4", qt = "3.2.1"
++
++ IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ?
++ MESSAGE( FATAL_ERROR "Qt major version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
++ ELSE (req_qt_major_vers GREATER qt_major_vers) # no
++ IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
++ SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
++ ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
++ IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ?
++ MESSAGE( FATAL_ERROR "Qt minor version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
++ ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
++ IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
++ SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
++ ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
++ IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
++ MESSAGE( FATAL_ERROR "Qt patch level not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
++ ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
++ SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
++ ENDIF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
++ ENDIF (req_qt_minor_vers LESS qt_minor_vers)
++ ENDIF (req_qt_minor_vers GREATER qt_minor_vers)
++ ENDIF (req_qt_major_vers LESS qt_major_vers)
++ ENDIF (req_qt_major_vers GREATER qt_major_vers)
++ENDIF (QT_MIN_VERSION)
++
++# if the include a library are found then we have it
++IF(QT_INCLUDE_DIR)
++ IF(QT_QT_LIBRARY)
++ SET( QT_FOUND "YES" )
++ ENDIF(QT_QT_LIBRARY)
++ENDIF(QT_INCLUDE_DIR)
++
++IF(QT_FOUND)
++ SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} )
++ SET( QT_DEFINITIONS "")
++
++ IF (WIN32 AND NOT CYGWIN)
++ IF (QT_QTMAIN_LIBRARY)
++ # for version 3
++ SET (QT_DEFINITIONS -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG)
++ SET (QT_LIBRARIES imm32.lib ${QT_QT_LIBRARY} ${QT_QTMAIN_LIBRARY} )
++ SET (QT_LIBRARIES ${QT_LIBRARIES} winmm wsock32)
++ ELSE (QT_QTMAIN_LIBRARY)
++ # for version 2
++ SET (QT_LIBRARIES imm32.lib ws2_32.lib ${QT_QT_LIBRARY} )
++ ENDIF (QT_QTMAIN_LIBRARY)
++ ELSE (WIN32 AND NOT CYGWIN)
++ SET (QT_LIBRARIES ${QT_QT_LIBRARY} )
++
++ SET (QT_DEFINITIONS -DQT_SHARED -DQT_NO_DEBUG)
++ IF(QT_QT_LIBRARY MATCHES "qt-mt")
++ SET (QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_THREAD_SUPPORT -D_REENTRANT)
++ ENDIF(QT_QT_LIBRARY MATCHES "qt-mt")
++
++ ENDIF (WIN32 AND NOT CYGWIN)
++
++ IF (QT_QASSISTANTCLIENT_LIBRARY)
++ SET (QT_LIBRARIES ${QT_QASSISTANTCLIENT_LIBRARY} ${QT_LIBRARIES})
++ ENDIF (QT_QASSISTANTCLIENT_LIBRARY)
++
++ # Backwards compatibility for CMake1.4 and 1.2
++ SET (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
++ SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
++ # for unix add X11 stuff
++ IF(UNIX)
++ FIND_PACKAGE(X11)
++ IF (X11_FOUND)
++ SET (QT_LIBRARIES ${QT_LIBRARIES} ${X11_LIBRARIES})
++ ENDIF (X11_FOUND)
++ IF (CMAKE_DL_LIBS)
++ SET (QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_DL_LIBS})
++ ENDIF (CMAKE_DL_LIBS)
++ ENDIF(UNIX)
++ IF(QT_QT_LIBRARY MATCHES "qt-mt")
++ FIND_PACKAGE(Threads)
++ SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++ ENDIF(QT_QT_LIBRARY MATCHES "qt-mt")
++ENDIF(QT_FOUND)
++
++
++IF (QT_MOC_EXECUTABLE)
++ SET ( QT_WRAP_CPP "YES")
++ENDIF (QT_MOC_EXECUTABLE)
++
++IF (QT_UIC_EXECUTABLE)
++ SET ( QT_WRAP_UI "YES")
++ENDIF (QT_UIC_EXECUTABLE)
++
++
++
++MARK_AS_ADVANCED(
++ QT_INCLUDE_DIR
++ QT_QT_LIBRARY
++ QT_QTMAIN_LIBRARY
++ QT_QASSISTANTCLIENT_LIBRARY
++ QT_UIC_EXECUTABLE
++ QT_MOC_EXECUTABLE
++ QT_WRAP_CPP
++ QT_WRAP_UI
++ )
+diff -Nur scribus-1.3.3.6/cmake/modules/FONTCONFIGConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/FONTCONFIGConfig.cmake
+--- scribus-1.3.3.6/cmake/modules/FONTCONFIGConfig.cmake 1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/FONTCONFIGConfig.cmake 2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,48 @@
++#
++# Find the native FONTCONFIG includes and library
++#
++
++# This module defines
++# FONTCONFIG_INCLUDE_DIR, where to find art*.h etc
++# FONTCONFIG_LIBRARY, the libraries to link against to use FONTCONFIG.
++# FONTCONFIG_FOUND, If false, do not try to use FONTCONFIG.
++# LIBFONTCONFIG_LIBS, link information
++# LIBFONTCONFIG_CFLAGS, cflags for include information
++
++
++INCLUDE(UsePkgConfig)
++
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_LIBRARY() calls
++PKGCONFIG(fontconfig _fontconfigIncDir _fontconfigLinkDir _fontconfigLinkFlags _fontconfigCflags)
++
++SET(FONTCONFIG_LIBS ${_fontconfigCflags})
++
++FIND_PATH(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
++${_fontconfigIncDir}
++/usr/include
++/usr/local/include
++PATH_SUFFIXES
++fontconfig
++)
++# quick hack as the above finds it nicely but our source includes the libart_lgpl text at the moment
++#STRING(REGEX REPLACE "/libart_lgpl" "" FONTCONFIG_INCLUDE_DIR ${FONTCONFIG_INCLUDE_DIR})
++FIND_LIBRARY(FONTCONFIG_LIBRARY NAMES fontconfig
++ PATHS /usr/lib /usr/local/lib
++)
++
++# MESSAGE(STATUS "fclib ${FONTCONFIG_LIBRARY}")
++# MESSAGE(STATUS "fcinclude ${FONTCONFIG_INCLUDE_DIR}")
++
++
++IF (FONTCONFIG_LIBRARY)
++ IF (FONTCONFIG_INCLUDE_DIR)
++ SET( FONTCONFIG_FOUND "YES" )
++ SET( FONTCONFIG_LIBRARIES ${FONTCONFIG_LIBRARY} )
++ FIND_PROGRAM(FONTCONFIG_CONFIG NAMES fontconfig-config PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin)
++# EXEC_PROGRAM(${FONTCONFIG_CONFIG} ARGS --libs OUTPUT_VARIABLE FONTCONFIG_LIBS)
++# EXEC_PROGRAM(${FONTCONFIG_CONFIG} ARGS --cflags OUTPUT_VARIABLE FONTCONFIG_CFLAGS)
++# MESSAGE(STATUS ${FONTCONFIG_LIBS})
++# MESSAGE(STATUS ${FONTCONFIG_CFLAGS})
++ ENDIF (FONTCONFIG_INCLUDE_DIR)
++ENDIF (FONTCONFIG_LIBRARY)
+\ Brak znaku nowej linii na końcu pliku
+diff -Nur scribus-1.3.3.6/cmake/modules/FREETYPEConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/FREETYPEConfig.cmake
+--- scribus-1.3.3.6/cmake/modules/FREETYPEConfig.cmake 1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/FREETYPEConfig.cmake 2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,43 @@
++#
++# Find the native FREETYPE includes and library
++#
++
++# This module defines
++# FREETYPE_INCLUDE_DIR, where to find ft2build.h, ftheader.h, ...
++# FREETYPE_LIBRARIES, the libraries to link against to use FREETYPE.
++# FREETYPE_FOUND, If false, do not try to use FREETYPE.
++
++# also defined, but not for general use are
++# FREETYPE_LIBRARY, where to find the FREETYPE library.
++
++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
++ /usr/include/
++ /usr/local/include/
++)
++
++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
++ /usr/include/freetype2
++ /usr/local/include/freetype2
++)
++
++FIND_LIBRARY(FREETYPE_LIBRARY freetype
++ PATHS /usr/lib /usr/local/lib
++)
++
++SET(FREETYPE_FIND_QUIETLY 1)
++
++IF (FREETYPE_LIBRARY)
++ IF (NOT FREETYPE_FIND_QUIETLY)
++ MESSAGE(STATUS "Found Freetype2: ${FREETYPE_LIBRARY}")
++ ENDIF (NOT FREETYPE_FIND_QUIETLY)
++ IF (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
++ SET( FREETYPE_FOUND "YES" )
++ SET( FREETYPE_INCLUDE_DIR
++ ${FREETYPE_INCLUDE_DIR_FT2BUILD}
++ ${FREETYPE_INCLUDE_DIR_FTHEADER} )
++ SET( FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} )
++ FIND_PROGRAM(FREETYPE_CONFIG NAMES freetype-config PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin)
++ EXEC_PROGRAM(${FREETYPE_CONFIG} ARGS --libs OUTPUT_VARIABLE LIBFREETYPE_LIBS)
++ EXEC_PROGRAM(${FREETYPE_CONFIG} ARGS --cflags OUTPUT_VARIABLE LIBFREETYPE_CFLAGS)
++ ENDIF (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
++ENDIF (FREETYPE_LIBRARY)
+\ Brak znaku nowej linii na końcu pliku
+diff -Nur scribus-1.3.3.6/cmake/modules/LIBART_LGPLConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/LIBART_LGPLConfig.cmake
+--- scribus-1.3.3.6/cmake/modules/LIBART_LGPLConfig.cmake 1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/LIBART_LGPLConfig.cmake 2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,49 @@
++#
++# Find the native LIBART includes and library
++#
++
++# This module defines
++# LIBART_LGPL_INCLUDE_DIR, where to find art*.h etc
++# LIBART_LGPL_LIBRARY, the libraries to link against to use LIBART.
++# LIBART_LGPL_FOUND, If false, do not try to use LIBART.
++# LIBART_LGPL_LIBS, link information
++# LIBART_LGPL_CFLAGS, cflags for include information
++
++
++INCLUDE(UsePkgConfig)
++
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_LIBRARY() calls
++PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags)
++
++SET(LIBART_LGPL_LIBS ${_libArtCflags})
++
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list