Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7916
Added Files:
seamonkey.info seamonkey.patch
Log Message:
pkg in dire need of maintainer.
Leaving under collective maintainership in the meantime...
--- NEW FILE: seamonkey.info ---
Package: seamonkey
Version: 1.0.5
Revision: 1
Source-MD5: a1b98cd4d2d0f71d50406f8cd3885a5e
Source: mirror:custom:mozilla.org/%N/releases/%v/%N-%v.source.tar.bz2
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-shlibs (>= %v-%r), libgnomeui2
BuildDepends: atk1, cairo, gconf2-dev, glib2-dev, gnome-vfs2-unified-dev,
gtk+2-dev, libbonobo2-dev, libgettext3-dev, libgnome2-dev, libgnomeui2-dev,
libiconv-dev, libidl2, libjpeg, libpng3, orbit2-dev, pango1-xft2-dev, xft2-dev,
x11-dev, pkgconfig
GCC: 4.0
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/include/cairo
PatchScript: <<
#!/bin/sh -ev
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
perl -pi.bak -e 's,[EMAIL PROTECTED],%p/lib/%N,' security/coreconf/Darwin.mk
perl -pi.bak -e 's/(AC_DEFUN\()([^[,]+)(,)/\1\[\2]\3/'
{{build,directory/c-sdk/config}/autoconf,nsprpub/config}/nspr.m4
### The next appears needed eg when building yelp...
perl -pi.bak -e 's,lxpcom,$& -lxpcom_core,'
build/unix/mozilla-{config,xpcom.pc}.in
#### MISSING INCLUDES
perl -pi.bak -e 's,NSSP,P,; s,nss,,' security/nss/lib/pki1/oiddata.h
## The following is "for safety" : to avoid "implicit declaration" warnings :
perl -pi.bak -e 's,\(XP_OS2\) \&\& \!defined\(DARWIN\)$,\(XP_OS2\),'
directory/c-sdk/ldap/libraries/liblber/lber-int.h
sed -i.bak -e '/sqliteInt\.h/i
#include "os.h"' db/sqlite3/src/experimental.c
#### MISC
## configure fails to detect libresolv (hence the 'env' before ./configure),
## and even if it would detect it, it forgets to add -lresolv to LIBS (Still
true with seamonkey ??)
## We put it as far as possible in the link line _ and just for the link that
needs it, in order not to get
## libresolv in the LOAD_COMMANDS everywhere :
perl -pi.bak -e 's,^MODULE\s,OS_LIBS += -lresolv\n$&,'
netwerk/build/Makefile.in
####
### Finally, ad-hoc correction of some install_names :
perl -pi -e "s;rules.mk;$&\nEXTRA_DSO_LDOPTS := \\\$\(subst install_name
\\\$\(mozappdir\)/,install_name
\\\$\(mozappdir\)/ipc/modules/,\\\$\(EXTRA_DSO_LDOPTS\)\);"
ipc/ipcd/{extensions/{lock/src,transmngr},test}/module/Makefile.in
perl -pi -e "s;rules.mk;$&\nEXTRA_DSO_LDOPTS := \\\$\(subst install_name
\\\$\(mozappdir\)/,install_name
\\\$\(mozappdir\)/plugins/,\\\$\(EXTRA_DSO_LDOPTS\)\);"
modules/plugin/samples/{default/unix,unixprinting}/Makefile.in
### New with 1.0.1 :
# 1) till this version, the zapping of '-DXP_MACCOSX' in the patch file (this
goes back to the first versions of mozilla!)
# ensured that no frameworks were needed on the link line... What is going on ?
perl -pi.bak -e 's,endif \# WINNT,$&\nEXTRA_DSO_LDOPTS +=
-F/System/Library/Frameworks -framework CoreFoundation,' xpcom/build/Makefile.in
# 2) Non-portable use of sed (not even useable with GNU sed !)
perl -pi.bak -e 's,sed \-E,/usr/bin/$&,' xpcom/typelib/xpidl/Makefile.in
## To fix EXC_BAD_INSTRUCTION on macintel (XP_MACOSX is zapped in the patch
file):
perl -pi.bak -e 's,XP_MACOSX,__APPLE__,'
xpcom/reflect/xptcall/src/md/unix/xptc{stubs_unixish_x86.cpp,_platforms_unixish_x86.h}
## linking nspr with g++ when using --enable-cplus
perl -pi -e 's,cplus$,$&\n\tMKSHLIB = \$(CCC) \$(DSO_LDOPTS) -o \$@,'
nsprpub/pr/src/Makefile.in
## Uncomment to check builddeps:
# perl -pi -e 's,CPPFLAGS%%,CPPFLAGS -H%%,' configure
<<
##########
# --enable-default-toolkit=cairo-gtk2 not useable (also w/o
--enable-system-cairo) :
# "nsCairoRenderingContext.cpp:99: error:
'cairo_set_target_surface_DEPRECATED_BY_cairo_create' was not declared in this
scope"
# : files in src refer (not always!) to a deprecated version of cairo...
# https://bugzilla.mozilla.org/show_bug.cgi?id=334250
## can't enable static : "configure: error: Only one of --enable-shared or
--enable-static must be specified."
ConfigureParams: --enable-xft --disable-freetype2 --enable-calendar
--enable-optimize="-O3" --disable-debug --enable-application=suite
--enable-macos-target=10.4 --enable-default-toolkit=gtk2 --with-pthreads
--with-default-mozilla-five-home=%p/lib/%N --mandir=%p/share/man --enable-strip
--enable-extensions=all --enable-image-decoders=all --enable-ldap-experimental
--enable-necko-protocols=all --enable-ctl --enable-xinerama --with-system-mng
--with-system-jpeg --with-system-png --with-system-zlib --enable-postscript
--enable-ipv6 --enable-tests --with-x --enable-xprint --enable-canvas
--with-qtdir=%p --enable-pango --enable-update-packaging --enable-storage
--enable-profilesharing --enable-svg --enable-system-cairo
--enable-svg-renderer=cairo --enable-cplus
# no -fstrict-aliasing in '--enable-optimize', else "dereferencing type-punned
pointer will break strict-aliasing rules" warnings
# dropped "--enable-xpctools" . Add --enable-javaxpcom (needs xulrunner ?)
# Also "--enable-boehm" leads to trouble...; probably not important (for a
'production' pkg): according to
# http://www.hpl.hp.com/personal/Hans_Boehm/gc/ , it is only used as a leak
detector.
CompileScript: <<
#!/bin/sh -ev
export CPATH=%p/include
env ac_cv_func_res_ninit=yes MOZ_ENABLE_COREXFONTS=1 ./configure %c
## next is needed for extensions/java/xpcom/nsJavaInterfaces.cpp, when using
"--enable-javaxpcom"
# not sufficient : trouble at link time then (for same symbols) _ make should
be run in toolkit/xre
# (cf above comment "--enable-javaxpcom (needs xulrunner ?)")
#ln -s ../../../../toolkit/xre/nsXULAppAPI.h extensions/java/xpcom/src
make -w
<<
InstallScript: <<
#!/bin/sh -ev
make install DESTDIR=%d
# The following gets installed twice. To hedge our bets, put a symlink in one
of the 2 places :
if test -f %i/lib/%N/ipc/modules/libtestmodule.dylib
then if test -f %i/lib/%N/libtestmodule.dylib
then rm -f %i/lib/%N/libtestmodule.dylib ; ln -s
ipc/modules/libtestmodule.dylib %i/lib/%N
fi
fi
# Install NSS headers.
/bin/cp -R -L dist/public/nss %i/include/%N/nss
# These files are redundant.
# comment out to see..
#for f in %i/lib/%N/chrome/*.jar; do
# rm -rf ${f/.jar/}
#done
# These files are created dynamically.
#rm -rf %i/lib/%N/chrome/overlayinfo
rm -f %i/lib/%N/chrome/*.rdf
#rm -f %i/lib/%N/component.reg
rm -f %i/lib/%N/components/*.dat
# Multi user setting.
touch %i/lib/%N/chrome/user-skins.rdf
touch %i/lib/%N/chrome/user-locales.rdf
# Empty installed-chrome.txt.
mkdir -p %i/var/lib/%N/chrome.d
mv %i/lib/%N/chrome/installed-chrome.txt %i/var/lib/%N/chrome.d
touch %i/lib/%N/chrome/installed-chrome.txt
# Install fink specific files.
install -d -m 755 %i/bin %i/sbin %i/var/lib/%N/chrome.d
# keep for the moment the file, but under the name moz
# in order not to conflict with mozilla, to compare with the original %i/bin/%N
install -c -m 755 fink/mozilla %i/bin/moz
install -c -m 755 fink/update-%N-chrome %i/sbin
install -c -m 644 fink/chrome.d/* %i/var/lib/%N/chrome.d/
# Move config file into %p/etc.
install -d -m 755 %i/etc/%N
install -c -m 644 fink/prefs.js %i/etc/%N
ln -sf %p/etc/%N/prefs.js %i/lib/%N/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/%N.xpm
install -c -m 644 dist/bin/chrome/icons/default/addressbookWindow.xpm
%i/share/pixmaps/%N-addressbook.xpm
install -c -m 644 dist/bin/chrome/icons/default/chatzilla-window.xpm
%i/share/pixmaps/%N-chatzilla.xpm
install -c -m 644 dist/bin/chrome/icons/default/editorWindow.xpm
%i/share/pixmaps/%N-editor.xpm
install -c -m 644 dist/bin/chrome/icons/default/msgcomposeWindow.xpm
%i/share/pixmaps/%N-mail-composer.xpm
install -c -m 644 dist/bin/chrome/icons/default/messengerWindow.xpm
%i/share/pixmaps/%N-mailnews.xpm
install -c -m 644 dist/bin/chrome/icons/default/calendar-window.xpm
%i/share/pixmaps/%N-calendar.xpm
### And all others remain in ???
# ls -l %p/bld/mozilla-1.7.11-5/mozilla/dist/bin/chrome/icons/default
# total 140
# Install a symlink to the docfiles
mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
<<
ConfFiles: %p/etc/%N/prefs.js
PostInstScript: <<
# Those 2 empty files are not installed by dpkg
touch %p/lib/%N/chrome/user-skins.rdf
touch %p/lib/%N/chrome/user-locales.rdf
if [ configure = "$1" ]; then
update-%N-chrome
fi
<<
PostRmScript: <<
case "$1" in
purge)
rm -rf %p/lib/%N/chrome/overlayinfo
rm -f %p/lib/%N/chrome/*.rdf
rm -f %p/lib/%N/component.reg
rm -f %p/lib/%N/components/*.dat
;;
esac
<<
SplitOff: <<
Package: %N-shlibs
Depends: cairo-shlibs, gnome-vfs2-unified-shlibs, gtk+2-shlibs
DocFiles: LEGAL LICENSE
Description: Seamonkey - shared libraries
# Many "dylib"'s under lib/%N 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/%N/plugins
# for dir in lib/%N lib/%N/plugins
# do
# cd %I/$dir
# for f in `ls -1 *.dylib|xargs file|grep dynamically|cut -f1 -d:`
# do mv $f %i/$dir
# done
# cd -
# done
# mv %I/lib/%N/ipc %i/lib/%N
# <<
## but I see currently no reasonable way to list the bundles that can be linked
from shlibs _ and those
## should probably for sanity be added here. Have some evidence that many of
them in fact can...
## So, for the moment, put all of them here too...
## And let us add, for files, the subdirs lib/%N/chrome, lib/%N/greprefs and
lib/%N/res _ trusting Hanspeter on this...
Files: lib/%N/lib*.dylib lib/%N/chrome lib/%N/components lib/%N/greprefs
lib/%N/ipc lib/%N/plugins lib/%N/res
# The following depends strongly on %c. Adjust at the last minute.
# Here all shared libs are listed. One could probably consider those in plugins
and ipc as meant to be internal, and omit them.
Shlibs: <<
%p/lib/%N/libDebugRobot.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libgfxpsshar.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libgkgfx.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libgtkembedmoz.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libgtkxtbin.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libjsj.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libldap50.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libmozjs.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libmozpango-dvngx.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libmozpango-thaix.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libmozpango.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libmsgbaseutil.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libnpsimple.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libnspr4.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libnss3.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libplc4.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libplds4.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libprldap50.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libsmime3.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libsoftokn3.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libssl3.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libxpcom.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libxpcom_compat.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libxpcom_core.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/libxpistub.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/plugins/libnullplugin.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/plugins/libunixprintplugin.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/ipc/modules/liblockmodule.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/ipc/modules/libtransmgr.dylib 1.0.0 %n (>= 1.0-1)
%p/lib/%N/ipc/modules/libtestmodule.dylib 1.0.0 %n (>= 1.0-1)
<<
# %p/lib/%N/libxlibrgb.dylib 1.0.0 %n (>= 1.7.11-1) seems to have
disappeared .. ?
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r), pkgconfig
# The following is for %p/share/aclocal/nspr.m4 (the only common file);
# since the different nspr.m4 are identical, (and hardly or not used within
fink),
# a Conflicts is not required _ and would at the moment be excessive prudence
just for hypothetical cases.
# Conflicts: mozilla-dev, firefox-dev, firefox1.5-dev
Replaces: mozilla-dev, firefox-dev, firefox1.5-dev
BuildDependsOnly: true
Description: Seamonkey - development headers and libraries
InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
Files: bin/%N-config include lib/pkgconfig share/aclocal share/idl
<<
Description: WWW, chat, mail, news, calendar, a-book, etc
DescDetail: <<
%N is an open-source web browser, designed for standards
compliance, performance and portability.
<<
DescPort: <<
The whole shlibs stuff is gratuitous: anyway the src doesn' version shared libs
for darwin...
Have no time now to patch that (it is not a single place to fix...)
Adding (in patch) %p/lib/%N/components to DYLD_LIBRARY_PATH _ else links with
qt3's libeditor...
(then added also plugins and ipc/modules, by analogy).
And then %p/lib, to make sure eg libcrypto comes from %p and not from /usr.
And then /usr/X11R6/lib between the latter 2, to make sure libfreetype.6.dylib
comes from there..
Added in the patch -x flag to the regxpcom command in update-%N-chrome, to get
correct PostInstScripts.
(and use there same DYLD_LIBRARY_PATH as in %p/bin/%N).
A bunch of warnings still to look at:
warning: invalid access to non-static data member '...' of NULL object
<<
DescPackaging: <<
After original packaging and porting of mozilla by msek
Simpler _ even for user _ to have just %N, %N-dev and %N-shlibs
<<
License: OSI-Approved
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.mozilla.org/projects/seamonkey
--- NEW FILE: seamonkey.patch ---
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)|msys|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 # USE_PREBINDING
PBBUILD = NEXT_ROOT= $(PBBUILD_BIN)
PBBUILD_SETTINGS = GCC_VERSION="$(GCC_VERSION)" SYMROOT=build
@@ -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/seamonkey/$(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
;;
esac
- 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/seamonkey/$@'
# Use the standard preprocessor (cpp)
CFLAGS="$CFLAGS -no-cpp-precomp"
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-address.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-address.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-address.desktop Thu Jan
1 09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-address.desktop Sun Aug
22 21:36:12 2004
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Seamonkey Addressbook
+Comment=Addressbook from Seamonkey Mailnews
+Exec=seamonkey -addressbook
+Icon=seamonkey-addressbook.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-chatzilla.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-chatzilla.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-chatzilla.desktop Thu Jan
1 09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-chatzilla.desktop Sun Aug
22 21:36:56 2004
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Chatzilla
+Comment=Seamonkey Chatzilla IRC client
+Exec=seamonkey -chat
+Icon=seamonkey-chatzilla.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-editor.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-editor.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-editor.desktop Thu Jan
1 09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-editor.desktop Sun Aug
22 21:40:48 2004
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Seamonkey Composer
+Comment=HTML editor from Seamonkey project
+Exec=seamonkey -edit
+Icon=seamonkey-editor.xpm
+Terminal=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-mail-composer.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-mail-composer.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-mail-composer.desktop Thu Jan
1 09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-mail-composer.desktop Sun Aug
22 21:39:25 2004
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Seamonkey Mail Composer
+Comment=Seamonkey Mail Composer
+Exec=seamonkey -compose
+Icon=seamonkey-mail-composer.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-mail.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-mail.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-mail.desktop Thu Jan 1
09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-mail.desktop Sun Aug 22
21:42:26 2004
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Seamonkey Mail
+Comment=Seamonkey Mail
+Exec=seamonkey -mail
+Icon=seamonkey-mailnews.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-news.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-news.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-news.desktop Thu Jan 1
09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-news.desktop Sun Aug 22
21:42:30 2004
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Seamonkey News
+Comment=Seamonkey News
+Exec=seamonkey -news
+Icon=seamonkey-mailnews.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey-calendar.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey-calendar.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey-calendar.desktop Thu Jan
1 09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey-calendar.desktop Sun Aug
22 21:42:30 2004
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Seamonkey Calendar
+Comment=Seamonkey Calendar
+Exec=seamonkey -calendar
+Icon=seamonkey-calendar.xpm
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
diff -Naur mozilla-1.7.2.old/fink/applications/Seamonkey.desktop
mozilla-1.7.2.new/fink/applications/Seamonkey.desktop
--- mozilla-1.7.2.old/fink/applications/Seamonkey.desktop Thu Jan 1
09:00:00 1970
+++ mozilla-1.7.2.new/fink/applications/Seamonkey.desktop Sun Aug 22
21:35:17 2004
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Seamonkey Web Browser
+Comment=Browse the World Wide Web
+Exec=seamonkey
+Icon=seamonkey.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,98 @@
+#!/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
+##
+## Set MOZILLA_FIVE_HOME
+##
+MOZILLA_FIVE_HOME="@PREFIX@/lib/seamonkey"
+export MOZILLA_FIVE_HOME
+
+MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/seamonkey-bin"
+
+##
+## Set DYLD_LIBRARY_PATH
+##
+DYLD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}:${MOZILLA_FIVE_HOME}/components:${MOZILLA_FIVE_HOME}/plugins:${MOZILLA_FIVE_HOME}/ipc/modules:/usr/X11R6/lib:@PREFIX@/lib:$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");
+
+// TrueType
+pref("font.FreeType2.enable", true);
+pref("font.freetype2.shared-library", "/usr/X11R6/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-seamonkey-chrome
mozilla-1.7.2.new/fink/update-seamonkey-chrome
--- mozilla-1.7.2.old/fink/update-seamonkey-chrome Thu Jan 1 09:00:00 1970
+++ mozilla-1.7.2.new/fink/update-seamonkey-chrome Fri Aug 20 20:07:48 2004
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+ulimit -s unlimited || true
+
[EMAIL PROTECTED]@/lib/seamonkey
[EMAIL PROTECTED]@/var/lib/seamonkey/chrome.d
+
+export
DYLD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}:${MOZILLA_FIVE_HOME}/components:${MOZILLA_FIVE_HOME}/plugins:${MOZILLA_FIVE_HOME}/ipc/modules:/usr/X11R6/lib:@PREFIX@/lib:$DYLD_LIBRARY_PATH
+cd ${MOZILLA_FIVE_HOME}
+TMPFILE=`tempfile`
+cat ${CHROME_DIR}/* >>${TMPFILE}
+mv ${TMPFILE} chrome/installed-chrome.txt
+chmod 644 chrome/installed-chrome.txt
+
+rm -f chrome/{c,o,s}*.rdf components/*.dat
+sudo -H ./regxpcom -a || true
+sudo -H ./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_CFLAGS=-fPIC
- 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/seamonkey/$@ -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/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/seamonkey/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/seamonkey/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/seamonkey/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 later
+# 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 later
+# echo skin,install,select,classic/1.0 >>
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
