OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 01-Jul-2003 20:01:34
Branch: HEAD Handle: 2003070119013103
Modified files:
openpkg-re/vcheck vc.mozilla
openpkg-src/mozilla mozilla.patch mozilla.spec
openpkg-web news.txt
Log:
upgrading package: mozilla 1.3.1 -> 1.4
Summary:
Revision Changes Path
1.19 +2 -2 openpkg-re/vcheck/vc.mozilla
1.5 +0 -142 openpkg-src/mozilla/mozilla.patch
1.61 +2 -2 openpkg-src/mozilla/mozilla.spec
1.5129 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.mozilla
============================================================================
$ cvs diff -u -r1.18 -r1.19 vc.mozilla
--- openpkg-re/vcheck/vc.mozilla 8 May 2003 09:20:45 -0000 1.18
+++ openpkg-re/vcheck/vc.mozilla 1 Jul 2003 18:01:31 -0000 1.19
@@ -2,9 +2,9 @@
}
prog mozilla = {
- version = 1.3.1
+ version = 1.4
url = ftp://ftp.mozilla.org/pub/mozilla/releases/
- regex = mozilla(1\.\d+(.\d+)*)\b
+ regex = mozilla(1\.\d+(\.\d+)*)\b
url = ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla__NEWVER__/src/
regex = mozilla-source-(__VER__)\.tar\.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 mozilla.patch
--- openpkg-src/mozilla/mozilla.patch 1 Jun 2003 08:17:48 -0000 1.4
+++ openpkg-src/mozilla/mozilla.patch 1 Jul 2003 18:01:34 -0000 1.5
@@ -28,119 +28,6 @@
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
---- config/Makefile.in.orig Fri Nov 1 21:47:34 2002
-+++ config/Makefile.in Thu Dec 26 17:24:17 2002
-@@ -152,7 +152,7 @@
- $(PERL) -I$(srcdir) $(srcdir)/aboutime.pl $@ build_number
$(srcdir)/nsBuildID.h.in
-
- elf-dynstr-gc: elf-dynstr-gc.c Makefile Makefile.in
-- $(CC) $(COMPILE_CFLAGS) $(GLIB_CFLAGS) $(GLIB_LIBS) $(LDFLAGS) -o $@ $<
-+ $(CC) $(COMPILE_CFLAGS) $(GLIB_CFLAGS) -o $@ $< $(GLIB_LIBS) $(LDFLAGS)
-
- ifdef USE_ELF_DYNSTR_GC
- export:: elf-dynstr-gc
---- nsprpub/pr/src/misc/prnetdb.c 16 Jan 2003 23:09:16 -0000 3.21.2.8
-+++ nsprpub/pr/src/misc/prnetdb.c 25 Jan 2003 00:12:13 -0000
-@@ -319,7 +319,7 @@
- PR_Free(buf);
- }
-
--#elif (defined(DARWIN) && defined(HAVE_GETIFADDRS))
-+#elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD)
-
- /*
- * Use the BSD getifaddrs function.
---- nsprpub/pr/src/misc/prtime.c.orig Sun Mar 31 12:17:46 2002
-+++ nsprpub/pr/src/misc/prtime.c Tue Dec 17 21:30:30 2002
-@@ -1666,12 +1666,13 @@
- * values for these two fields.
- */
-
--#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS)
-+#if defined(__FreeBSD__)|| defined(SUNOS4) \
-+ || (__GLIBC__ >= 2) || defined(XP_BEOS)
- if (mktime(&a) == -1) {
- PR_snprintf(buf, buflen, "can't get timezone");
- return 0;
- }
--#endif
-+#endif /* check for __FreeBSD__, too <[EMAIL PROTECTED]> */
-
- return strftime(buf, buflen, fmt, &a);
- }
---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon Mar 31 12:30:39 2003
-+++ gfx/src/gtk/nsFontMetricsXft.cpp Mon Mar 31 12:30:58 2003
-@@ -84,6 +84,7 @@
- FcPattern *mPattern;
- FcPattern *mFontName;
- FcCharSet *mCharset;
-+ int mNotXft;
- };
-
- struct MozXftLangGroup {
-@@ -375,7 +376,7 @@
- PRInt32 end = mLoadedFonts.Count();
- for (PRInt32 j = 0; j < end; ++j) {
- font = (nsFontXft *)mLoadedFonts.ElementAt(j);
-- if (FcCharSetHasChar(font->mCharset, c)) {
-+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
- currFont = font;
- goto FoundFont; // for speed -- avoid "if" statement
- }
-@@ -635,7 +636,7 @@
-
- for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
- font = (nsFontXft *)mLoadedFonts.ElementAt(j);
-- if (FcCharSetHasChar(font->mCharset, c)) {
-+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
- currFont = font;
- goto FoundFont; // for speed -- avoid "if" statement
- }
-@@ -888,7 +889,7 @@
- // font in our loaded list that supports the character
- for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
- nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
-- if (FcCharSetHasChar(font->mCharset, aChar))
-+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont() != NULL)
- return font;
- }
-
-@@ -1051,7 +1052,7 @@
-
- for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
- font = (nsFontXft *)mLoadedFonts.ElementAt(j);
-- if (FcCharSetHasChar(font->mCharset, c)) {
-+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
- currFont = font;
- goto FoundFont; // for speed -- avoid "if" statement
- }
-@@ -1461,6 +1462,7 @@
- FcPatternReference(mFontName);
-
- mXftFont = nsnull;
-+ mNotXft = 0;
-
- // set up our charset
- mCharset = nsnull;
-@@ -1487,14 +1489,16 @@
- XftFont *
- nsFontXft::GetXftFont(void)
- {
-- if (!mXftFont) {
-+ if (!mXftFont && !mNotXft) {
- FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
- if (!pat)
- return nsnull;
-
- mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
-- if (!mXftFont)
-+ if (!mXftFont) {
- FcPatternDestroy(pat);
-+ mNotXft = 1;
-+ }
- }
-
- return mXftFont;
--- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003
+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003
@@ -65,7 +65,8 @@
@@ -162,32 +49,3 @@
|| defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
|| defined(DGUX) || defined(VMS) || defined(NTO)
#define _PRSockLen_t size_t
---- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
-+++ js/src/jsfun.c Fri May 30 20:54:24 2003
-@@ -1081,7 +1081,7 @@
- JSString *atomstr;
- char *propname;
- JSScopeProperty *sprop;
-- jsid userid;
-+ uint32 userid;
- JSAtom *atom;
- uintN i, n, dupflag;
- uint32 type;
-@@ -1157,7 +1157,7 @@
- userid = INT_TO_JSVAL(sprop->shortid);
- propname = ATOM_BYTES((JSAtom *)sprop->id);
- if (!JS_XDRUint32(xdr, &type) ||
-- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
-+ !JS_XDRUint32(xdr, &userid) ||
- !JS_XDRCString(xdr, &propname)) {
- if (mark)
- JS_ARENA_RELEASE(&cx->tempPool, mark);
-@@ -1173,7 +1173,7 @@
- uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
-
- if (!JS_XDRUint32(xdr, &type) ||
-- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
-+ !JS_XDRUint32(xdr, &userid) ||
- !JS_XDRCString(xdr, &propname)) {
- return JS_FALSE;
- }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 mozilla.spec
--- openpkg-src/mozilla/mozilla.spec 4 Jun 2003 12:48:56 -0000 1.60
+++ openpkg-src/mozilla/mozilla.spec 1 Jul 2003 18:01:34 -0000 1.61
@@ -24,7 +24,7 @@
##
# package versions
-%define V_mozilla 1.3.1
+%define V_mozilla 1.4
%define V_libart 1.2.1
# package information
@@ -37,7 +37,7 @@
Group: Web
License: MPL
Version: %{V_mozilla}
-Release: 20030604
+Release: 20030701
# package options
%option with_mailnews no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5128 -r1.5129 news.txt
--- openpkg-web/news.txt 1 Jul 2003 15:43:53 -0000 1.5128
+++ openpkg-web/news.txt 1 Jul 2003 18:01:32 -0000 1.5129
@@ -1,3 +1,4 @@
+01-Jul-2003: Upgraded package: P<mozilla-1.4-20030701>
01-Jul-2003: Upgraded package: P<openldap-2.1.22-20030701>
01-Jul-2003: Upgraded package: P<portsentry-1.1-20030701>
01-Jul-2003: Upgraded package: P<postgresql-7.3.3-20030701>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
