OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   20-Jun-2004 21:36:33
  Branch: HEAD                             Handle: -NONE-

  Modified files:
    openpkg-src/mozilla     mozilla.patch mozilla.spec

  Log:
    mozilla 1.7 is shipped with a broken embedded freetype2 component, so
    disable it until the problem is solved (we supply our own libfreetype
    anyways so it's unclear why the embedded component is even needed) and
    update 1.6 -> 1.7

  Summary:
    Revision    Changes     Path
    1.9         +0  -0      openpkg-src/mozilla/mozilla.patch
    1.85        +0  -0      openpkg-src/mozilla/mozilla.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mozilla/mozilla.patch
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 mozilla.patch
  --- openpkg-src/mozilla/mozilla.patch 29 Apr 2004 15:06:56 -0000      1.8
  +++ openpkg-src/mozilla/mozilla.patch 20 Jun 2004 19:36:32 -0000      1.9
  @@ -34,7 +34,7 @@
   Index: nsprpub/pr/src/pthreads/ptio.c
   --- nsprpub/pr/src/pthreads/ptio.c   2003-07-14 23:59:47.000000000 +0200
   +++ nsprpub/pr/src/pthreads/ptio.c   2003-10-16 18:59:28.000000000 +0200
  -@@ -3469,6 +3469,16 @@
  +@@ -3484,6 +8469,16 @@
                (void)setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
                        &on, sizeof(on));
            }
  @@ -89,12 +89,12 @@
       {
   +      png_size_t len;
   +      if ((len = png_strlen(error_message)) > 63)
  -+          len = 63;
  ++         len = 63; 
          buffer[iout++] = ':';
          buffer[iout++] = ' ';
  --      png_memcpy(buffer+iout, error_message, 64);
  +-      png_strncpy(buffer+iout, error_message, 63);
   -      buffer[iout+63] = 0;
  -+      png_memcpy(buffer+iout, error_message, len);
  ++      png_strncpy(buffer+iout, error_message, len);
   +      buffer[iout+len] = 0;
       }
    }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mozilla/mozilla.spec
  ============================================================================
  $ cvs diff -u -r1.84 -r1.85 mozilla.spec
  --- openpkg-src/mozilla/mozilla.spec  29 Apr 2004 15:06:56 -0000      1.84
  +++ openpkg-src/mozilla/mozilla.spec  20 Jun 2004 19:36:32 -0000      1.85
  @@ -33,8 +33,8 @@
   Class:        PLUS
   Group:        Web
   License:      MPL
  -Version:      1.7rc1
  -Release:      20040429
  +Version:      1.7
  +Release:      20040620
   
   #   package options
   %option       with_optimize   yes
  @@ -134,7 +134,6 @@
           --with-system-png=%{l_prefix} \
           --with-system-zlib=%{l_prefix} \
           --with-ft-prefix=%{l_prefix} \
  -        --enable-freetype2 \
           --enable-jsd \
           --enable-crypto \
           --enable-chrome-format=jar \
  @@ -158,6 +157,7 @@
           --disable-composer \
   %endif
           --disable-xft \
  +        --disable-freetype2 \
           --disable-xinerama \
           --disable-shared \
           --disable-tests \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to