Attachment 934751 Details for Bug 926634 – patch + spec changeset

[patch] patch + spec changeset

thunderbird-lightning.diff (text/plain), 2.40 KB, created by Marcin Juszkiewicz on 2014-09-05 11:31:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-09-05 11:31:04 UTC

Size: 2.40 KB

patch

obsolete

>diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
>index ef41388..8c0e468 100644
>--- a/thunderbird-lightning.spec
>+++ b/thunderbird-lightning.spec
>@@ -18,6 +18,8 @@
> %global lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
> %global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
> 
>+%define system_ffi        1
>+
> # The tarball is pretty inconsistent with directory structure.
> # Sometimes there is a top level directory.  That goes here.
> #
>@@ -33,7 +35,7 @@ Name:           thunderbird-lightning
> Summary:        The calendar extension to Thunderbird
> Version:        %{lightning_version}
> # Must bump release unless gdata_version is increased too
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> URL:            http://www.mozilla.org/projects/calendar/lightning/
> License:        MPLv1.1 or GPLv2+ or LGPLv2+
> Group:          Applications/Productivity
>@@ -89,6 +91,9 @@ BuildRequires:  yasm
> BuildRequires:  mesa-libGL-devel
> BuildRequires:  libvpx-devel >= %{libvpx_version}
> BuildRequires:  pulseaudio-libs-devel
>+%if %{?system_ffi}
>+BuildRequires:  libffi-devel
>+%endif
> Requires:       thunderbird >= %{thunderbird_version}
> Requires:       thunderbird < %{thunderbird_next_version}
> Obsoletes:      thunderbird-lightning-wcap <= 0.8
>@@ -152,6 +157,10 @@ echo "ac_add_options --disable-elf-hack" >> .mozconfig
> echo "ac_add_options --disable-webrtc" >> .mozconfig
> %endif
> 
>+%if %{?system_ffi}
>+echo "ac_add_options --enable-system-ffi" >> .mozconfig
>+%endif
>+
> # Fix permissions
> find -name \*.js -type f | xargs chmod -x
> 
>@@ -160,6 +169,9 @@ find -name \*.js -type f | xargs chmod -x
> %build
> cd %{tarballdir}
> 
>+# Update the various config.guess to upstream release for aarch64 support
>+find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
>+
> INTERNAL_GECKO=%{version_internal}
> MOZ_APP_DIR=%{mozappdir}
> 
>@@ -240,6 +252,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
> #===============================================================================
> 
> %changelog
>+* Fri Sep 05 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 3.3-4
>+- Use system libffi instead of own outdated copy - fixes build on AArch64.
>+
> * Wed Aug 20 2014 Orion Poplawski <orion@cora.nwra.com> - 3.3-3
> - Use new style rpm dependency/provides filtering where we can
>

Actions: View | Diff

Attachments on bug 926634: 934751