Update of /cvsroot/fink/experimental/jfmertens/crypto/finkinfo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10101
Modified Files: evolution-data-server.info evolution.info mozilla.info Added Files: mozilla1.7.11.info mozilla1.7.11.patch Log Message: updates --- NEW FILE: mozilla1.7.11.info --- Package: mozilla Version: 1.7.11 Revision: 2 Source-MD5: ed54ad54b4b5de85c7916e7d1efa0ae3 Source: mirror:custom:mozilla.org/mozilla/releases/%n%v/source/%n-%v-source.tar.bz2 #Version: 1.8nightly #Revision: 1 #Source: mirror:custom:mozilla.org/mozilla/nightly/latest/mozilla-source.tar.bz2 #Source-MD5: 4edecf46394ec2e5de80eb42415568b3 CustomMirror: << Primary: http://ftp.mozilla.org/pub/ nam-US: ftp://ftp.tux.org/pub/net/mozilla/ eur-DE: ftp://ftp.fh-wolfenbuettel.de/pub/www/mozilla/ asi-JP: http://www.t.ring.gr.jp/pub/net/www/mozilla/ << SourceDirectory: mozilla Depends: %N-psm (>= %v-%r), %N-mailnews (>= %v-%r), %N-chatzilla (>= %v-%r), %N-js-debugger (>= %v-%r), %N-dom-inspector (>= %v-%r) BuildDepends: atk1, freetype2-hinting-dev | freetype2-dev, gconf2-dev, glib2-dev, gnome-vfs2-ssl-dev | gnome-vfs2-dev, gtk+2-dev, libbonobo2-dev, libgettext3-dev, libiconv-dev, libidl2-dev, libjpeg, libpng3, orbit2-dev, pango1-xft2-dev, xft2-dev, x11-dev, pkgconfig NoSetLDFLAGS: true SetLDFLAGS: -L%p/lib/freetype2/lib SetLIBRARY_PATH: %p/lib NoSetCPPFLAGS: true 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: << 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) # 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 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 << ## --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 CompileScript: << #! /bin/sh -ev export PATH="%p/lib/freetype2/bin:${PATH}" #export CPATH=%p/include/cairo:%p/include export CPATH=%p/include ./configure %c make -w # Devide installed-chrome.txt for each split-off. sed -e '/pipnss/d' -e '/pippki/d' -e '/messenger/d' -e '/chatzilla/d' \ -e '/venkman/d' -e '/inspector/d' \ dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00browser grep 'pip[nss|pki]' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00psm grep 'messenger' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00mailnews grep 'chatzilla' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00chatzilla grep 'venkman' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00js-debugger grep 'inspector' dist/bin/chrome/installed-chrome.txt >fink/chrome.d/00dom-inspector << InstallScript: << #!/bin/sh make install DESTDIR=%d # Install NSS headers. /bin/cp -R -L dist/public/nss %i/include/mozilla/nss # These files are reduntant. for f in %i/lib/mozilla/chrome/*.jar; do rm -rf ${f/.jar/} done # These files are created dynamically. rm -rf %i/lib/mozilla/chrome/overlayinfo rm -f %i/lib/mozilla/chrome/*.rdf rm -f %i/lib/mozilla/component.reg rm -f %i/lib/mozilla/components/*.dat # Multi user setting. touch %i/lib/mozilla/chrome/user-skins.rdf touch %i/lib/mozilla/chrome/user-locales.rdf # Empty installed-chrome.txt. rm %i/lib/mozilla/chrome/installed-chrome.txt touch %i/lib/mozilla/chrome/installed-chrome.txt # Install fink specific files. install -d -m 755 %i/bin %i/sbin %i/var/lib/mozilla/chrome.d install -c -m 755 fink/mozilla %i/bin/ install -c -m 755 fink/update-mozilla-chrome %i/sbin/ install -c -m 644 fink/chrome.d/* %i/var/lib/mozilla/chrome.d/ # Move config file into %p/etc. install -d -m 755 %i/etc/mozilla install -c -m 644 fink/prefs.js %i/etc/mozilla/ ln -sf %p/etc/mozilla/prefs.js %i/lib/mozilla/defaults/pref/fink.js # Install gnome .desktop files. install -d -m 755 %i/share/applications install -c -m 644 fink/applications/* %i/share/applications/ install -d -m 755 %i/share/pixmaps install -c -m 644 dist/bin/chrome/icons/default/main-window.xpm %i/share/pixmaps/mozilla.xpm install -c -m 644 dist/bin/chrome/icons/default/addressbookWindow.xpm %i/share/pixmaps/mozilla-addressbook.xpm install -c -m 644 dist/bin/chrome/icons/default/chatzilla-window.xpm %i/share/pixmaps/mozilla-chatzilla.xpm install -c -m 644 dist/bin/chrome/icons/default/editorWindow.xpm %i/share/pixmaps/mozilla-editor.xpm install -c -m 644 dist/bin/chrome/icons/default/msgcomposeWindow.xpm %i/share/pixmaps/mozilla-mail-composer.xpm install -c -m 644 dist/bin/chrome/icons/default/messengerWindow.xpm %i/share/pixmaps/mozilla-mailnews.xpm << SplitOff: << Package: %N-psm Depends: %N-browser (>= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - personal security manager DocFiles: LEGAL LICENSE PostInstScript: << if [ configure = "$1" ]; then update-mozilla-chrome fi << PostRmScript: << if [ upgrade != "$1" ]; then update-mozilla-chrome fi << Files: << lib/mozilla/chrome/pipnss.jar lib/mozilla/chrome/pippki.jar lib/mozilla/components/pipboot.xpt lib/mozilla/components/pipnss.xpt lib/mozilla/components/pippki.xpt var/lib/mozilla/chrome.d/00psm << << SplitOff2: << Package: %N-mailnews 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 PostInstScript: << if [ configure = "$1" ]; then update-mozilla-chrome fi << PostRmScript: << if [ upgrade != "$1" ]; then update-mozilla-chrome fi << Files: << lib/mozilla/chrome/messenger.jar lib/mozilla/components/addrbook.xpt lib/mozilla/components/impComm4xMail.xpt lib/mozilla/components/import.xpt lib/mozilla/components/mailnews.xpt lib/mozilla/components/mailview.xpt lib/mozilla/components/mdn-service.js lib/mozilla/components/mime.xpt lib/mozilla/components/msgbase.xpt lib/mozilla/components/msgcompose.xpt lib/mozilla/components/msgdb.xpt lib/mozilla/components/msgimap.xpt lib/mozilla/components/msglocal.xpt lib/mozilla/components/msgnews.xpt lib/mozilla/components/msgsearch.xpt lib/mozilla/components/msgsmime.xpt lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/smime-service.js lib/mozilla/defaults/pref/mailnews.js lib/mozilla/defaults/pref/mdn.js lib/mozilla/defaults/pref/smime.js share/applications/Mozilla-mail-composer.desktop share/applications/Mozilla-mail.desktop share/applications/Mozilla-news.desktop share/pixmaps/mozilla-mail-composer.xpm share/pixmaps/mozilla-mailnews.xpm var/lib/mozilla/chrome.d/00mailnews << << SplitOff3: << Package: %N-chatzilla Depends: %N-browser (>= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - irc client DocFiles: LEGAL LICENSE PostInstScript: << if [ configure = "$1" ]; then update-mozilla-chrome fi << PostRmScript: << if [ upgrade != "$1" ]; then update-mozilla-chrome fi << Files: << lib/mozilla/chrome/chatzilla.jar lib/mozilla/chrome/icons/default/chatzilla* lib/mozilla/components/chatzilla-service.js share/applications/Mozilla-chatzilla.desktop var/lib/mozilla/chrome.d/00chatzilla << << SplitOff4: << Package: %N-js-debugger Depends: %N-browser (>= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - java script debugger DocFiles: LEGAL LICENSE PostInstScript: << if [ configure = "$1" ]; then update-mozilla-chrome fi << PostRmScript: << if [ upgrade != "$1" ]; then update-mozilla-chrome fi << Files: << lib/mozilla/chrome/venkman.jar lib/mozilla/chrome/icons/default/venkman* lib/mozilla/components/venkman-service.js var/lib/mozilla/chrome.d/00js-debugger << << SplitOff5: << Package: %N-dom-inspector Depends: %N-browser (>= %v-%r) Replaces: %N (<< 1.1.0-4) Description: Mozilla - DOM inspector DocFiles: LEGAL LICENSE PostInstScript: << if [ configure = "$1" ]; then update-mozilla-chrome fi << PostRmScript: << if [ upgrade != "$1" ]; then update-mozilla-chrome fi << Files: << lib/mozilla/chrome/inspector.jar lib/mozilla/components/inspector.xpt lib/mozilla/components/libinspector.dylib lib/mozilla/defaults/pref/inspector.js lib/mozilla/res/inspector var/lib/mozilla/chrome.d/00dom-inspector << << SplitOff6: << Package: %N-shlibs Replaces: %N (<< 1.1.0-4), %N-mailnews (<< 1.3-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 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) %p/lib/mozilla/libmozcomps.dylib 1.0.0 %n (>= 1.7.11-1) %p/lib/mozilla/libmozjs.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libmozpango-dvngx.dylib 1.0.0 %n (>= 1.7.11-1) %p/lib/mozilla/libmozpango-thaix.dylib 1.0.0 %n (>= 1.7.11-1) %p/lib/mozilla/libnspr4.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libnss3.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libplc4.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libplds4.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libprldap50.dylib 1.0.0 %n (>= 1.7.11-1) %p/lib/mozilla/libsmime3.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libsoftokn3.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libssl3.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libxpcom.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/libxpcom_compat.dylib 1.0.0 %n (>= 1.5.1-4) %p/lib/mozilla/libxpistub.dylib 1.0.0 %n (>= 1.1.0-4) %p/lib/mozilla/plugins/libnullplugin.dylib 1.0.0 %n (>= 1.7.11-1) %p/lib/mozilla/ipc/modules/liblockmodule.dylib 1.0.0 %n (>= 1.7.11-1) %p/lib/mozilla/ipc/modules/libtransmgr.dylib 1.0.0 %n (>= 1.7.11-1) << << SplitOff7: << Package: %N-bin Depends: libidl2-shlibs, %N-shlibs (= %v-%r) Replaces: %N-dev (<= 1.7.11.1) Description: Mozilla - extra binaries DocFiles: LEGAL LICENSE Files: lib/mozilla/xp* << SplitOff8: << 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 Files: bin/mozilla-config include lib/pkgconfig share/aclocal share/idl << SplitOff9: << Package: %N-browser Depends: %N-shlibs (>= %v-%r), gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, gtk+2 Replaces: %N (<< 1.1.0-4) Conflicts: %N-browser-xft2 ConfFiles: %p/etc/mozilla/prefs.js Description: Mozilla - web browser DocFiles: LEGAL LICENSE PostInstScript: << # Those 2 empty files are not installed by dpkg touch %p/lib/mozilla/chrome/user-skins.rdf touch %p/lib/mozilla/chrome/user-locales.rdf if [ configure = "$1" ]; then update-mozilla-chrome fi << PostRmScript: << case "$1" in purge) rm -rf %p/lib/mozilla/chrome/overlayinfo rm -f %p/lib/mozilla/chrome/*.rdf rm -f %p/lib/mozilla/component.reg rm -f %p/lib/mozilla/components/*.dat ;; esac << Files: bin etc lib sbin share/applications share/man share/pixmaps var << DocFiles: LEGAL LICENSE Description: Mozilla - full install DescDetail: << Mozilla is an open-source web browser, designed for standards compliance, performance and portability. << DescPort: << If you feel your configuration is not saved, check permission of ~/.mozilla directory. If it is owned by root, fix or removed it. In this version, this problem was fixed. (sudo -H in install script fixes it) Patch does following things: - 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... << License: OSI-Approved Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> Homepage: http://www.mozilla.org Index: evolution.info =================================================================== RCS file: /cvsroot/fink/experimental/jfmertens/crypto/finkinfo/evolution.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- evolution.info 26 Aug 2005 00:01:33 -0000 1.3 +++ evolution.info 6 Sep 2005 21:05:24 -0000 1.4 @@ -6,80 +6,75 @@ 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 -# # otool_deps evolution -# atk1-shlibs, audiofile-shlibs, esound-shlibs, evolution-data-server-dev, evolution-data-server-shlibs, gail17-shlibs, \ -# gal199-shlibs, gconf2-shlibs, glib2-shlibs, gnome-keyring-shlibs, gnome-vfs2-ssl-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, libsoup-ssl-shlibs, libtasn1-shlibs, \ -# libxml2-shlibs, mozilla-shlibs, orbit2-shlibs, pango1-xft2-shlibs, popt-shlibs, pth-shlibs, xorg-shlibs -Depends: << - audiofile-shlibs (>= 0.2.3-1), - esound (>= 0.2.28-1), - gal2.4.0, - gconf2 (>= 2.4.0.1-1), - libgettext3-shlibs, - glib2 (>= 2.2.3-1), - gnome-spell ( >= 1.0.5-1), - gnome-vfs2 (>= 2.4.0-1) | gnome-vfs2-ssl (>= 2.4.0-1), - gtk+2 (>= 2.4.0-1), - gtkhtml3 ( >= 3.2.0-1), - libart2-shlibs (>= 2.3.16-1), - libbonobo2 (>= 2.4.0-1), - libbonoboui2 (>= 2.4.0-1), - libglade2-shlibs (>= 2.0.1-3), - libgnomeprintui2.2-shlibs (>= 2.4.0-1), - libgnomeprint2.2-shlibs (>= 2.4.0-2), - libgnome2 (>= 2.4.0-1), - libgnomecanvas2 (>= 2.4.0-1), - libgnomeui2 (>= 2.4.0.1-1), - libiconv, - libsoup2.2.8-ssl-shlibs, - libxml2-shlibs (>= 2.6.1-1), - orbit2 (>= 2.8.1-1), - pango1-xft2 (>= 1.2.5-1), - pkgconfig, - popt, - mozilla, - gail17-shlibs, - evolution-data-server (>= 1.0.1-1) -<< -BuildDepends: << - glib2-dev (>= 2.4.0-1), - atk1 (>= 1.8.0-1), - pango1-xft2-dev (>= 1.2.5-1), - gtkhtml3-dev ( >= 3.2.0), - gtk+2-dev (>= 2.4.0-1), - libgnomecanvas2-dev (>= 2.4.0-1), - orbit2-dev (>= 2.8.1-1), - gal2.4.0-dev, - gconf2-dev (>= 2.4.0.1-1), - gnome-spell-dev ( >= 1.0.5-1), - gnome-vfs2-dev (>= 2.4.0-1) | gnome-vfs2-ssl-dev (>= 2.4.0-1), - libsoup2.2.8-ssl, - libxml2 (>= 2.6.1-1), - libbonobo2-dev (>= 2.4.0-1), - libglade2-shlibs (>= 2.0.1-3), - libgnomeprintui2.2-dev (>= 2.4.0-1), - libgnomeprint2.2-dev (>= 2.4.0-2), - libgnome2-dev (>= 2.4.0-1), - libbonoboui2-dev (>= 2.4.0-1), - libgnomeui2-dev (>= 2.4.0.1-1), - db31 (>= 3.1.17-9), - libjpeg, - pkgconfig, - intltool, - popt, - mozilla, - gail17-dev, - libgettext3-dev, - gettext-tools, - libiconv-dev, - libart2 (>= 2.3.16-1), - esound (>= 0.2.28-1), - scrollkeeper (>= 0.3.12-2), - evolution-data-server-dev (>= 1.0.1-1) -<< +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: << +# audiofile-shlibs (>= 0.2.3-1), +# esound (>= 0.2.28-1), +# gal2.4.0, +# gconf2 (>= 2.4.0.1-1), +# libgettext3-shlibs, +# glib2 (>= 2.2.3-1), +# gnome-spell ( >= 1.0.5-1), +# gnome-vfs2 (>= 2.4.0-1) | gnome-vfs2-ssl (>= 2.4.0-1), +# gtk+2 (>= 2.4.0-1), +# gtkhtml3 ( >= 3.2.0-1), +# libart2-shlibs (>= 2.3.16-1), +# libbonobo2 (>= 2.4.0-1), +# libbonoboui2 (>= 2.4.0-1), +# libglade2-shlibs (>= 2.0.1-3), +# libgnomeprintui2.2-shlibs (>= 2.4.0-1), +# libgnomeprint2.2-shlibs (>= 2.4.0-2), +# libgnome2 (>= 2.4.0-1), +# libgnomecanvas2 (>= 2.4.0-1), +# libgnomeui2 (>= 2.4.0.1-1), +# libiconv, +# libsoup2.2.8-ssl-shlibs, +# libxml2-shlibs (>= 2.6.1-1), +# orbit2 (>= 2.8.1-1), +# pango1-xft2 (>= 1.2.5-1), +# pkgconfig, +# popt, +# mozilla, +# 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: << +# glib2-dev (>= 2.4.0-1), +# atk1 (>= 1.8.0-1), +# pango1-xft2-dev (>= 1.2.5-1), +# gtkhtml3-dev ( >= 3.2.0), +# gtk+2-dev (>= 2.4.0-1), +# libgnomecanvas2-dev (>= 2.4.0-1), +# orbit2-dev (>= 2.8.1-1), +# gal2.4.0-dev, +# gconf2-dev (>= 2.4.0.1-1), +# gnome-spell-dev ( >= 1.0.5-1), +# gnome-vfs2-dev (>= 2.4.0-1) | gnome-vfs2-ssl-dev (>= 2.4.0-1), +# libsoup2.2.8-ssl, +# libxml2 (>= 2.6.1-1), +# libbonobo2-dev (>= 2.4.0-1), +# libglade2-shlibs (>= 2.0.1-3), +# libgnomeprintui2.2-dev (>= 2.4.0-1), +# libgnomeprint2.2-dev (>= 2.4.0-2), +# libgnome2-dev (>= 2.4.0-1), +# libbonoboui2-dev (>= 2.4.0-1), +# libgnomeui2-dev (>= 2.4.0.1-1), +# db31 (>= 3.1.17-9), +# libjpeg, +# pkgconfig, +# intltool, +# popt, +# mozilla, +# gail17-dev, +# libgettext3-dev, +# gettext-tools, +# libiconv-dev, +# libart2 (>= 2.3.16-1), +# esound (>= 0.2.28-1), +# scrollkeeper (>= 0.3.12-2), +# evolution-data-server-dev (>= 1.0.1-1) +#<< SetCPPFLAGS: -no-cpp-precomp SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing -flat_namespace -undefined suppress NoSetMAKEFLAGS: true Index: evolution-data-server.info =================================================================== RCS file: /cvsroot/fink/experimental/jfmertens/crypto/finkinfo/evolution-data-server.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- evolution-data-server.info 26 Aug 2005 00:01:33 -0000 1.4 +++ evolution-data-server.info 6 Sep 2005 21:05:24 -0000 1.5 @@ -136,6 +136,7 @@ SplitOff2: << Package: %N-dev Depends: %N-shlibs + BuildDependsOnly: true Files: include lib/*.dylib lib/*.la lib/pkgconfig lib/evolution-data-server-1.2/camel-providers/*.la lib/evolution-data-server-1.2/extensions/*.la DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO << Index: mozilla.info =================================================================== RCS file: /cvsroot/fink/experimental/jfmertens/crypto/finkinfo/mozilla.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mozilla.info 26 Aug 2005 00:01:33 -0000 1.6 +++ mozilla.info 6 Sep 2005 21:05:24 -0000 1.7 @@ -14,26 +14,6 @@ asi-JP: http://www.t.ring.gr.jp/pub/net/www/mozilla/ << SourceDirectory: mozilla -# # for f in `fink list -t mozilla|grep '1.8b1-1'|cut -f2` ; do echo $f; otool_deps $f ; done -# mozilla -# -# mozilla-browser -# atk1-shlibs, gconf2-shlibs, glib2-shlibs, gnome-vfs2-ssl-shlibs, gtk+2-shlibs, libbonobo2-shlibs, libgettext3-shlibs, \ -# libiconv, libjpeg-shlibs, libpng3-shlibs, mozilla-shlibs, orbit2-shlibs, pango1-xft2-shlibs, xorg-shlibs -# mozilla-chatzilla -# -# mozilla-dev -# glib2-shlibs, libgettext3-shlibs, libiconv, libidl2-shlibs, mozilla-shlibs, pango1-xft2-shlibs -# mozilla-dom-inspector -# mozilla-shlibs, pango1-xft2-shlibs -# mozilla-js-debugger -# -# mozilla-mailnews -# mozilla-shlibs, pango1-xft2-shlibs -# mozilla-psm -# mozilla-shlibs, pango1-xft2-shlibs -# mozilla-shlibs -# atk1-shlibs, glib2-shlibs, gtk+2-shlibs, libgettext3-shlibs, libiconv, pango1-xft2-shlibs, xorg-shlibs Depends: %N-psm (>= %v-%r), %N-mailnews (>= %v-%r), %N-chatzilla (>= %v-%r), %N-js-debugger (>= %v-%r), %N-dom-inspector (>= %v-%r), %N-browser (>= %v-%r), %N-shlibs (>= %v-%r) BuildDepends: libpng3, libmng2, libjpeg, glib2-dev, atk1, pango1-xft2-dev, gtk+2-dev, orbit2-dev, libbonobo2-dev, gnome-vfs2-ssl-dev | gnome-vfs2-dev, libidl2-dev, x11-dev, xft2-dev, libgettext3-dev, gettext-tools, libiconv-dev, pkgconfig NoSetLDFLAGS: true @@ -41,7 +21,8 @@ NoSetCPPFLAGS: true PatchScript: << sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 -# perl -pi -e 's,cc$,gcc-3.3,' security/coreconf/Darwin.mk +# The next appears needed eg when building yelp... + perl -pi.bak -e 's,lxpcom,$& -lxpcom_core,' build/unix/mozilla-xpcom.pc.in perl -pi.bak -e 's,\#ifndef NSS,#include "pki1t.h"\n$&,' security/nss/lib/pki1/oiddata.h ## 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 --- NEW FILE: mozilla1.7.11.patch --- diff -Naur mozilla-1.7.2.old/.mozconfig mozilla-1.7.2.new/.mozconfig --- mozilla-1.7.2.old/.mozconfig Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/.mozconfig Sat Aug 21 02:12:35 2004 @@ -0,0 +1,21 @@ +ac_add_options --enable-macos-target=10.4 +ac_add_options --enable-prebinding +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --with-pthreads +ac_add_options [EMAIL PROTECTED]@/share/man +ac_add_options [EMAIL PROTECTED]@ +ac_add_options [EMAIL PROTECTED]@ +ac_add_options [EMAIL PROTECTED]@ +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-short-wchar +ac_add_options --enable-optimize +ac_add_options --enable-strip +ac_add_options --enable-crypto +ac_add_options --enable-extensions=all +ac_add_options --enable-xinerama +ac_add_options --enable-freetype2 +ac_add_options --enable-xft +ac_add_options [EMAIL PROTECTED]@/lib/mozilla +mk_add_options MOZ_MAKE_FLAGS=-j2 + diff -Naur mozilla-1.7.2.old/config/add-chrome.pl mozilla-1.7.2.new/config/add-chrome.pl --- mozilla-1.7.2.old/config/add-chrome.pl Sat Feb 21 07:14:12 2004 +++ mozilla-1.7.2.new/config/add-chrome.pl Fri Aug 20 20:07:48 2004 @@ -14,7 +14,7 @@ my $jarFileName = $ARGV[4]; my $win32 = ($^O =~ /((MS)?win32)|cygwin|os2/i) ? 1 : 0; -my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0; +my $macos = 0; my $unix = !($win32 || $macos) ? 1 : 0; sub foreignPlatformFile diff -Naur mozilla-1.7.2.old/config/autoconf.mk.in mozilla-1.7.2.new/config/autoconf.mk.in --- mozilla-1.7.2.old/config/autoconf.mk.in Sun Mar 21 11:31:17 2004 +++ mozilla-1.7.2.new/config/autoconf.mk.in Fri Aug 20 20:11:09 2004 @@ -31,14 +31,14 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir = @includedir@/$(MOZ_APP_NAME) libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ -idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = @datadir@/idl/$(MOZ_APP_NAME) -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) +mozappdir = $(libdir)/$(MOZ_APP_NAME) +mredir = $(libdir)/mre/mre mrelibdir = $(mredir)/lib DIST = $(DEPTH)/dist diff -Naur mozilla-1.7.2.old/config/config.mk mozilla-1.7.2.new/config/config.mk --- mozilla-1.7.2.old/config/config.mk Sun Apr 11 07:51:37 2004 +++ mozilla-1.7.2.new/config/config.mk Fri Aug 20 20:36:42 2004 @@ -702,7 +702,7 @@ ifeq ($(OS_ARCH),Darwin) ifdef USE_PREBINDING export LD_PREBIND=1 -export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table +export LD_PREBIND_ALLOW_OVERLAP=1 endif ifdef MACOS_SDK_DIR export NEXT_ROOT=$(MACOS_SDK_DIR) @@ -747,7 +747,7 @@ # Tell the linker where NSS is, if we're building crypto ifeq ($(OS_ARCH),Darwin) ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS))) -MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library)) +MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @PREFIX@/lib/mozilla/$(library):$(DIST)/bin/$(library)) endif endif endif diff -Naur mozilla-1.7.2.old/config/rules.mk mozilla-1.7.2.new/config/rules.mk --- mozilla-1.7.2.old/config/rules.mk Wed May 5 22:44:22 2004 +++ mozilla-1.7.2.new/config/rules.mk Fri Aug 20 20:07:48 2004 @@ -420,7 +420,7 @@ ifdef IS_COMPONENT EXTRA_DSO_LDOPTS += -bundle else -EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1 +EXTRA_DSO_LDOPTS += -dynamiclib -install_name \$(mozappdir)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1 endif endif endif diff -Naur mozilla-1.7.2.old/configure mozilla-1.7.2.new/configure --- mozilla-1.7.2.old/configure Sun Jun 6 03:44:52 2004 +++ mozilla-1.7.2.new/configure Sat Aug 21 03:41:21 2004 @@ -4976,7 +4976,7 @@ ;; *-darwin*) - HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11" + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ;; @@ -5207,8 +5207,8 @@ *-darwin*) _PEDANTIC= - CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common" - CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common" + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" + CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common" DLL_SUFFIX=".dylib" DSO_LDOPTS='' STRIP="$STRIP -x -S" diff -Naur mozilla-1.7.2.old/directory/c-sdk/config/config.mk mozilla-1.7.2.new/directory/c-sdk/config/config.mk --- mozilla-1.7.2.old/directory/c-sdk/config/config.mk Mon Feb 24 00:54:18 2003 +++ mozilla-1.7.2.new/directory/c-sdk/config/config.mk Fri Aug 20 20:07:48 2004 @@ -60,10 +60,10 @@ NFSPWD = $(MOD_DEPTH)/config/nfspwd -CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\ - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) -CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\ - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) +CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\ + $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS) +CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\ + $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS) # For purify NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) diff -Naur mozilla-1.7.2.old/directory/c-sdk/configure mozilla-1.7.2.new/directory/c-sdk/configure --- mozilla-1.7.2.old/directory/c-sdk/configure Fri Mar 26 10:23:41 2004 +++ mozilla-1.7.2.new/directory/c-sdk/configure Fri Aug 20 20:07:48 2004 @@ -3401,7 +3401,7 @@ CPU_ARCH=ppc fi - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@' + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/mozilla/$@' # Use the standard preprocessor (cpp) CFLAGS="$CFLAGS -no-cpp-precomp" MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@' diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-address.desktop mozilla-1.7.2.new/fink/applications/Mozilla-address.desktop --- mozilla-1.7.2.old/fink/applications/Mozilla-address.desktop Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/applications/Mozilla-address.desktop Sun Aug 22 21:36:12 2004 @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Addressbook +Comment=Addressbook from Mozilla Mailnews +Exec=mozilla -addressbook +Icon=mozilla-addressbook.xpm +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-chatzilla.desktop mozilla-1.7.2.new/fink/applications/Mozilla-chatzilla.desktop --- mozilla-1.7.2.old/fink/applications/Mozilla-chatzilla.desktop Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/applications/Mozilla-chatzilla.desktop Sun Aug 22 21:36:56 2004 @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Chatzilla +Comment=Mozilla Chatzilla IRC client +Exec=mozilla -chat +Icon=mozilla-chatzilla.xpm +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-editor.desktop mozilla-1.7.2.new/fink/applications/Mozilla-editor.desktop --- mozilla-1.7.2.old/fink/applications/Mozilla-editor.desktop Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/applications/Mozilla-editor.desktop Sun Aug 22 21:40:48 2004 @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Composer +Comment=HTML editor from Mozilla project +Exec=mozilla -edit +Icon=mozilla-editor.xpm +Terminal=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-mail-composer.desktop mozilla-1.7.2.new/fink/applications/Mozilla-mail-composer.desktop --- mozilla-1.7.2.old/fink/applications/Mozilla-mail-composer.desktop Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/applications/Mozilla-mail-composer.desktop Sun Aug 22 21:39:25 2004 @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Mail Composer +Comment=Mozilla Mail Composer +Exec=mozilla -compose +Icon=mozilla-mail-composer.xpm +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-mail.desktop mozilla-1.7.2.new/fink/applications/Mozilla-mail.desktop --- mozilla-1.7.2.old/fink/applications/Mozilla-mail.desktop Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/applications/Mozilla-mail.desktop Sun Aug 22 21:42:26 2004 @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Mail +Comment=Mozilla Mail +Exec=mozilla -mail +Icon=mozilla-mailnews.xpm +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla-news.desktop mozilla-1.7.2.new/fink/applications/Mozilla-news.desktop --- mozilla-1.7.2.old/fink/applications/Mozilla-news.desktop Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/applications/Mozilla-news.desktop Sun Aug 22 21:42:30 2004 @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla News +Comment=Mozilla News +Exec=mozilla -news +Icon=mozilla-mailnews.xpm +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -Naur mozilla-1.7.2.old/fink/applications/Mozilla.desktop mozilla-1.7.2.new/fink/applications/Mozilla.desktop --- mozilla-1.7.2.old/fink/applications/Mozilla.desktop Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/applications/Mozilla.desktop Sun Aug 22 21:35:17 2004 @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Mozilla Web Browser +Comment=Browse the World Wide Web +Exec=mozilla +Icon=mozilla.xpm +Terminal=false +Type=Application +Categories=Application;Network +StartupNotify=true diff -Naur mozilla-1.7.2.old/fink/chrome.d/default mozilla-1.7.2.new/fink/chrome.d/default --- mozilla-1.7.2.old/fink/chrome.d/default Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/chrome.d/default Fri Aug 20 20:07:48 2004 @@ -0,0 +1,2 @@ +skin,install,select,modern/1.0 +locale,install,select,en-US diff -Naur mozilla-1.7.2.old/fink/mozilla mozilla-1.7.2.new/fink/mozilla --- mozilla-1.7.2.old/fink/mozilla Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/mozilla Fri Aug 20 20:07:48 2004 @@ -0,0 +1,99 @@ +#!/bin/sh +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +## +## Usage: +## +## $ mozilla +## +## This script is meant to run a mozilla program from the mozilla +## rpm installation. +## +## The script will setup all the environment voodoo needed to make +## mozilla work. + +## +## Variables +## +MOZ_PROGRAM="@PREFIX@/lib/mozilla/mozilla-bin" + +## +## Set MOZILLA_FIVE_HOME +## +MOZILLA_FIVE_HOME="@PREFIX@/lib/mozilla" +export MOZILLA_FIVE_HOME + +## +## Set DYLD_LIBRARY_PATH +## [EMAIL PROTECTED]@/lib/mozilla:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH + +# If there is no command line argument at all then try to open a new +# window in an already running instance. + +if [ -z "$1" ]; then + $MOZ_PROGRAM -remote "openurl(about:blank,new-window)" >/dev/null + RETURN_VAL=$? + if [ "$RETURN_VAL" -eq "2" ]; then + $MOZ_PROGRAM ${1+"$@"} + RETURN_VAL=$? + fi + exit $RETURN_VAL +fi + +# If there's a command line argument but it doesn't begin with a - +# it's probably a url. Try to send it to a running instance. + +USE_EXIST=0 +opt="$1" +case "$opt" in + -*) ;; + *) USE_EXIST=1 ;; +esac + +if [ "${USE_EXIST}" -eq "1" ]; then + # check to make sure that the command contains at least a :/ in it. + echo $opt | grep -e ':/' 2>/dev/null >/dev/null + RETURN_VAL=$? + if [ "$RETURN_VAL" -eq "1" ]; then + # does it begin with a / ? + echo $opt | grep -e '^/' >/dev/null + RETURN_VAL=$? + if [ "$RETURN_VAL" -eq "0" ]; then + opt="file:$opt" + elif [ -e `pwd`/$opt ]; then + opt="`pwd`/$opt" + else + opt="http://$opt" + fi + fi + $MOZ_PROGRAM -remote "openurl($opt,new-window)" >/dev/null + RETURN_VAL=$? + if [ "$RETURN_VAL" -eq "2" ]; then + $MOZ_PROGRAM ${1+"$@"} + RETURN_VAL=$? + fi + exit $RETURN_VAL +fi + +$MOZ_PROGRAM ${1+"$@"} diff -Naur mozilla-1.7.2.old/fink/prefs.js mozilla-1.7.2.new/fink/prefs.js --- mozilla-1.7.2.old/fink/prefs.js Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/prefs.js Fri Aug 20 20:07:48 2004 @@ -0,0 +1,23 @@ +// XIM style +pref("xim.input_style", "over-the-spot"); + +// TryeType +pref("font.FreeType2.enable", true); +pref("font.freetype2.shared-library", "@PREFIX@/lib/libfreetype.6.dylib"); +pref("font.FreeType2.autohinted", true); +pref("font.FreeType2.unhinted", true); +pref("font.antialias.min", 10); +pref("font.embedded_bitmaps.max", 1000000); +pref("font.scale.tt_bitmap.dark_text.min", 64); +pref("font.scale.tt_bitmap.dark_text.gain", "0.0"); +pref("font.directory.truetype.1", "/Library/Fonts"); +pref("font.directory.truetype.2", "/Network/Library/Fonts"); +pref("font.directory.truetype.3", "/System/Library/Fonts"); +pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF"); +pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype"); + +// AA with Bitmap scaling. +pref("font.scale.aa_bitmap.enable", true); +pref("font.scale.aa_bitmap.always", false); +pref("font.scale.aa_bitmap.min", 6); + diff -Naur mozilla-1.7.2.old/fink/update-mozilla-chrome mozilla-1.7.2.new/fink/update-mozilla-chrome --- mozilla-1.7.2.old/fink/update-mozilla-chrome Thu Jan 1 09:00:00 1970 +++ mozilla-1.7.2.new/fink/update-mozilla-chrome Fri Aug 20 20:07:48 2004 @@ -0,0 +1,24 @@ +#!/bin/sh -e + +ulimit -s unlimited || true + [EMAIL PROTECTED]@/lib/mozilla [EMAIL PROTECTED]@/var/lib/mozilla/chrome.d + +export DYLD_LIBRARY_PATH=$MOZILLA_FIVE_HOME + +TMPFILE=`tempfile` +cat ${CHROME_DIR}/* >>${TMPFILE} +mv ${TMPFILE} ${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt +chmod 644 ${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt + +rm -rf ${MOZILLA_FIVE_HOME}/chrome/overlayinfo +rm -f ${MOZILLA_FIVE_HOME}/chrome/*.rdf +rm -f ${MOZILLA_FIVE_HOME}/component.reg +rm -f ${MOZILLA_FIVE_HOME}/components/*.dat + +sudo -H ${MOZILLA_FIVE_HOME}/regxpcom || true +sudo -H ${MOZILLA_FIVE_HOME}/regchrome || true + +exit 0 + diff -Naur mozilla-1.7.2.old/modules/libpref/src/nsPrefService.cpp mozilla-1.7.2.new/modules/libpref/src/nsPrefService.cpp --- mozilla-1.7.2.old/modules/libpref/src/nsPrefService.cpp Thu Feb 12 22:09:13 2004 +++ mozilla-1.7.2.new/modules/libpref/src/nsPrefService.cpp Fri Aug 20 20:07:49 2004 @@ -779,6 +779,7 @@ #elif defined(XP_BEOS) "beos.js" #endif + , "fink.js" }; rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); diff -Naur mozilla-1.7.2.old/nsprpub/configure mozilla-1.7.2.new/nsprpub/configure --- mozilla-1.7.2.old/nsprpub/configure Sat Apr 17 07:28:02 2004 +++ mozilla-1.7.2.new/nsprpub/configure Fri Aug 20 20:13:54 2004 @@ -3305,7 +3305,7 @@ CPU_ARCH=ppc fi - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/mozilla/$@ -headerpad_max_install_names' # Use the standard preprocessor (cpp) CFLAGS="$CFLAGS -no-cpp-precomp" MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@' @@ -3320,9 +3320,6 @@ # Add Mac OS X support for loading CFM & CFBundle plugins if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then - cat >> confdefs.h <<\EOF -#define XP_MACOSX 1 -EOF OS_TARGET=MacOSX @@ -4837,8 +4834,6 @@ case $target in -*-darwin*) - ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 echo "configure:4845: checking for dlopen in -ldl" >&5 diff -Naur mozilla-1.7.2.old/nsprpub/pr/include/md/_darwin.h mozilla-1.7.2.new/nsprpub/pr/include/md/_darwin.h --- mozilla-1.7.2.old/nsprpub/pr/include/md/_darwin.h Thu Nov 27 10:30:44 2003 +++ mozilla-1.7.2.new/nsprpub/pr/include/md/_darwin.h Fri Aug 20 20:07:49 2004 @@ -55,7 +55,8 @@ #undef HAVE_STACK_GROWING_UP #define HAVE_DLL -#define USE_MACH_DYLD +/* #define USE_MACH_DYLD */ +#define USE_DLFCN #define _PR_HAVE_SOCKADDR_LEN #define _PR_STAT_HAS_ST_ATIMESPEC #define _PR_NO_LARGE_FILES diff -Naur mozilla-1.7.2.old/nsprpub/pr/src/Makefile.in mozilla-1.7.2.new/nsprpub/pr/src/Makefile.in --- mozilla-1.7.2.old/nsprpub/pr/src/Makefile.in Tue Mar 23 09:40:17 2004 +++ mozilla-1.7.2.new/nsprpub/pr/src/Makefile.in Fri Aug 20 20:07:49 2004 @@ -199,9 +199,9 @@ endif endif -ifeq ($(OS_TARGET),MacOSX) -OS_LIBS = -framework CoreServices -framework CoreFoundation -endif +#ifeq ($(OS_TARGET),MacOSX) +#OS_LIBS = -framework CoreServices -framework CoreFoundation +#endif ifdef GC_LEAK_DETECTOR EXTRA_LIBS = -L$(dist_libdir) -lboehm diff -Naur mozilla-1.7.2.old/nsprpub/pr/src/linking/prlink.c mozilla-1.7.2.new/nsprpub/pr/src/linking/prlink.c --- mozilla-1.7.2.old/nsprpub/pr/src/linking/prlink.c Wed Jan 21 04:46:21 2004 +++ mozilla-1.7.2.new/nsprpub/pr/src/linking/prlink.c Fri Aug 20 20:16:02 2004 @@ -164,7 +164,8 @@ #if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \ || defined(WIN16) || defined(XP_OS2) \ || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)) -#define NEED_LEADING_UNDERSCORE +/* On MacOSX 10.3, dlsym does not accept symbols with '_'. +/* #define NEED_LEADING_UNDERSCORE */ #endif #ifdef XP_PC diff -Naur mozilla-1.7.2.old/security/coreconf/Darwin.mk mozilla-1.7.2.new/security/coreconf/Darwin.mk --- mozilla-1.7.2.old/security/coreconf/Darwin.mk Thu Nov 13 10:59:22 2003 +++ mozilla-1.7.2.new/security/coreconf/Darwin.mk Fri Aug 20 20:18:08 2004 @@ -68,7 +68,7 @@ ARCH = darwin # May override this with -bundle to create a loadable module. -DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names +DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @PREFIX@/lib/mozilla/$(notdir $@) -headerpad_max_install_names MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) DLL_SUFFIX = dylib diff -Naur mozilla-1.7.2.old/security/nss/cmd/platlibs.mk mozilla-1.7.2.new/security/nss/cmd/platlibs.mk --- mozilla-1.7.2.old/security/nss/cmd/platlibs.mk Sun Apr 20 13:23:14 2003 +++ mozilla-1.7.2.new/security/nss/cmd/platlibs.mk Fri Aug 20 20:07:54 2004 @@ -195,7 +195,7 @@ endif ifeq ($(OS_ARCH), Darwin) -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif diff -Naur mozilla-1.7.2.old/security/nss/lib/smime/config.mk mozilla-1.7.2.new/security/nss/lib/smime/config.mk --- mozilla-1.7.2.old/security/nss/lib/smime/config.mk Sun Apr 20 13:23:33 2003 +++ mozilla-1.7.2.new/security/nss/lib/smime/config.mk Fri Aug 20 20:07:54 2004 @@ -70,7 +70,7 @@ $(NULL) ifeq ($(OS_ARCH), Darwin) -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif endif diff -Naur mozilla-1.7.2.old/security/nss/lib/ssl/config.mk mozilla-1.7.2.new/security/nss/lib/ssl/config.mk --- mozilla-1.7.2.old/security/nss/lib/ssl/config.mk Sun Apr 20 13:23:37 2003 +++ mozilla-1.7.2.new/security/nss/lib/ssl/config.mk Fri Aug 20 20:07:54 2004 @@ -75,7 +75,7 @@ endif ifeq ($(OS_ARCH), Darwin) -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib endif endif diff -Naur mozilla-1.7.2.old/themes/Makefile.in mozilla-1.7.2.new/themes/Makefile.in --- mozilla-1.7.2.old/themes/Makefile.in Thu Sep 25 21:48:58 2003 +++ mozilla-1.7.2.new/themes/Makefile.in Fri Aug 20 20:07:54 2004 @@ -36,7 +36,9 @@ # select classic as the default skin libs:: - echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt +# fix lator +# echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt install:: - echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt +# fix lator +# echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt ------------------------------------------------------- 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