[xulrunner] Update to 1.9.3.1 beta 3
Martin Stransky
stransky at fedoraproject.org
Mon Aug 16 10:19:31 UTC 2010
commit ddf59ad53903504f7b76cfba88c3494e7640c7e9
Author: komat <komat at localhost.localdomain>
Date: Mon Aug 16 12:19:31 2010 +0200
Update to 1.9.3.1 beta 3
.gitignore | 1 +
mozilla-193-pkgconfig.patch | 73 +++++++++++++++++++++++++++++++++++++++++++
mozilla-build.patch | 22 ++++++------
mozilla-libjpeg-turbo.patch | 14 ++++----
sources | 2 +-
xulrunner.spec | 27 +++++++++-------
6 files changed, 108 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04e5933..a6e78cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xulrunner-1.9.2.7.source.tar.bz2
+xulrunner-1.9.3.0b3.source.tar.bz2
diff --git a/mozilla-193-pkgconfig.patch b/mozilla-193-pkgconfig.patch
new file mode 100644
index 0000000..c17c89b
--- /dev/null
+++ b/mozilla-193-pkgconfig.patch
@@ -0,0 +1,73 @@
+diff -up xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in.pk xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in
+--- xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in.pk 2010-08-06 03:09:27.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/config/autoconf.mk.in 2010-08-16 11:07:52.000000000 +0200
+@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
+
+ installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
+
+ DIST = $(DEPTH)/dist
+ LIBXUL_SDK = @LIBXUL_SDK@
+diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in
+--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul-embedding.pc.in 2010-08-16 11:12:32.000000000 +0200
+@@ -6,5 +6,6 @@ idldir=%idldir%
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue -ldl
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
+diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in
+--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/libxul.pc.in 2010-08-16 11:07:52.000000000 +0200
+@@ -2,6 +2,7 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%libdir%
+
+ Name: libxul
+ Description: The Mozilla Runtime and Embedding Engine
+diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in
+--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk 2010-08-16 11:07:52.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in 2010-08-16 11:07:52.000000000 +0200
+@@ -116,6 +116,7 @@ endif
+ -e "s|%includedir%|$(includedir)|" \
+ -e "s|%idldir%|$(idldir)|" \
+ -e "s|%sdkdir%|$(sdkdir)|" \
++ -e "s|%libdir%|$(installdir)|" \
+ -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
+diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-08-16 11:07:52.000000000 +0200
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+
+ Name: mozilla-gtkembedmoz
+diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-08-16 11:07:52.000000000 +0200
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+
+ Name: mozilla-gtkembedmoz
diff --git a/mozilla-build.patch b/mozilla-build.patch
index a956e5f..065ca9f 100644
--- a/mozilla-build.patch
+++ b/mozilla-build.patch
@@ -1,18 +1,18 @@
-diff -up mozilla/security/manager/Makefile.in.old mozilla/security/manager/Makefile.in
---- mozilla/security/manager/Makefile.in.old 2007-10-25 00:25:30.000000000 +0200
-+++ mozilla/security/manager/Makefile.in 2007-11-06 10:57:39.000000000 +0100
-@@ -153,7 +153,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
+diff -up xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in.build xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in
+--- xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in.build 2010-08-06 03:09:27.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in 2010-08-16 10:49:10.000000000 +0200
+@@ -181,7 +181,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=
DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
-DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
- ifdef NSS_DISABLE_DBM
- DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
- endif
-diff -up mozilla/security/manager/ssl/src/Makefile.in.old mozilla/security/manager/ssl/src/Makefile.in
---- mozilla/security/manager/ssl/src/Makefile.in.old 2007-10-19 21:16:36.000000000 +0200
-+++ mozilla/security/manager/ssl/src/Makefile.in 2007-11-06 10:57:52.000000000 +0100
-@@ -134,8 +134,6 @@ REQUIRES = nspr \
+ DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)"
+ ifndef MOZ_NATIVE_SQLITE
+ DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
+diff -up xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in.build xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in
+--- xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in.build 2010-08-06 03:09:17.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in 2010-08-16 10:46:22.000000000 +0200
+@@ -113,8 +113,6 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)
diff --git a/mozilla-libjpeg-turbo.patch b/mozilla-libjpeg-turbo.patch
index 0016a51..9abd0e9 100644
--- a/mozilla-libjpeg-turbo.patch
+++ b/mozilla-libjpeg-turbo.patch
@@ -1,7 +1,7 @@
-diff -up xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
---- xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old 2010-07-13 21:10:28.000000000 +0200
-+++ xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-07-22 12:33:21.000000000 +0200
-@@ -57,19 +57,6 @@
+diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
+--- xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo 2010-08-06 03:09:15.000000000 +0200
++++ xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-08-16 11:19:17.000000000 +0200
+@@ -58,19 +58,6 @@
extern "C" {
#include "iccjpeg.h"
@@ -21,12 +21,12 @@ diff -up xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDec
}
NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder)
-@@ -514,14 +501,6 @@ nsresult nsJPEGDecoder::ProcessData(cons
+@@ -443,14 +430,6 @@ nsresult nsJPEGDecoder::Write(const char
return NS_OK; /* I/O suspension */
}
- /* Force to use our YCbCr to Packed RGB converter when possible */
-- if (!mTransform && (gfxPlatform::GetCMSMode() == eCMSMode_Off) &&
+- if (!mTransform && (gfxPlatform::GetCMSMode() != eCMSMode_All) &&
- mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) {
- /* Special case for the most common case: transform from YCbCr direct into packed ARGB */
- mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/
@@ -36,7 +36,7 @@ diff -up xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDec
/* If this is a progressive JPEG ... */
mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
}
-@@ -678,15 +657,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s
+@@ -616,15 +595,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s
PRUint32 *imageRow = ((PRUint32*)mImageData) +
(mInfo.output_scanline * mInfo.output_width);
diff --git a/sources b/sources
index 9322d49..d4c1f5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e240541898766e44a407e543c70d4949 xulrunner-1.9.2.7.source.tar.bz2
+e891608090dd32fd0944f6b363f62d87 xulrunner-1.9.3.0b3.source.tar.bz2
diff --git a/xulrunner.spec b/xulrunner.spec
index 8abc8f4..e71f380 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -11,19 +11,20 @@
%define cairo_version 1.6.0
%define freetype_version 2.1.9
%define sqlite_version 3.6.16
-%define tarballdir mozilla-1.9.2
+%define tarballdir mozilla-central
%define enable_mozilla_crashreporter 0
# The actual sqlite version (see #480989):
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
-%define version_internal 1.9.2
+%define version_internal 1.9.3
%define mozappdir %{_libdir}/%{name}-%{version_internal}
+%define pretag b3
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 1.9.2.7
-Release: 1%{?pretag}%{?dist}
+Version: 1.9.3.0
+Release: 0%{?pretag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -46,7 +47,7 @@ Patch9: mozilla-build-sbrk.patch
Patch10: mozilla-build-s390.patch
# Fedora specific patches
-Patch20: mozilla-192-pkgconfig.patch
+Patch20: mozilla-193-pkgconfig.patch
Patch21: mozilla-libjpeg-turbo.patch
# Upstream patches
@@ -135,21 +136,20 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
-%patch1 -p1 -b .build
-%patch3 -p1 -b .jemalloc
+%patch1 -p2 -b .build
+#%patch3 -p1 -b .jemalloc
%patch4 -p1 -b .about-firefox-version
%patch7 -p2 -b .del
-%patch8 -p1 -b .plugin
-%patch9 -p2 -b .sbrk
+#%patch8 -p1 -b .plugin
+#%patch9 -p2 -b .sbrk
%ifarch s390
%patch10 -p1 -b .s390
%endif
-%patch20 -p1 -b .pk
+%patch20 -p2 -b .pk
%patch21 -p2 -b .jpeg-turbo
-%patch100 -p1 -b .ps-pdf-simplify-operators
-
+#%patch100 -p1 -b .ps-pdf-simplify-operators
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -452,6 +452,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Aug 16 2010 Martin Stransky <stransky at redhat.com> 1.9.3.0-0.b3
+- Update to 1.9.3.1 beta 3
+
* Tue Jul 20 2010 Jan Horak <jhorak at redhat.com> - 1.9.2.7-1
- Update to 1.9.2.7
More information about the scm-commits
mailing list