diff options
| -rw-r--r-- | mozilla-639554.patch | 15 | ||||
| -rw-r--r-- | mozilla-851850.patch | 31 | ||||
| -rw-r--r-- | mozilla-build.patch | 21 | ||||
| -rw-r--r-- | rhbz-911314.patch | 133 | ||||
| -rw-r--r-- | rhbz-928353.patch | 82 | ||||
| -rw-r--r-- | rhbz-966424.patch | 24 | ||||
| -rw-r--r-- | xulrunner-21.0-s390-inlines.patch | 12 | ||||
| -rw-r--r-- | xulrunner-mozconfig | 1 | ||||
| -rw-r--r-- | xulrunner-mozconfig-debuginfo | 5 | ||||
| -rw-r--r-- | xulrunner.spec | 49 |
10 files changed, 183 insertions, 190 deletions
diff --git a/mozilla-639554.patch b/mozilla-639554.patch new file mode 100644 index 0000000..12d32b2 --- /dev/null +++ b/mozilla-639554.patch @@ -0,0 +1,15 @@ +--- a/toolkit/mozapps/installer/packager.mk ++++ b/toolkit/mozapps/installer/packager.mk +@@ -621,10 +621,12 @@ ifdef INSTALL_SDK # Here comes the hard + (cd $(DESTDIR)$(idldir) && tar -xf -) + # SDK directory is the libs + a bunch of symlinks + $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib ++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin + if test -f $(DIST)/include/xpcom-config.h; then \ + $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ + fi + (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) ++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) + $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl + ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib + ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin diff --git a/mozilla-851850.patch b/mozilla-851850.patch new file mode 100644 index 0000000..04260b9 --- /dev/null +++ b/mozilla-851850.patch @@ -0,0 +1,31 @@ + +# HG changeset patch +# User Steve Singer <steve@ssinger.info> +# Date 1363699875 14400 +# Node ID fe010206e5add13f4202113dcd74f54acb1e5b37 +# Parent 90c5dd3a2d1533ce2646a53c6ec84773e6f42d43 +Bug 851850 - Link in altivec on ppc64. r=jmuizelaar + +diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in +--- a/gfx/qcms/Makefile.in ++++ b/gfx/qcms/Makefile.in +@@ -48,17 +48,17 @@ else + endif + else + SSE1_FLAGS= + SSE2_FLAGS= + endif + endif + endif + else +-ifeq (ppc,$(CPU_ARCH)) ++ifeq (ppc,$(findstring ppc,$(CPU_ARCH))) + ifdef GNU_CC + CSRCS += transform-altivec.c + ALTIVEC_FLAGS=-maltivec + endif + endif + endif + + FORCE_STATIC_LIB = 1 + diff --git a/mozilla-build.patch b/mozilla-build.patch index 9468e02..1dd29d0 100644 --- a/mozilla-build.patch +++ b/mozilla-build.patch @@ -1,20 +1,17 @@ -diff -up mozilla-aurora-7676a9a06403/security/build/Makefile.in.build mozilla-aurora-7676a9a06403/security/build/Makefile.in ---- mozilla-aurora-7676a9a06403/security/build/Makefile.in.build 2012-09-13 14:18:35.000000000 +0200 -+++ mozilla-aurora-7676a9a06403/security/build/Makefile.in 2012-09-18 10:58:45.560063613 +0200 -@@ -139,7 +139,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= +--- mozilla-release/security/build/Makefile.in.build 2013-06-18 13:01:39.000000000 +0200 ++++ mozilla-release/security/build/Makefile.in 2013-06-18 14:01:41.940378194 +0200 +@@ -133,7 +133,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 DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)" - ifndef MOZ_NATIVE_SQLITE - DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3 -diff -up mozilla-aurora-7676a9a06403/security/manager/Makefile.in.build mozilla-aurora-7676a9a06403/security/manager/Makefile.in -diff -up mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in.build mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in ---- mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in.build 2012-09-13 14:18:35.000000000 +0200 -+++ mozilla-aurora-7676a9a06403/security/manager/ssl/src/Makefile.in 2012-09-18 10:54:16.310505794 +0200 -@@ -84,7 +84,6 @@ CSRCS += md4.c - EXTRA_DEPS = $(NSS_DEP_LIBS) + ifeq ($(OS_ARCH),WINNT) + DEFAULT_GMAKE_FLAGS += INSTALL="$(NSINSTALL) -t" +--- mozilla-release/security/manager/ssl/src/Makefile.in.build 2013-06-18 13:01:39.000000000 +0200 ++++ mozilla-release/security/manager/ssl/src/Makefile.in 2013-06-18 14:01:18.659377663 +0200 +@@ -86,7 +86,6 @@ endif + CSRCS += md4.c DEFINES += \ - -DNSS_ENABLE_ECC \ diff --git a/rhbz-911314.patch b/rhbz-911314.patch index 82f245a..9a28aaa 100644 --- a/rhbz-911314.patch +++ b/rhbz-911314.patch @@ -1,14 +1,35 @@ -Use the runtime page size to control arena decommit (RHBZ#911314) -Return success when decommit is disabled - -Author: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com> -Based on Terrence Cole's patch v0 on MOZ#840242 - -Index: mozilla-release/js/src/gc/Heap.h -=================================================================== ---- mozilla-release.orig/js/src/gc/Heap.h -+++ mozilla-release/js/src/gc/Heap.h -@@ -800,7 +800,7 @@ struct Chunk +diff -up xulrunner-21.0/mozilla-release/js/public/HeapAPI.h.ppc xulrunner-21.0/mozilla-release/js/public/HeapAPI.h +--- xulrunner-21.0/mozilla-release/js/public/HeapAPI.h.ppc 2013-05-12 23:56:19.000000000 +0200 ++++ xulrunner-21.0/mozilla-release/js/public/HeapAPI.h 2013-05-21 23:14:04.698238150 +0200 +@@ -11,24 +11,7 @@ + namespace js { + namespace gc { + +-/* +- * Page size must be static to support our arena pointer optimizations, so we +- * are forced to support each platform with non-4096 pages as a special case. +- * Note: The freelist supports a maximum arena shift of 15. +- * Note: Do not use JS_CPU_SPARC here, this header is used outside JS. +- */ +-#if (defined(SOLARIS) || defined(__FreeBSD__)) && \ +- (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) +-const size_t PageShift = 13; +-const size_t ArenaShift = PageShift; +-#elif defined(__powerpc64__) +-const size_t PageShift = 16; + const size_t ArenaShift = 12; +-#else +-const size_t PageShift = 12; +-const size_t ArenaShift = PageShift; +-#endif +-const size_t PageSize = size_t(1) << PageShift; + const size_t ArenaSize = size_t(1) << ArenaShift; + const size_t ArenaMask = ArenaSize - 1; + +diff -up xulrunner-21.0/mozilla-release/js/src/gc/Heap.h.ppc xulrunner-21.0/mozilla-release/js/src/gc/Heap.h +--- xulrunner-21.0/mozilla-release/js/src/gc/Heap.h.ppc 2013-05-12 23:56:19.000000000 +0200 ++++ xulrunner-21.0/mozilla-release/js/src/gc/Heap.h 2013-05-21 23:14:04.693238124 +0200 +@@ -812,7 +812,7 @@ struct Chunk /* Search for a decommitted arena to allocate. */ unsigned findDecommittedArenaOffset(); @@ -17,10 +38,9 @@ Index: mozilla-release/js/src/gc/Heap.h public: /* Unlink and return the freeArenasHead. */ -Index: mozilla-release/js/src/gc/Memory.cpp -=================================================================== ---- mozilla-release.orig/js/src/gc/Memory.cpp -+++ mozilla-release/js/src/gc/Memory.cpp +diff -up xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp.ppc xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp +--- xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp.ppc 2013-05-12 23:56:19.000000000 +0200 ++++ xulrunner-21.0/mozilla-release/js/src/gc/Memory.cpp 2013-05-21 23:14:04.693238124 +0200 @@ -8,6 +8,7 @@ #include "mozilla/Assertions.h" @@ -329,10 +349,9 @@ Index: mozilla-release/js/src/gc/Memory.cpp return true; } -Index: mozilla-release/js/src/gc/Memory.h -=================================================================== ---- mozilla-release.orig/js/src/gc/Memory.h -+++ mozilla-release/js/src/gc/Memory.h +diff -up xulrunner-21.0/mozilla-release/js/src/gc/Memory.h.ppc xulrunner-21.0/mozilla-release/js/src/gc/Memory.h +--- xulrunner-21.0/mozilla-release/js/src/gc/Memory.h.ppc 2013-05-12 23:56:19.000000000 +0200 ++++ xulrunner-21.0/mozilla-release/js/src/gc/Memory.h 2013-05-21 23:14:04.693238124 +0200 @@ -16,20 +16,20 @@ namespace gc { // Sanity check that our compiled configuration matches the currently running @@ -359,11 +378,10 @@ Index: mozilla-release/js/src/gc/Memory.h // Returns #(hard faults) + #(soft faults) size_t GetPageFaultCount(); -Index: mozilla-release/js/src/jsapi.cpp -=================================================================== ---- mozilla-release.orig/js/src/jsapi.cpp -+++ mozilla-release/js/src/jsapi.cpp -@@ -1113,8 +1113,6 @@ JS_NewRuntime(uint32_t maxbytes, JSUseHe +diff -up xulrunner-21.0/mozilla-release/js/src/jsapi.cpp.ppc xulrunner-21.0/mozilla-release/js/src/jsapi.cpp +--- xulrunner-21.0/mozilla-release/js/src/jsapi.cpp.ppc 2013-05-12 23:56:21.000000000 +0200 ++++ xulrunner-21.0/mozilla-release/js/src/jsapi.cpp 2013-05-21 23:14:04.695238134 +0200 +@@ -1110,8 +1110,6 @@ JS_NewRuntime(uint32_t maxbytes, JSUseHe #undef MSG_DEF #endif /* DEBUG */ @@ -372,11 +390,10 @@ Index: mozilla-release/js/src/jsapi.cpp if (!js::TlsPerThreadData.init()) return NULL; -Index: mozilla-release/js/src/jscntxt.h -=================================================================== ---- mozilla-release.orig/js/src/jscntxt.h -+++ mozilla-release/js/src/jscntxt.h -@@ -873,6 +873,15 @@ struct JSRuntime : js::RuntimeFriendFiel +diff -up xulrunner-21.0/mozilla-release/js/src/jscntxt.h.ppc xulrunner-21.0/mozilla-release/js/src/jscntxt.h +--- xulrunner-21.0/mozilla-release/js/src/jscntxt.h.ppc 2013-05-12 23:56:21.000000000 +0200 ++++ xulrunner-21.0/mozilla-release/js/src/jscntxt.h 2013-05-21 23:14:04.696238140 +0200 +@@ -1026,6 +1026,15 @@ struct JSRuntime : js::RuntimeFriendFiel /* Stack of thread-stack-allocated GC roots. */ js::AutoGCRooter *autoGCRooters; @@ -392,11 +409,10 @@ Index: mozilla-release/js/src/jscntxt.h /* Strong references on scripts held for PCCount profiling API. */ js::ScriptAndCountsVector *scriptAndCountsVector; -Index: mozilla-release/js/src/jsgc.cpp -=================================================================== ---- mozilla-release.orig/js/src/jsgc.cpp -+++ mozilla-release/js/src/jsgc.cpp -@@ -477,13 +477,13 @@ FinalizeArenas(FreeOp *fop, +diff -up xulrunner-21.0/mozilla-release/js/src/jsgc.cpp.ppc xulrunner-21.0/mozilla-release/js/src/jsgc.cpp +--- xulrunner-21.0/mozilla-release/js/src/jsgc.cpp.ppc 2013-05-12 23:56:21.000000000 +0200 ++++ xulrunner-21.0/mozilla-release/js/src/jsgc.cpp 2013-05-21 23:15:40.198740765 +0200 +@@ -465,13 +465,13 @@ FinalizeArenas(FreeOp *fop, } static inline Chunk * @@ -414,7 +430,7 @@ Index: mozilla-release/js/src/jsgc.cpp } inline bool -@@ -573,25 +573,25 @@ ChunkPool::expire(JSRuntime *rt, bool re +@@ -561,25 +561,25 @@ ChunkPool::expire(JSRuntime *rt, bool re } static void @@ -444,7 +460,7 @@ Index: mozilla-release/js/src/jsgc.cpp #ifdef JSGC_ROOT_ANALYSIS // Our poison pointers are not guaranteed to be invalid on 64-bit -@@ -604,7 +604,7 @@ Chunk::allocate(JSRuntime *rt) +@@ -592,7 +592,7 @@ Chunk::allocate(JSRuntime *rt) // were marked as uncommitted, but it's a little complicated to avoid // clobbering pre-existing unrelated mappings. while (IsPoisonedPtr(chunk)) @@ -453,7 +469,7 @@ Index: mozilla-release/js/src/jsgc.cpp #endif if (!chunk) -@@ -620,7 +620,7 @@ Chunk::release(JSRuntime *rt, Chunk *chu +@@ -608,7 +608,7 @@ Chunk::release(JSRuntime *rt, Chunk *chu { JS_ASSERT(chunk); chunk->prepareToBeFreed(rt); @@ -462,7 +478,7 @@ Index: mozilla-release/js/src/jsgc.cpp } inline void -@@ -736,7 +736,7 @@ Chunk::findDecommittedArenaOffset() +@@ -725,7 +725,7 @@ Chunk::findDecommittedArenaOffset() } ArenaHeader * @@ -471,7 +487,7 @@ Index: mozilla-release/js/src/jsgc.cpp { JS_ASSERT(info.numArenasFreeCommitted == 0); JS_ASSERT(info.numArenasFree > 0); -@@ -747,7 +747,7 @@ Chunk::fetchNextDecommittedArena() +@@ -736,7 +736,7 @@ Chunk::fetchNextDecommittedArena() decommittedArenas.unset(offset); Arena *arena = &arenas[offset]; @@ -480,16 +496,16 @@ Index: mozilla-release/js/src/jsgc.cpp arena->aheader.setAsNotAllocated(); return &arena->aheader; -@@ -781,7 +781,7 @@ Chunk::allocateArena(JSCompartment *comp +@@ -770,7 +770,7 @@ Chunk::allocateArena(Zone *zone, AllocKi ArenaHeader *aheader = JS_LIKELY(info.numArenasFreeCommitted > 0) ? fetchNextFreeArena(rt) - : fetchNextDecommittedArena(); + : fetchNextDecommittedArena(rt); - aheader->init(comp, thingKind); + aheader->init(zone, thingKind); if (JS_UNLIKELY(!hasAvailableArenas())) removeFromAvailableList(); -@@ -881,6 +881,8 @@ static const int64_t JIT_SCRIPT_RELEASE_ +@@ -937,6 +937,8 @@ static const int64_t JIT_SCRIPT_RELEASE_ JSBool js_InitGC(JSRuntime *rt, uint32_t maxbytes) { @@ -498,7 +514,7 @@ Index: mozilla-release/js/src/jsgc.cpp if (!rt->gcChunkSet.init(INITIAL_CHUNK_CAPACITY)) return false; -@@ -1969,7 +1971,7 @@ DecommitArenasFromAvailableList(JSRuntim +@@ -2102,7 +2104,7 @@ DecommitArenasFromAvailableList(JSRuntim Maybe<AutoUnlockGC> maybeUnlock; if (!rt->isHeapBusy()) maybeUnlock.construct(rt); @@ -507,7 +523,7 @@ Index: mozilla-release/js/src/jsgc.cpp } if (ok) { -@@ -2037,7 +2039,7 @@ ExpireChunksAndArenas(JSRuntime *rt, boo +@@ -2170,7 +2172,7 @@ ExpireChunksAndArenas(JSRuntime *rt, boo { if (Chunk *toFree = rt->gcChunkPool.expire(rt, shouldShrink)) { AutoUnlockGC unlock(rt); @@ -516,32 +532,3 @@ Index: mozilla-release/js/src/jsgc.cpp } if (shouldShrink) -Index: mozilla-release/js/public/HeapAPI.h -=================================================================== ---- mozilla-release.orig/js/public/HeapAPI.h -+++ mozilla-release/js/public/HeapAPI.h -@@ -13,24 +13,7 @@ - namespace js { - namespace gc { - --/* -- * Page size must be static to support our arena pointer optimizations, so we -- * are forced to support each platform with non-4096 pages as a special case. -- * Note: The freelist supports a maximum arena shift of 15. -- * Note: Do not use JS_CPU_SPARC here, this header is used outside JS. -- */ --#if (defined(SOLARIS) || defined(__FreeBSD__)) && \ -- (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) --const size_t PageShift = 13; --const size_t ArenaShift = PageShift; --#elif defined(__powerpc64__) --const size_t PageShift = 16; - const size_t ArenaShift = 12; --#else --const size_t PageShift = 12; --const size_t ArenaShift = PageShift; --#endif --const size_t PageSize = size_t(1) << PageShift; - const size_t ArenaSize = size_t(1) << ArenaShift; - const size_t ArenaMask = ArenaSize - 1; - diff --git a/rhbz-928353.patch b/rhbz-928353.patch deleted file mode 100644 index 00d8e67..0000000 --- a/rhbz-928353.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -up xulrunner-21.0/mozilla-release/config/Makefile.in.old xulrunner-21.0/mozilla-release/config/Makefile.in ---- xulrunner-21.0/mozilla-release/config/Makefile.in.old 2013-05-11 21:19:23.000000000 +0200 -+++ xulrunner-21.0/mozilla-release/config/Makefile.in 2013-05-13 08:53:03.351969145 +0200 -@@ -37,7 +37,7 @@ override NSBUILDROOT := - endif - - ifdef GNU_CC --MODULE_OPTIMIZE_FLAGS = -O3 -+MODULE_OPTIMIZE_FLAGS = -Os - endif - - include $(topsrcdir)/config/config.mk -diff -up xulrunner-21.0/mozilla-release/configure.in.old xulrunner-21.0/mozilla-release/configure.in ---- xulrunner-21.0/mozilla-release/configure.in.old 2013-05-11 21:19:23.000000000 +0200 -+++ xulrunner-21.0/mozilla-release/configure.in 2013-05-13 09:02:12.931823544 +0200 -@@ -1791,7 +1791,7 @@ case "$host" in - *-linux*|*-kfreebsd*-gnu|*-gnu*) - HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" - HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' -- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-Os}" - ;; - - *os2*) -@@ -2041,7 +2041,7 @@ ia64*-hpux*) - # -Os is broken on gcc 4.5.x we need to tweak it to get good results. - MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50" - esac -- MOZ_PGO_OPTIMIZE_FLAGS="-O3" -+ MOZ_PGO_OPTIMIZE_FLAGS="-Os" - MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK" - MOZ_DEBUG_FLAGS="-g" - fi -diff -up xulrunner-21.0/mozilla-release/js/src/config/Makefile.in.old xulrunner-21.0/mozilla-release/js/src/config/Makefile.in ---- xulrunner-21.0/mozilla-release/js/src/config/Makefile.in.old 2013-05-11 21:19:32.000000000 +0200 -+++ xulrunner-21.0/mozilla-release/js/src/config/Makefile.in 2013-05-13 08:53:03.353969129 +0200 -@@ -26,7 +26,7 @@ override NSBUILDROOT := - endif - - ifdef GNU_CC --MODULE_OPTIMIZE_FLAGS = -O3 -+MODULE_OPTIMIZE_FLAGS = -Os - endif - - include $(topsrcdir)/config/config.mk -diff -up xulrunner-21.0/mozilla-release/js/src/configure.in.old xulrunner-21.0/mozilla-release/js/src/configure.in ---- xulrunner-21.0/mozilla-release/js/src/configure.in.old 2013-05-11 21:19:32.000000000 +0200 -+++ xulrunner-21.0/mozilla-release/js/src/configure.in 2013-05-13 09:00:24.431225716 +0200 -@@ -1391,7 +1391,7 @@ case "$host" in - *-linux*|*-kfreebsd*-gnu|*-gnu*) - HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" - HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' -- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" -+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-Os}" - ;; - - *os2*) -@@ -1596,8 +1596,8 @@ ia64*-hpux*) - # -Os is broken on gcc 4.5.x we need to tweak it to get good results. - MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50" - esac -- MOZ_PGO_OPTIMIZE_FLAGS="-O3" -- MOZ_OPTIMIZE_FLAGS="-O3 -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK" -+ MOZ_PGO_OPTIMIZE_FLAGS="-Os" -+ MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks $MOZ_OPTIMIZE_SIZE_TWEAK" - MOZ_DEBUG_FLAGS="-g" - fi - -diff -up xulrunner-21.0/mozilla-release/media/webrtc/trunk/Makefile.old xulrunner-21.0/mozilla-release/media/webrtc/trunk/Makefile -diff -up xulrunner-21.0/mozilla-release/memory/jemalloc/src/configure.ac.old xulrunner-21.0/mozilla-release/memory/jemalloc/src/configure.ac ---- xulrunner-21.0/mozilla-release/memory/jemalloc/src/configure.ac.old 2013-05-11 21:19:46.000000000 +0200 -+++ xulrunner-21.0/mozilla-release/memory/jemalloc/src/configure.ac 2013-05-13 08:53:03.355969113 +0200 -@@ -573,7 +573,7 @@ if test "x$enable_debug" = "x0" -a "x$no - echo "$EXTRA_CFLAGS" | grep "\-O" >/dev/null || optimize="yes" - if test "x${optimize}" = "xyes" ; then - if test "x$GCC" = "xyes" ; then -- JE_CFLAGS_APPEND([-O3]) -+ JE_CFLAGS_APPEND([-Os]) - JE_CFLAGS_APPEND([-funroll-loops]) - elif test "x$je_cv_msvc" = "xyes" ; then - JE_CFLAGS_APPEND([-O2]) -diff -up xulrunner-21.0/mozilla-release/memory/jemalloc/src/configure.old xulrunner-21.0/mozilla-release/memory/jemalloc/src/configure diff --git a/rhbz-966424.patch b/rhbz-966424.patch new file mode 100644 index 0000000..37ddc6e --- /dev/null +++ b/rhbz-966424.patch @@ -0,0 +1,24 @@ +diff --git a/toolkit/mozapps/shared/CertUtils.jsm b/toolkit/toolkit/mozapps/shared/CertUtils.jsm +--- a/toolkit/mozapps/shared/CertUtils.jsm ++++ b/toolkit/mozapps/shared/CertUtils.jsm +@@ -170,17 +170,19 @@ this.checkCert = + issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); + var tokenNames = issuerCert.getAllTokenNames({}); + + if (!tokenNames || !tokenNames.some(isBuiltinToken)) + throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); + } + + function isBuiltinToken(tokenName) { +- return tokenName == "Builtin Object Token"; ++ return tokenName == "Builtin Object Token" || ++ tokenName == "Default Trust" || ++ tokenName == "System Trust"; + } + + /** + * This class implements nsIBadCertListener. Its job is to prevent "bad cert" + * security dialogs from being shown to the user. It is better to simply fail + * if the certificate is bad. See bug 304286. + * + * @param aAllowNonBuiltInCerts (optional) diff --git a/xulrunner-21.0-s390-inlines.patch b/xulrunner-21.0-s390-inlines.patch new file mode 100644 index 0000000..cf2b0ca --- /dev/null +++ b/xulrunner-21.0-s390-inlines.patch @@ -0,0 +1,12 @@ +diff -up mozilla-release/js/src/vm/SPSProfiler.cpp.jscntxt mozilla-release/js/src/vm/SPSProfiler.cpp +--- mozilla-release/js/src/vm/SPSProfiler.cpp.jscntxt 2013-05-20 11:46:14.736790245 -0400 ++++ mozilla-release/js/src/vm/SPSProfiler.cpp 2013-05-20 11:38:20.696788904 -0400 +@@ -10,6 +10,8 @@ + #include "jsnum.h" + #include "jsscript.h" + ++#include "jscntxtinlines.h" ++ + #include "methodjit/MethodJIT.h" + #include "methodjit/Compiler.h" + diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 7852dd4..9482fc9 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -20,7 +20,6 @@ ac_add_options --enable-pango ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter ac_add_options --enable-safe-browsing ac_add_options --enable-extensions=default ac_add_options --enable-libnotify diff --git a/xulrunner-mozconfig-debuginfo b/xulrunner-mozconfig-debuginfo deleted file mode 100644 index 4dd2427..0000000 --- a/xulrunner-mozconfig-debuginfo +++ /dev/null @@ -1,5 +0,0 @@ -# For mozilla's debuginfo: -export CFLAGS="$CFLAGS -gdwarf-2" -export CXXFLAGS="$CXXFLAGS -gdwarf-2" -export MOZ_DEBUG_SYMBOLS=1 -ac_add_options --enable-crashreporter diff --git a/xulrunner.spec b/xulrunner.spec index 8186641..b2da2c3 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -91,14 +91,13 @@ Summary: XUL Runtime for Gecko Applications Name: %{shortname}-last -Version: 21.0 -Release: 2%{?pre_tag}%{?dist} +Version: 22.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/%{tarballname}/releases/%{version}%{?pre_version}/source/%{tarballname}-%{version}%{?pre_version}.source.tar.bz2 Source10: %{shortname}-mozconfig -Source11: %{shortname}-mozconfig-debuginfo Source12: %{shortname}-redhat-default-prefs.js Source21: %{shortname}.sh.in @@ -109,11 +108,15 @@ Patch14: xulrunner-2.0-chromium-types.patch Patch17: xulrunner-15.0-gcc47.patch # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 Patch18: xulrunner-16.0-jemalloc-ppc.patch +# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found) +Patch19: xulrunner-21.0-s390-inlines.patch # Fedora specific patches Patch20: mozilla-193-pkgconfig.patch Patch21: rhbz-911314.patch -Patch22: rhbz-928353.patch +Patch23: mozilla-851850.patch +# Unable to install addons from https pages +Patch24: rhbz-966424.patch # Upstream patches Patch104: mozilla-844883.patch @@ -268,18 +271,16 @@ cd %{tarballdir} %patch14 -p2 -b .chromium-types %patch17 -p2 -b .gcc47 %patch18 -p2 -b .jemalloc-ppc +%patch19 -p1 -b .s390-inlines %patch20 -p2 -b .pk %ifarch ppc ppc64 -%patch21 -p1 -b .ppc +%patch21 -p2 -b .ppc +%patch23 -p1 -b .851850 %patch104 -p1 -b .844883 %endif -%if 0%{?fedora} >= 19 -%ifarch %{ix86} -%patch22 -p2 -%endif -%endif +%patch24 -p1 -b .966424 %{__rm} -f .mozconfig %{__cat} %{SOURCE10} \ @@ -291,10 +292,6 @@ cd %{tarballdir} %endif | tee .mozconfig -%if %{enable_mozilla_crashreporter} -%{__cat} %{SOURCE11} >> .mozconfig -%endif - %if %{?system_nss} echo "ac_add_options --with-system-nspr" >> .mozconfig echo "ac_add_options --with-system-nss" >> .mozconfig @@ -502,9 +499,6 @@ EOF # Install xpcshell %{__cp} objdir/dist/bin/xpcshell $RPM_BUILD_ROOT/%{mozappdir} -# Fix libxpcom.so rights -chmod 755 $RPM_BUILD_ROOT/%{mozappdir}/libxpcom.so - # Install run-mozilla.sh %{__cp} objdir/dist/bin/run-mozilla.sh $RPM_BUILD_ROOT/%{mozappdir} @@ -591,6 +585,27 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jun 24 2013 Remi Collet <RPMS@FamilleCollet.com> - 22.0-1 +- Update to 22.0, sync with rawhide + +* Fri Jun 21 2013 Martin Stransky <stransky@redhat.com> - 22.0-1 +- Update to latest upstream (22.0) + +* Wed Jun 12 2013 Jan Horak <jhorak@redhat.com> - 21.0-8 +- Fixed rhbz#966424 - unable to install addons + +* Mon Jun 3 2013 Jan Horak <jhorak@redhat.com> - 21.0-7 +- Using upstream build flags for crashreporter + +* Wed May 29 2013 Martin Stransky <stransky@redhat.com> - 21.0-6 +- Removed the i686/f19 gcc hack (rhbz#928353) + +* Tue May 21 2013 Martin Stransky <stransky@redhat.com> - 21.0-5 +- Added ppc(64) patches (rhbz#963907) + +* Tue May 21 2013 Martin Stransky <stransky@redhat.com> - 21.0-4 +- Added s390(x) patch + * Sun May 19 2013 Remi Collet <RPMS@FamilleCollet.com> - 21.0-2 - rebuild |