Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7198
Modified Files:
dia.info
Added Files:
dia.patch
Log Message:
Dia now compiles on gcc4.
Index: dia.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/dia.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dia.info 21 Feb 2006 01:36:19 -0000 1.3
+++ dia.info 6 Apr 2006 02:54:46 -0000 1.4
@@ -1,8 +1,6 @@
Package: dia
Version: 0.94
-Revision: 1005
-Architecture: powerpc
-GCC: 3.3
+Revision: 1006
Depends: orbit2-shlibs, libart2-shlibs, atk1-shlibs, audiofile-shlibs,
libbonobo2-shlibs, bonobo-activation2-shlibs, libbonoboui2-shlibs,
esound-shlibs, gconf2-shlibs, gtk+2-shlibs, gdk-pixbuf-shlibs, glib2-shlibs (>=
2.6.6-1111), libgnome2-shlibs, libgnomecanvas2-shlibs, libgnomeui2-shlibs,
gnome-vfs2-shlibs | gnome-vfs2-ssl-shlibs, libiconv, gettext, libjpeg-shlibs,
pango1-xft2-shlibs, libpng3-shlibs, popt-shlibs, libxml2-bin, libxml2-shlibs,
scrollkeeper, gnome-keyring-shlibs
BuildDepends: orbit2-dev, libart2, atk1, audiofile, libbonobo2-dev,
bonobo-activation2, libbonoboui2-dev, libbonoboui2, esound, gettext-dev,
gettext-bin, gettext-tools, libiconv-dev, gconf2-dev, glib2-dev (>=
2.6.6-1111), gtk+2-dev, gdk-pixbuf, libgnome2-dev, libgnomecanvas2-dev,
libgnomeui2-dev, gnome-vfs2-dev | gnome-vfs2-ssl-dev, libjpeg, pango1-xft2-dev,
libpng3, popt, libxml2, intltool, gnome-keyring-dev (>= 0.4.3-1), gcc3.3
Source: gnome
@@ -10,12 +8,8 @@
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLDFLAGS: -L/usr/X11R6/lib
-# No longer necessary _ causes to build with not even -O, but still
-finline-functions -fstrict-aliasing .. :
-# SetCFLAGS: -no-cpp-precomp
-# Next is needed with v. 0.93 for the second perl cmd in the CompileScript to
remain effective;
-# else there is again a build-time conflict with freetype :
+Patch: %n.patch
Patchscript: <<
-# perl -pi.bak -e "s/Makefile: [EMAIL PROTECTED]@/Makefile:/g" `find .
-name Makefile.in`
perl -pi.bak -e "s/-scrollkeeper-update/#-scrollkeeper-update/g"
omf.make doc/en/Makefile.in doc/pl/Makefile.in
<<
PostInstScript: <<
@@ -36,11 +30,9 @@
ConfigureParams: --infodir=%i/share/info --mandir=%i/share/man --enable-gnome
CompileScript: <<
#!/bin/sh -e
- export CPATH=%p/include; export LIBRARY_PATH=%p/lib; export
DYLD_FALLBACK_LIBRARY_PATH=%p/lib; export CC=gcc-3.3; export CXX=g++-3.3;
perl -pi.bak -e "s/-module//g" ./lib/Makefile.in
./configure %c
- perl -pi.bak -e "s,-(I%p/include|L%p/lib)([^/]),\$2,g" config.status
- make CC=gcc-3.3 CXX=g++-3.3
+ make
<<
DocFiles: COPYING README AUTHORS NEWS ChangeLog KNOWN_BUGS TODO
Description: Diagram drawing program
--- NEW FILE: dia.patch ---
diff -Naur dia-0.94.orig/objects/custom/shape_info.h
dia-0.94/objects/custom/shape_info.h
--- dia-0.94.orig/objects/custom/shape_info.h 2006-04-04 21:32:16.000000000
-0700
+++ dia-0.94/objects/custom/shape_info.h 2006-04-04 21:33:24.000000000
-0700
@@ -166,7 +166,7 @@
void shape_info_realise(ShapeInfo* info);
void shape_info_print(ShapeInfo *info);
-void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
+// void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle
*s);
/*MC 11/03 handy g_new0 variant for struct with variable size */
#define g_new0_ext(struct_type, ext_size) \
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
