diff --git a/firefox.spec b/firefox.spec index e2b617a..26c57a1 100644 --- a/firefox.spec +++ b/firefox.spec @@ -106,7 +106,6 @@ Source23: firefox.1 Patch0: firefox-install-dir.patch Patch3: mozilla-build-arm.patch Patch14: xulrunner-2.0-chromium-types.patch -Patch17: xulrunner-24.0-gcc47.patch # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 Patch18: xulrunner-24.0-jemalloc-ppc.patch # workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found) @@ -221,7 +220,6 @@ cd %{tarballdir} %patch3 -p2 -b .arm %endif %patch14 -p2 -b .chromium-types -%patch17 -p1 -b .gcc47 %patch18 -p2 -b .jemalloc-ppc %patch19 -p2 -b .s390-inlines diff --git a/xulrunner-24.0-gcc47.patch b/xulrunner-24.0-gcc47.patch deleted file mode 100644 index 28de75f..0000000 --- a/xulrunner-24.0-gcc47.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-release/toolkit/crashreporter/client/Makefile.in ---- mozilla-release/toolkit/crashreporter/client/Makefile.in.gcc47 2013-12-09 15:12:50.659231760 +0100 -+++ mozilla-release/toolkit/crashreporter/client/Makefile.in 2013-12-09 15:13:45.448324783 +0100 -@@ -42,6 +42,9 @@ endif - - ifdef MOZ_WIDGET_GTK - -+# Needed for moz_free -+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc -+ - LIBS += \ - $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \ - $(NULL)