[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/firefox/ firefox.patch firefox.spec
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2004-06-30 12:01:17
Message-ID: 20040630120117.9B1D1302299 () mail ! openpkg ! org
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   30-Jun-2004 14:01:17
  Branch: HEAD                             Handle: -NONE-

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

  Log:
    blind upgrade (it seems to be still broken under build-time anyway)

  Summary:
    Revision    Changes     Path
    1.3         +0  -48     openpkg-src/firefox/firefox.patch
    1.4         +8  -6      openpkg-src/firefox/firefox.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/firefox/firefox.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 firefox.patch
  --- openpkg-src/firefox/firefox.patch	29 Apr 2004 15:06:54 -0000	1.2
  +++ openpkg-src/firefox/firefox.patch	30 Jun 2004 12:01:16 -0000	1.3
  @@ -29,51 +29,3 @@
        || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
        || defined(DGUX) || defined(VMS) || defined(NTO)
    #define _PRSockLen_t size_t
  -
  ---- modules/libimg/png/pngrtran.c.orig	Wed Oct  2 20:20:24 2002
  -+++ modules/libimg/png/pngrtran.c	Wed Jan 15 11:30:23 2003
  -@@ -1965,8 +1965,8 @@
  -          /* This changes the data from RRGGBB to RRGGBBXX */
  -          if (flags & PNG_FLAG_FILLER_AFTER)
  -          {
  --            png_bytep sp = row + (png_size_t)row_width * 3;
  --            png_bytep dp = sp  + (png_size_t)row_width;
  -+            png_bytep sp = row + (png_size_t)row_width * 6;
  -+            png_bytep dp = sp  + (png_size_t)row_width * 2;
  -             for (i = 1; i < row_width; i++)
  -             {
  -                *(--dp) = hi_filler;
  -@@ -1987,8 +1987,8 @@
  -          /* This changes the data from RRGGBB to XXRRGGBB */
  -          else
  -          {
  --            png_bytep sp = row + (png_size_t)row_width * 3;
  --            png_bytep dp = sp  + (png_size_t)row_width;
  -+            png_bytep sp = row + (png_size_t)row_width * 6;
  -+            png_bytep dp = sp  + (png_size_t)row_width * 2;
  -             for (i = 0; i < row_width; i++)
  -             {
  -                *(--dp) = *(--sp);
  -
  -Steve G <linux_4ever@yahoo.com>
  -Libpng accesses memory that is out of bounds when creating an error message
  -
  -Index: pngerror.c
  ---- modules/libimg/png/pngerror.c.orig	2002-10-03 13:32:27.000000000 +0200
  -+++ modules/libimg/png/pngerror.c	2004-04-28 13:24:22.000000000 +0200
  -@@ -135,10 +135,13 @@
  -       buffer[iout] = 0;
  -    else
  -    {
  -+      png_size_t len;
  -+      if ((len = png_strlen(error_message)) > 63)
  -+          len = 63;
  -       buffer[iout++] = ':';
  -       buffer[iout++] = ' ';
  --      png_memcpy(buffer+iout, error_message, 64);
  --      buffer[iout+63] = 0;
  -+      png_memcpy(buffer+iout, error_message, len);
  -+      buffer[iout+len] = 0;
  -    }
  - }
  - 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/firefox/firefox.spec
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 firefox.spec
  --- openpkg-src/firefox/firefox.spec	29 Apr 2004 15:06:54 -0000	1.3
  +++ openpkg-src/firefox/firefox.spec	30 Jun 2004 12:01:16 -0000	1.4
  @@ -33,14 +33,14 @@
   Class:        EVAL
   Group:        Web
   License:      MPL
  -Version:      0.8
  -Release:      20040429
  +Version:      0.9.1
  +Release:      20040630
   
   #   package options
   %option       with_optimize   yes
   
   #   list of sources
  -Source0:      ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-source-%{version}.tar.bz2
  +Source0:      ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2
  Source1:      ftp://ftp.openpkg.org/sources/CPY/mozilla/mozilla-1.4-libart.tar.bz2
   Source2:      firefox.sh
   Source3:      firefox.pod
  @@ -51,8 +51,10 @@
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gcc, perl
   PreReq:       OpenPKG, openpkg >= 20040130, xsel
  -BuildPreReq:  X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype
  -PreReq:       X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype
  +BuildPreReq:  X11, glib, gtk, png, jpeg, orbit, libiconv
  +BuildPreReq:  infozip, zlib, openssl, freetype
  +PreReq:       X11, glib, gtk, png, jpeg, orbit, libiconv
  +PreReq:       infozip, zlib, openssl, freetype
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -67,7 +69,7 @@
           url       = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/
           regex     = (__VER__)
           url       = \
                ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/__NEWVER__/
  -        regex     = firefox-source-(__VER__)\.tar\.bz2
  +        regex     = firefox-(__VER__)-source\.tar\.bz2
       }
   
   %prep
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]