rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused patch

Browse Source
This commit is contained in:
Martin Stransky 2014-04-24 10:36:49 +02:00
parent 2b5d6925fb
commit c01f068ad2
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firefox.spec
View File

@ -87,7 +87,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 29.0 Version: 29.0
Release: 1%{?pre_tag}%{?dist} Release: 2%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -105,7 +105,6 @@ Source23: firefox.1
#Build patches #Build patches
Patch0: firefox-install-dir.patch Patch0: firefox-install-dir.patch
Patch3: mozilla-build-arm.patch Patch3: mozilla-build-arm.patch
Patch14: xulrunner-2.0-chromium-types.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
Patch18: xulrunner-24.0-jemalloc-ppc.patch Patch18: xulrunner-24.0-jemalloc-ppc.patch
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found) # workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
@ -219,7 +218,6 @@ cd %{tarballdir}
%ifarch %{arm} %ifarch %{arm}
%patch3 -p2 -b .arm %patch3 -p2 -b .arm
%endif %endif
%patch14 -p2 -b .chromium-types
%patch18 -p2 -b .jemalloc-ppc %patch18 -p2 -b .jemalloc-ppc
%patch19 -p2 -b .s390-inlines %patch19 -p2 -b .s390-inlines
@ -636,6 +634,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Apr 24 2014 Martin Stransky <stransky@redhat.com> - 29.0-2
- Removed unused patch
* Tue Apr 22 2014 Martin Stransky <stransky@redhat.com> - 29.0-1 * Tue Apr 22 2014 Martin Stransky <stransky@redhat.com> - 29.0-1
- Update to 29.0 Build 1 - Update to 29.0 Build 1

31
xulrunner-2.0-chromium-types.patch
View File

@ -1,31 +0,0 @@
diff -up firefox-29.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types firefox-29.0/mozilla-release/gfx/ycbcr/chromium_types.h
--- firefox-29.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types 2014-04-22 07:27:47.000000000 +0200
+++ firefox-29.0/mozilla-release/gfx/ycbcr/chromium_types.h 2014-04-22 15:46:24.288677788 +0200
@@ -34,7 +34,11 @@ typedef uint32_t uint32;
#define ARCH_CPU_ARM_FAMILY 1
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
-#elif defined(__ppc__) || defined(__powerpc) || defined(__PPC__)
+#elif defined(__powerpc64__)
+#define ARCH_CPU_PPC_FAMILY 1
+#define ARCH_CPU_PPC 1
+#define ARCH_CPU_64_BITS 1
+#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__)
#define ARCH_CPU_PPC_FAMILY 1
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
@@ -50,6 +54,14 @@ typedef uint32_t uint32;
#define ARCH_CPU_AARCH64_FAMILY 1
#define ARCH_CPU_AARCH64 1
#define ARCH_CPU_64_BITS 1
+#elif defined(__s390x__)
+#define ARCH_CPU_S390_FAMILY 1
+#define ARCH_CPU_S390 1
+#define ARCH_CPU_64_BITS 1
+#elif defined(__s390__)
+#define ARCH_CPU_S390_FAMILY 1
+#define ARCH_CPU_S390 1
+#define ARCH_CPU_32_BITS 1
#else
#warning Please add support for your architecture in chromium_types.h
#endif