rpm/MozillaThunderbird
SHA256
1
0
Fork 0
forked from pool/MozillaThunderbird
Code Pull Requests Activity

Accepting request 336538 from devel:ARM:Factory

Browse Source 
- fix build on aarch64 by reusing the crashreporter conditional
  from MozillaFirefox

- mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration

OBS-URL: https://build.opensuse.org/request/show/336538
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=293
This commit is contained in:
Wolfgang Rosenauer 2015-10-05 15:42:43 +00:00 committed by Git OBS Bridge
parent 73325deeb2
commit 536fa4ffa1
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MozillaThunderbird.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 5 12:44:39 UTC 2015 - dmueller@suse.com
- fix build on aarch64 by reusing the crashreporter conditional
from MozillaFirefox
-------------------------------------------------------------------
Mon Sep 28 18:00:50 UTC 2015 - wr@rosenauer.org
@ -107,6 +113,11 @@ Fri Jun 19 17:00:11 UTC 2015 - wr@rosenauer.org
- tb-develdirs.patch is now mozilla-develdirs.patch as it is a
platform configuration now
-------------------------------------------------------------------
Thu Jun 18 10:30:18 UTC 2015 - schwab@suse.de
- mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
-------------------------------------------------------------------
Thu May 28 10:28:13 UTC 2015 - dmueller@suse.com

8
MozillaThunderbird.spec
View File

@ -100,16 +100,17 @@ Patch3: mozilla-kde.patch
Patch4: mozilla-arm-disable-edsp.patch
Patch5: mozilla-develdirs.patch
Patch6: mozilla-icu-strncat.patch
Patch17: mozilla-arm64-libjpeg-turbo.patch
# Thunderbird/mail
Patch20: tb-ssldap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: coreutils fileutils textutils /bin/sh
Recommends: libcanberra0
### build options
%ifnarch ppc ppc64 ppc64le %arm
%define crashreporter 1
%else
%ifarch aarch64 ppc ppc64 ppc64le s390 s390x ia64 %arm
%define crashreporter 0
%else
%define crashreporter 1
%endif
%define has_system_cairo 0
%define localize 1
@ -196,6 +197,7 @@ pushd mozilla
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch17 -p1
popd
# comm-central patches
%patch20 -p1

22
mozilla-arm64-libjpeg-turbo.patch Normal file
View File

@ -0,0 +1,22 @@
Index: mozilla/configure.in
===================================================================
--- mozilla.orig/configure.in
+++ mozilla/configure.in
@@ -6241,7 +6241,7 @@ fi
dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and
dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler.
-if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then
+if test -n "$LIBJPEG_TURBO_ARM_ASM" -o -n "$LIBJPEG_TURBO_ARM64_ASM" ; then
echo "Using $AS as the assembler for ARM code."
LIBJPEG_TURBO_AS=$AS
fi
@@ -6252,6 +6252,8 @@ elif test -n "$LIBJPEG_TURBO_X64_ASM"; t
AC_DEFINE(LIBJPEG_TURBO_X64_ASM)
elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then
AC_DEFINE(LIBJPEG_TURBO_ARM_ASM)
+elif test -n "$LIBJPEG_TURBO_ARM64_ASM"; then
+ AC_DEFINE(LIBJPEG_TURBO_ARM64_ASM)
elif test -n "$MOZ_LIBJPEG_TURBO"; then
dnl Warn if we're not building the optimized routines, even though the user
dnl didn't specify --disable-libjpeg-turbo.