firefox-esr 52 patches for wheezy

[Emilio Pozuelo Monfort]

Hi Mike,

Thanks for looking at this.

On 05/05/17 10:03, Mike Hommey wrote:
> On Wed, Apr 26, 2017 at 07:46:50PM +0200, Emilio Pozuelo Monfort wrote:
>> From f5cea02f4c19b04de834639cc8e5daec5b9a787b Mon Sep 17 00:00:00 2001
>> From: Emilio Pozuelo Monfort <pochu at debian.org>
>> Date: Sat, 22 Apr 2017 13:51:23 +0200
>> Subject: [PATCH 2/3] Build with -fPIC on wheezy
>>
>> ---
>>  debian/changelog | 2 ++
>>  debian/rules     | 1 +
>>  2 files changed, 3 insertions(+)
>>
>> diff --git a/debian/changelog b/debian/changelog
>> index 85fadd30dc3..1d41bfdf9c6 100644
>> --- a/debian/changelog
>> +++ b/debian/changelog
>> @@ -2,6 +2,8 @@ firefox-esr (52.1.0esr-2) UNRELEASED; urgency=medium
>>  
>>    * debian/rules, debian/control.in:
>>      - Switch to gcc-mozilla (GCC 4.8) on wheezy, as required by FF 52.
>> +  * debian/rules:
>> +    - Build with -fPIC on wheezy.
>>  
>>   -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 22 Apr 2017 13:48:08 +0200
>>  
>> diff --git a/debian/rules b/debian/rules
>> index 62c417bd46b..250e4c94935 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -35,6 +35,7 @@ $(foreach lib,$(sort $(call uc,$(SYSTEM_LIBS))),$(eval $(call system_lib,$(lib))
>>  ifeq ($(BACKPORT),wheezy)
>>  CC := /usr/lib/gcc-mozilla/bin/gcc
>>  CXX := /usr/lib/gcc-mozilla/bin/g++
>> +CFLAGS := -fPIC
> 
> You'll have to detail why you need this, because this shouldn't be
> needed.

Compilation fails without -fPIC with a compiler error requesting that files be
compiled with -fPIC. I don't have a build log handy though, shout if you want
the exact error / full build log.

Note that at least on sid ff is compiled with -fPIC [1], it's just that either
the compiler or the default dpkg cflags are injecting it, but that's not the
case in wheezy.

[1]
https://buildd.debian.org/status/fetch.php?pkg=firefox-esr&arch=i386&ver=45.9.0esr-1&stamp=1492638454&raw=0

>> From 9cad00699574e93277e29832da5259086aae59ed Mon Sep 17 00:00:00 2001
>> From: Emilio Pozuelo Monfort <pochu at debian.org>
>> Date: Sat, 22 Apr 2017 14:29:13 +0200
>> Subject: [PATCH 3/3] Don't remove debian/control on clean
>>
>> ---
>>  debian/changelog | 3 +++
>>  debian/rules     | 2 +-
>>  2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/debian/changelog b/debian/changelog
>> index 1d41bfdf9c6..9f413fcddd0 100644
>> --- a/debian/changelog
>> +++ b/debian/changelog
>> @@ -4,6 +4,9 @@ firefox-esr (52.1.0esr-2) UNRELEASED; urgency=medium
>>      - Switch to gcc-mozilla (GCC 4.8) on wheezy, as required by FF 52.
>>    * debian/rules:
>>      - Build with -fPIC on wheezy.
>> +    - Don't remove debian/control on clean before generating it. Otherwise
>> +      generating it will fail on wheezy as /usr/share/dpkg/pkg-info.mk
>> +      relies on debian/control being there to determine the source name.
> 
> Can you remind me what pkg-info.mk does that requires debian/control?

In wheezy it does:

DEB_SOURCE = $(call dpkg_late_eval,DEB_SOURCE,awk '/^Source: / { print $$2 }'
debian/control)

So without a debian/control, regenerating debian/control ends up with a broken
file, e.g. "Package: -dbg" because the source variable will be empty.

https://sources.debian.net/src/dpkg/1.16.18/scripts/mk/pkg-info.mk/

This is not a problem in >= jessie, but the change should cause no harm and will
allow us to ship the same version.

Cheers,
Emilio