Date: Wed, 2 Sep 2009 07:56:37 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r98 - in branches/experimental/www/kompozer: . files Message-ID: <200909020756.n827ub1t046170@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Wed Sep 2 07:56:36 2009
New Revision: 98
Log:
- Unbreak and update to 0.8a4
- Fix build on sparc64
Added:
branches/experimental/www/kompozer/files/patch-xpfe-components-Makefile.in
Deleted:
branches/experimental/www/kompozer/files/patch-extensions_p3p_Makefile.in
branches/experimental/www/kompozer/files/patch-gfx-src-gtk-Makefile.in
branches/experimental/www/kompozer/files/patch-widget_src_gtk2_nsDragService.cpp
Modified:
branches/experimental/www/kompozer/Makefile
branches/experimental/www/kompozer/distinfo
branches/experimental/www/kompozer/files/patch-bugzilla149334
branches/experimental/www/kompozer/files/patch-libm
branches/experimental/www/kompozer/files/patch-sysnss
branches/experimental/www/kompozer/files/patch-xptcall-ia64
Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile Wed Aug 26 13:21:12 2009 (r97)
+++ branches/experimental/www/kompozer/Makefile Wed Sep 2 07:56:36 2009 (r98)
@@ -2,39 +2,41 @@
# Date created: August 21, 2004
# Whom: Thierry Thomas <thierry@pompo.net>
#
-# $FreeBSD: ports/www/kompozer/Makefile,v 1.39 2009/05/04 19:23:43 miwi Exp $
+# $FreeBSD: ports/www/kompozer/Makefile,v 1.42 2009/08/22 00:38:10 amdmi3 Exp $
# $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $
#
PORTNAME= kompozer
-DISTVERSION= 0.7.10
-PORTREVISION= 3
+DISTVERSION= 0.8a4
CATEGORIES= www
-MASTER_SITES= SF
-DISTNAME= ${PORTNAME}-${DISTVERSION}dfsg-src
+MASTER_SITES= SF/${PORTNAME}/current/${DISTVERSION}
+DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= gecko@FreeBSD.org
COMMENT= Complete Web Authoring Suite
WANT_GNOME= yes
WANT_PERL= yes
+USE_BZIP2= yes
+USE_GECKO= gecko
USE_GMAKE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}/mozilla
+WRKSRC= ${WRKDIR}/mozilla
MAKEFILE= client.mk
ALL_TARGET= build_all
MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
+MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
+ --enable-application=composer \
+ --enable-system-cairo
PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux
DESKTOP_ENTRIES="Kompozer" "${COMMENT}" \
"${PREFIX}/lib/kompozer/icons/mozicon50.xpm" "${PORTNAME}" \
"Application;Network;" true
-NOT_FOR_ARCHS= ia64 sparc64
+NOT_FOR_ARCHS= ia64
NOT_FOR_ARCHS_REASON_ia64= does not build
-NOT_FOR_ARCHS_REASON_sparc64= crashes in font selection
.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/Makefile.common"
post-patch:
@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
Modified: branches/experimental/www/kompozer/distinfo
==============================================================================
--- branches/experimental/www/kompozer/distinfo Wed Aug 26 13:21:12 2009 (r97)
+++ branches/experimental/www/kompozer/distinfo Wed Sep 2 07:56:36 2009 (r98)
@@ -1,3 +1,3 @@
-MD5 (kompozer-0.7.10dfsg-src.tar.gz) = 422675f098bae8cbd1e4d35cae426855
-SHA256 (kompozer-0.7.10dfsg-src.tar.gz) = 90978b89b745f8b91b40b8b6f8748169d0a811084283a3945b370173f96a6b42
-SIZE (kompozer-0.7.10dfsg-src.tar.gz) = 35284737
+MD5 (kompozer-0.8a4-src.tar.bz2) = ff4585dfbdde4c215304d600af6e5d0e
+SHA256 (kompozer-0.8a4-src.tar.bz2) = d2ee04e53c47a22022e0175d2ce3999cdab7343372bf82f8edc2d47fbe95677b
+SIZE (kompozer-0.8a4-src.tar.bz2) = 39010828
Modified: branches/experimental/www/kompozer/files/patch-bugzilla149334
==============================================================================
--- branches/experimental/www/kompozer/files/patch-bugzilla149334 Wed Aug 26 13:21:12 2009 (r97)
+++ branches/experimental/www/kompozer/files/patch-bugzilla149334 Wed Sep 2 07:56:36 2009 (r98)
@@ -226,26 +226,26 @@
RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v
retrieving revision 1.25
diff -u -3 -p -r1.25 nsFontMetricsPS.h
---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25
-+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000
-@@ -319,7 +319,7 @@ protected:
+--- gfx/src/ps/nsFontMetricsPS.h.orig 2009-05-02 18:42:46.000000000 +0200
++++ gfx/src/ps/nsFontMetricsPS.h 2009-08-31 14:44:11.000000000 +0200
+@@ -424,7 +424,7 @@
nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
nsCOMPtr<nsIFreeType2> mFt2;
PRUint16 mPixelSize;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
+ nsCString mFontNameBase; // the base name of type 1 (sub) fonts
+ nscoord mHeight;
-
- static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -362,7 +362,7 @@ public:
+@@ -493,7 +493,7 @@
protected:
nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
nsCOMPtr<nsIFreeType2> mFt2;
- FTC_Image_Desc mImageDesc;
+ FTC_ImageType mImageDesc;
};
- #endif
-
+ #endif // MOZ_ENABLE_FREETYPE2
+ #endif // MOZ_ENABLE_XFT
Index: gfx/src/x11shared/nsFontFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
@@ -329,9 +329,9 @@
RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
retrieving revision 1.10
diff -u -3 -p -r1.10 nsFontFreeType.h
---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10
-+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000
-@@ -110,7 +110,7 @@ protected:
+--- gfx/src/x11shared/nsFontFreeType.h.orig 2009-05-02 18:42:44.000000000 +0200
++++ gfx/src/x11shared/nsFontFreeType.h 2009-08-31 14:38:12.000000000 +0200
+@@ -110,7 +110,7 @@
XImage *GetXImage(PRUint32 width, PRUint32 height);
nsITrueTypeFontCatalogEntry *mFaceID;
PRUint16 mPixelSize;
Deleted: branches/experimental/www/kompozer/files/patch-extensions_p3p_Makefile.in
==============================================================================
--- branches/experimental/www/kompozer/files/patch-extensions_p3p_Makefile.in Wed Sep 2 07:56:36 2009 (r97)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,30 +0,0 @@
---- extensions/p3p/Makefile.in.orig Sun Jul 9 14:10:16 2006
-+++ extensions/p3p/Makefile.in Sun Jul 9 14:20:10 2006
-@@ -62,23 +62,23 @@
- p3p200010.xsl: resources/content/p3p.xsl.in Makefile.in
- @$(RM) -f $@
- $(PP) -DNAMESPACE=http://www.w3.org/2000/10/18/P3Pv1 \
-- -DHAS_TMPL_RETENTION\
-+ -DHAS_TMPL_RETENTION \
- $< > $@
-
- p3p200012.xsl: resources/content/p3p.xsl.in Makefile.in
- @$(RM) -f $@
- $(PP) -DNAMESPACE=http://www.w3.org/2000/12/P3Pv1 \
-- -DHAS_CALL_OURS\
-+ -DHAS_CALL_OURS \
- $< > $@
-
- p3p200109.xsl: resources/content/p3p.xsl.in Makefile.in
- @$(RM) -f $@
- $(PP) -DNAMESPACE=http://www.w3.org/2001/09/P3Pv1 \
-- -DHAS_CALL_OURS\
-+ -DHAS_CALL_OURS \
- $< > $@
-
- p3p200201.xsl: resources/content/p3p.xsl.in Makefile.in
- @$(RM) -f $@
- $(PP) -DNAMESPACE=http://www.w3.org/2002/01/P3Pv1 \
-- -DHAS_CALL_OURS -DHAS_PURPOSE_SRC\
-+ -DHAS_CALL_OURS -DHAS_PURPOSE_SRC \
- $< > $@
Deleted: branches/experimental/www/kompozer/files/patch-gfx-src-gtk-Makefile.in
==============================================================================
--- branches/experimental/www/kompozer/files/patch-gfx-src-gtk-Makefile.in Wed Sep 2 07:56:36 2009 (r97)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
-When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
-contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
-
-This causes an error, because libgfxshared_s is only under dist/lib.
-
- -mi
-
---- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003
-+++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005
-@@ -165,4 +165,5 @@
- ifdef MOZ_ENABLE_GTK2
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
-+ $(LIBS_DIR) \
- -lgkgfx \
- -lgfxshared_s \
Modified: branches/experimental/www/kompozer/files/patch-libm
==============================================================================
--- branches/experimental/www/kompozer/files/patch-libm Wed Aug 26 13:21:12 2009 (r97)
+++ branches/experimental/www/kompozer/files/patch-libm Wed Sep 2 07:56:36 2009 (r98)
@@ -1,19 +1,3 @@
---- js/src/Makefile.in Thu Aug 4 22:26:52 2005
-+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
-
--FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK = jsmathtemp.o
- JS_SAFE_ARENA = 1
-@@ -320,7 +319,4 @@
- endif
- @$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
-
--- js/Makefile.in Sun Mar 23 14:36:00 2003
+++ js/Makefile.in Thu Aug 4 23:08:06 2005
@@ -46,5 +46,5 @@
Modified: branches/experimental/www/kompozer/files/patch-sysnss
==============================================================================
--- branches/experimental/www/kompozer/files/patch-sysnss Wed Aug 26 13:21:12 2009 (r97)
+++ branches/experimental/www/kompozer/files/patch-sysnss Wed Sep 2 07:56:36 2009 (r98)
@@ -7,27 +7,34 @@
-
ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg
---- security/manager/Makefile.in Mon Mar 28 19:56:36 2005
-+++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
-@@ -37,16 +37,7 @@
+--- security/manager/Makefile.in.orig 2009-05-02 18:42:16.000000000 +0200
++++ security/manager/Makefile.in 2009-08-31 14:54:01.000000000 +0200
+@@ -54,22 +54,14 @@
+ SSL3_LIB \
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_MODULES \
+ HAVE_FREEBL_LIBS \
+ HAVE_FREEBL_LIBS_32 \
+ HAVE_FREEBL_LIBS_32INT64 \
+ HAVE_FREEBL_LIBS_64 \
$(NULL)
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
+ endif
+
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
-@@ -132,9 +123,4 @@
+ # Default
+ HAVE_FREEBL_LIBS = 1
+
+@@ -218,11 +210,6 @@
.nss.cleaned: .nss.checkout
+ ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
@@ -35,35 +42,27 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
+ endif
-@@ -153,43 +139,4 @@
+@@ -245,8 +232,6 @@
+ endif
ifeq ($(OS_ARCH),WINNT)
cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+ endif
+ ifndef MOZ_NATIVE_NSS
+ $(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean
+@@ -256,48 +241,6 @@
+ $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs
+ $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
+ # In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
+- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
+- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
--ifndef DISABLE_DIST_GRE
-- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
@@ -72,17 +71,41 @@
- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
+- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
+-endif
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
+- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
-endif
endif
$(MAKE) -C boot $@
-@@ -200,18 +147,4 @@
+ $(MAKE) -C ssl $@
+@@ -308,42 +251,6 @@
install::
+ ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -91,57 +114,65 @@
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_LIBS
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_32INT64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
+-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
+-endif
+-ifdef HAVE_FREEBL_LIBS_64
+-ifndef SKIP_CHK
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
+- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
+-endif
+ endif
$(MAKE) -C boot $@
$(MAKE) -C ssl $@
-@@ -227,9 +160,4 @@
+@@ -361,11 +268,6 @@
endif
+ ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
+ endif
echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004
-+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005
-@@ -117,5 +117,5 @@
+--- security/manager/ssl/src/Makefile.in.orig 2009-05-02 18:42:14.000000000 +0200
++++ security/manager/ssl/src/Makefile.in 2009-08-31 14:56:30.000000000 +0200
+@@ -131,7 +131,8 @@
+
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
+-LOCAL_INCLUDES += $(NSS_CFLAGS)
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
- $(NULL)
++ $(NULL)
---- config/config.mk Tue Oct 12 00:11:11 2004
-+++ config/config.mk Tue Aug 2 09:19:18 2005
-@@ -170,5 +170,4 @@
- NSS_LIBS = \
- $(LIBS_DIR) \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
- -lsmime3 \
- -lssl3 \
-@@ -189,11 +188,5 @@
- endif
-
--NSS_DEP_LIBS = \
-- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-- $(NULL)
-+NSS_DEP_LIBS =
-
- MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
---- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004
-+++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005
-@@ -88,4 +88,8 @@
+ EXTRA_DSO_LDOPTS += \
+ $(MOZ_UNICHARUTIL_LIBS) \
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig 2009-08-31 14:58:10.000000000 +0200
++++ security/manager/ssl/src/nsNSSComponent.cpp 2009-08-31 15:00:26.000000000 +0200
+@@ -124,6 +124,10 @@
+ #include "p12plcy.h"
}
+#include <sys/types.h>
@@ -150,29 +181,34 @@
+
#ifdef PR_LOGGING
PRLogModuleInfo* gPIPNSSLog = nsnull;
-@@ -406,4 +410,5 @@
+ #endif
+@@ -703,6 +707,7 @@
+
const char *possible_ckbi_locations[] = {
NS_GRE_DIR,
+ NS_UNIX_LIB_DIR,
- NS_XPCOM_CURRENT_PROCESS_DIR
- };
-@@ -419,5 +424,5 @@
- }
+ NS_XPCOM_CURRENT_PROCESS_DIR,
+ 0 // This special value means:
+ // search for ckbi in the directories on the shared
+@@ -711,12 +716,20 @@
+ for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
+ nsCOMPtr<nsILocalFile> mozFile;
- char *fullModuleName = nsnull;
+ char *fullModuleName;
- #ifdef XP_MAC
- nsCAutoString nativePath;
-@@ -431,4 +436,12 @@
- fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
- #endif
+
+ if (!possible_ckbi_locations[il])
+ {
+ fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
+ }
+ if (fullModuleName == nsnull)
+ continue;
+ struct stat sb;
+ if (stat(fullModuleName, &sb)) {
-+ if (errno != ENOENT)
-+ perror(fullModuleName);
-+ continue;
++ if (errno != ENOENT)
++ perror(fullModuleName);
++ continue;
+ }
- /* If a module exists with the same name, delete it. */
- NS_ConvertUCS2toUTF8 modNameUTF8(modName);
+ else
+ {
+ directoryService->Get( possible_ckbi_locations[il],
Deleted: branches/experimental/www/kompozer/files/patch-widget_src_gtk2_nsDragService.cpp
==============================================================================
--- branches/experimental/www/kompozer/files/patch-widget_src_gtk2_nsDragService.cpp Wed Sep 2 07:56:36 2009 (r97)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,18 +0,0 @@
---- widget/src/gtk2/nsDragService.cpp.nograb 2007-01-16 21:26:49.000000000 -0500
-+++ widget/src/gtk2/nsDragService.cpp 2007-01-16 21:27:04.000000000 -0500
-@@ -799,7 +799,6 @@
- void
- nsDragService::GetTargetDragData(GdkAtom aFlavor)
- {
-- gtk_grab_add(mHiddenWidget);
- PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor));
- PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n",
- mTargetWidget, mTargetDragContext));
-@@ -817,7 +816,6 @@
- gtk_main_iteration();
- }
- PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n"));
-- gtk_grab_remove(mHiddenWidget);
- }
-
- void
Added: branches/experimental/www/kompozer/files/patch-xpfe-components-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/kompozer/files/patch-xpfe-components-Makefile.in Wed Sep 2 07:56:36 2009 (r98)
@@ -0,0 +1,12 @@
+--- xpfe/components/Makefile.in.orig 2009-09-01 17:52:59.000000000 +0200
++++ xpfe/components/Makefile.in 2009-09-01 17:53:27.000000000 +0200
+@@ -126,9 +126,6 @@
+ DIRS += winhooks
+ endif
+
+-# build2 should be last
+-DIRS += build2
+-
+ endif
+
+ ifndef MOZ_XUL_APP
Modified: branches/experimental/www/kompozer/files/patch-xptcall-ia64
==============================================================================
--- branches/experimental/www/kompozer/files/patch-xptcall-ia64 Wed Aug 26 13:21:12 2009 (r97)
+++ branches/experimental/www/kompozer/files/patch-xptcall-ia64 Wed Sep 2 07:56:36 2009 (r98)
@@ -17,8 +17,8 @@
.prologue
.save ar.pfs, r37
// allocate 4 input args, 6 local args, and 8 output args
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig 2009-05-02 18:43:37.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s 2009-08-31 15:05:05.000000000 +0200
@@ -6,6 +6,7 @@
// Section has executable code
.section .text, "ax","progbits"
@@ -33,6 +33,6 @@
-SharedStub::
+SharedStub:
- // 9 arguments, first 8 are the input arguments of previous
- // function call. The last one is methodIndex, and is passed in memory
- .prologue
+ // 10 arguments, first 8 are the input arguments of previous
+ // function call. The 9th one is methodIndex and the 10th is the
+ // pointer to the remaining input arguments. The last two arguments
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909020756.n827ub1t046170>