Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20172
Modified Files:
amaya.info amaya.patch
Log Message:
Clean for gcc4 (BSD tm_gmtoff, not glibc timezone), switch to GCC:4.0
Index: amaya.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/amaya.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- amaya.patch 20 Jan 2006 20:32:32 -0000 1.1
+++ amaya.patch 29 Mar 2006 02:04:15 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur Amaya/Makefile.in.old Amaya/Makefile.in
---- Amaya/Makefile.in.old Mon Aug 16 12:31:47 2004
-+++ Amaya/Makefile.in Mon Aug 16 12:32:30 2004
+diff -Nurd -x'*~' amaya-8.6.orig/Amaya/Makefile.in amaya-8.6/Amaya/Makefile.in
+--- amaya-8.6.orig/Amaya/Makefile.in 2004-07-02 04:03:45.000000000 -0400
++++ amaya-8.6/Amaya/Makefile.in 2006-03-28 20:32:38.000000000 -0500
@@ -348,6 +348,7 @@
--with-www=none \
--without-libwww \
@@ -9,3 +9,35 @@
--cache-file=$$localdir/config.cache; \
$(ECHO) "redland is configured" ; \
cd raptor ; \
+diff -Nurd -x'*~' amaya-8.6.orig/Amaya/annotlib/ANNOTtools.c
amaya-8.6/Amaya/annotlib/ANNOTtools.c
+--- amaya-8.6.orig/Amaya/annotlib/ANNOTtools.c 2004-07-02 04:03:48.000000000
-0400
++++ amaya-8.6/Amaya/annotlib/ANNOTtools.c 2006-03-28 20:35:44.000000000
-0500
+@@ -2279,11 +2279,7 @@
+ curDate = time (&curDate);
+ localDate = localtime (&curDate);
+
+-#ifdef _WINGUI
+- UTCoffset = _timezone; /* global, set by localtime() */
+-#else
+- UTCoffset = timezone; /* global, set by localtime() */
+-#endif /* _WINGUI */
++ UTCoffset = -1 * localDate->tm_gmtoff;
+
+ UTChourOffset = UTCminOffset = abs(UTCoffset)/60; /* UTCoffset is seconds */
+ UTChourOffset /= 60;
+@@ -2380,13 +2376,9 @@
+
+ case 'Z': /* subtract mktime()'s UTC offset */
+ case 'z':
+- (void)localtime( &cal_date ); /* set timezone global */
++ struct tm *localCalDate = localtime( &cal_date ); /* set timezone
global */
+
+-#ifdef _WINGUI
+- UTCoffset = _timezone; /* global, set by localtime() */
+-#else
+- UTCoffset = timezone; /* global, set by localtime() */
+-#endif /* _WINGUI */
++ UTCoffset = -1 * localCalDate->tm_gmtoff;
+
+ cal_date -= UTCoffset;
+ break;
Index: amaya.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/amaya.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- amaya.info 29 Mar 2006 00:56:51 -0000 1.2
+++ amaya.info 29 Mar 2006 02:04:15 -0000 1.3
@@ -1,10 +1,9 @@
Package: amaya
Version: 8.6
-Revision: 2
-Architecture: powerpc
+Revision: 1002
Maintainer: Stephane GULLY <[EMAIL PROTECTED]>
Depends: glib-shlibs, imlib-shlibs (>= 1.9.14-2), gtk+-shlibs, gettext,
libjpeg-shlibs, libpng3-shlibs
-BuildDepends: glib, gtk+, imlib (>= 1.9.14-2), libjpeg, libpng3,
gettext-bin, gettext-tools, gettext-dev, gcc3.3
+BuildDepends: glib, gtk+, imlib (>= 1.9.14-2), libjpeg, libpng3,
gettext-bin, gettext-tools, gettext-dev, x11-dev
Conflicts: amaya-gtk
Replaces: amaya-gtk
Source: mirror:custom:amaya-src-%v.tgz
@@ -12,22 +11,20 @@
Primary: ftp://ftp.w3.org/pub/amaya
ftp-US: ftp://ftp.w3.org/pub/amaya
<<
-SourceDirectory: Amaya
+NoSourceDirectory: true
NoSetLDFLAGS: true
-GCC: 3.3
-PatchScript:<<
- cd .. && sed 's|@FINK@|%p|g' < %a/%n.patch | patch -p0
- perl -pi -e 's|/sw|%p|g' ../Amaya/configure ../redland/configure
-<<
+GCC: 4.0
+Patch: %n.patch
+PatchScript: perl -pi -e 's|/sw|%p|g' Amaya/configure redland/configure
CompileScript: <<
- mkdir Darwin
- export CC=gcc-3.3; export CXX=g++-3.3; cd 'Darwin' && ../configure
--with-gtk --with-dav --enable-bookmarks --prefix=%p/share --bindir=%p/bin &&
make CC=gcc-3.3 CXX=g++-3.3
+ mkdir Amaya/Darwin
+ cd Amaya/Darwin && ../configure --with-gtk --with-dav
--enable-bookmarks --prefix=%p/share --bindir=%p/bin && make
<<
InstallScript: <<
- cd 'Darwin' && make install prefix=%i/share bindir=%i/bin
+ cd Amaya/Darwin && make install prefix=%i/share bindir=%i/bin
cd %i/bin && ln -sf ../share/Amaya/applis/bin/amaya amaya
<<
-DocFiles: README README.amaya amaya/COPYRIGHT
+DocFiles: Amaya/README Amaya/README.amaya Amaya/amaya/COPYRIGHT
Description: W3C's Editor/Browser
DescDetail: <<
Amaya is a complete web browsing and authoring
@@ -45,11 +42,11 @@
Slight hack to make Amaya install in /sw/share/Amaya with
link from /sw/bin/amaya to amaya executable. (Default would
have /sw/Amaya, which isn't pretty).
-
- This version is compiled with g++-3.3, even in the 10.4 tree. If it is
- ever updated to a more recent compiler, any packages which depend on
- this one must be updated at the same time.
<<
+DescPort: <<
+ dmacks: The timezone variable is a glibc/linux feature. Use
+ struct tm member instead. Hope I got the sign correct!
+<<
License: OSI-Approved
Homepage: http://www.w3.org/Amaya/
Source-MD5: a70d4fcb5c3f8d81eff78522dc7f8b01
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
