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                      Date:   01-Dec-2002 10:29:54
  Branch: HEAD                             Handle: 2002120109295400

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

  Log:
    work-off this package -- unfortunately it still does not run :-(

  Summary:
    Revision    Changes     Path
    1.1         +30 -0      openpkg-src/mozilla/mozilla.patch
    1.33        +32 -25     openpkg-src/mozilla/mozilla.spec
  ____________________________________________________________________________

  Index: openpkg-src/mozilla/mozilla.patch
  ============================================================
  $ cvs update -p -r1.1 mozilla.patch
  --- nsprpub/pr/include/md/_freebsd.h.orig     Sat Feb 16 09:12:55 2002
  +++ nsprpub/pr/include/md/_freebsd.h  Thu Aug  8 19:31:23 2002
  @@ -40,6 +40,7 @@
   #if __FreeBSD__ >= 2
   #include <osreldate.h>  /* for __FreeBSD_version */
   #endif
  +#include <sys/param.h>
   #include <sys/syscall.h>
   
   #define PR_LINKER_ARCH       "freebsd"
  --- nsprpub/pr/src/pthreads/ptio.c.orig       Fri Apr 12 03:14:39 2002
  +++ nsprpub/pr/src/pthreads/ptio.c    Tue Jul 30 18:52:11 2002
  @@ -3414,6 +3414,17 @@
       if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
       else
       {
  +#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
  +     defined(__FreeBSD__) && defined(IPV6_V6ONLY)
  +             if (domain == PR_AF_INET6) {
  +                     int opt = 0;
  +                     if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
  +                           &opt, sizeof(opt))) {
  +                             close(osfd);
  +                             return NULL;
  +                     }
  +             }
  +#endif
           fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
           if (fd == NULL) close(osfd);
       }
  Index: openpkg-src/mozilla/mozilla.spec
  ============================================================
  $ cvs diff -u -r1.32 -r1.33 mozilla.spec
  --- openpkg-src/mozilla/mozilla.spec  28 Nov 2002 16:55:20 -0000      1.32
  +++ openpkg-src/mozilla/mozilla.spec  1 Dec 2002 09:29:54 -0000       1.33
  @@ -29,15 +29,16 @@
   URL:          http://www.mozilla.org/
   Vendor:       Mozilla
   Packager:     The OpenPKG Project
  -Distribution: OpenPKG [JUNK]
  +Distribution: OpenPKG [EVAL]
   Group:        Web
   License:      MPL
   Version:      1.2
  -Release:      20021128
  +Release:      20021201
   
   #   list of sources
   Source0:      
ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla%{version}/src/mozilla-source-%{version}.tar.bz2
   Source1:      mozilla.sh
  +Patch0:       mozilla.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -54,9 +55,9 @@
   
   %prep
       %setup -q -n mozilla
  +    %patch -p0
   
   %build
  -    LD_LIBRARY_PATH="%{l_prefix}/lib:/usr/lib:$LD_LIBRARY_PATH"; export 
LD_LIBRARY_PATH
       CC="%{l_cc}" \
       CXX="%{l_cxx}" \
       CFLAGS="%{l_cflags -O} %{l_cppflags}" \
  @@ -68,40 +69,48 @@
       LIBIDL_CONFIG="%{l_prefix}/bin/libIDL-config" \
       ./configure \
           --prefix=%{l_prefix} \
  -        --with-jpeg=%{l_prefix} \
  -        --with-png=%{l_prefix} \
  -        --with-zlib=%{l_prefix} \
  -        --enable-toolkit=gtk \
  +        --libdir=%{l_prefix}/lib/mozilla \
  +        --includedir=%{l_prefix}/include/mozilla \
           --with-x \
           --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
           --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
  -        --with-gtk \
  +        --enable-toolkit-gtk \
  +        --enable-default-toolkit=gtk \
           --with-gtk-prefix=%{l_prefix} \
           --with-glib-prefix=%{l_prefix} \
           --with-libIDL-prefix=%{l_prefix} \
  -        --enable-shared \
  -        --enable-double-buffer \
  -        --enable-x11-shm \
  +        --with-system-jpeg=%{l_prefix} \
  +        --with-system-png=%{l_prefix} \
  +        --with-system-zlib=%{l_prefix} \
  +        --enable-jsd \
  +        --enable-crypto \
  +        --enable-xinerama \
  +        --enable-strip \
  +        --enable-chrome-format=jar \
  +        --enable-static \
  +        --disable-shared \
  +        --disable-mailnews \
  +        --disable-composer \
  +        --disable-svg \
  +        --disable-ldap \
  +        --disable-freetype2 \
  +        --disable-accessibility \
  +        --disable-tests \
  +        --disable-debug \
           --disable-dtd-debug \
  +        --disable-pedantic \
  +        --disable-auto-deps \
  +        --disable-md \
           --disable-cpp-exceptions \
           --disable-cpp-rtti \
  -        --disable-md \
  -        --disable-pedantic \
  +        --disable-optimize \
           --disable-xterm-updates \
  -        --enable-editor \
  -        --enable-mailnews \
  -        --enable-crypto \
  -        --disable-ldap \
  -        --disable-debug \
  -        --disable-tests \
           --with-pthreads
       %{l_make} %{l_mflags}
       ( cd dist/bin
         LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH
         MOZILLA_FIVE_HOME=.; export MOZILLA_FIVE_HOME
         ./regxpcom
  -      echo "skin,install,select,classic/1.0" >>chrome/installed-chrome.txt
  -      echo "locale,install,select,en-US"     >>chrome/installed-chrome.txt
         ./regchrome
         touch chrome/user-skins.rdf chrome/user-locales.rdf
         find . -type d -depth -print | xargs rmdir >/dev/null 2>&1 || true
  @@ -113,11 +122,9 @@
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/lib/mozilla
        (cd dist/bin && %{l_tar} -chf - . ) |\
  -     (cd $RPM_BUILD_ROOT%{l_prefix}/lib/mozilla && %{l_tar} -xf -)
  -    strip $RPM_BUILD_ROOT%{l_prefix}/lib/mozilla/* >/dev/null 2>&1 || true
  +         (cd $RPM_BUILD_ROOT%{l_prefix}/lib/mozilla && %{l_tar} -xf -)
       %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE mozilla.sh} \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin/mozilla
  +        %{SOURCE mozilla.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/mozilla
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to