OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Mar-2005 15:33:10
Branch: HEAD Handle: 2005032314331000
Modified files:
openpkg-src/mozilla mozilla.patch mozilla.spec
Log:
upgrading package: mozilla 1.7.5 -> 1.7.6
Summary:
Revision Changes Path
1.13 +26 -0 openpkg-src/mozilla/mozilla.patch
1.100 +7 -9 openpkg-src/mozilla/mozilla.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 mozilla.patch
--- openpkg-src/mozilla/mozilla.patch 27 Dec 2004 19:01:25 -0000 1.12
+++ openpkg-src/mozilla/mozilla.patch 23 Mar 2005 14:33:10 -0000 1.13
@@ -91,3 +91,29 @@
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
+Index: layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp
+--- layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp.orig 2005-02-04
20:01:59 +0100
++++ layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp 2005-02-04
20:02:52 +0100
+@@ -50,6 +50,11 @@
+ #include "nsRenderingContextGTK.h"
+ #include <gdk/gdkx.h>
+ #include <cairo.h>
++#ifdef CAIRO_HAS_XLIB_SURFACE
++#include <cairo-xlib.h>
++#else
++#error Require Cairo with Xlib backend
++#endif
+
+ /**
+ * \addtogroup cairo_renderer Cairo Rendering Engine
+Index: layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp
+--- layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp.orig
2004-03-16 22:40:07 +0100
++++ layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp 2005-02-04
20:03:40 +0100
+@@ -50,6 +50,7 @@
+ #include "nsIDOMSVGRect.h"
+ #include "nsSVGTypeCIDs.h"
+ #include "nsIComponentManager.h"
++#include <stdlib.h>
+ #include <cairo.h>
+
+ /**
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla/mozilla.spec
============================================================================
$ cvs diff -u -r1.99 -r1.100 mozilla.spec
--- openpkg-src/mozilla/mozilla.spec 1 Jan 2005 10:52:32 -0000 1.99
+++ openpkg-src/mozilla/mozilla.spec 23 Mar 2005 14:33:10 -0000 1.100
@@ -33,8 +33,8 @@
Class: PLUS
Group: Web
License: MPL
-Version: 1.7.5
-Release: 20041228
+Version: 1.7.6
+Release: 20050323
# package options
%option with_optimize yes
@@ -44,9 +44,8 @@
# list of sources
Source0:
ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla%{version}/source/mozilla-source-%{version}.tar.bz2
-Source1:
ftp://ftp.openpkg.org/sources/CPY/mozilla/mozilla-1.7.2-libart.tar.bz2
-Source2: mozilla.sh
-Source3: mozilla.pod
+Source1: mozilla.sh
+Source2: mozilla.pod
Patch0: mozilla.patch
# build information
@@ -55,9 +54,9 @@
BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, perl, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130, xsel, wmctrl
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
+BuildPreReq: infozip, zlib, openssl, freetype, cairo, cairo::with_x11 = yes
+PreReq: infozip, zlib, openssl, freetype, cairo, cairo::with_x11 = yes
AutoReq: no
AutoReqProv: no
@@ -85,7 +84,6 @@
# extract source distribution
%setup -q -n mozilla
- %setup -q -n mozilla -T -D -b 1
# patch source distribution
%patch -p0
@@ -143,7 +141,7 @@
--enable-crypto \
--enable-chrome-format=jar \
--enable-svg \
- --enable-svg-renderer-libart \
+ --enable-svg-renderer-cairo \
--enable-static \
--enable-strip \
%if "%{with_optimize}" == "yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
