Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/text
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7897
Modified Files:
scribus-aqua.info scribus.info
Added Files:
scribus.patch
Log Message:
latest version to stable
--- NEW FILE: scribus.patch ---
--- scribus-1.3.3.12/CMakeLists.txt 2008-06-20 23:44:21.000000000 +0200
+++ scribus-1.3.3.12_corr/CMakeLists.txt 2008-08-21 19:54:45.000000000
+0200
@@ -221,15 +221,15 @@
SET (QT_MT_REQUIRED true)
SET (QT_MIN_VERSION "3.3.4")
FIND_PACKAGE(Qt3 REQUIRED)
+ MESSAGE("QTDIR=$ENV{QTDIR}")
+ MESSAGE("QT_MOC_EXECUTABLE=${QT_MOC_EXECUTABLE}")
+ MESSAGE("QT_UIC_EXECUTABLE=${QT_UIC_EXECUTABLE}")
+ MESSAGE("QT_QT_LIBRARY=${QT_QT_LIBRARY}")
+ MESSAGE("QT_INCLUDE_DIR=${QT_INCLUDE_DIR}")
+ MESSAGE("qt_version_str=${qt_version_str}")
+ MESSAGE("qt_version_str_lib=${qt_version_str_lib}")
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)
@@ -263,12 +263,13 @@
ENDIF(PYTHON_LIBRARY)
# START FREETYPE
-SET(FREETYPE_DIR ${CMAKE_MODULE_PATH})
-FIND_PACKAGE(FREETYPE REQUIRED)
+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)
+MESSAGE("LIBFREETYPE_CFLAGS: ${LIBFREETYPE_CFLAGS}")
+MESSAGE("FREETYPE_INCLUDE_DIR: ${FREETYPE_INCLUDE_DIR}")
+MESSAGE("FREETYPE_INCLUDE_DIRS: ${FREETYPE_INCLUDE_DIRS}")
+MESSAGE("FREETYPE_LIBRARIES: ${FREETYPE_LIBRARIES}")
ENDIF(FREETYPE_FOUND)
#FIXME: if cflags empty add, otherwise replace as now
SET(CFLAGS "${LIBFREETYPE_CFLAGS}")
@@ -397,10 +398,12 @@
INCLUDE_DIRECTORIES(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/scribus
+${CMAKE_SOURCE_DIR}/scribus
${QT_INCLUDE_DIR}
${QT_INCLUDE_PATH}
${CUPS_INCLUDE_DIR}
${FREETYPE_INCLUDE_DIR}
+${FREETYPE_INCLUDE_DIRS}
${FONTCONFIG_INCLUDE_DIR}
${LCMS_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
Index: scribus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/scribus.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scribus.info 16 Jul 2008 03:01:51 -0000 1.8
+++ scribus.info 29 Sep 2008 04:56:47 -0000 1.9
@@ -1,6 +1,6 @@
Package: scribus
Version: 1.3.3.12
-Revision: 1
+Revision: 2
GCC: 4.0
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
Source-MD5: 48f6d762809ad714b366d8d4fc82d5c3
@@ -10,27 +10,28 @@
Replaces: scribus12, scribus-i18n-en, scribus-scripting, scribus134
Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts
Depends: x11, ghostscript, qt3-shlibs (>= 3.3.5-1023), libjpeg-shlibs,
libjpeg-bin, lcms-shlibs, libart2-shlibs, libpng3-shlibs, libtiff-shlibs,
freetype219-shlibs, libxml2-shlibs, libiconv, python25, pil-py25
-BuildDepends: x11-dev, lcms, libjpeg, qt3 (>= 3.3.5-1023), libart2, cups-dev,
libpng3, libtiff, freetype219, libxml2, libiconv-dev, python, cmake (>= 2.4.6-1)
+BuildDepends: fink (>= 0.24.12), x11-dev, lcms, libjpeg, qt3 (>= 3.3.5-1023),
libart2, cups-dev, libpng3, libtiff, freetype219, libxml2, libiconv-dev,
python, cmake (>= 2.6.0-1)
SetLDFLAGS: -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+PatchFile: %n.patch
+PatchFile-MD5: a0c9dadc5b4651f8fcb59601903ebe73
PatchScript: <<
#!/bin/sh -ev
-# Try to make cmake find Fink's freetype219. Needs quite some coaxing...
+# Try to make cmake find Fink's freetype219. Needs quite some coaxing..
+ patch -p1 < %{PatchFile}
+ rm cmake/modules/FREETYPEConfig.cmake
# Also don't build an app bundle in this version. We are using X11 here.
- perl -pi.bak -e 's|/usr/local/|%p/lib/freetype219/|g'
cmake/modules/FREETYPEConfig.cmake
- perl -pi.bak -e '
- s|libfreetype.so( FT.* )\"\"(.*)|libfreetype.dylib\1
\"%p/lib/freetype219/lib\"\2|g;
- s|(BUILD_MAC_BUNDLE) 1|\1 0|g;
-
s|(\$\{CMAKE_BINARY_DIR\}/scribus)|\1\n\$\{CMAKE_SOURCE_DIR\}/scribus|g
- ' CMakeLists.txt
+ perl -pi.bak -e 's|(BUILD_MAC_BUNDLE) 1|\1 0|g;' CMakeLists.txt
<<
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/freetype219/bin:$PATH
mkdir build
cd build
- cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ cmake --debug-output -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_INSTALL_PREFIX:PATH=%p \
- -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=%p/lib/freetype219/include \
+ -DFREETYPE_DIR:PATH=%p/lib/freetype219 \
+ -DFREETYPE_INCLUDE_DIR_ft2build:PATH=%p/lib/freetype219/include \
+
-DFREETYPE_INCLUDE_DIR_freetype2:PATH=%p/lib/freetype219/include/freetype2 \
-DFREETYPE_LIBRARY:FILEPATH=%p/lib/freetype219/lib/libfreetype.dylib \
-DBUILD_MAC_BUNDLE:BOOL=0 \
-DPYTHON_DEBUG_LIBRARY:FILEPATH=%p/lib/python2.5/config/libpython2.5.dylib \
Index: scribus-aqua.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/scribus-aqua.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scribus-aqua.info 16 Jul 2008 03:01:51 -0000 1.6
+++ scribus-aqua.info 29 Sep 2008 04:56:47 -0000 1.7
@@ -1,6 +1,6 @@
Package: scribus-aqua
Version: 1.3.3.12
-Revision: 1
+Revision: 3
Source: mirror:sourceforge:scribus/scribus-%v.tar.bz2
Source-MD5: 48f6d762809ad714b366d8d4fc82d5c3
SourceDirectory: scribus-%v
@@ -10,20 +10,21 @@
GCC: 4.0
Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts
Depends: ghostscript, qt3mac-shlibs (>= 3.3.5-13), qt3mac-apps (>= 3.3.5-13),
libjpeg-shlibs, libjpeg-bin, lcms-shlibs, libart2-shlibs, libpng3-shlibs,
libtiff-shlibs, freetype219-shlibs, libxml2-shlibs, libiconv, fontconfig2-shlibs
-BuildDepends: lcms, libjpeg, qt3mac (>= 3.3.5-13), libart2, cups-dev, libpng3,
libtiff, freetype219, libxml2, libiconv-dev, fontconfig2-dev, expat1, cmake (>=
2.4.6-1)
+BuildDepends: fink (>= 0.24.12), lcms, libjpeg, qt3mac (>= 3.3.5-13), libart2,
cups-dev, libpng3, libtiff, freetype219, libxml2, libiconv-dev,
fontconfig2-dev, expat1, cmake (>= 2.6.0-1)
BuildConflicts: qt3, qt3-dev
Conflicts: scribus134-aqua
Replaces: scribus134-aqua
SetLDFLAGS: -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+PatchFile: scribus.patch
+PatchFile-MD5: a0c9dadc5b4651f8fcb59601903ebe73
PatchScript: <<
#!/bin/sh -ev
+#don't build pixbuf stuff that wants to pull in X11
+ perl -pi.bak -e 's|^.*pixbuf.*$||g; s|^.*PIXBUF.*$||g' scribus/CMakeLists.txt
# Use Fink's freetype219
# and place all source tree include dirs before %p/include
- perl -pi.bak -e 's|/usr/local/|%p/lib/freetype219/|g'
cmake/modules/FREETYPEConfig.cmake
- perl -pi.bak -e '
- s|libfreetype.so( FT.* )\"\"(.*)|libfreetype.dylib\1
\"%p/lib/freetype219/lib\"\2|g;
-
s|(\$\{CMAKE_BINARY_DIR\}/scribus)|\1\n\$\{CMAKE_SOURCE_DIR\}/scribus|g
- ' CMakeLists.txt
+# with cmake-2.6.0 this gets too messy to do with a patch script, we need a
patch file now
+ patch -p1 < %{PatchFile}
<<
CompileScript: <<
#!/bin/sh -ex
@@ -32,15 +33,21 @@
# For fontconfig2, we have to bypass Scribus' CMake find mechanism,
# so that it finds Fink's fontconfig2, which is still important
# on Tiger.
+# For freetype219, we provide both
+# FREETYPE_INCLUDE_DIR_FT2BUILD (understood by cmake-2.4, used by scribus) and
+# FREETYPE_INCLUDE_DIR_ft2build (understood by cmake-2.6)
+#
export PATH=%p/lib/freetype219/bin:$PATH
unset QMAKESPEC
export QTDIR=%p/lib/qt3mac
mkdir build
cd build
- cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ cmake --debug-output -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_INSTALL_PREFIX:PATH=%p \
- -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=%p/lib/freetype219/include \
+ -DFREETYPE_DIR:PATH=%p/lib/freetype219 \
+ -DFREETYPE_INCLUDE_DIR_ft2build:PATH=%p/lib/freetype219/include \
+
-DFREETYPE_INCLUDE_DIR_freetype2:PATH=%p/lib/freetype219/include/freetype2 \
-DFREETYPE_LIBRARY:FILEPATH=%p/lib/freetype219/lib/libfreetype.dylib \
-DFONTCONFIG_INCLUDE_DIR:PATH=%p/lib/fontconfig2/include \
-DFONTCONFIG_LIBRARY:FILEPATH=%p/lib/fontconfig2/lib/libfontconfig.dylib \
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
