Update of /cvsroot/fink/experimental/jfmertens/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2892
Modified Files:
evolution.info mozilla1.7.11.info
Removed Files:
gtkhtml3.info gtkhtml3.patch
Log Message:
mozilla1.7.11 starts looking OK
Index: mozilla1.7.11.info
===================================================================
RCS file:
/cvsroot/fink/experimental/jfmertens/crypto/finkinfo/mozilla1.7.11.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mozilla1.7.11.info 6 Sep 2005 21:05:24 -0000 1.1
+++ mozilla1.7.11.info 9 Sep 2005 19:01:29 -0000 1.2
@@ -1,6 +1,6 @@
Package: mozilla
Version: 1.7.11
-Revision: 2
+Revision: 3
Source-MD5: ed54ad54b4b5de85c7916e7d1efa0ae3
Source:
mirror:custom:mozilla.org/mozilla/releases/%n%v/source/%n-%v-source.tar.bz2
#Version: 1.8nightly
@@ -23,30 +23,42 @@
SetCC: gcc -I%p/lib/freetype2/include -I%p/lib/freetype2/include/freetype2
SetCXX: g++ -I%p/lib/freetype2/include -I%p/lib/freetype2/include/freetype2
PatchScript: <<
+ #!/bin/sh -ev
sed 's|@PREFIX@|%p|g' <%a/%n%v.patch | patch -p1
perl -pi.bak -e 's,\#ifndef NSS,#include "pki1t.h"\n$&,'
security/nss/lib/pki1/oiddata.h
-# The next appears needed eg when building yelp... (only version 1.8b1)
+## The next appears needed eg when building yelp... (only version 1.8b1)
# perl -pi.bak -e 's,lxpcom,$& -lxpcom_core,' build/unix/mozilla-xpcom.pc.in
## The following are "for safety" : to avoid "implicit declaration" warnings
perl -pi.bak -e 's,\#include,\#include <unistd.h>\n$&,'
directory/c-sdk/ldap/libraries/liblber/io.c
perl -pi.bak -e 's,\#if 0,\#include <unistd.h>\n$&,'
directory/c-sdk/ldap/libraries/libldap/os-ip.c
-## For the componentlib :
- perl -pi.bak -e 's,^\#EXTRA,EXTRA,; s,t exported_symbols$,$&
-search_paths_first -m -x -dead_strip -single_module,; s,lstdc\+\+,$&.6,;
s,lgcc,$&_s.1,' embedding/componentlib/Makefile.in
+## For the componentlib (avoiding hard-coded version numbers):
+ lstdc="`ls -1 /usr/lib/libstdc++.*dylib|tail -n1|sed -e 's,/usr/lib/lib,
\-l,' -e 's,\.dylib$,,'`"
+ lgcc="`ls -1 /usr/lib/libgcc_s.*dylib|tail -n1|sed -e 's,/usr/lib/lib, \-l,'
-e 's,\.dylib$,,'`"
+ perl -pi.bak -e "s,^\#EXTRA,EXTRA,; s,t exported_symbols$,$&
-search_paths_first -m -x -dead_strip -single_module,; s,
\-lstdc\+\+,${lstdc},; s, \-lgcc,${lgcc}," embedding/componentlib/Makefile.in
+# not better with the followng;
+# perl -pi.bak -e "s,^\#EXTRA,EXTRA,; s,\-exported_symbols_list
exported_symbols$,-lresolv -search_paths_first -m,; s,lstdc\+\+,${lstdc},; s,
\-lgcc,${lgcc}," embedding/componentlib/Makefile.in
## For calendar, to avoid a clash with uuid_t in /usr/include/unistd.h :
perl -pi.bak -e 's,([^_])uuid_t( |\)|;|$),\1uuid_t_moz\2,g'
calendar/libxpical/{to*,oeICalEventImpl.cpp}
## To enable "native-uconv" :
perl -pi.bak -e 's,\|darwin\*\)$,\),' configure
perl -pi.bak -e 's,\((char *\*\*\)\&(z|aSrc)),\(const \1,'
intl/uconv/native/nsNativeUConvService.cpp
+## configure fails to detect libresolv (hence the 'env' before ./configure),
+## and even if it would detect it, it forgets to add -lresolv to LIBS
+ perl -pi -e 's,^if test "\$SUNCTL",LIBS="\$LIBS -lresolv"\n$&,' configure
<<
## --enable-svg : must also choose SVG render library; will try later. (none
seem to work)
-## (v. 1.8b1): "--enable-cairo" leads to compile-errors in
nsCanvasRenderingContext2D.cpp _ incompatible versions ?
-ConfigureParams: --enable-optimize=-O3 --enable-image-decoders=all
--enable-ldap-experimental --enable-xft --enable-xpctools
--enable-necko-protocols=all --enable-ctl --enable-componentlib --enable-efence
--enable-calendar --enable-native-uconv
+## (v. 1.8b1): "--enable-cairo" leads to compile-errors in
nsCanvasRenderingContext2D.cpp _ incompatible versions.
+## builds also with --enable-componentlib (and THEN also with --enable-ctl),
but has then problems launching.
+# Some more work ahead for those 2.
+ConfigureParams: --enable-optimize=-O3 --enable-image-decoders=all
--enable-ldap-experimental --enable-xft --enable-xpctools
--enable-necko-protocols=all --enable-efence --enable-calendar
--enable-native-uconv
+# --enable-ctl
+# --enable-componentlib
CompileScript: <<
-#! /bin/sh -ev
+#!/bin/sh -ev
export PATH="%p/lib/freetype2/bin:${PATH}"
#export CPATH=%p/include/cairo:%p/include
export CPATH=%p/include
-./configure %c
+env ac_cv_func_res_ninit=yes ./configure %c
make -w
# Devide installed-chrome.txt for each split-off.
@@ -114,7 +126,7 @@
Depends: %N-browser (>= %v-%r)
Replaces: %N (<< 1.1.0-4)
Description: Mozilla - personal security manager
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
PostInstScript: <<
if [ configure = "$1" ]; then
update-mozilla-chrome
@@ -139,7 +151,7 @@
Depends: %N-browser (>= %v-%r)
Replaces: %N (<< 1.1.0-4), %N-chatzilla (<< 1.7.2-1)
Description: Mozilla - mail and news support
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
PostInstScript: <<
if [ configure = "$1" ]; then
update-mozilla-chrome
@@ -185,7 +197,7 @@
Depends: %N-browser (>= %v-%r)
Replaces: %N (<< 1.1.0-4)
Description: Mozilla - irc client
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
PostInstScript: <<
if [ configure = "$1" ]; then
update-mozilla-chrome
@@ -209,7 +221,7 @@
Depends: %N-browser (>= %v-%r)
Replaces: %N (<< 1.1.0-4)
Description: Mozilla - java script debugger
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
PostInstScript: <<
if [ configure = "$1" ]; then
update-mozilla-chrome
@@ -232,7 +244,7 @@
Depends: %N-browser (>= %v-%r)
Replaces: %N (<< 1.1.0-4)
Description: Mozilla - DOM inspector
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
PostInstScript: <<
if [ configure = "$1" ]; then
update-mozilla-chrome
@@ -253,17 +265,50 @@
<<
<<
SplitOff6: <<
+ Package: %N-calendar
+ Depends: %N-browser (>= %v-%r)
+ Description: Mozilla - Calendar
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
+ PostInstScript: <<
+ if [ configure = "$1" ]; then
+ update-mozilla-chrome
+ fi
+ <<
+ PostRmScript: <<
+ if [ upgrade != "$1" ]; then
+ update-mozilla-chrome
+ fi
+ <<
+ Files: <<
+ lib/mozilla/chrome/calendar.jar
+ lib/mozilla/components/calendar.xpt
+ lib/mozilla/components/calendarService.js
+ lib/mozilla/init.d/S80calendar_fix_permissions_bug_230617
+ lib/mozilla/chrome/icons/default/calendar-window.xpm
+ lib/mozilla/chrome/icons/default/calendar-window16.xpm
+ <<
+<<
+SplitOff7: <<
Package: %N-shlibs
- Replaces: %N (<< 1.1.0-4), %N-mailnews (<< 1.3-1)
+ Replaces: %N (<< 1.1.0-4), %N-mailnews (<< 1.3-1), %N-browser (<< 1.7.11-1)
Depends: freetype2-hinting-shlibs | freetype2-shlibs, gtk+2-shlibs
DocFiles: LEGAL LICENSE
Description: Mozilla - shared libraries
- Files: lib/mozilla/lib*{0,3,4,b,m,s,t,x,z}.dylib lib/mozilla/ipc
lib/mozilla/plugins/*.dylib
-# Better as follows, but must wait for the ordering of Files and InstallScript
to conform to documentation.
-# Files: lib/mozilla/lib*.dylib lib/mozilla/ipc lib/mozilla/plugins/*.dylib
-## libnssckbi.dylib is a bundle, belongs in %N-browser instead.
-## Possibly postpone this to next update, in order to facilitate upgrade
-# InstallScript: mv %i/lib/mozilla/libnssckbi.dylib
%I/lib/mozilla/libnssckbi.dylib
+# Many "dylib"'s under lib/mozilla are in fact bundles, hence don't belong
here.
+# Further the exact sets, both dylibs and of bundles, vary with %c _ and from
%v to %v,
+# so we don't want to hardcode them.
+ InstallScript: <<
+ #!/bin/sh -ev
+ mkdir -p %i/lib/mozilla/plugins
+ cd %I/lib/mozilla
+ for f in `ls -1 *.dylib|xargs file|grep dynamically|cut -f1 -d:`
+ do mv $f %i/lib/mozilla
+ done
+ mv plugins/libnullplugin.dylib %i/lib/mozilla/plugins
+ mv ipc %i/lib/mozilla
+ cd -
+ <<
+# The following depends strongly on %c. Adjust at the last minute.
Shlibs: <<
%p/lib/mozilla/libgtkembedmoz.dylib 1.0.0 %n (>= 1.3-1)
%p/lib/mozilla/libldap50.dylib 1.0.0 %n (>= 1.7.11-1)
@@ -287,31 +332,35 @@
%p/lib/mozilla/ipc/modules/libtransmgr.dylib 1.0.0 %n (>= 1.7.11-1)
<<
<<
-SplitOff7: <<
+SplitOff8: <<
Package: %N-bin
Depends: libidl2-shlibs, %N-shlibs (= %v-%r)
Replaces: %N-dev (<= 1.7.11.1)
Description: Mozilla - extra binaries
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
Files: lib/mozilla/xp*
<<
-SplitOff8: <<
+SplitOff9: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r), pkgconfig
Replaces: %N (<< 1.1.0-4)
BuildDependsOnly: true
Description: Mozilla - development headers and libraries
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
Files: bin/mozilla-config include lib/pkgconfig share/aclocal share/idl
<<
-SplitOff9: <<
+SplitOff10: <<
Package: %N-browser
+# At least when launched under KDE, I see (under ps) gnome-terminal coming up;
clearly also when launched under gnome.
+# Don't know yet what happens when launched from an xterm; if confirmed,
gnome-terminal should be added
+# to Depends instead of gtk+2 and gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs.
+ Recommends: gnome-terminal
Depends: %N-shlibs (>= %v-%r), gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs,
gtk+2
- Replaces: %N (<< 1.1.0-4)
+ Replaces: %N (<< 1.1.0-4), %N-shlibs (<< 1.7.11-1)
Conflicts: %N-browser-xft2
ConfFiles: %p/etc/mozilla/prefs.js
Description: Mozilla - web browser
- DocFiles: LEGAL LICENSE
+ InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
PostInstScript: <<
# Those 2 empty files are not installed by dpkg
touch %p/lib/mozilla/chrome/user-skins.rdf
@@ -348,16 +397,6 @@
- uses gtk+2 toolkit.
- pass exact install directory to the linker
- forces to see local ldap headers.
-
-Misc. small problems :
-- In configure :
-configure:9233: checking for res_ninit()
-configure:9250: gcc -I/sw/lib/freetype2/include
-I/sw/lib/freetype2/include/freetype2 -o conftest -no-cpp-precomp -fno-common
-I/usr/X11R6/include -L/sw/lib/freetype2/lib conftest.c -lm 1>&5
-In file included from configure:9243:
-/usr/include/resolv.h:189: error: array type has incomplete element type
-/usr/include/resolv.h:203: error: field 'addr' has incomplete type
-/usr/include/resolv.h:231: error: field 'sin' has incomplete type
- -> answer = no
<<
DescPackaging: <<
There are 4 executables in -dev _ leaving there for the moment...
--- gtkhtml3.patch DELETED ---
--- gtkhtml3.info DELETED ---
Index: evolution.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/crypto/finkinfo/evolution.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- evolution.info 6 Sep 2005 21:05:24 -0000 1.4
+++ evolution.info 9 Sep 2005 19:01:29 -0000 1.5
@@ -6,7 +6,7 @@
Source-MD5: 1e01511c78b2dd0dcb8cf83521c167af
#Source: mirror:gnome:sources/%n/2.3/%n-%v.tar.bz2
Source: mirror:gnome:sources/%n/2.2/%n-%v.tar.bz2
-Depends: atk1-shlibs, audiofile-shlibs, esound-shlibs,
evolution-data-server-shlibs, gail17-shlibs, gal2.4.0-shlibs, gconf2-shlibs,
glib2-shlibs, gnome-keyring-shlibs, gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs,
gnutls-shlibs, gstreamer-shlibs, gtk+2-shlibs, gtkhtml3-shlibs, libart2-shlibs,
libbonobo2-shlibs, libbonoboui2-shlibs, libgcrypt-shlibs, libgettext3-shlibs,
libglade2-shlibs, libgnome2-shlibs, libgnomecanvas2-shlibs,
libgnomeprint2.2-shlibs, libgnomeprintui2.2-shlibs, libgnomeui2-shlibs,
libgpg-error-shlibs, libhowl-shlibs, libiconv, libjpeg-shlibs,
libsoup2.2.8-ssl-shlibs, libtasn1-shlibs, libxml2-shlibs, mozilla-shlibs,
orbit2-shlibs, pango1-xft2-shlibs, popt-shlibs, pth2-shlibs, x11-shlibs
+Depends: atk1-shlibs, audiofile-shlibs, esound-shlibs,
evolution-data-server-shlibs, gail17-shlibs, gal2.4.0-shlibs, gconf2-shlibs,
glib2-shlibs, gnome-keyring-shlibs, gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs,
gnutls-shlibs, gstreamer-shlibs, gtk+2-shlibs, gtkhtml3.8.15-shlibs,
libart2-shlibs, libbonobo2-shlibs, libbonoboui2-shlibs, libgcrypt-shlibs,
libgettext3-shlibs, libglade2-shlibs, libgnome2-shlibs, libgnomecanvas2-shlibs,
libgnomeprint2.2-shlibs, libgnomeprintui2.2-shlibs, libgnomeui2-shlibs,
libgpg-error-shlibs, libhowl-shlibs, libiconv, libjpeg-shlibs,
libsoup2.2.8-ssl-shlibs, libtasn1-shlibs, libxml2-shlibs, mozilla-shlibs,
orbit2-shlibs, pango1-xft2-shlibs, popt-shlibs, pth2-shlibs, x11-shlibs
#Depends: <<
# audiofile-shlibs (>= 0.2.3-1),
# esound (>= 0.2.28-1),
@@ -38,7 +38,7 @@
# gail17-shlibs,
# evolution-data-server (>= 1.0.1-1)
#<<
-BuildDepends: atk1, audiofile, esound, evolution-data-server-dev, gail17-dev,
gal2.4.0-dev, gconf2-dev, glib2-dev, gnome-keyring-dev, gnome-vfs2-ssl-dev |
gnome-vfs2-dev, gnutls, gstreamer-dev, gtk+2-dev, gtkhtml3-dev, libart2,
libbonobo2-dev, libbonoboui2-dev, libgcrypt, libgettext3-dev, libglade2,
libgnome2-dev, libgnomecanvas2-dev, libgnomeprint2.2-dev,
libgnomeprintui2.2-dev, libgnomeui2-dev, libgpg-error, libhowl-dev,
libiconv-dev, libjpeg, libsoup2.2.8-ssl, libtasn1, libxml2, mozilla-dev,
orbit2-dev, pango1-xft2-dev, popt, pth2-dev, x11-dev, pkgconfig, intltool,
gettext-tools, scrollkeeper
+BuildDepends: atk1, audiofile, esound, evolution-data-server-dev, gail17-dev,
gal2.4.0-dev, gconf2-dev, glib2-dev, gnome-keyring-dev, gnome-vfs2-ssl-dev |
gnome-vfs2-dev, gnutls, gstreamer-dev, gtk+2-dev, gtkhtml3.8.15-dev, libart2,
libbonobo2-dev, libbonoboui2-dev, libgcrypt, libgettext3-dev, libglade2,
libgnome2-dev, libgnomecanvas2-dev, libgnomeprint2.2-dev,
libgnomeprintui2.2-dev, libgnomeui2-dev, libgpg-error, libhowl-dev,
libiconv-dev, libjpeg, libsoup2.2.8-ssl, libtasn1, libxml2, mozilla-dev,
orbit2-dev, pango1-xft2-dev, popt, pth2-dev, x11-dev, pkgconfig, intltool,
gettext-tools, scrollkeeper
#BuildDepends: <<
# glib2-dev (>= 2.4.0-1),
# atk1 (>= 1.8.0-1),
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
