Bug#872776: stretch-pu: package unknown-horizons/2017.1+ds-2

[Adam D. Barratt]

Control: tags -1 + pending

On Wed, 2017-08-23 at 00:40 +0200, Markus Koschany wrote:
> Am 22.08.2017 um 22:21 schrieb Adam D. Barratt:
> [...]
> > That happened. Please go ahead.
> 
> Uploaded. Thanks!

Flagged for acceptance.

Regards,

Adam

Bug#872776: stretch-pu: package unknown-horizons/2017.1+ds-2

[Markus Koschany]

Am 22.08.2017 um 22:21 schrieb Adam D. Barratt:
[...]
> That happened. Please go ahead.

Uploaded. Thanks!

Regards,

Markus



signature.asc
Description: OpenPGP digital signature

Bug#872776: stretch-pu: package unknown-horizons/2017.1+ds-2

[Adam D. Barratt]

Control: tags -1 + confirmed

On Mon, 2017-08-21 at 13:38 +0100, Adam D. Barratt wrote:
> On 2017-08-21 13:19, Markus Koschany wrote:
> > Am 21.08.2017 um 11:04 schrieb Martin Zobel-Helas:
> >> Hi,
> >> 
> >> On Mon Aug 21, 2017 at 09:27:33 +0200, Markus Koschany wrote:
[...]
> >>> This is part 2 to address a memory leak in unknown-horizons. I have
> >>> just filed another bug report for the game engine called fife.
> >>> 
> >>> This issue is also known as #871037 [1]. Please find attached the
> >>> debdiff for unknown-horizons.
> >> 
> >> If i read the bug version information correctly, this fix wants to 
> >> enter
> >> unstable first? Beside that, the patch looks good to me.
> > 
> > Hi,
> > 
> > the fix is already in unstable and testing (latest upstream version
> > 2017.2). The intended update for Stretch only includes the relevant
> > patches to address the memory leak.
> 
> Then please add an appropriate fixed version to #871037 to make that 
> clear.

That happened. Please go ahead.

Regards,

Adam

Bug#872776: stretch-pu: package unknown-horizons/2017.1+ds-2

[Adam D. Barratt]

On 2017-08-21 13:19, Markus Koschany wrote:

Am 21.08.2017 um 11:04 schrieb Martin Zobel-Helas:

Hi,

On Mon Aug 21, 2017 at 09:27:33 +0200, Markus Koschany wrote:

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu

This is part 2 to address a memory leak in unknown-horizons. I have
just filed another bug report for the game engine called fife.

This issue is also known as #871037 [1]. Please find attached the
debdiff for unknown-horizons.


If i read the bug version information correctly, this fix wants to 
enter

unstable first? Beside that, the patch looks good to me.


Hi,

the fix is already in unstable and testing (latest upstream version
2017.2). The intended update for Stretch only includes the relevant
patches to address the memory leak.


Then please add an appropriate fixed version to #871037 to make that 
clear.


Regards,

Adam

Bug#872776: stretch-pu: package unknown-horizons/2017.1+ds-2

[Markus Koschany]

Am 21.08.2017 um 11:04 schrieb Martin Zobel-Helas:
> Hi, 
> 
> On Mon Aug 21, 2017 at 09:27:33 +0200, Markus Koschany wrote:
>> Package: release.debian.org
>> Severity: normal
>> Tags: stretch
>> User: release.debian@packages.debian.org
>> Usertags: pu
>>
>> This is part 2 to address a memory leak in unknown-horizons. I have
>> just filed another bug report for the game engine called fife.
>>
>> This issue is also known as #871037 [1]. Please find attached the
>> debdiff for unknown-horizons.
> 
> If i read the bug version information correctly, this fix wants to enter
> unstable first? Beside that, the patch looks good to me.

Hi,

the fix is already in unstable and testing (latest upstream version
2017.2). The intended update for Stretch only includes the relevant
patches to address the memory leak.

Cheers,

Markus



signature.asc
Description: OpenPGP digital signature

Bug#872776: stretch-pu: package unknown-horizons/2017.1+ds-2

[Martin Zobel-Helas]

Hi, 

On Mon Aug 21, 2017 at 09:27:33 +0200, Markus Koschany wrote:
> Package: release.debian.org
> Severity: normal
> Tags: stretch
> User: release.debian@packages.debian.org
> Usertags: pu
> 
> This is part 2 to address a memory leak in unknown-horizons. I have
> just filed another bug report for the game engine called fife.
> 
> This issue is also known as #871037 [1]. Please find attached the
> debdiff for unknown-horizons.

If i read the bug version information correctly, this fix wants to enter
unstable first? Beside that, the patch looks good to me.

Cheers,
Martin



-- 
 Martin Zobel-Helas Debian System Administrator
 Debian & GNU/Linux Developer   Debian Listmaster
 http://about.me/zobel   Debian Webmaster
 GPG Fingerprint:  6B18 5642 8E41 EC89 3D5D  BDBB 53B1 AC6D B11B 627B 

Bug#872776: stretch-pu: package unknown-horizons/2017.1+ds-2

[Markus Koschany]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu

This is part 2 to address a memory leak in unknown-horizons. I have
just filed another bug report for the game engine called fife.

This issue is also known as #871037 [1]. Please find attached the
debdiff for unknown-horizons.

Regards,

Markus


[1] https://bugs.debian.org/871037
diff -Nru unknown-horizons-2017.1+ds/debian/changelog 
unknown-horizons-2017.1+ds/debian/changelog
--- unknown-horizons-2017.1+ds/debian/changelog 2017-01-22 01:56:39.0 
+0100
+++ unknown-horizons-2017.1+ds/debian/changelog 2017-08-21 08:54:57.0 
+0200
@@ -1,3 +1,12 @@
+unknown-horizons (2017.1+ds-2+deb9u1) stretch; urgency=medium
+
+  * Team upload.
+  * Add 1000-icon-mem-leak.patch and fix a memory leak.
+Thanks to Petter Reinholdtsen for the report and testing and LinuxDonald
+for the patch. (Closes: #871037)
+
+ -- Markus Koschany   Mon, 21 Aug 2017 08:54:57 +0200
+
 unknown-horizons (2017.1+ds-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru unknown-horizons-2017.1+ds/debian/patches/1000-icon-mem-leak.patch 
unknown-horizons-2017.1+ds/debian/patches/1000-icon-mem-leak.patch
--- unknown-horizons-2017.1+ds/debian/patches/1000-icon-mem-leak.patch  
1970-01-01 01:00:00.0 +0100
+++ unknown-horizons-2017.1+ds/debian/patches/1000-icon-mem-leak.patch  
2017-08-21 08:53:37.0 +0200
@@ -0,0 +1,27 @@
+Description: Fix small `get_res_icon_path()` widget leak
+
+`horizons.gui.util.get_res_icon_path()` does the same thing as as
+`horizons.gui.widgets.imagebuton`: aks fife to create an `Icon()` to
+see if it's a valid image path. But other than the `ImageButton`,
+`get_res_icon_path()` did forget to call `hide()` on that `Icon`. So the
+`Icon` stayed alive, even though unused.
+
+We now call `hide()` on that `Icon`.
+
+Origin: 
https://github.com/unknown-horizons/unknown-horizons/commit/25e933202e2db6083d0f163d978559c4ac24fb94
+Author: MasterofJOKers 
+Bug-Debian: https://bugs.debian.org/871037
+
+diff --git a/horizons/gui/util.py b/horizons/gui/util.py
+index a7c13584b..2fb2796b3 100644
+--- a/horizons/gui/util.py
 b/horizons/gui/util.py
+@@ -125,7 +125,7 @@ def get_res_icon_path(res, size=32, greyscale=False, 
full_path=True):
+   icon_path = icon_path + '{res:03d}.png'.format(res=res)
+ 
+   try:
+-  Icon(image=icon_path)
++  Icon(image=icon_path).hide()
+   except fife.NotFound: # ImageManager: image not found, use placeholder 
or die
+   if res == 'placeholder':
+   raise Exception('Image not found: 
{icon_path}'.format(icon_path=icon_path))
diff -Nru unknown-horizons-2017.1+ds/debian/patches/series 
unknown-horizons-2017.1+ds/debian/patches/series
--- unknown-horizons-2017.1+ds/debian/patches/series2017-01-22 
01:56:39.0 +0100
+++ unknown-horizons-2017.1+ds/debian/patches/series2017-08-21 
08:53:44.0 +0200
@@ -1 +1,2 @@
 VERSION.patch
+1000-icon-mem-leak.patch