Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv632
Modified Files:
coot.info
Log Message:
coot version that compiles on pangocairo
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- coot.info 18 May 2008 15:51:13 -0000 1.69
+++ coot.info 30 May 2008 03:03:51 -0000 1.70
@@ -1,15 +1,15 @@
Package:coot
Version: 0.5-pre-1
-Revision: 1037
+Revision: 1074
GCC: 4.0
Source:
http://www.ysbl.york.ac.uk/~emsley/software/pre-release/%n-%v-revision-%r.tar.gz
# Source: http://www.ysbl.york.ac.uk/~emsley/software/%n-%v.tar.gz
-Source-MD5: 9081617ded138562357d473d4888d6cb
+Source-MD5: 9c46c563c91b44e7d518a62121e65ec6
SourceDirectory: %n-%v
Source2: http://www.ysbl.york.ac.uk/refmac/data/refmac5.4_dictionary.tar.gz
Source2-MD5: 14b965dc5ab9762c819f632c133998b9
Source3:
http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz
-Source3-MD5: 257ab90d44f1c877ada96720dbb87c13
+Source3-MD5: 257ab90d44f1c877ada96720dbb87c13
#
###############################################################################
Description: Crystallographic molecular graphics
@@ -42,8 +42,8 @@
gmp ,
gnome-libs-dev ,
gsl ,
- gtk+2 ,
- gtk+2-dev ,
+ gtk+2 (>= 2.12.0-1) ,
+ gtk+2-dev (>= 2.12.0-1) ,
gtkglext1 ,
guile18 ,
guile18-dev ,
@@ -52,21 +52,22 @@
imlib ,
libart2 (>= 2.3.16-2) ,
libgettext3-dev ,
- libglade2 ,
- libgnomecanvas2-dev ,
+ libglade2 (>= 2.6.2-1) ,
+ libgnomecanvas2-dev (>= 2.20.0) ,
libiconv-dev ,
libjpeg ,
libpng3 ,
librsvg2-gtk ,
libtool14 ,
- pango1-xft2-dev ,
+ pango1-xft2-ft219-dev ,
pygtk2-gtk-py25-dev ,
python25 ,
swig
<<
+#
# Note: gtkglext1 IS required at runtime for stereo functionality
Depends: <<
- atk1-shlibs ,
+ atk1-shlibs (>= 1.20.0-1) ,
coot-shlibs (= %v-%r) ,
freeglut-shlibs ,
giflib-shlibs ,
@@ -75,7 +76,7 @@
gnome-libs-shlibs ,
gnome-themes-glossy-p ,
gsl-shlibs ,
- gtk+2-shlibs ,
+ gtk+2-shlibs (>= 2.12.0-1) ,
gtkglext1-shlibs ,
gtkglext1 ,
guile18 ,
@@ -89,7 +90,7 @@
imlib-shlibs ,
libart2-shlibs ,
libgettext3-shlibs ,
- libgnomecanvas2-shlibs ,
+ libgnomecanvas2-shlibs (>= 2.20.0),
libiconv ,
libjpeg-shlibs ,
libpng3-shlibs ,
@@ -99,7 +100,7 @@
librsvg2-gtk ,
pango1-xft2-shlibs ,
pygtk2-gtk-py25 ,
- python25
+ python25
<<
#
###############################################################################
@@ -123,6 +124,10 @@
echo "(set-display-lists-for-maps 0)" >>| scheme/group-settings.scm
# Fix configure to work with gpp4 library instead of ccp4c
# perl -pi -e 's|ccp4c|gpp4|g' configure
+perl -pi.bak -e 's|2.8.0|2.6.0|g' configure
+# perl -pi.bak -e 's|have_glut=no|have_glut=yes|g' configure
+perl -pi.bak -e 's|have_goosh=no|have_goosh=yes|g' configure
+# perl -pi.bak -e 's|have_guile_gui=no|have_guile_gui=yes|g' configure
perl -pi -e "s|guile -c|guile-1.8 -c|g" configure
perl -pi -e 's|\(goosh\)|\(goosh goosh\)|g' configure
<<
@@ -137,26 +142,28 @@
<<
###############################################################################
CompileScript: <<
-#!/bin/zsh -efx
+#!/bin/zsh -ef
+# set -x
export
PATH=%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH:%p/share/guile/1.8/goosh
export SED=/usr/bin/sed
export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
+export PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:${PKG_CONFIG_PATH}
export
PYTHONPATH=%p/share/coot/python:%p/lib/python2.5:%p/lib/python2.5/site-packages:%p/lib/python2.5/site-packages/gtk-2.0:%p/lib/python2.5/site-packages/gtk-2.0
FLIBS="-L%p/lib" \
-CPPFLAGS="-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/include
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib/ssm -I%p/include
-I$PWD/ccp4mg-utils -I$PWD/src" \
-LDFLAGS="-L%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib -L%p/lib -L/usr/lib
-lSystemStubs -flat_namespace -L%p/lib/python2.5/config
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
+CPPFLAGS="-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/include
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib/ssm -I%p/include
-I/usr/X11R6/include" \
+LDFLAGS="-Wl,-dylib_file,%p/lib/pango-ft219/lib/libpango-1.0.dylib:%p/lib/pango-ft219/lib/libpangocairo-1.0.dylib:%p/lib/pango-ft219/lib/libpangoft2-1.0.dylib:%p/lib/pango-ft219/lib/libpangox-1.0.dylib:%p/lib/pango-ft219/lib/libpangoxft-1.0.dylib
-L%p/lib/pango-ft219/lib -L%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib -L%p/lib
-L/usr/lib -lSystemStubs -flat_namespace -L%p/lib/python2.5/config
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
CXX="/usr/bin/g++" \
CC="/usr/bin/gcc" \
./configure %c
# py_path="%p/bin/python2.5" \
#
#remake the src/coot_wrap_python.cc and src/coot_wrap_guile.cc files
- /bin/rm -f **/coot_wrap_**.cc
- cd src
+ /bin/rm -f **/coot_wrap_**.cc
+ cd src
touch c-interface-database.hh
- make coot_wrap_guile.cc
- make coot_wrap_python.cc
- cp coot_wrap_guile_pre.cc coot_wrap_guile.cc
+ make coot_wrap_guile.cc
+ make coot_wrap_python.cc
+ cp coot_wrap_guile_pre.cc coot_wrap_guile.cc
cd ..
make
<<
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
