]> git.pld-linux.org Git - packages/scribus.git/commitdiff
This commit was manufactured by cvs2git to create branch 'AC-branch'. AC-branch
authorcvs2git <feedback@pld-linux.org>
Tue, 27 Feb 2007 09:46:17 +0000 (09:46 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Cherrypick from master 2006-12-26 21:59:38 UTC Elan Ruusamäe <glen@pld-linux.org> '- readd':
    kde-ac260-lt.patch -> 1.1
    kde-common-LD_quote.patch -> 1.3
    scribus-cmake.patch -> 1.2
    scribus-docdir.patch -> 1.1
    scribus-module-fixes.patch -> 1.7
    scribus-nolibs.patch -> 1.5
Cherrypick from master 2007-02-27 09:46:17 UTC deejay1 <deejay1@pld-linux.org> '- up to 1.3.3.8':
    scribus-version.patch -> 1.1
    scribus.spec -> 1.131
Cherrypick from master 2006-10-24 09:52:26 UTC deejay1 <deejay1@pld-linux.org> '- updated to detect Python 2.5':
    scribus-python.patch -> 1.7

kde-ac260-lt.patch [new file with mode: 0644]
kde-common-LD_quote.patch [new file with mode: 0644]
scribus-cmake.patch [new file with mode: 0644]
scribus-docdir.patch [new file with mode: 0644]
scribus-module-fixes.patch [new file with mode: 0644]
scribus-nolibs.patch [new file with mode: 0644]
scribus-python.patch [new file with mode: 0644]
scribus-version.patch [new file with mode: 0644]
scribus.spec [new file with mode: 0644]

diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
new file mode 100644 (file)
index 0000000..acbbc6c
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
+--- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
++++ arts-1.5.4/admin/libtool.m4.in     2006-09-09 12:45:13.172062500 +0200
+@@ -3542,7 +3542,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
diff --git a/kde-common-LD_quote.patch b/kde-common-LD_quote.patch
new file mode 100644 (file)
index 0000000..7d65c3f
--- /dev/null
@@ -0,0 +1,33 @@
+--- gwenview-1.4.0/admin/am_edit       2006-09-25 00:04:55.213036950 +0300
++++ kdelibs-3.5.5/admin/am_edit        2006-10-03 11:40:08.052152886 +0300
+@@ -499,6 +499,15 @@
+         }
+     }
++    $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++    }
++    $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
++    if ($MakefileData =~ m/$lookup/) {
++        substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
++    }
++
+     $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
+     $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -578,6 +587,14 @@
+         local @kde_options = split(/[\034\s]+/, $kde_options_str);
+         if (grep(/^foreign$/, @kde_options)) {
+             push(@foreignfiles, $makefileDir . "/");
++
++            # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
++            $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
++            if ($MakefileData =~ m/$lookup/) {
++                substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++                updateMakefile ();
++            }
++
+             return 0; # don't touch me
+         }
+         for $opt (@kde_options) {
diff --git a/scribus-cmake.patch b/scribus-cmake.patch
new file mode 100644 (file)
index 0000000..29150ed
--- /dev/null
@@ -0,0 +1,1564 @@
+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})
++
++FIND_PATH(LIBART_LGPL_INCLUDE_DIR libart_lgpl/libart.h
++${_libArtIncDir}
++/usr/include
++/usr/local/include/
++PATH_SUFFIXES
++libart-2.0
++)
++
++FIND_LIBRARY(LIBART_LGPL_LIBRARY NAMES art_lgpl_2
++PATHS
++${_libArtLinkDir}
++/usr/lib
++/usr/local/lib
++)
++
++SET(LIBART_LGPL_FIND_QUIETLY 1)
++
++IF (LIBART_LGPL_LIBRARY)
++  IF (LIBART_LGPL_INCLUDE_DIR)
++    SET( LIBART_LGPL_FOUND "YES" )
++    IF(NOT LIBART_LGPL_FIND_QUIETLY)
++      MESSAGE(STATUS "Found Libart_LGPL: ${LIBART_LGPL_LIBRARY}")
++    ENDIF(NOT LIBART_LGPL_FIND_QUIETLY)
++    SET( LIBART_LGPL_LIBRARIES ${LIBART_LGPL_LIBRARY} )
++    FIND_PROGRAM(LIBART_LGPL_CONFIG NAMES libart2-config PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin)
++    EXEC_PROGRAM(${LIBART_LGPL_CONFIG} ARGS --libs OUTPUT_VARIABLE LIBART_LGPL_LIBS)
++    EXEC_PROGRAM(${LIBART_LGPL_CONFIG} ARGS --cflags OUTPUT_VARIABLE LIBART_LGPL_CFLAGS)
++  ENDIF (LIBART_LGPL_INCLUDE_DIR)
++ENDIF (LIBART_LGPL_LIBRARY)
+\ Brak znaku nowej linii na koñcu pliku
+diff -Nur scribus-1.3.3.6/cmake/modules/LIBXML2Config.cmake scribus-1.3.3.6-cmake/cmake/modules/LIBXML2Config.cmake
+--- scribus-1.3.3.6/cmake/modules/LIBXML2Config.cmake  1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/LIBXML2Config.cmake    2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,43 @@
++# - Try to find LibXml2
++# Once done this will define
++#
++#  LIBXML2_FOUND - system has LibXml2
++#  LIBXML2_INCLUDE_DIR - the LibXml2 include directory
++#  LIBXML2_LIBRARIES - the libraries needed to use LibXml2
++#  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
++#
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_LIBRARY() calls
++
++
++INCLUDE(UsePkgConfig)
++
++PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
++
++SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
++
++FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
++  PATHS ${_LibXml2IncDir} PATH_SUFFIXES libxml2
++)
++
++FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
++  PATHS ${_LibXml2LinkDir}
++)
++
++IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
++   SET(LIBXML2_FOUND TRUE)
++ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
++
++SET(LibXml2_FIND_QUIETLY 1)
++
++IF (LIBXML2_FOUND)
++  IF (NOT LibXml2_FIND_QUIETLY)
++    MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
++  ENDIF (NOT LibXml2_FIND_QUIETLY)
++ELSE (LIBXML2_FOUND)
++  IF (LibXml2_FIND_REQUIRED)
++    MESSAGE(SEND_ERROR "Could NOT find LibXml2")
++  ENDIF (LibXml2_FIND_REQUIRED)
++ENDIF (LIBXML2_FOUND)
++
++MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
+\ Brak znaku nowej linii na koñcu pliku
+diff -Nur scribus-1.3.3.6/cmake/modules/oldFindQt3.cmake scribus-1.3.3.6-cmake/cmake/modules/oldFindQt3.cmake
+--- scribus-1.3.3.6/cmake/modules/oldFindQt3.cmake     1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/oldFindQt3.cmake       2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,290 @@
++# - 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" QGLOBAL_H "${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 "${QGLOBAL_H}")
++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
++  )
++
++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
++  NO_DEFAULT_PATH
++  )
++
++IF(QT_MOC_EXECUTABLE)
++  SET ( QT_WRAP_CPP "YES")
++ELSE(QT_MOC_EXECUTABLE)
++ENDIF(QT_MOC_EXECUTABLE)
++
++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
++  NO_DEFAULT_PATH
++  )
++
++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/SCRIBUSQTConfig.cmake scribus-1.3.3.6-cmake/cmake/modules/SCRIBUSQTConfig.cmake
+--- scribus-1.3.3.6/cmake/modules/SCRIBUSQTConfig.cmake        1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake/modules/SCRIBUSQTConfig.cmake  2006-11-12 00:36:50.000000000 +0100
+@@ -0,0 +1,41 @@
++#Based on QT4_QRAP_UI/CPP from cmake 2.3.4
++  MACRO(SCRIBUS_QT_WRAP_UI outfiles )
++
++    FOREACH(it ${ARGN})
++      GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
++      SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
++      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
++      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
++        COMMAND ${QT_UIC_EXECUTABLE}
++        ARGS -o ${outfile} ${infile}
++        MAIN_DEPENDENCY ${infile})
++      SET(${outfiles} ${${outfiles}} ${outfile})
++    ENDFOREACH(it)
++
++  ENDMACRO(SCRIBUS_QT_WRAP_UI)
++
++  MACRO(SCRIBUS_QT_WRAP_CPP outfiles )
++
++    # get include dirs
++    GET_DIRECTORY_PROPERTY(moc_includes_tmp INCLUDE_DIRECTORIES)
++    SET(moc_includes)
++    #FOREACH(it ${moc_includes_tmp})
++    #  SET(moc_includes ${moc_includes} "-I${it}")
++    #ENDFOREACH(it)
++
++    FOREACH(it ${ARGN})
++      GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
++      
++      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
++#       SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
++      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfilename}.moc)
++      ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
++        COMMAND ${QT_MOC_EXECUTABLE}
++#         ARGS ${moc_includes} -o ${outfile} ${infile}
++          ARGS -o ${outfile} ${infile}
++#         MAIN_DEPENDENCY ${infile})
++        DEPENDS ${infile})
++      SET(${outfiles} ${${outfiles}} ${outfile})
++    ENDFOREACH(it)
++
++  ENDMACRO(SCRIBUS_QT_WRAP_CPP)
+diff -Nur scribus-1.3.3.6/CMakeLists.txt scribus-1.3.3.6-cmake/CMakeLists.txt
+--- scribus-1.3.3.6/CMakeLists.txt     1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/CMakeLists.txt       2006-12-05 17:06:55.000000000 +0100
+@@ -0,0 +1,393 @@
++#CMAKE SETUP
++#Require 2.4.2 for Qt finding
++#Require 2.4.3 for moc change detection
++#Require 2.4.3 for rpath updates for custom cairo install
++CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3 FATAL_ERROR)
++
++SET(CMAKE_COLOR_MAKEFILE ON)
++SET(CMAKE_VERBOSE_MAKEFILE ON)
++SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
++SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
++#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++#SET(CMAKE_SKIP_RPATH:BOOL NO)
++SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
++
++SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
++# SET(CMAKE_SHARED_MODULE_LINK_FLAGS "${CMAKE_SHARED_MODULE_LINK_FLAGS} -export-dynamic")
++# SET(CMAKE_SHARED_MODULE_LINK_CXX_FLAGS "${CMAKE_SHARED_MODULE_LINK_CXX_FLAGS} -export-dynamic")
++# SET(CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} -export-dynamic")
++# SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -export-dynamic")
++# MESSAGE(STATUS ${CMAKE_SHARED_MODULE_LINK_FLAGS})
++# MESSAGE(STATUS ${CMAKE_SHARED_MODULE_LINK_CXX_FLAGS})
++# MESSAGE(STATUS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
++# MESSAGE(STATUS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
++# MESSAGE(STATUS ${CMAKE_CXX_CREATE_SHARED_MODULE})
++# MESSAGE(STATUS ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
++
++#IMPORT FROM COMMANDLINE
++# SET with cmake -DWANT_CAIRO=1, etc
++# MESSAGE(STATUS ${WANT_CAIRO})
++# MESSAGE(STATUS ${WANT_LIBART})
++# MESSAGE(STATUS ${WANT_DEBUG})
++
++# SET(WANT_CAIRO 0)
++# SET(WANT_LIBART 1)
++
++#PROJECT SETUP
++PROJECT(scribus)
++SET (VERSION_MAJOR "1")
++SET (VERSION_MINOR "3")
++SET (VERSION_PATCH "3.6")
++SET (VERSION_SUFFIX "")
++SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
++MESSAGE(STATUS "Scribus ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
++
++SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE)
++
++SET(MAIN_DIR_NAME "scribus")
++IF(TAG_VERSION)
++  MESSAGE(STATUS "Previously selected version tag: ${TAG_VERSION}")
++  SET(WANT_VERSIONING 1)
++  SET(CACHED_VERSIONING 1)
++ENDIF(TAG_VERSION)
++IF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
++  IF (NOT CUSTOM_VERSIONTAG)
++    SET(TAG_VERSION "-${VERSION}" CACHE TYPE STRING)
++  ELSE (NOT CUSTOM_VERSIONTAG)
++    SET(TAG_VERSION ${CUSTOM_VERSIONTAG} CACHE TYPE STRING)
++  ENDIF (NOT CUSTOM_VERSIONTAG)
++ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
++
++SET(MANDIR "share/man/")
++SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
++ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
++IF(TAG_VERSION)
++    SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
++ELSE(TAG_VERSION)
++    SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
++ENDIF (TAG_VERSION)
++ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
++SET(PLDDOCDIR "share/doc/${MAIN_DIR_NAME}/")
++ADD_DEFINITIONS("-DPLDDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLDDOCDIR}\\\"")
++SET(ICONDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/icons/")
++ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"")
++SET(SAMPLESDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/samples/")
++ADD_DEFINITIONS("-DSAMPLESDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SAMPLESDIR}\\\"")
++SET(SCRIPTSDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/scripts/")
++ADD_DEFINITIONS("-DSCRIPTSDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SCRIPTSDIR}\\\"")
++SET(TEMPLATEDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/templates/")
++ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"")
++SET(LIBDIR "lib/${MAIN_DIR_NAME}${TAG_VERSION}/")
++ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
++SET(PLUGINDIR "lib/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/")
++ADD_DEFINITIONS("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"")
++set(CMAKE_INSTALL_RPATH ${PLUGINDIR})
++
++# Set the XDG mime stuff
++SET(MIMEDIR "share/mime/packages/")
++
++
++#BUILD SETUP
++#None, Debug, Release, .. or custom ones
++SET(WANT_DEBUG 1)
++IF(WANT_DEBUG)
++  SET(CMAKE_BUILD_TYPE Debug)
++ELSE(WANT_DEBUG)
++  SET(CMAKE_BUILD_TYPE RELEASE)
++ENDIF(WANT_DEBUG)
++
++IF(APPLE)
++  SET( ENV{MACOSX_DEPLOYMENT_TARGET} 10.3 ) 
++  SET( ENV{LD_PREBIND} 1 )
++  SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
++  SET(CMAKE_CXX_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions -Wall")
++  SET(CMAKE_C_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions -Wall")
++  SET(BUILD_MAC_BUNDLE 1)
++ELSE(APPLE)
++  SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall")
++  SET(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -Wall")
++ENDIF(APPLE)
++SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall")
++SET(CMAKE_C_FLAGS_RELEASE "-O2 -Wall")
++
++
++INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
++TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
++
++#FIND DEPENDENCIES
++# START QT
++SET (QT_MT_REQUIRED true)
++SET (QT_MIN_VERSION "3.3.4")
++FIND_PACKAGE(Qt3 REQUIRED)
++IF (QT_FOUND)
++  MESSAGE("Qt3 Found OK (${qt_version_str})")
++#   MESSAGE("$ENV{QTDIR}")
++#   MESSAGE("${QT_MOC_EXECUTABLE}")
++#   MESSAGE("${QT_UIC_EXECUTABLE}")
++#   MESSAGE("${QT_QT_LIBRARY}")
++#   MESSAGE("${QT_INCLUDE_DIR}")
++#   MESSAGE("${qt_version_str}")
++#   MESSAGE(${qt_version_str_lib})
++ELSE(QT_FOUND)
++  MESSAGE(FATAL_ERROR "No Qt3")
++ENDIF(QT_FOUND)
++# END QT
++# START PNG, JPEG, TIFF
++FIND_PACKAGE(PNG REQUIRED)
++IF (PNG_FOUND)
++  MESSAGE("PNG Library Found OK")
++ENDIF(PNG_FOUND)
++FIND_PACKAGE(JPEG REQUIRED)
++IF (JPEG_FOUND)
++  MESSAGE("JPEG Library Found OK")
++ENDIF(JPEG_FOUND)
++FIND_PACKAGE(TIFF REQUIRED)
++IF (TIFF_FOUND)
++  MESSAGE("TIFF Library Found OK")
++  SET(HAVE_TIFF 1)
++ELSE(TIFF_FOUND)
++  MESSAGE(FATAL_ERROR "Could not find the TIFF Library")
++ENDIF(TIFF_FOUND)
++FIND_PACKAGE(ZLIB REQUIRED)
++IF (ZLIB_FOUND)
++  MESSAGE("ZLIB Library Found OK")
++  SET(HAVE_LIBZ 1)
++ENDIF(ZLIB_FOUND)
++FIND_PACKAGE(PythonLibs REQUIRED)
++IF (PYTHON_LIBRARY)
++  MESSAGE("Python Library Found OK")
++  SET(HAVE_PYTHON 1)
++  SET(COMPILE_PYTHON 1)
++ENDIF(PYTHON_LIBRARY)
++
++# START FREETYPE
++SET(FREETYPE_DIR ${CMAKE_MODULE_PATH})
++FIND_PACKAGE(FREETYPE REQUIRED)
++IF (FREETYPE_FOUND)
++  MESSAGE("FreeType2 Library Found OK")
++  CHECK_LIBRARY_EXISTS(libfreetype.so FT_Get_First_Char "" HAVE_FREETYPE_FIRST)
++  CHECK_LIBRARY_EXISTS(libfreetype.so FT_Get_Next_Char "" HAVE_FREETYPE_NEXT)
++ENDIF(FREETYPE_FOUND)
++#FIXME: if cflags empty add, otherwise replace as now
++SET(CFLAGS "${LIBFREETYPE_CFLAGS}")
++# END FREETYPE
++
++# If we have a RENDER_LIB selected from a previous cmake run, then use it
++# otherwise, we should be defaulting to Libart_LGPL for 1.3.3.x
++IF(RENDER_LIB)
++  MESSAGE(STATUS "Previously selected rendering system: ${RENDER_LIB}")
++ELSE(RENDER_LIB)
++  IF (NOT WANT_CAIRO)
++    SET(WANT_LIBART 1)
++  ENDIF (NOT WANT_CAIRO)
++ENDIF(RENDER_LIB)
++
++# START LIBART_LGPL
++IF (WANT_LIBART OR RENDER_LIB STREQUAL "LIBART")
++  SET(LIBART_LGPL_DIR ${CMAKE_MODULE_PATH})
++  FIND_PACKAGE(LIBART_LGPL REQUIRED)
++  IF(LIBART_LGPL_FOUND)
++    SET(RENDER_LIB "LIBART" CACHE TYPE STRING)
++    MESSAGE("Libart_LGPL Library Found OK")
++  ELSE(LIBART_LGPL_FOUND)
++    SET(OLDRENDERLIBLOST TRUE)
++  ENDIF(LIBART_LGPL_FOUND)
++ELSE (WANT_LIBART OR RENDER_LIB STREQUAL "LIBART")
++  # START CAIRO
++  SET(CAIRO_DIR ${CMAKE_MODULE_PATH})
++  FIND_PACKAGE(CAIRO)
++  IF(CAIRO_FOUND)
++    MESSAGE("CAIRO Library Found OK")
++    SET(RENDER_LIB "CAIRO" CACHE TYPE STRING)
++  ELSE(CAIRO_FOUND)
++    SET(OLDRENDERLIBLOST TRUE)
++  ENDIF(CAIRO_FOUND)
++  # END CAIRO
++ENDIF (WANT_LIBART OR RENDER_LIB STREQUAL "LIBART")
++# END LIBART_LGPL
++
++IF(NOT RENDER_LIB OR OLDRENDERLIBLOST)
++  MESSAGE(FATAL_ERROR "ERROR: Neither LibArt_LGPL nor cairo have been selected or found, please correct and restart cmake")
++ENDIF(NOT RENDER_LIB OR OLDRENDERLIBLOST)
++
++
++# START CUPS
++SET(CUPS_DIR ${CMAKE_MODULE_PATH})
++FIND_PACKAGE(CUPS REQUIRED)
++IF(CUPS_FOUND)
++  SET(HAVE_CUPS 1)
++  MESSAGE("CUPS Library Found OK")
++ENDIF(CUPS_FOUND)
++# END CUPS
++
++# START LIBXML2
++SET(LIBXML2_DIR ${CMAKE_MODULE_PATH})
++FIND_PACKAGE(LIBXML2 REQUIRED)
++IF(LIBXML2_FOUND)
++  SET(HAVE_XML 1)
++  MESSAGE("LIBXML2 Library Found OK")
++ENDIF(LIBXML2_FOUND)
++# END LIBXML2
++
++# START LCMS
++SET(LCMS_DIR ${CMAKE_MODULE_PATH})
++FIND_PACKAGE(LCMS REQUIRED)
++IF(LCMS_FOUND)
++  SET(HAVE_CMS 1)
++  SET(CMS_INC "lcms.h")
++  MESSAGE("LittleCMS Library Found OK")
++ELSE(LCMS_FOUND)
++  MESSAGE(FATAL_ERROR "Could not find the LittleCMS Library")
++ENDIF(LCMS_FOUND)
++# END LCMS
++
++# START FONTCONFIG
++SET(FONTCONFIG_DIR ${CMAKE_MODULE_PATH})
++FIND_PACKAGE(FONTCONFIG)
++IF(FONTCONFIG_FOUND)
++      MESSAGE("FontConfig Found OK")
++      SET(HAVE_FONTCONFIG 1)
++ENDIF(FONTCONFIG_FOUND)
++# END FONTCONFIG
++
++ADD_DEFINITIONS(${QT_DEFINITIONS})
++
++CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
++IF(HAVE_DLFCN_H)
++  ADD_DEFINITIONS(-DHAVE_DLFCN_H)
++ENDIF(HAVE_DLFCN_H)
++
++CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
++IF(HAVE_UNISTD_H)
++  ADD_DEFINITIONS(-DHAVE_UNISTD_H)
++ENDIF(HAVE_UNISTD_H)
++
++CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
++# IF(HAVE_SYS_TYPES_H)
++#   ADD_DEFINITIONS(-DHAVE_SYS_TYPES_H)
++# ENDIF(HAVE_SYS_TYPES_H)
++
++CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
++# IF(HAVE_SYS_STAT_H)
++#   ADD_DEFINITIONS(-DHAVE_SYS_STAT_H)
++# ENDIF(HAVE_SYS_STAT_H)
++
++
++#Create configure files.. config.h and uninstall
++#config.h
++INCLUDE (ConfigureChecks.cmake)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
++ADD_DEFINITIONS("-DHAVE_CONFIG_H")
++#uninstall
++CONFIGURE_FILE(
++  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
++  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
++  IMMEDIATE @ONLY)
++
++ADD_CUSTOM_TARGET(uninstall
++  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
++
++#Load our SCRIBUSQT package which gives us filename.moc instead of moc_filename.*
++SET(SCRIBUSQT_DIR ${CMAKE_MODULE_PATH})
++FIND_PACKAGE(SCRIBUSQT)
++
++#Set up include dirs with all found packages
++INCLUDE_DIRECTORIES(
++${CMAKE_BINARY_DIR}
++${CMAKE_BINARY_DIR}/scribus
++${QT_INCLUDE_DIR}
++${QT_INCLUDE_PATH}
++${CUPS_INCLUDE_DIR}
++${FREETYPE_INCLUDE_DIR}
++${FONTCONFIG_INCLUDE_DIR}
++${LCMS_INCLUDE_DIR}
++${LIBXML2_INCLUDE_DIR}
++${PYTHON_INCLUDE_PATH}
++${TIFF_INCLUDE_DIR}
++${ZLIB_INCLUDE_DIR}
++)
++
++#Set up libraries to link with all found packages
++
++#Select Libart_LGPL or Cairo
++IF(RENDER_LIB STREQUAL "LIBART")
++  INCLUDE_DIRECTORIES(${LIBART_LGPL_INCLUDE_DIR})
++  LINK_LIBRARIES(${LIBART_LGPL_LIBRARIES})
++ENDIF(RENDER_LIB STREQUAL "LIBART")
++IF(RENDER_LIB STREQUAL "CAIRO")
++  INCLUDE_DIRECTORIES(${CAIRO_INCLUDE_DIR})
++  LINK_LIBRARIES(${CAIRO_LIBRARIES})
++  LINK_DIRECTORIES(${PREFIX_CAIRO_LIB})
++  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${PREFIX_CAIRO_LIB}")
++ENDIF(RENDER_LIB STREQUAL "CAIRO")
++
++MESSAGE("RPATH: ${CMAKE_INSTALL_RPATH}")
++
++LINK_LIBRARIES (
++${QT_QT_LIBRARY}
++${CUPS_LIBRARIES}
++${FREETYPE_LIBRARIES}
++${FONTCONFIG_LIBRARIES}
++${LCMS_LIBRARIES}
++${LIBXML2_LIBRARIES}
++${PYTHON_LIBRARIES}
++${TIFF_LIBRARIES}
++${JPEG_LIBRARIES}
++${ZLIB_LIBRARIES}
++)
++
++IF(WIN32)
++  LINK_LIBRARIES(
++    ${QT_QTMAIN_LIBRARY}
++  )
++ENDIF(WIN32)
++
++IF(WIN32)
++  ADD_DEFINITIONS(-DQT_DLL)
++ENDIF(WIN32)
++
++IF(APPLE)
++  LINK_LIBRARIES( "-undefined dynamic_lookup" ) 
++  LINK_LIBRARIES( "-framework CoreFoundation" ) 
++ENDIF(APPLE)
++
++#Add our source subdirs
++ADD_SUBDIRECTORY(scribus)
++
++#Install our READMEs etc.
++INSTALL(FILES
++AUTHORS
++BUILDING
++ChangeLog
++ChangeLogCVS
++COPYING
++INSTALL
++NEWS
++PACKAGING
++README
++README.MacOSX
++TODO
++
++  DESTINATION ${DOCDIR}
++)
++INSTALL(FILES
++scribus.xml
++DESTINATION ${MIMEDIR}
++)
++
++# If the cmake version includes cpack, use it
++IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
++  SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Scribus is an open source publishing application for Linux, Mac OSX and Windows")
++  SET(CPACK_PACKAGE_VENDOR "Scribus Team")
++  SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
++  SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README")
++  SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
++  SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
++  SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
++  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Scribus ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
++  SET(CPACK_PACKAGE_EXECUTABLES "scribus${TAG_VERSION}")
++  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "scribus${TAG_VERSION}")
++  SET(CPACK_SOURCE_GENERATOR TBZ2)
++
++  INCLUDE(CPack)
++ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+diff -Nur scribus-1.3.3.6/cmake_uninstall.cmake.in scribus-1.3.3.6-cmake/cmake_uninstall.cmake.in
+--- scribus-1.3.3.6/cmake_uninstall.cmake.in   1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/cmake_uninstall.cmake.in     2006-12-05 12:19:45.000000000 +0100
+@@ -0,0 +1,18 @@
++IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
++  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
++ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
++
++FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
++STRING(REGEX REPLACE "\n" ";" files "${files}")
++FOREACH(file ${files})
++  MESSAGE(STATUS "Uninstalling \"${file}\"")
++  IF(NOT EXISTS "${file}")
++    MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
++  ENDIF(NOT EXISTS "${file}")
++  EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
++    OUTPUT_VARIABLE rm_out
++    RETURN_VARIABLE rm_retval)
++  IF("${rm_retval}" GREATER 0)
++    MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
++  ENDIF("${rm_retval}" GREATER 0)
++ENDFOREACH(file)
+\ Brak znaku nowej linii na koñcu pliku
+diff -Nur scribus-1.3.3.6/config.h.cmake scribus-1.3.3.6-cmake/config.h.cmake
+--- scribus-1.3.3.6/config.h.cmake     1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/config.h.cmake       2006-12-05 14:25:22.000000000 +0100
+@@ -0,0 +1,27 @@
++
++
++/*
++ * Prevent code from including config.h directly. You should include
++ * scconfig.h instead. This lets us handle win-config.h correctly, and
++ * may do more later.
++ */
++#ifndef _SCCONFIG_H
++#error "Include <scconfig.h> rather than using <config.h> directly"
++#endif
++
++#cmakedefine VERSION "1.3.3.6"
++
++#cmakedefine BUILD_MAC_BUNDLE
++#cmakedefine HAVE_CMS 1
++#cmakedefine HAVE_XML 1
++#cmakedefine CMS_INC "lcms.h"
++#cmakedefine HAVE_CAIRO 1
++#cmakedefine HAVE_CUPS 1
++#cmakedefine HAVE_TIFF 1
++#cmakedefine HAVE_LIBZ 1
++#cmakedefine HAVE_FONTCONFIG 1
++#cmakedefine HAVE_SYS_TYPES_H 1
++#cmakedefine HAVE_SYS_STAT_H 1
++#cmakedefine FT_FREETYPE_H
++#cmakedefine COMPILE_PYTHON 1
++#cmakedefine WORDS_BIGENDIAN 1
+diff -Nur scribus-1.3.3.6/ConfigureChecks.cmake scribus-1.3.3.6-cmake/ConfigureChecks.cmake
+--- scribus-1.3.3.6/ConfigureChecks.cmake      1970-01-01 01:00:00.000000000 +0100
++++ scribus-1.3.3.6-cmake/ConfigureChecks.cmake        2006-12-05 12:19:45.000000000 +0100
+@@ -0,0 +1,101 @@
++#http://websvn.kde.org/trunk/KDE/kdeaddons/ConfigureChecks.cmake?rev=520160&view=log
++
++include(CheckIncludeFile)
++include(CheckIncludeFiles)
++#include(CheckSymbolExists)
++include(CheckFunctionExists)
++include(CheckLibraryExists)
++#include(CheckPrototypeExists)
++include(CheckTypeSize)
++
++
++#check for libz using the cmake supplied FindZLIB.cmake
++if(ZLIB_FOUND)
++   set(HAVE_LIBZ 1)
++else(ZLIB_FOUND)
++   set(HAVE_LIBZ 0)
++endif(ZLIB_FOUND)
++
++if(JPEG_FOUND)
++   set(HAVE_LIBJPEG 1)
++else(JPEG_FOUND)
++   set(HAVE_LIBJPEG 0)
++endif(JPEG_FOUND)
++
++#check for png
++if(PNG_FOUND)
++   set(HAVE_LIBPNG 1)
++else(PNG_FOUND)
++   set(HAVE_LIBPNG 0)
++endif(PNG_FOUND)
++
++if(BZIP2_FOUND)
++   set(HAVE_BZIP2_SUPPORT 1)
++   if(BZIP2_NEED_PREFIX)
++      set(NEED_BZ2_PREFIX 1)
++   endif(BZIP2_NEED_PREFIX)
++else(BZIP2_FOUND)
++   set(HAVE_BZIP2_SUPPORT 0)
++endif(BZIP2_FOUND)
++
++if(LIBART_LGPL_FOUND)
++   set(HAVE_LIBART 1)
++   set(HAVE_CAIRO 0)
++else(LIBART_LGPL_FOUND)
++   set(HAVE_LIBART 0)
++   set(HAVE_CAIRO 1)
++endif(LIBART_LGPL_FOUND)
++
++if(CARBON_FOUND)
++        set(HAVE_CARBON 1)
++else(CARBON_FOUND)
++        set(HAVE_CARBON 0)
++endif(CARBON_FOUND)
++
++if(OPENSSL_FOUND)
++   set(HAVE_SSL 1)
++else(OPENSSL_FOUND)
++   set(HAVE_SSL 0)
++endif(OPENSSL_FOUND)
++
++
++check_include_files(endian.h HAVE_ENDIAN_H)
++check_include_files(fcntl.h HAVE_FCNTL_H)
++check_include_files(dlfcn.h HAVE_DLFCN_H)
++#check_include_files(crt_externs.h HAVE_CRT_EXTERNS_H)
++#check_include_files(inttypes.h HAVE_INTTYPES_H)
++#check_include_files(memory.h HAVE_MEMORY_H)
++#check_include_files(stdint.h HAVE_STDINT_H)
++#check_include_files(stdlib.h HAVE_STDLIB_H)
++#check_include_files(strings.h HAVE_STRINGS_H)
++#check_include_files(string.h HAVE_STRING_H)
++#check_include_files(sys/bitypes.h HAVE_SYS_BITYPES_H)
++#check_include_files(sys/stat.h HAVE_SYS_STAT_H)
++#check_include_files(sys/types.h HAVE_SYS_TYPES_H)
++check_include_files(unistd.h HAVE_UNISTD_H)
++
++#check_function_exists(_NSGetEnviron   HAVE_NSGETENVIRON)
++#check_function_exists(initgroups HAVE_INITGROUPS)
++#check_function_exists(setenv     HAVE_SETENV)
++#check_function_exists(strlcat    HAVE_STRLCAT)
++#check_function_exists(strlcpy    HAVE_STRLCPY)
++
++#check_symbol_exists(res_init        "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT)
++#check_symbol_exists(snprintf        "stdio.h"                  HAVE_SNPRINTF)
++#check_symbol_exists(vsnprintf       "stdio.h"                  HAVE_VSNPRINTF)
++
++
++#check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO)
++#check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO)
++#check_prototype_exists(setenv stdlib.h HAVE_SETENV_PROTO)
++#check_prototype_exists(strlcat string.h HAVE_STRLCAT_PROTO)
++#check_prototype_exists(strlcpy string.h HAVE_STRLCPY_PROTO)
++
++
++#check_type_size("int" SIZEOF_INT)
++#check_type_size("char *"  SIZEOF_CHAR_P)
++#check_type_size("long" SIZEOF_LONG)
++#check_type_size("short" SIZEOF_SHORT)
++#check_type_size("size_t" SIZEOF_SIZE_T)
++#check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG)
++
diff --git a/scribus-docdir.patch b/scribus-docdir.patch
new file mode 100644 (file)
index 0000000..a791da3
--- /dev/null
@@ -0,0 +1,12 @@
+diff -Nur scribus-1.3.3.6/scribus/scpaths.cpp scribus-1.3.3.6-docs/scribus/scpaths.cpp
+--- scribus-1.3.3.6/scribus/scpaths.cpp        2006-11-11 23:26:19.000000000 +0100
++++ scribus-1.3.3.6-docs/scribus/scpaths.cpp   2006-12-05 17:13:12.000000000 +0100
+@@ -49,7 +49,7 @@
+ // All paths are initialized to compile-time defaults passed in
+ // as preprocessor macros and set by autoconf.
+ ScPaths::ScPaths() :
+-      m_docDir(DOCDIR),
++      m_docDir(PLDDOCDIR),
+       m_iconDir(ICONDIR),
+       m_libDir(LIBDIR),
+       m_pluginDir(PLUGINDIR),
diff --git a/scribus-module-fixes.patch b/scribus-module-fixes.patch
new file mode 100644 (file)
index 0000000..51e52cc
--- /dev/null
@@ -0,0 +1,264 @@
+diff -ur scribus-1.3.3.4/scribus/plugins/barcodegenerator/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/barcodegenerator/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/barcodegenerator/Makefile.am       2006-03-14 01:11:47.000000000 +0100
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/barcodegenerator/Makefile.am  2006-10-29 15:41:24.000000000 +0100
+@@ -4,7 +4,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libbarcodegenerator_la_LDFLAGS = -version-info 0:0:0
++libbarcodegenerator_la_LDFLAGS = -avoid-version
+ libbarcodegenerator_la_METASOURCES = AUTO
+ libbarcodegenerator_la_SOURCES = barcode.cpp barcodegeneratorbase.ui barcodegenerator.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/colorwheel/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/colorwheel/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/colorwheel/Makefile.am     2006-03-29 14:41:03.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/colorwheel/Makefile.am        2006-10-29 15:40:05.000000000 +0100
+@@ -4,7 +4,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libcolorwheel_la_LDFLAGS = -version-info 0:0:0
++libcolorwheel_la_LDFLAGS = -avoid-version
+ libcolorwheel_la_METASOURCES = AUTO
+ libcolorwheel_la_SOURCES = colorwheel.cpp colorwheelwidget.cpp cwdialog.cpp colorblind.cpp cwsetcolor.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/fileloader/oldscribusformat/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oldscribusformat/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/fileloader/oldscribusformat/Makefile.am    2005-12-28 16:09:59.000000000 +0100
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oldscribusformat/Makefile.am       2006-10-29 15:40:05.000000000 +0100
+@@ -4,7 +4,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-liboldscribusformat_la_LDFLAGS = -version-info 0:0:0
++liboldscribusformat_la_LDFLAGS = -avoid-version
+ liboldscribusformat_la_METASOURCES = AUTO
+ liboldscribusformat_la_SOURCES = oldscribusformat.cpp oldscribusformatimpl.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/fileloader/oodraw/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oodraw/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/fileloader/oodraw/Makefile.am      2006-03-29 14:41:03.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/fileloader/oodraw/Makefile.am 2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-liboodrawimp_la_LDFLAGS = -version-info 0:0:0
++liboodrawimp_la_LDFLAGS = -avoid-version
+ liboodrawimp_la_METASOURCES = AUTO
+ liboodrawimp_la_SOURCES = oodrawimp.cpp stylestack.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/fontpreview/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/fontpreview/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/fontpreview/Makefile.am    2006-08-05 14:20:33.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/fontpreview/Makefile.am       2006-10-29 15:40:06.000000000 +0100
+@@ -4,7 +4,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libfontpreview_la_LDFLAGS = -version-info 0:0:0
++libfontpreview_la_LDFLAGS = -avoid-version
+ libfontpreview_la_METASOURCES = AUTO
+ libfontpreview_la_SOURCES = fontpreviewplugin.cpp fontpreview.cpp fontpreviewbase.ui
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/csvim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/csvim/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/csvim/Makefile.am  2006-03-29 14:41:03.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/csvim/Makefile.am     2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libcsvim_la_LDFLAGS = -version-info 0:0:0
++libcsvim_la_LDFLAGS = -avoid-version
+ libcsvim_la_METASOURCES = AUTO
+ libcsvim_la_SOURCES = csvdia.cpp csvim.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/docim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/docim/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/docim/Makefile.am  2006-03-29 14:41:03.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/docim/Makefile.am     2006-10-29 15:42:44.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libdocim_la_LDFLAGS = -version-info 0:0:0
++libdocim_la_LDFLAGS = -avoid-version
+ libdocim_la_METASOURCES = AUTO
+ libdocim_la_SOURCES = docim.cpp 
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/htmlim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/htmlim/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/htmlim/Makefile.am 2006-03-29 14:41:03.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/htmlim/Makefile.am    2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
+-libhtmlim_la_LDFLAGS = -version-info 0:0:0
++libhtmlim_la_LDFLAGS = -avoid-version
+ libhtmlim_la_METASOURCES = AUTO
+ libhtmlim_la_SOURCES = htmlim.cpp htmlreader.cpp 
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/odtim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/odtim/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/odtim/Makefile.am  2006-03-29 14:41:03.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/odtim/Makefile.am     2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
+-libodtimplugin_la_LDFLAGS = -version-info 0:0:0
++libodtimplugin_la_LDFLAGS = -avoid-version
+ libodtimplugin_la_METASOURCES = AUTO
+ libodtimplugin_la_SOURCES = odtim.cpp odtdia.cpp stylereader.cpp contentreader.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/pdbim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/pdbim/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/pdbim/Makefile.am  2006-03-29 14:41:05.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/pdbim/Makefile.am     2006-10-29 15:43:04.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libpdbim_la_LDFLAGS = -version-info 0:0:0
++libpdbim_la_LDFLAGS = -avoid-version
+ libpdbim_la_METASOURCES = AUTO
+ libpdbim_la_SOURCES = pdbim.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/sxwim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/sxwim/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/sxwim/Makefile.am  2006-03-29 14:41:08.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/sxwim/Makefile.am     2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(XML_CFLAGS) $(all_includes)
+-libsxwimplugin_la_LDFLAGS = -version-info 0:0:0
++libsxwimplugin_la_LDFLAGS = -avoid-version
+ libsxwimplugin_la_METASOURCES = AUTO
+ libsxwimplugin_la_SOURCES = sxwim.cpp sxwdia.cpp stylereader.cpp contentreader.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/textfilter/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/textfilter/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/textfilter/Makefile.am     2006-03-29 14:41:10.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/textfilter/Makefile.am        2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libtextfilterplugin_la_LDFLAGS = -version-info 0:0:0
++libtextfilterplugin_la_LDFLAGS = -avoid-version
+ libtextfilterplugin_la_METASOURCES = AUTO
+ libtextfilterplugin_la_SOURCES = textfilter.cpp tfdia.cpp tffilter.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/gettext/txtim/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/txtim/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/gettext/txtim/Makefile.am  2006-03-29 14:41:10.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/gettext/txtim/Makefile.am     2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libtxtim_la_LDFLAGS = -version-info 0:0:0
++libtxtim_la_LDFLAGS = -avoid-version
+ libtxtim_la_METASOURCES = AUTO
+ libtxtim_la_SOURCES = txtim.cpp 
+diff -ur scribus-1.3.3.4/scribus/plugins/myplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/myplugin/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/myplugin/Makefile.am       2005-12-28 16:10:02.000000000 +0100
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/myplugin/Makefile.am  2006-10-29 15:40:06.000000000 +0100
+@@ -9,7 +9,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libmyplugin_la_LDFLAGS = -version-info 0:0:0
++libmyplugin_la_LDFLAGS = -avoid-version
+ libmyplugin_la_METASOURCES = AUTO
+ libmyplugin_la_SOURCES = myplugin.cpp mypluginimpl.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/newfromtemplateplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/newfromtemplateplugin/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/newfromtemplateplugin/Makefile.am  2006-03-29 14:41:11.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/newfromtemplateplugin/Makefile.am     2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libnewfromtemplateplugin_la_LDFLAGS = -version-info 0:0:0
++libnewfromtemplateplugin_la_LDFLAGS = -avoid-version
+ libnewfromtemplateplugin_la_METASOURCES = AUTO
+ libnewfromtemplateplugin_la_SOURCES = nftemplate.cpp nftdialog.cpp nftrcreader.cpp nftsettings.cpp nfttemplate.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/pixmapexport/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/pixmapexport/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/pixmapexport/Makefile.am   2006-03-29 14:41:11.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/pixmapexport/Makefile.am      2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libscribusexportpixmap_la_LDFLAGS = -version-info 0:0:0
++libscribusexportpixmap_la_LDFLAGS = -avoid-version
+ libscribusexportpixmap_la_METASOURCES = AUTO
+ libscribusexportpixmap_la_SOURCES = export.cpp dialog.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/psimport/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/psimport/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/psimport/Makefile.am       2006-03-29 14:41:11.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/psimport/Makefile.am  2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libimportps_la_LDFLAGS = -version-info 0:0:0
++libimportps_la_LDFLAGS = -avoid-version
+ libimportps_la_METASOURCES = AUTO
+ libimportps_la_SOURCES = importps.cpp importpsplugin.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/saveastemplateplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/saveastemplateplugin/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/saveastemplateplugin/Makefile.am   2006-03-29 14:41:11.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/saveastemplateplugin/Makefile.am      2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libsaveastemplateplugin_la_LDFLAGS = -version-info 0:0:0
++libsaveastemplateplugin_la_LDFLAGS = -avoid-version
+ libsaveastemplateplugin_la_METASOURCES = AUTO
+ libsaveastemplateplugin_la_SOURCES = satemplate.cpp satdialog.cpp 
+diff -ur scribus-1.3.3.4/scribus/plugins/scriptplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/scriptplugin/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/scriptplugin/Makefile.am   2006-03-29 14:41:11.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/scriptplugin/Makefile.am      2006-10-29 15:40:06.000000000 +0100
+@@ -6,7 +6,7 @@
+ pluginsdir = $(libdir)/scribus/plugins
+ plugins_LTLIBRARIES = libscriptplugin.la
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libscriptplugin_la_LDFLAGS = -version-info 0:0:0 $(scripter2lib)
++libscriptplugin_la_LDFLAGS = -avoid-version $(scripter2lib)
+ libscriptplugin_la_METASOURCES = AUTO
+ libscriptplugin_la_SOURCES = \
+diff -ur scribus-1.3.3.4/scribus/plugins/short-words/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/short-words/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/short-words/Makefile.am    2006-03-29 14:41:12.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/short-words/Makefile.am       2006-10-29 15:40:06.000000000 +0100
+@@ -4,7 +4,7 @@
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+-libscribusshortwords_la_LDFLAGS = -version-info 0:0:0
++libscribusshortwords_la_LDFLAGS = -avoid-version
+ libscribusshortwords_la_METASOURCES = AUTO
+ libscribusshortwords_la_SOURCES = vlnadialog.cpp parse.cpp shortwords.cpp configuration.cpp version.h swprefsgui.cpp
+diff -ur scribus-1.3.3.4/scribus/plugins/svgexplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/svgexplugin/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/svgexplugin/Makefile.am    2006-03-29 14:41:18.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/svgexplugin/Makefile.am       2006-10-29 15:40:06.000000000 +0100
+@@ -2,7 +2,7 @@
+ plugins_LTLIBRARIES = libsvgexplugin.la
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ AM_LDFLAGS = $(LIBFREETYPE_LIBS) $(MODULE_LINK_FLAGS) 
+-libsvgexplugin_la_LDFLAGS = -version-info 0:0:0
++libsvgexplugin_la_LDFLAGS = -avoid-version
+ libsvgexplugin_la_METASOURCES = AUTO
+ libsvgexplugin_la_SOURCES = svgexplugin.cpp 
+ KDE_OPTIONS = qtonly
+diff -ur scribus-1.3.3.4/scribus/plugins/svgimplugin/Makefile.am scribus-1.3.3.4-module-fixes/scribus/plugins/svgimplugin/Makefile.am
+--- scribus-1.3.3.4/scribus/plugins/svgimplugin/Makefile.am    2006-03-29 14:41:18.000000000 +0200
++++ scribus-1.3.3.4-module-fixes/scribus/plugins/svgimplugin/Makefile.am       2006-10-29 15:40:06.000000000 +0100
+@@ -2,7 +2,7 @@
+ plugins_LTLIBRARIES = libsvgimplugin.la
+ INCLUDES = $(LIBFREETYPE_CFLAGS) $(all_includes)
+ AM_LDFLAGS =  $(LIBFREETYPE_LIBS) $(MODULE_LINK_FLAGS) 
+-libsvgimplugin_la_LDFLAGS = -version-info 0:0:0
++libsvgimplugin_la_LDFLAGS = -avoid-version
+ libsvgimplugin_la_METASOURCES = AUTO
+ libsvgimplugin_la_SOURCES = svgplugin.cpp 
+ KDE_OPTIONS = qtonly
diff --git a/scribus-nolibs.patch b/scribus-nolibs.patch
new file mode 100644 (file)
index 0000000..600e13a
--- /dev/null
@@ -0,0 +1,25 @@
+--- scribus-1.3.1/configure.in.orig    2005-10-03 02:04:41.000000000 +0200
++++ scribus-1.3.1/configure.in 2005-10-05 13:03:41.000000000 +0200
+@@ -339,18 +339,18 @@
+ fi
+ dnl check for -lsocket
+-AC_CHECK_LIB(socket,socket,
++AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket,
+ if test "$uname" != "IRIX"; then
+       LIBS="-lsocket $LIBS"
+ else
+       echo "Not using -lsocket since you are running IRIX."
+-fi)
+-AC_CHECK_LIB(nsl,gethostbyaddr,
++fi)])
++AC_CHECK_FUNC(gethostbyaddr,,[AC_CHECK_LIB(nsl,gethostbyaddr,
+ if test "$uname" != "IRIX"; then
+       LIBS="-lnsl $LIBS"
+ else
+       echo "Not using -lnsl since you are running IRIX."
+-fi)
++fi)])
+ dnl Check for lcms
+ dnl TODO look for lcms using pkg-config too
diff --git a/scribus-python.patch b/scribus-python.patch
new file mode 100644 (file)
index 0000000..f031bef
--- /dev/null
@@ -0,0 +1,45 @@
+diff -ur scribus-1.2.1/acinclude.m4 scribus-1.2.1-patch/acinclude.m4
+--- scribus-1.2.1/acinclude.m4 2004-11-17 10:49:56.000000000 +0100
++++ scribus-1.2.1-patch/acinclude.m4   2004-11-18 13:30:11.421704096 +0100
+@@ -4114,7 +4114,7 @@
+ PYTHONINC=-I$python_incdir
+-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
++python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/share /usr/local /usr/lib64 /usr/lib$kdelibsuff $kde_extra_libs"
+ AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
+ if test ! -r $python_libdir/libpython$version.so; then
+   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
+@@ -4133,9 +4133,9 @@
+   LIBPYTHON=-lpython$version
+ fi
+-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
++AC_FIND_FILE(python$version/copy.pyo, $python_libdirs, python_moddir)
+ python_moddir=$python_moddir/python$version
+-if test ! -r $python_moddir/copy.py; then
++if test ! -r $python_moddir/copy.pyo; then
+   python_moddir=no
+ fi
+diff -ur scribus-1.3.3.4-python/acinclude.m4 scribus-1.3.3.4/acinclude.m4
+--- scribus-1.3.3.4-python/acinclude.m4        2006-10-03 01:07:35.000000000 +0200
++++ scribus-1.3.3.4/acinclude.m4       2006-10-24 11:40:07.000000000 +0200
+@@ -4183,7 +4183,8 @@
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+-  KDE_CHECK_PYTHON_INTERN("2.4",
++ KDE_CHECK_PYTHON_INTERN("2.5",
++  [KDE_CHECK_PYTHON_INTERN("2.4",
+    [KDE_CHECK_PYTHON_INTERN("2.3", 
+     [KDE_CHECK_PYTHON_INTERN("2.2", 
+      [KDE_CHECK_PYTHON_INTERN("2.1", 
+@@ -4193,6 +4194,7 @@
+      ])
+     ])
+    ])
++  ])
+ ])
+ AC_DEFUN([KDE_CHECK_STL],
diff --git a/scribus-version.patch b/scribus-version.patch
new file mode 100644 (file)
index 0000000..52c12a7
--- /dev/null
@@ -0,0 +1,12 @@
+diff -ur scribus-1.3.3.7/config.h.cmake scribus-1.3.3.7-cmake/config.h.cmake
+--- scribus-1.3.3.7/config.h.cmake     2006-11-12 00:38:58.000000000 +0100
++++ scribus-1.3.3.7-cmake/config.h.cmake       2007-01-15 10:25:02.000000000 +0100
+@@ -9,7 +9,7 @@
+ #error "Include <scconfig.h> rather than using <config.h> directly"
+ #endif
+-#cmakedefine VERSION "1.3.3.6cvs"
++#cmakedefine VERSION "1.3.3.7"
+ #cmakedefine BUILD_MAC_BUNDLE
+ #cmakedefine HAVE_CMS 1
diff --git a/scribus.spec b/scribus.spec
new file mode 100644 (file)
index 0000000..7cbd69b
--- /dev/null
@@ -0,0 +1,276 @@
+#
+# Conditional build:
+%bcond_with    cairo   # build with cairo support
+%bcond_without cups    # build without CUPS support
+#
+Summary:       Scribus - Open Source Desktop Publishing
+Summary(pl.UTF-8):     Scribus - DTP dla Wolnego Oprogramowania
+Name:          scribus
+Version:       1.3.3.8
+Release:       1
+License:       GPL v2
+Group:         X11/Applications/Publishing
+Source0:       http://dl.sourceforge.net/scribus/%{name}-%{version}.tar.bz2
+# Source0-md5: fa79c8bba3e6e09b0bdeaf16579d6fa1
+Source1:       %{name}.desktop
+Patch1:                %{name}-standard-font-paths.patch
+URL:           http://www.scribus.net/
+%{?with_cairo:BuildRequires:   cairo-devel >= 1.2.0}
+BuildRequires: cmake >= 2.4.5
+%if %{with cups}
+BuildRequires: cups-devel
+%else
+BuildConflicts:        cups-devel
+%endif
+BuildRequires: freetype-devel >= 2.1.0
+BuildRequires: lcms-devel >= 1.09
+%{!?with_cairo:BuildRequires:  libart_lgpl-devel >= 2.3.14}
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libxml2-devel
+BuildRequires: openssl-devel
+BuildRequires: perl-base
+BuildRequires: python-devel
+BuildRequires: python-modules
+BuildRequires: qt-devel >= 6:3.0.5
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.293
+BuildRequires: sed >= 4.0
+BuildRequires: zlib-devel
+Requires:      desktop-file-utils
+Requires:      python-PIL
+Requires:      python-tkinter
+Obsoletes:     scribus-scripting
+Obsoletes:     scribus-short-words
+Obsoletes:     scribus-svg
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define                specflags_ia32  -fomit-frame-pointer
+%define                _ulibdir        %{_prefix}/lib
+
+%description
+Scribus is an open source desktop page layout program with the aim of
+producing commerical grade output in PDF and Postscript, primarily,
+though not exclusively for Linux(R).
+
+%description -l pl.UTF-8
+Scribus jest to program do tworzenia publikacji z założenia generujący
+dokumenty PDF oraz Postscript nadające się do użytku komercyjnego,
+przeznaczony głównie, lecz nie tylko, dla systemu Linux(R).
+
+%package devel
+Summary:       Header files for Scribus plugins development
+Summary(pl.UTF-8):     Pliki nagłówkowe do tworzenia wtyczek Scribusa
+Group:         Development/Libraries
+# currently it doesn't require base
+Requires:      qt-devel
+
+%description devel
+Header files for Scribus plugins development.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do tworzenia wtyczek Scribusa.
+
+%package docs
+Summary:       Documentation for Scribus
+Summary(pl.UTF-8):     Dokumentacja dla Scribusa
+License:       custom OPL (see License),FDL
+Group:         X11/Applications/Publishing
+
+%description docs
+User documentation for Scribus.
+
+%description docs -l pl.UTF-8
+Dokumentacja użytkownika dla Scribusa.
+
+%package icc
+Summary:       ICC profiles for Scribus
+Summary(pl.UTF-8):     Profile ICC dla Scribusa
+License:       freely distributable
+Group:         X11/Applications/Publishing
+Requires:      %{name} = %{version}-%{release}
+
+%description icc
+Some standard ICM CMYK and RGB profiles for use with Scribus. You
+should take care to use custom ones!
+
+%description icc -l pl.UTF-8
+Standardowe profile ICM w formacie CMYK i RGB do użycia w Scribusie.
+Zalecane jest używanie własnych profili zamiast nich!
+
+%package templates-base
+Summary:       Default document templates
+Summary(pl.UTF-8):     Domyślne szablony dokumentów
+License:       GPL v2
+Group:         X11/Applications/Publishing
+Requires:      %{name} = %{version}-%{release}
+Obsoletes:     scribus-templates < 1.2.1
+
+%description templates-base
+Default document templates shipped with Scribus.
+
+%description templates-base -l pl.UTF-8
+Domyślne szablony dokumentów dostarczane wraz ze Scribusem.
+
+%prep
+%setup -q
+%patch1 -p1
+
+%build
+export QTDIR=%{_prefix}
+export KDEDIR=%{_prefix}
+
+%cmake . \
+       -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+%if %{with cairo}
+       -DWANT_CAIRO=1
+%else
+       -DWANT_LIBART=1
+%endif
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install $RPM_BUILD_ROOT%{_datadir}/%{name}/icons/scribusicon.png $RPM_BUILD_ROOT%{_pixmapsdir}
+
+mv $RPM_BUILD_ROOT%{_ulibdir}/scribus/%{name}.lt_LT.qm $RPM_BUILD_ROOT%{_ulibdir}/scribus/%{name}.lt.qm
+
+rm -f $RPM_BUILD_ROOT%{_ulibdir}/scribus/*.no.qm
+
+rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{AUTHORS,BUILDING,COPYING,ChangeLog,ChangeLogCVS,INSTALL,NEWS,PACKAGING,README,README.MacOSX,TODO}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_desktop_database_post
+%update_mime_database
+
+%postun
+%update_desktop_database_postun
+%update_mime_database
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS BUILDING ChangeLog ChangeLogCVS INSTALL NEWS README TODO
+%attr(755,root,root) %{_bindir}/scribus
+%dir %{_ulibdir}/%{name}
+%{_ulibdir}/%{name}/import.prolog
+# don't mark dictionaries with lang() --misiek
+%{_ulibdir}/%{name}/dicts
+%{_ulibdir}/%{name}/keysets
+%dir %{_ulibdir}/%{name}/plugins
+%attr(755,root,root) %{_ulibdir}/%{name}/plugins/*.so*
+%dir %{_ulibdir}/%{name}/plugins/gettext
+%attr(755,root,root) %{_ulibdir}/%{name}/plugins/gettext/*.so*
+%dir %{_ulibdir}/scribus/profiles
+%lang(af) %{_ulibdir}/scribus/scribus.af.qm
+%lang(bg) %{_ulibdir}/scribus/scribus.bg.qm
+%lang(br) %{_ulibdir}/scribus/scribus.br.qm
+%lang(ca) %{_ulibdir}/scribus/scribus.ca.qm
+%lang(cs) %{_ulibdir}/scribus/scribus.cs.qm
+%lang(cy) %{_ulibdir}/scribus/scribus.cy.qm
+%lang(da) %{_ulibdir}/scribus/scribus.da.qm
+%lang(de) %{_ulibdir}/scribus/scribus.de.qm
+%lang(de_CH) %{_ulibdir}/scribus/scribus.de_CH.qm
+%lang(de_OL) %{_ulibdir}/scribus/scribus.de_ol.qm
+%lang(dz) %{_ulibdir}/scribus/scribus.dz.qm
+%lang(el) %{_ulibdir}/scribus/scribus.el.qm
+#%lang(en_AU) %{_ulibdir}/scribus/scribus.en_AU.qm
+%lang(en_GB) %{_ulibdir}/scribus/scribus.en_GB.qm
+#%lang(en_US) %{_ulibdir}/scribus/scribus.en_US.qm
+%lang(eo) %{_ulibdir}/scribus/scribus.eo.qm
+%lang(es) %{_ulibdir}/scribus/scribus.es.qm
+%lang(es_LA) %{_ulibdir}/scribus/scribus.es_LA.qm
+%lang(et) %{_ulibdir}/scribus/scribus.et.qm
+%lang(eu) %{_ulibdir}/scribus/scribus.eu.qm
+%lang(fi) %{_ulibdir}/scribus/scribus.fi.qm
+%lang(fr) %{_ulibdir}/scribus/scribus.fr.qm
+%lang(gl) %{_ulibdir}/scribus/scribus.gl.qm
+%lang(hu) %{_ulibdir}/scribus/scribus.hu.qm
+%lang(id) %{_ulibdir}/scribus/scribus.id.qm
+%lang(it) %{_ulibdir}/scribus/scribus.it.qm
+%lang(ja) %{_ulibdir}/scribus/scribus.ja.qm
+%lang(ko) %{_ulibdir}/scribus/scribus.ko.qm
+%lang(lt) %{_ulibdir}/scribus/scribus.lt.qm
+%lang(nl) %{_ulibdir}/scribus/scribus.nl.qm
+%lang(nb) %{_ulibdir}/scribus/scribus.nb.qm
+%lang(pl) %{_ulibdir}/scribus/scribus.pl.qm
+%lang(pt_BR) %{_ulibdir}/scribus/scribus.pt_BR.qm
+%lang(ru) %{_ulibdir}/scribus/scribus.ru.qm
+%lang(se) %{_ulibdir}/scribus/scribus.se.qm
+%lang(sk) %{_ulibdir}/scribus/scribus.sk.qm
+%lang(sl) %{_ulibdir}/scribus/scribus.sl.qm
+%lang(sq) %{_ulibdir}/scribus/scribus.sq.qm
+%lang(sr) %{_ulibdir}/scribus/scribus.sr.qm
+%lang(th) %{_ulibdir}/scribus/scribus.th_TH.qm
+%lang(tr) %{_ulibdir}/scribus/scribus.tr.qm
+%lang(uk) %{_ulibdir}/scribus/scribus.uk.qm
+%lang(zh_CN) %{_ulibdir}/scribus/scribus.zh.qm
+%dir %{_ulibdir}/%{name}/swatches
+%{_ulibdir}/%{name}/swatches/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/dtd
+%{_datadir}/%{name}/icons
+%{_datadir}/%{name}/loremipsum
+%{_datadir}/mime/packages/scribus.xml
+%dir %{_datadir}/%{name}/plugins
+%{_datadir}/%{name}/plugins/*
+%dir %{_datadir}/%{name}/samples
+%{_datadir}/%{name}/samples/*.py
+%dir %{_datadir}/%{name}/scripts
+%{_datadir}/%{name}/scripts/*.py
+%{_desktopdir}/%{name}.desktop
+%{_mandir}/man1/%{name}.*
+%lang(pl) %{_mandir}/pl/man1/%{name}.*
+%{_pixmapsdir}/%{name}icon.png
+
+#%files devel
+#%defattr(644,root,root,755)
+#%{_includedir}/scribus
+
+%files docs
+%defattr(644,root,root,755)
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/en
+%{_docdir}/%{name}/en/*
+%lang(cs) %dir %{_docdir}/%{name}/cs
+%lang(cs) %dir %{_docdir}/%{name}/cs/tutorials
+%lang(cs) %dir %{_docdir}/%{name}/cs/tutorials/scribus-short-words
+%lang(cs) %{_docdir}/%{name}/cs/tutorials/scribus-short-words/*
+%lang(de) %dir %{_docdir}/%{name}/de
+%lang(de) %{_docdir}/%{name}/de/*
+%lang(fr) %dir %{_docdir}/%{name}/fr
+%lang(fr) %{_docdir}/%{name}/fr/*.html
+%lang(fr) %dir %{_docdir}/%{name}/fr/tutorials
+%lang(fr) %dir %{_docdir}/%{name}/fr/tutorials/scribus-short-words
+%lang(fr) %{_docdir}/%{name}/fr/tutorials/scribus-short-words/*
+%lang(pl) %dir %{_docdir}/%{name}/pl
+%lang(pl) %dir %{_docdir}/%{name}/pl/tutorials
+%lang(pl) %dir %{_docdir}/%{name}/pl/tutorials/scribus-short-words
+%lang(pl) %{_docdir}/%{name}/pl/tutorials/scribus-short-words/*
+
+%files icc
+%defattr(644,root,root,755)
+%{_ulibdir}/scribus/profiles/*
+
+%files templates-base
+%defattr(644,root,root,755)
+%dir %{_datadir}/%{name}/templates
+%{_datadir}/%{name}/templates/*.xml
+%dir %{_datadir}/%{name}/templates/br1
+%{_datadir}/%{name}/templates/br1/*
+%dir %{_datadir}/%{name}/templates/nl1
+%{_datadir}/%{name}/templates/nl1/*
+%dir %{_datadir}/%{name}/templates/sc_presentation
+%{_datadir}/%{name}/templates/sc_presentation/*
+%dir %{_datadir}/%{name}/templates/textbased
+%{_datadir}/%{name}/templates/textbased/*
This page took 0.154036 seconds and 4 git commands to generate.