[SVN-Commit] r341 - trunk/deskutils/lightning
Author: beat Date: Tue Jun 29 09:22:43 2010 New Revision: 341 Log: - Set DISTVERSION to 1.0. This prevent us from bumping PORTEPOCH once lightning 1.0 is released. Modified: trunk/deskutils/lightning/Makefile Modified: trunk/deskutils/lightning/Makefile == --- trunk/deskutils/lightning/Makefile Mon Jun 28 09:01:54 2010(r340) +++ trunk/deskutils/lightning/Makefile Tue Jun 29 09:22:43 2010(r341) @@ -6,11 +6,11 @@ # PORTNAME= lightning -DISTVERSION= 1.0b1 +DISTVERSION= 1.0 CATEGORIES=deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR=calendar/${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-sunbird-${DISTVERSION}.source +MASTER_SITE_SUBDIR=calendar/${PORTNAME}/releases/${DISTVERSION}b1/source +DISTNAME= ${PORTNAME}-sunbird-${DISTVERSION}b1.source MAINTAINER=ge...@freebsd.org COMMENT= An integrated calendar for Thunderbird and SeaMonkey ___ freebsd-gecko@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
[SVN-Commit] r342 - branches/experimental/mail/thunderbird/files trunk/mail/thunderbird/files
Author: beat Date: Tue Jun 29 14:07:00 2010 New Revision: 342 Log: - Add patch to fix startup with certain plugins installed (like lightning 1.0b2) Obtained from: https://bugzilla.mozilla.org/show_bug.cgi?id=551152 Added: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp trunk/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp Added: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp Tue Jun 29 14:07:00 2010(r342) @@ -0,0 +1,23 @@ +--- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile) + NS_ASSERTION(count, "broken search path! bad count"); + for(PRUint32 i = 0; i < count; i++) + { +-nsCOMPtr current; ++nsCOMPtr current, normalized; + aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), + getter_AddRefs(current)); + NS_ASSERTION(current, "broken search path! bad element"); + // nsIFile::Equals basically compares path strings so normalize + // before the comparison. + parent->Normalize(); +-current->Normalize(); ++current->Clone(getter_AddRefs(normalized)); ++normalized->Normalize(); + PRBool same; +-if (NS_SUCCEEDED(parent->Equals(current, &same)) && same) ++if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same) + return (int) i; + } + } Added: trunk/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp Tue Jun 29 14:07:00 2010(r342) @@ -0,0 +1,23 @@ +--- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile) + NS_ASSERTION(count, "broken search path! bad count"); + for(PRUint32 i = 0; i < count; i++) + { +-nsCOMPtr current; ++nsCOMPtr current, normalized; + aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), + getter_AddRefs(current)); + NS_ASSERTION(current, "broken search path! bad element"); + // nsIFile::Equals basically compares path strings so normalize + // before the comparison. + parent->Normalize(); +-current->Normalize(); ++current->Clone(getter_AddRefs(normalized)); ++normalized->Normalize(); + PRBool same; +-if (NS_SUCCEEDED(parent->Equals(current, &same)) && same) ++if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same) + return (int) i; + } + } ___ freebsd-gecko@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
[SVN-Commit] r343 - in branches/experimental/devel/nspr: . files
Author: beat Date: Tue Jun 29 21:33:29 2010 New Revision: 343 Log: - Provide PR_STATIC_ASSERT in prtypes.h. Firefox 3.7 Alpha 5 requires this although the official nspr release does not include PR_STATIC_ASSERT in prtypes.h but the bundled one does. - While I'm here update to 4.8.4 Added: branches/experimental/devel/nspr/files/patch-..-pr-include-prtypes.h Modified: branches/experimental/devel/nspr/Makefile branches/experimental/devel/nspr/distinfo branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c branches/experimental/devel/nspr/files/patch-tests branches/experimental/devel/nspr/files/patch-warnings branches/experimental/devel/nspr/pkg-plist Modified: branches/experimental/devel/nspr/Makefile == --- branches/experimental/devel/nspr/Makefile Tue Jun 29 14:07:00 2010 (r342) +++ branches/experimental/devel/nspr/Makefile Tue Jun 29 21:33:29 2010 (r343) @@ -2,11 +2,11 @@ # Date created:18 December 2001 # Whom:Maxim Sobolev # -# $FreeBSD: ports/devel/nspr/Makefile,v 1.36 2008/04/03 16:50:42 ahze Exp $ +# $FreeBSD: ports/devel/nspr/Makefile,v 1.39 2009/11/11 05:36:52 mi Exp $ #$MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $ PORTNAME= nspr -DISTVERSION= 4.8.2 +DISTVERSION= 4.8.4 CATEGORIES=devel #MASTER_SITES= LOCAL/ahze MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -19,6 +19,7 @@ USE_LDCONFIG= yes USE_GMAKE= yes +MAKE_JOBS_SAFE=yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure CONFIGURE_ARGS=--disable-debug \ @@ -43,12 +44,21 @@ ${MKDIR} ${PREFIX}/include/nspr ${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \ ${TAR} -C ${PREFIX}/include -xf - + ${FIND} ${PREFIX}/include/nspr | \ + ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP} + ${FIND} ${PREFIX}/include/nspr -type d | \ + ${XARGS} ${CHMOD} 0755 + ${FIND} ${PREFIX}/include/nspr -type f | \ + ${XARGS} ${CHMOD} ${SHAREMODE} ${TAR} -C ${WRKSRC}/dist/lib --dereference -cf - . | \ ${TAR} -C ${PREFIX}/lib -xf - ${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin ${MKDIR} ${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${PREFIX}/libdata/pkgconfig .for lib in ${LIBS} + ${STRIP_CMD} ${PREFIX}/lib/${lib} + ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/lib/${lib} + ${CHMOD} ${BINMODE} ${PREFIX}/lib/${lib} ${LN} -sf ${lib} ${PREFIX}/lib/${lib:R} .endfor @@ -69,6 +79,8 @@ test: libtests prtests +#regression-test: test + #.if defined(PACKAGE_BUILDING) #post-build: test #.else Modified: branches/experimental/devel/nspr/distinfo == --- branches/experimental/devel/nspr/distinfo Tue Jun 29 14:07:00 2010 (r342) +++ branches/experimental/devel/nspr/distinfo Tue Jun 29 21:33:29 2010 (r343) @@ -1,3 +1,3 @@ -MD5 (nspr-4.8.2.tar.gz) = 2a6fbfa56c9760ed3651d527272249c7 -SHA256 (nspr-4.8.2.tar.gz) = 23ec182a42eec4b6df01f3c02c632ed9f7e004d6c320d048d5fe24054d319bce -SIZE (nspr-4.8.2.tar.gz) = 1232677 +MD5 (nspr-4.8.4.tar.gz) = a85bdbe1eb646aa32c785a37d8e3a2f5 +SHA256 (nspr-4.8.4.tar.gz) = 8c119a1702acf7568e5de887e84b34470a929639ee5a89271df2ba57a31f6746 +SIZE (nspr-4.8.4.tar.gz) = 1196103 Added: branches/experimental/devel/nspr/files/patch-..-pr-include-prtypes.h == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/devel/nspr/files/patch-..-pr-include-prtypes.h Tue Jun 29 21:33:29 2010(r343) @@ -0,0 +1,17 @@ +--- ../pr/include/prtypes.h.orig 2010-06-29 23:09:47.0 +0200 ../pr/include/prtypes.h2010-06-29 23:10:18.0 +0200 +@@ -519,6 +519,14 @@ + /* ? End Fix me ?? */ + #endif /* NO_NSPR_10_SUPPORT */ + ++/* ++** Compile-time assert. "condition" must be a constant expression. ++** The macro can be used only in places where an "extern" declaration is ++** allowed. ++*/ ++#define PR_STATIC_ASSERT(condition) \ ++extern void pr_static_assert(int arg[(condition) ? 1 : -1]) ++ + PR_END_EXTERN_C + + #endif /* prtypes_h___ */ Modified: branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c == --- branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c Tue Jun 29 14:07:00 2010(r342) +++ branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c Tue Jun 29 21:33:29 2010(r343) @@ -1,6 +1,15 @@ ../pr/src/pthreads/ptio.c.orig