Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv5762/main/finkinfo/sci
Modified Files:
Tag: pangocairo-branch
cadabra.info genius.info gretl.info gsl.info lie.info
Added Files:
Tag: pangocairo-branch
cadabra.patch
Log Message:
more validation fixes
--- NEW FILE: cadabra.patch ---
diff -uNr cadabra-0.119/gui/main.cc cadabra-0.119-new/gui/main.cc
--- cadabra-0.119/gui/main.cc 2007-06-14 10:37:31.000000000 -0400
+++ cadabra-0.119-new/gui/main.cc 2007-09-19 14:13:35.000000000 -0400
@@ -32,7 +32,7 @@
#include "window.hh"
-std::map<int, SigC::Connection> connections;
+std::map<int, sigc::connection> connections;
std::ofstream debugout;
diff -uNr cadabra-0.119/gui/window.cc cadabra-0.119-new/gui/window.cc
--- cadabra-0.119/gui/window.cc 2007-06-20 07:24:53.000000000 -0400
+++ cadabra-0.119-new/gui/window.cc 2007-09-19 14:13:35.000000000 -0400
@@ -1172,7 +1172,7 @@
void XCadabra::disconnect_io_signals()
{
- std::map<int, SigC::Connection>::iterator it=connections.begin();
+ std::map<int, sigc::connection>::iterator it=connections.begin();
while(it!=connections.end()) {
it->second.disconnect();
++it;
diff -uNr cadabra-0.119/gui/window.hh cadabra-0.119-new/gui/window.hh
--- cadabra-0.119/gui/window.hh 2007-06-14 09:40:11.000000000 -0400
+++ cadabra-0.119-new/gui/window.hh 2007-09-19 14:13:35.000000000 -0400
@@ -324,7 +324,7 @@
bool load_file; // used by main to indicate a load
should occur after start
bool have_received;
modglue::main *cmm;
- std::map<int, SigC::Connection> connections;
+ std::map<int, sigc::connection> connections;
bool callmm(Glib::IOCondition, int fd);
std::string name;
diff -uNr cadabra-0.119/src/manipulator.hh cadabra-0.119-new/src/manipulator.hh
--- cadabra-0.119/src/manipulator.hh 2007-01-23 05:38:15.000000000 -0500
+++ cadabra-0.119-new/src/manipulator.hh 2007-09-19 14:13:43.000000000
-0400
@@ -64,7 +64,7 @@
exit_exception();
};
-class manipulator : public SigC::Object {
+class manipulator : public sigc::trackable {
public:
manipulator();
~manipulator();
Index: genius.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/genius.info,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -d -r1.1.2.30 -r1.1.2.31
--- genius.info 19 Sep 2007 02:33:09 -0000 1.1.2.30
+++ genius.info 21 Sep 2007 00:24:39 -0000 1.1.2.31
@@ -8,7 +8,7 @@
atk1-shlibs (>= 1.20.0-1),
audiofile-shlibs,
esound-shlibs (>= 0.2.38-1),
- gconf2-shlibs (>= 2.19.1-1),
+ gconf2-shlibs (>= 2.20.0-1),
glib2-shlibs (>= 2.14.0-1),
gmp-shlibs,
gnome-keyring-shlibs (>= 2.20-1),
@@ -23,7 +23,7 @@
libgnome2-shlibs (>= 2.20.0-1),
libgnomecanvas2-shlibs (>= 2.20.0-1),
libgnomeprint2.2-shlibs (>= 2.18.2-1),
- libgnomeui2-shlibs (>= 2.19.1-1),
+ libgnomeui2-shlibs (>= 2.20.0-1),
libiconv,
libjpeg-shlibs,
libmpfr1-shlibs,
@@ -46,7 +46,7 @@
expat1,
fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.5-1),
- gconf2-dev (>= 2.19.1-1),
+ gconf2-dev (>= 2.20.0-1),
glib2-dev (>= 2.14.0-1),
glitz,
gmp,
@@ -65,7 +65,7 @@
libgnome2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
libgnomeprint2.2-dev (>= 2.18.2-1),
- libgnomeui2-dev (>= 2.19.1-1),
+ libgnomeui2-dev (>= 2.20.0-1),
libiconv-dev,
libjpeg,
libmpfr1,
Index: cadabra.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/cadabra.info,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -d -r1.1.2.16 -r1.1.2.17
--- cadabra.info 18 Sep 2007 14:43:12 -0000 1.1.2.16
+++ cadabra.info 21 Sep 2007 00:24:39 -0000 1.1.2.17
@@ -21,18 +21,24 @@
# Unpack Phase:
Source: http://www.aei.mpg.de/~peekas/cadabra/cadabra-%v.tar.gz
Source-MD5: 323d6ea3e22c55d0d02d91b0049d9cda
+Patch: %n.patch
# Compile Phase:
# GCC: 4.0
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -DX_LOCALE
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
SetCFLAGS: -Os
SetCXXFLAGS: -Os
-ConfigureParams: --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --disable-dependency-tracking
CompileScript: <<
+#!/bin/sh -ev
+
+ export CPPFLAGS="-I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-DX_LOCALE"
+ export LDFLAGS="-L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib -L%p/lib"
+ export
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+ export FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+
if [ -f %p/bin/mktexlsr ]; then mktexlsr %p/etc/texmf.local; fi
./configure %c
make
@@ -50,8 +56,7 @@
/bin/cp -p %b/doc/* %i/share/doc/%n/doc
/bin/mkdir %i/share/doc/%n/texmacs
/bin/cp -p %b/texmacs/* %i/share/doc/%n/texmacs
- /bin/mkdir -p %i/etc
- /bin/mv %i/share/texmf-local %i/etc/texmf.local
+ /bin/mkdir -p %i/etc/texmf.local
<<
PostInstScript: if [ -f %p/bin/mktexlsr ]; then mktexlsr %p/etc/texmf.local; fi
Index: lie.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/lie.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- lie.info 15 Jul 2007 15:10:41 -0000 1.1.2.3
+++ lie.info 21 Sep 2007 00:24:39 -0000 1.1.2.4
@@ -8,6 +8,8 @@
License: Public Domain
BuildDepends: readline5
Depends: readline5-shlibs
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
PatchScript: <<
# force Apple's headers to be really ANSI compliant
Index: gsl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gsl.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- gsl.info 9 Mar 2007 01:13:28 -0000 1.4.2.1
+++ gsl.info 21 Sep 2007 00:24:39 -0000 1.4.2.2
@@ -15,10 +15,6 @@
<<
<<
DocFiles: README COPYING
-Shlibs: <<
- %p/lib/libgsl.0.dylib 11.0.0 gsl (>= 1.9-1)
- %p/lib/libgslcblas.0.dylib 1.0.0 gsl (>= 1.4-1)
-<<
SplitOff: <<
Package: %n-shlibs
Files: <<
@@ -27,6 +23,10 @@
lib/libgslcblas.0.0.0.dylib
lib/libgslcblas.0.dylib
<<
+ Shlibs: <<
+ %p/lib/libgsl.0.dylib 11.0.0 gsl (>= 1.9-1)
+ %p/lib/libgslcblas.0.dylib 1.0.0 gsl (>= 1.4-1)
+ <<
DocFiles: COPYING
<<
DescDetail: <<
Index: gretl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gretl.info,v
retrieving revision 1.6.2.25
retrieving revision 1.6.2.26
diff -u -d -r1.6.2.25 -r1.6.2.26
--- gretl.info 19 Sep 2007 02:33:09 -0000 1.6.2.25
+++ gretl.info 21 Sep 2007 00:24:39 -0000 1.6.2.26
@@ -15,8 +15,8 @@
License: GPL
Source: http://ricardo.ecn.wfu.edu/pub/gretl/%n-%v.tar.bz2
Source-MD5: 8bfbdf21565c7e3fa751b5630975367f
-BuildDepends: glitz, expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.5-1), xft2-dev, atk1 (>= 1.20.0-1), audiofile, esound (>=
0.2.38-1), gconf2-dev (>= 2.19.1-1), glib2-dev (>= 2.14.0-1), gnome-keyring-dev
(>= 2.20-1), dbus-dev (>= 1.0-1), gnome-vfs2-unified-dev (>= 1:2.20.0-1),
gtk+2-dev (>= 2.12.0-1), gtksourceview2-dev (>= 2.0.0-1), libart2,
libbonobo2-dev (>= 2.20.0-1), libbonoboui2-dev (>= 2.20.0-1), libgettext3-dev,
libgnome2-dev (>= 2.20.0-1), libgnomecanvas2-dev (>= 2.20.0-1),
libgnomeprint2.2-dev (>= 2.18.2-1), libgnomeprintui2.2-dev (>= 2.18.1-1),
libgnomeui2-dev (>= 2.19.1-1), libiconv-dev, libjpeg, libncurses5 (>=
5.4-20041023-1006), libpng3, libxml2 (>= 2.6.30-1), orbit2-dev (>= 2.14.9-1),
pango1-xft2-ft219-dev (>= 1.18.2-1), popt, readline5 (>= 5.0-1004), x11-dev,
gettext-tools, pkgconfig (>= 0.21-1)
-Depends: %N-shlibs (= %v-%r), gnuplot (>= 4.0.0-1002), gtksourceview2-shlibs
(>= 2.0.0-1), libgnomeprintui2.2-shlibs (>= 2.18.1-1), libgnomeui2-shlibs (>=
2.19.1-1), readline5-shlibs (>= 5.0-1004)
+BuildDepends: glitz, expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.5-1), xft2-dev, atk1 (>= 1.20.0-1), audiofile, esound (>=
0.2.38-1), gconf2-dev (>= 2.20.0-1), glib2-dev (>= 2.14.0-1), gnome-keyring-dev
(>= 2.20-1), dbus-dev (>= 1.0-1), gnome-vfs2-unified-dev (>= 1:2.20.0-1),
gtk+2-dev (>= 2.12.0-1), gtksourceview2-dev (>= 2.0.0-1), libart2,
libbonobo2-dev (>= 2.20.0-1), libbonoboui2-dev (>= 2.20.0-1), libgettext3-dev,
libgnome2-dev (>= 2.20.0-1), libgnomecanvas2-dev (>= 2.20.0-1),
libgnomeprint2.2-dev (>= 2.18.2-1), libgnomeprintui2.2-dev (>= 2.18.1-1),
libgnomeui2-dev (>= 2.20.0-1), libiconv-dev, libjpeg, libncurses5 (>=
5.4-20041023-1006), libpng3, libxml2 (>= 2.6.30-1), orbit2-dev (>= 2.14.9-1),
pango1-xft2-ft219-dev (>= 1.18.2-1), popt, readline5 (>= 5.0-1004), x11-dev,
gettext-tools, pkgconfig (>= 0.21-1)
+Depends: %N-shlibs (= %v-%r), gnuplot (>= 4.0.0-1002), gtksourceview2-shlibs
(>= 2.0.0-1), libgnomeprintui2.2-shlibs (>= 2.18.1-1), libgnomeui2-shlibs (>=
2.20.0-1), readline5-shlibs (>= 5.0-1004)
Recommends: tetex-base | system-tetex
Suggests: r-base, octave
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
