Compare commits
31 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f24da24efb | ||
|
|
4440bfdcb4 | ||
|
|
42108faccd | ||
|
|
e9fc6c0cdd | ||
|
|
a7aaa4e216 | ||
|
|
a1268bcad5 | ||
|
|
e5b1a4deab | ||
|
|
23997c967e | ||
|
|
198eec8682 | ||
|
|
d3121973ce | ||
|
|
9d2c658a1a | ||
|
|
dcb3c8ac33 | ||
|
|
7860a33249 | ||
|
|
700bdc1b85 | ||
|
|
21d9f3cb95 | ||
|
|
7185271dc4 | ||
|
|
9faafe8142 | ||
|
|
edd0ea12af | ||
|
|
a6fa45542b | ||
|
|
b31ae121b5 | ||
|
|
3c531902e1 | ||
|
|
de358a17c5 | ||
|
|
7f282e9627 | ||
|
|
7d2b522561 | ||
|
|
c97fb225d1 | ||
|
|
c62665c523 | ||
|
|
9dfc80f57e | ||
|
|
593ef552ef | ||
|
|
e8ca4707d9 | ||
|
|
4b70a27341 | ||
|
|
2406a7b668 |
12 changed files with 257 additions and 73 deletions
13
.gitignore
vendored
13
.gitignore
vendored
|
|
@ -1 +1,14 @@
|
||||||
xulrunner-1.9.2.7.source.tar.bz2
|
xulrunner-1.9.2.7.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.9.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.11.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.12.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.13.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.14.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.15.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.16.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.17.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.18.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.20.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.22.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.23.source.tar.bz2
|
||||||
|
/xulrunner-1.9.2.24.source.tar.bz2
|
||||||
|
|
|
||||||
11
crashreporter-remove-static.patch
Normal file
11
crashreporter-remove-static.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
|
||||||
|
--- mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-06-23 19:47:11.000000000 +0200
|
||||||
|
+++ mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-07-12 15:51:41.000000000 +0200
|
||||||
|
@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
|
||||||
|
|
||||||
|
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
|
||||||
|
# due to them having an older libstdc++
|
||||||
|
-HOST_LDFLAGS += -static
|
||||||
|
+#HOST_LDFLAGS += -static
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
97
mozilla-513747.patch
Normal file
97
mozilla-513747.patch
Normal file
|
|
@ -0,0 +1,97 @@
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in.513747 2010-12-03 16:47:53.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/package-manifest.in 2011-01-03 13:29:14.000000000 +0100
|
||||||
|
@@ -99,7 +99,7 @@
|
||||||
|
#elifdef XP_OS2
|
||||||
|
@BINPATH@/plugins/npnulos2.dll
|
||||||
|
#endif
|
||||||
|
-@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@
|
||||||
|
+@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
|
||||||
|
@BINPATH@/README.txt
|
||||||
|
@BINPATH@/LICENSE
|
||||||
|
@BINPATH@/blocklist.xml
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in.513747 2010-12-03 16:47:53.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/browser/installer/removed-files.in 2011-01-03 13:20:16.000000000 +0100
|
||||||
|
@@ -811,5 +811,6 @@ install.rdf
|
||||||
|
components/nsUpdateService.js
|
||||||
|
components/nsUpdateServiceStub.js
|
||||||
|
#endif
|
||||||
|
+@DLL_PREFIX@sqlite3@DLL_SUFFIX@
|
||||||
|
old-homepage-default.properties
|
||||||
|
mozilla-runtime@BIN_SUFFIX@
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in.513747 2010-12-03 16:47:53.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/build/automation.py.in 2011-01-03 13:20:16.000000000 +0100
|
||||||
|
@@ -448,7 +448,7 @@ user_pref("camino.use_system_proxy_setti
|
||||||
|
if self.UNIXISH or self.IS_MAC:
|
||||||
|
envVar = "LD_LIBRARY_PATH"
|
||||||
|
if self.IS_MAC:
|
||||||
|
- envVar = "DYLD_LIBRARY_PATH"
|
||||||
|
+ envVar = "DYLD_LIBRARY_PATH_DISABLED"
|
||||||
|
else: # unixish
|
||||||
|
env['MOZILLA_FIVE_HOME'] = xrePath
|
||||||
|
if envVar in env:
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/configure.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/configure.in
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/configure.in.513747 2011-01-03 13:20:16.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/configure.in 2011-01-03 13:28:11.000000000 +0100
|
||||||
|
@@ -6332,8 +6332,8 @@ MOZ_NATIVE_SQLITE= )
|
||||||
|
|
||||||
|
if test -z "$MOZ_NATIVE_SQLITE"
|
||||||
|
then
|
||||||
|
- SQLITE_CFLAGS=
|
||||||
|
- SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
|
||||||
|
+ SQLITE_CFLAGS=
|
||||||
|
+ SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)'
|
||||||
|
else
|
||||||
|
PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
|
||||||
|
dnl ===================================
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in.513747 2010-12-03 16:47:59.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/Makefile.in 2011-01-03 13:20:16.000000000 +0100
|
||||||
|
@@ -46,7 +46,7 @@ VPATH = @srcdir@
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
MODULE = sqlite3
|
||||||
|
-LIBRARY_NAME = sqlite3
|
||||||
|
+LIBRARY_NAME = mozsqlite3
|
||||||
|
FORCE_SHARED_LIB = 1
|
||||||
|
VISIBILITY_FLAGS =
|
||||||
|
LIB_IS_C_ONLY = 1
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def.513747 xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def.513747 2010-12-03 16:47:59.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/db/sqlite3/src/sqlite.def 2011-01-03 13:20:16.000000000 +0100
|
||||||
|
@@ -33,7 +33,7 @@
|
||||||
|
;
|
||||||
|
; ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
-LIBRARY sqlite3.dll
|
||||||
|
+LIBRARY mozsqlite3.dll
|
||||||
|
|
||||||
|
EXPORTS
|
||||||
|
sqlite3_aggregate_context
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in.513747 2011-01-03 13:20:16.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/security/manager/Makefile.in 2011-01-03 13:30:23.000000000 +0100
|
||||||
|
@@ -179,6 +179,9 @@ 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
|
||||||
|
+ifndef MOZ_NATIVE_SQLITE
|
||||||
|
+DEFAULT_GMAKE_FLAGS += SQLITE=$(call EXPAND_LIBNAME,mozsqlite3)
|
||||||
|
+endif
|
||||||
|
ifdef NSS_DISABLE_DBM
|
||||||
|
DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
|
||||||
|
endif
|
||||||
|
diff -up xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in.513747 xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in
|
||||||
|
--- xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in.513747 2010-12-03 16:49:21.000000000 +0100
|
||||||
|
+++ xulrunner-1.9.2.13/mozilla-1.9.2/xpcom/stub/Makefile.in 2011-01-03 13:20:16.000000000 +0100
|
||||||
|
@@ -85,7 +85,7 @@ DEPENDENT_LIBS_LIST += \
|
||||||
|
ifdef MOZ_ENABLE_LIBXUL
|
||||||
|
|
||||||
|
DEPENDENT_LIBS_LIST += \
|
||||||
|
- $(LIB_PREFIX)sqlite3$(DLL_SUFFIX) \
|
||||||
|
+ $(LIB_PREFIX)mozsqlite3$(DLL_SUFFIX) \
|
||||||
|
$(LIB_PREFIX)nssutil3$(DLL_SUFFIX) \
|
||||||
|
$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
|
||||||
|
$(LIB_PREFIX)nss3$(DLL_SUFFIX) \
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
diff -up mozilla-1.9.2/js/src/jstl.h.old mozilla-1.9.2/js/src/jstl.h
|
diff -up mozilla-1.9.2/js/src/jstl.h.s390 mozilla-1.9.2/js/src/jstl.h
|
||||||
--- mozilla-1.9.2/js/src/jstl.h.old 2010-03-10 10:01:51.000000000 +0100
|
--- mozilla-1.9.2/js/src/jstl.h.s390 2011-02-18 19:33:24.000000000 +0100
|
||||||
+++ mozilla-1.9.2/js/src/jstl.h 2010-03-10 12:24:55.000000000 +0100
|
+++ mozilla-1.9.2/js/src/jstl.h 2011-03-07 08:41:29.000000000 +0100
|
||||||
@@ -195,7 +195,6 @@ class ReentrancyGuard
|
@@ -195,7 +195,6 @@ class ReentrancyGuard
|
||||||
static JS_ALWAYS_INLINE size_t
|
JS_ALWAYS_INLINE size_t
|
||||||
RoundUpPow2(size_t x)
|
RoundUpPow2(size_t x)
|
||||||
{
|
{
|
||||||
- typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _;
|
- typedef tl::StaticAssert<tl::IsSameType<size_t,JSUword>::result>::result _;
|
||||||
|
|
|
||||||
11
mozilla-crashreporter-static.patch
Normal file
11
mozilla-crashreporter-static.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
diff -up mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
|
||||||
|
--- mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static 2010-09-14 20:53:09.000000000 +0200
|
||||||
|
+++ mozilla-1.9.2/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in 2010-10-13 14:21:14.000000000 +0200
|
||||||
|
@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
|
||||||
|
|
||||||
|
#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
|
||||||
|
# due to them having an older libstdc++
|
||||||
|
-HOST_LDFLAGS += -static
|
||||||
|
+#HOST_LDFLAGS += -static
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
15
mozilla-gdk-pixbuf.patch
Normal file
15
mozilla-gdk-pixbuf.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
diff -up mozilla-1.9.2/configure.in.gdk-pixbuf mozilla-1.9.2/configure.in
|
||||||
|
--- mozilla-1.9.2/configure.in.gdk-pixbuf 2010-07-13 21:10:45.000000000 +0200
|
||||||
|
+++ mozilla-1.9.2/configure.in 2010-08-03 15:38:43.113733420 +0200
|
||||||
|
@@ -5354,7 +5354,10 @@ then
|
||||||
|
then
|
||||||
|
if test "$MOZ_ENABLE_LIBNOTIFY"
|
||||||
|
then
|
||||||
|
- PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION)
|
||||||
|
+ dnl Code which requires gdk-pixbuf is only in
|
||||||
|
+ dnl toolkit/system/gnome/nsAlertsIconListener.cpp and is compiled
|
||||||
|
+ dnl only when libnotify is enabled
|
||||||
|
+ PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION gdk-pixbuf-2.0 gtk+-2.0)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
diff -up mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in
|
|
||||||
--- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old 2009-11-25 05:13:11.000000000 +0100
|
|
||||||
+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2009-12-03 10:14:41.000000000 +0100
|
|
||||||
@@ -5,5 +5,5 @@ includedir=%includedir%
|
|
||||||
Name: Mozilla Plug-In API
|
|
||||||
Description: Mozilla Plug-In API
|
|
||||||
Version: %MOZILLA_VERSION%
|
|
||||||
-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
|
|
||||||
+Cflags: -I${includedir} -DXP_UNIX %ojidef%
|
|
||||||
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
https://bugzilla.mozilla.org/show_bug.cgi?id=435313
|
|
||||||
|
|
||||||
Index: mozilla/gfx/thebes/public/gfxPDFSurface.h
|
|
||||||
===================================================================
|
|
||||||
RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v
|
|
||||||
retrieving revision 1.13
|
|
||||||
diff -d -u -p -r1.13 gfxPDFSurface.h
|
|
||||||
--- mozilla/gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13
|
|
||||||
+++ mozilla/gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000
|
|
||||||
@@ -63,7 +63,11 @@ public:
|
|
||||||
// this is in points!
|
|
||||||
const gfxSize& GetSize() const { return mSize; }
|
|
||||||
|
|
||||||
- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
|
|
||||||
+ virtual PRInt32 GetDefaultContextFlags() const
|
|
||||||
+ {
|
|
||||||
+ return gfxContext::FLAG_SIMPLIFY_OPERATORS |
|
|
||||||
+ gfxContext::FLAG_DISABLE_SNAPPING;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
private:
|
|
||||||
nsCOMPtr<nsIOutputStream> mStream;
|
|
||||||
Index: mozilla/gfx/thebes/public/gfxPSSurface.h
|
|
||||||
===================================================================
|
|
||||||
RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v
|
|
||||||
retrieving revision 1.13
|
|
||||||
diff -d -u -p -r1.13 gfxPSSurface.h
|
|
||||||
--- mozilla/gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13
|
|
||||||
+++ mozilla/gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000
|
|
||||||
@@ -63,7 +63,11 @@ public:
|
|
||||||
// this is in points!
|
|
||||||
const gfxSize& GetSize() const { return mSize; }
|
|
||||||
|
|
||||||
- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
|
|
||||||
+ virtual PRInt32 GetDefaultContextFlags() const
|
|
||||||
+ {
|
|
||||||
+ return gfxContext::FLAG_SIMPLIFY_OPERATORS |
|
|
||||||
+ gfxContext::FLAG_DISABLE_SNAPPING;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
private:
|
|
||||||
nsCOMPtr<nsIOutputStream> mStream;
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
e240541898766e44a407e543c70d4949 xulrunner-1.9.2.7.source.tar.bz2
|
28e37363782c47b4718d82ce5a699c14 xulrunner-1.9.2.24.source.tar.bz2
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,10 @@ ac_add_options --with-system-jpeg
|
||||||
ac_add_options --with-system-zlib
|
ac_add_options --with-system-zlib
|
||||||
ac_add_options --with-system-bz2
|
ac_add_options --with-system-bz2
|
||||||
ac_add_options --enable-system-hunspell
|
ac_add_options --enable-system-hunspell
|
||||||
ac_add_options --enable-system-sqlite
|
# Temporary since System Sqlite library is not compiled with SQLITE_SECURE_DELETE
|
||||||
ac_add_options --enable-system-cairo
|
ac_add_options --disable-system-sqlite
|
||||||
|
# disabled because of rhbz#628331
|
||||||
|
ac_add_options --disable-system-cairo
|
||||||
ac_add_options --with-pthreads
|
ac_add_options --with-pthreads
|
||||||
ac_add_options --disable-strip
|
ac_add_options --disable-strip
|
||||||
ac_add_options --disable-tests
|
ac_add_options --disable-tests
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# For mozilla's debuginfo:
|
# For mozilla's debuginfo:
|
||||||
export CFLAGS="-gstabs+"
|
export CFLAGS="$CFLAGS -gdwarf-2"
|
||||||
export CXXFLAGS="-gstabs+"
|
export CXXFLAGS="$CXXFLAGS -gdwarf-2"
|
||||||
export MOZ_DEBUG_SYMBOLS=1
|
export MOZ_DEBUG_SYMBOLS=1
|
||||||
ac_add_options --enable-crashreporter
|
ac_add_options --enable-crashreporter
|
||||||
|
|
|
||||||
111
xulrunner.spec
111
xulrunner.spec
|
|
@ -7,12 +7,17 @@
|
||||||
|
|
||||||
# Minimal required versions
|
# Minimal required versions
|
||||||
%define nspr_version 4.8
|
%define nspr_version 4.8
|
||||||
%define nss_version 3.12.6
|
%define nss_version 3.12.8
|
||||||
%define cairo_version 1.6.0
|
%define cairo_version 1.6.0
|
||||||
%define freetype_version 2.1.9
|
%define freetype_version 2.1.9
|
||||||
%define sqlite_version 3.6.16
|
%define sqlite_version 3.6.16
|
||||||
%define tarballdir mozilla-1.9.2
|
%define tarballdir mozilla-1.9.2
|
||||||
%define enable_mozilla_crashreporter 0
|
# enable crash reporter only for iX86
|
||||||
|
%ifarch %{ix86} x86_64
|
||||||
|
%define enable_mozilla_crashreporter 1
|
||||||
|
%else
|
||||||
|
%define enable_mozilla_crashreporter 0
|
||||||
|
%endif
|
||||||
|
|
||||||
# The actual sqlite version (see #480989):
|
# The actual sqlite version (see #480989):
|
||||||
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
|
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
|
||||||
|
|
@ -22,7 +27,7 @@
|
||||||
|
|
||||||
Summary: XUL Runtime for Gecko Applications
|
Summary: XUL Runtime for Gecko Applications
|
||||||
Name: xulrunner
|
Name: xulrunner
|
||||||
Version: 1.9.2.7
|
Version: 1.9.2.24
|
||||||
Release: 1%{?pretag}%{?dist}
|
Release: 1%{?pretag}%{?dist}
|
||||||
URL: http://developer.mozilla.org/En/XULRunner
|
URL: http://developer.mozilla.org/En/XULRunner
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
|
|
@ -41,16 +46,18 @@ Patch1: mozilla-build.patch
|
||||||
Patch3: mozilla-jemalloc.patch
|
Patch3: mozilla-jemalloc.patch
|
||||||
Patch4: mozilla-about-firefox-version.patch
|
Patch4: mozilla-about-firefox-version.patch
|
||||||
Patch7: xulrunner-1.9.2.1-build.patch
|
Patch7: xulrunner-1.9.2.1-build.patch
|
||||||
Patch8: mozilla-plugin.patch
|
|
||||||
Patch9: mozilla-build-sbrk.patch
|
Patch9: mozilla-build-sbrk.patch
|
||||||
Patch10: mozilla-build-s390.patch
|
Patch10: mozilla-build-s390.patch
|
||||||
|
Patch11: mozilla-gdk-pixbuf.patch
|
||||||
|
|
||||||
# Fedora specific patches
|
# Fedora specific patches
|
||||||
Patch20: mozilla-192-pkgconfig.patch
|
Patch20: mozilla-192-pkgconfig.patch
|
||||||
Patch21: mozilla-libjpeg-turbo.patch
|
Patch21: mozilla-libjpeg-turbo.patch
|
||||||
|
Patch22: mozilla-crashreporter-static.patch
|
||||||
|
Patch24: crashreporter-remove-static.patch
|
||||||
|
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
Patch100: mozilla-ps-pdf-simplify-operators.patch
|
Patch30: mozilla-513747.patch
|
||||||
|
|
||||||
# ---------------------------------------------------
|
# ---------------------------------------------------
|
||||||
|
|
||||||
|
|
@ -121,6 +128,8 @@ Requires: sqlite-devel
|
||||||
Requires: startup-notification-devel
|
Requires: startup-notification-devel
|
||||||
Requires: alsa-lib-devel
|
Requires: alsa-lib-devel
|
||||||
Requires: libnotify-devel
|
Requires: libnotify-devel
|
||||||
|
Requires: curl-devel
|
||||||
|
BuildRequires: libcurl-devel
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Gecko development files.
|
Gecko development files.
|
||||||
|
|
@ -139,17 +148,17 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
|
||||||
%patch3 -p1 -b .jemalloc
|
%patch3 -p1 -b .jemalloc
|
||||||
%patch4 -p1 -b .about-firefox-version
|
%patch4 -p1 -b .about-firefox-version
|
||||||
%patch7 -p2 -b .del
|
%patch7 -p2 -b .del
|
||||||
%patch8 -p1 -b .plugin
|
|
||||||
%patch9 -p2 -b .sbrk
|
%patch9 -p2 -b .sbrk
|
||||||
%ifarch s390
|
%ifarch s390
|
||||||
%patch10 -p1 -b .s390
|
%patch10 -p1 -b .s390
|
||||||
%endif
|
%endif
|
||||||
|
%patch11 -p1 -b .gdk-pixbuf
|
||||||
|
|
||||||
%patch20 -p1 -b .pk
|
%patch20 -p1 -b .pk
|
||||||
%patch21 -p2 -b .jpeg-turbo
|
%patch21 -p2 -b .jpeg-turbo
|
||||||
|
%patch22 -p1 -b .static
|
||||||
|
|
||||||
%patch100 -p1 -b .ps-pdf-simplify-operators
|
%patch30 -p2 -b .513747
|
||||||
|
|
||||||
|
|
||||||
%{__rm} -f .mozconfig
|
%{__rm} -f .mozconfig
|
||||||
%{__cp} %{SOURCE10} .mozconfig
|
%{__cp} %{SOURCE10} .mozconfig
|
||||||
|
|
@ -161,6 +170,12 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
|
||||||
echo "ac_add_options --disable-ipc" >> .mozconfig
|
echo "ac_add_options --disable-ipc" >> .mozconfig
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Upstream bug filed without resolution
|
||||||
|
# for now make sure jit is not enabled on sparc64
|
||||||
|
%ifarch sparc64
|
||||||
|
echo "ac_add_options --disable-jit" >> .mozconfig
|
||||||
|
%endif
|
||||||
|
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
@ -180,7 +195,11 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
|
||||||
|
|
||||||
# Mozilla builds with -Wall with exception of a few warnings which show up
|
# Mozilla builds with -Wall with exception of a few warnings which show up
|
||||||
# everywhere in the code; so, don't override that.
|
# everywhere in the code; so, don't override that.
|
||||||
MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
|
#
|
||||||
|
# -fpermissive is needed to build with gcc 4.6+ which has become stricter
|
||||||
|
#
|
||||||
|
MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
|
||||||
|
%{__sed} -e 's/-Wall//' )
|
||||||
export CFLAGS=$MOZ_OPT_FLAGS
|
export CFLAGS=$MOZ_OPT_FLAGS
|
||||||
export CXXFLAGS=$MOZ_OPT_FLAGS
|
export CXXFLAGS=$MOZ_OPT_FLAGS
|
||||||
|
|
||||||
|
|
@ -362,9 +381,10 @@ touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat
|
||||||
|
|
||||||
# Add debuginfo for crash-stats.mozilla.com
|
# Add debuginfo for crash-stats.mozilla.com
|
||||||
%if %{enable_mozilla_crashreporter}
|
%if %{enable_mozilla_crashreporter}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
|
# Debug symbols are stored in /usr/lib even in x86_64 arch
|
||||||
cp dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
|
DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"`
|
||||||
#cp %{moz_objdir}/mozilla/dist/firefox-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
|
mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
|
||||||
|
cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
@ -452,6 +472,73 @@ fi
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 8 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.24-1
|
||||||
|
- Update to 1.9.2.24
|
||||||
|
|
||||||
|
* Tue Sep 27 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.23-1
|
||||||
|
- Update to 1.9.2.23
|
||||||
|
|
||||||
|
* Tue Sep 6 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.22-1
|
||||||
|
- Update to 1.9.2.22
|
||||||
|
|
||||||
|
* Wed Aug 31 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.20-2
|
||||||
|
- Distrust a specific Certificate Authority
|
||||||
|
|
||||||
|
* Tue Aug 16 2011 Jan Horak <stransky@redhat.com> - 1.9.2.20-1
|
||||||
|
- Update to 1.9.2.20
|
||||||
|
|
||||||
|
* Tue Jun 21 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.18-1
|
||||||
|
- Update to 1.9.2.18
|
||||||
|
|
||||||
|
* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.17-2
|
||||||
|
- Update to 1.9.2.17
|
||||||
|
|
||||||
|
* Tue Mar 22 2011 Christopher Aillon <caillon@redhat.com> - 3.6.16-1
|
||||||
|
- Update to 1.9.2.16
|
||||||
|
|
||||||
|
* Mon Mar 7 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.15-1
|
||||||
|
- Update to 1.9.2.15
|
||||||
|
|
||||||
|
* Tue Mar 1 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.14-1
|
||||||
|
- Update to 1.9.2.14
|
||||||
|
|
||||||
|
* Mon Jan 10 2011 Dennis Gilmore <dennis@ausil.us> 1.9.2.13-6
|
||||||
|
- disable nanojit on sparc64 its not supported and doesnt get automatically switched off
|
||||||
|
|
||||||
|
* Mon Jan 3 2011 Martin Stransky <stransky@redhat.com> 1.9.2.13-5
|
||||||
|
- renamed libsqlite3.so to libmozsqlite3.so (rhbz#658471)
|
||||||
|
|
||||||
|
* Mon Jan 3 2011 Jan Horak <jhorak@redhat.com> - 1.9.2.13-4
|
||||||
|
- Enabled mozilla crash reporter
|
||||||
|
|
||||||
|
* Mon Jan 3 2011 Martin Stransky <stransky@redhat.com> 1.9.2.13-3
|
||||||
|
- reverted fix for rhbz#658471, breaks gnome shell
|
||||||
|
- disabled system cairo, breaks animated gifs (rhbz#628331)
|
||||||
|
|
||||||
|
* Mon Dec 20 2010 Martin Stransky <stransky@redhat.com> 1.9.2.13-2
|
||||||
|
- removed unused library path (rhbz#658471)
|
||||||
|
|
||||||
|
* Thu Dec 9 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.13-1
|
||||||
|
- Update to 1.9.2.13
|
||||||
|
|
||||||
|
* Wed Oct 27 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.12-1
|
||||||
|
- Update to 1.9.2.12
|
||||||
|
|
||||||
|
* Tue Oct 19 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.11-1
|
||||||
|
- Update to 1.9.2.11
|
||||||
|
|
||||||
|
* Tue Oct 05 2010 jkeating - 1.9.2.10-1.1
|
||||||
|
- Rebuilt for gcc bug 634757
|
||||||
|
|
||||||
|
* Tue Sep 21 2010 Martin Stransky <stransky@redhat.com> 1.9.2.10-1
|
||||||
|
- Update to 1.9.2.10
|
||||||
|
|
||||||
|
* Mon Sep 6 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.9-1
|
||||||
|
- Update to 1.9.2.9
|
||||||
|
|
||||||
|
* Mon Aug 9 2010 Martin Stransky <stransky@redhat.com> 1.9.2.7-2
|
||||||
|
- added build-fix by Adam Tkac <atkac@redhat.com>
|
||||||
|
|
||||||
* Tue Jul 20 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.7-1
|
* Tue Jul 20 2010 Jan Horak <jhorak@redhat.com> - 1.9.2.7-1
|
||||||
- Update to 1.9.2.7
|
- Update to 1.9.2.7
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue