Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs17:/tmp/cvs-serv16580

Modified Files:
        scribus-aqua.info 
Log Message:
Fix pixmap and icon loading bugs

Index: scribus-aqua.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/scribus-aqua.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scribus-aqua.info   28 May 2007 22:42:09 -0000      1.17
+++ scribus-aqua.info   30 Jul 2007 11:07:58 -0000      1.18
@@ -1,6 +1,6 @@
 Package: scribus-aqua
 Version: 1.3.4
-Revision: 1
+Revision: 3
 Source: mirror:sourceforge:scribus/scribus-%v.tar.bz2
 Source-MD5: cd3bc6cc6c2e2826eb689342e439443d
 Source2: http://perso.wanadoo.fr/costabel/Scribusapp-skeleton.tar.bz2
@@ -20,6 +20,10 @@
           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
+#don't build pixbuf stuff that wants to pull in X11
+  perl -pi.bak -e 's|^.*pixbuf.*$||g; s|^.*PIXBUF.*$||g' 
scribus/CMakeLists.txt 
+# remove spurious qtplugins definitions; this fixes icon loading bug
+ perl -pi.bak -e 's|.*qtplugins.*p.*a.*P.*|//$&|g' scribus/scpaths.cpp
 <<
 CompileScript: <<
 #!/bin/sh -ex
@@ -35,7 +39,7 @@
  mkdir build
  cd build
  cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-       -DCMAKE_INSTALL_PREFIX:PATH=%p \
+       -DCMAKE_INSTALL_PREFIX:PATH=%p/Applications/Scribus.app/Contents \
        -DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=%p/lib/freetype219/include \
        -DFREETYPE_LIBRARY:FILEPATH=%p/lib/freetype219/lib/libfreetype.dylib \
        -DFONTCONFIG_INCLUDE_DIR:PATH=%p/lib/fontconfig2/include \
@@ -48,14 +52,12 @@
 # This version has no Scribus.app skeleton, so we take the one from cvs
 # tar zxf Scribus.app.tgz
  mkdir -p %i/Applications
-# mv Scribus.app %i/Applications/
  /bin/cp -p -R ../Scribus.app %i/Applications/
  mkdir %i/Applications/Scribus.app/Contents/MacOS
  ln -s ../bin/scribus %i/Applications/Scribus.app/Contents/MacOS/Scribus
  cd build
  make install DESTDIR=%d
- /bin/cp /System/Library/ColorSync/Profiles/* %i/lib/scribus/profiles/ || 
/usr/bin/true
- mv %i/{bin,lib,share} %i/Applications/Scribus.app/Contents/
+ /bin/cp /System/Library/ColorSync/Profiles/* 
%i/Applications/Scribus.app/Contents/lib/scribus/profiles/ || /usr/bin/true
 <<
 DocFiles: AUTHORS COPYING ChangeLog README ChangeLogCVS
 PostInstScript: <<


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to