diff --git a/mozilla-844883.patch b/mozilla-844883.patch deleted file mode 100644 index 9298d7d..0000000 --- a/mozilla-844883.patch +++ /dev/null @@ -1,17 +0,0 @@ -# HG changeset patch -# Parent f8a3e008d03b538873a8d4f16fb97829f171517b -# User Steve Singer -bug 844883 use a signed value for the stride - -diff -r f8a3e008d03b -r a298fedfda70 gfx/2d/Blur.cpp ---- a/gfx/2d/Blur.cpp Sun Mar 17 00:55:23 2013 -0400 -+++ b/gfx/2d/Blur.cpp Sun Mar 17 01:28:39 2013 -0400 -@@ -650,7 +650,7 @@ - return; - } - -- uint32_t stride32bit = aIntegralImageStride / 4; -+ int32_t stride32bit = aIntegralImageStride / 4; - - int32_t leftInflation = RoundUpToMultipleOf4(aLeftLobe).value(); - diff --git a/mozilla-851850.patch b/mozilla-851850.patch deleted file mode 100644 index 04260b9..0000000 --- a/mozilla-851850.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# HG changeset patch -# User Steve Singer -# 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/xulrunner.spec b/xulrunner.spec index a994201..e1fd6a2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -76,7 +76,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 22.0 -Release: 5%{?pre_tag}%{?dist} +Release: 6%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -98,12 +98,10 @@ Patch19: xulrunner-21.0-s390-inlines.patch # Fedora specific patches Patch20: mozilla-193-pkgconfig.patch Patch21: rhbz-911314.patch -Patch23: mozilla-851850.patch # Unable to install addons from https pages Patch24: rhbz-966424.patch # Upstream patches -Patch104: mozilla-844883.patch Patch105: mozilla-817533.patch Patch106: mozilla-831688.patch @@ -239,8 +237,6 @@ cd %{tarballdir} %ifarch ppc ppc64 %patch21 -p2 -b .ppc -%patch23 -p1 -b .851850 -%patch104 -p1 -b .844883 %endif %patch24 -p1 -b .966424 @@ -521,6 +517,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Jul 25 2013 Martin Stransky - 22.0-6 +- Removed already applied patches (rhbz#978123) + * Wed Jul 24 2013 Peter Robinson 22.0-5 - Enable web-rtc on ARM now it's fixed upstream (RHBZ 886976)