Bug#767694: unblock: gnustep-gui/0.24.0-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock (or reduce age-days) package gnustep-gui, it fixes RC
bugs #754825 and #755823. (It's being held by gnustep-base/1.24.7-1
which I believe is due to migrate without your intervention on
November 5th.)
Debdiff attached.
unblock gnustep-gui/0.24.0-3
diff --git a/debian/changelog b/debian/changelog
index 85ccf2b..3626063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gnustep-gui (0.24.0-3) unstable; urgency=medium
+
+ * debian/patches/xib-loading.patch: New; fixes a crash with XIB
+ decoding/loading (Closes: #754825).
+ * debian/patches/gorm-loading.patch: New; fixes a crash in Gorm
+ loading (Closes: #755823).
+ * debian/patches/series: Update.
+ * debian/control.m4 (Standards-Version): Bump to 3.9.6; no changes
+ needed.
+ * debian/control: Regenerate.
+
+ -- Yavor Doganov <yavor@gnu.org> Tue, 28 Oct 2014 09:39:18 +0200
+
gnustep-gui (0.24.0-2) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/control b/debian/control
index 0fe9e0d..2398c52 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian GNUstep maintainers <pkg-gnustep-maintainers@lists.alioth.debian.org>
Uploaders: Gürkan Sengün <gurkan@phys.ethz.ch>,
Yavor Doganov <yavor@gnu.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9),
m4,
libgnustep-base-dev (>= 1.24.6),
diff --git a/debian/control.m4 b/debian/control.m4
index 4f80e2d..5b33272 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian GNUstep maintainers <pkg-gnustep-maintainers@lists.alioth.debian.org>
Uploaders: Gürkan Sengün <gurkan@phys.ethz.ch>,
Yavor Doganov <yavor@gnu.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9),
m4,
libgnustep-base-dev (>= V_BASE),
diff --git a/debian/patches/gorm-loading.patch b/debian/patches/gorm-loading.patch
new file mode 100644
index 0000000..82530ab
--- /dev/null
+++ b/debian/patches/gorm-loading.patch
@@ -0,0 +1,18 @@
+Description: Fix crash in Gorm loading.
+Bug: http://savannah.gnu.org/bugs/index.php?42782
+Bug-Debian: http://bugs.debian.org/755823
+Origin: upstream, commit: r38005
+Last-Update: 2014-10-28
+---
+
+--- gnustep-gui.orig/Source/GSGormLoading.m
++++ gnustep-gui/Source/GSGormLoading.m
+@@ -892,7 +892,7 @@
+ // decode the defer flag...
+ [coder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
+ _autoPositionMask = GSWindowAutoPositionNone;
+- _screenRect = [[_object screen] frame];
++ _screenRect = [[obj screen] frame];
+ }
+
+ // FIXME: The designated initializer logic for NSWindow is in the initWithCoder: method of
diff --git a/debian/patches/series b/debian/patches/series
index 56c0e09..b5eb35d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+gorm-loading.patch
+xib-loading.patch
info-direntry.patch
diff --git a/debian/patches/xib-loading.patch b/debian/patches/xib-loading.patch
new file mode 100644
index 0000000..1caf686
--- /dev/null
+++ b/debian/patches/xib-loading.patch
@@ -0,0 +1,93 @@
+Description: Fix crash in XIB loading.
+Bug: http://savannah.gnu.org/bugs/index.php?42717
+Bug-Debian: http://bugs.debian.org/754825
+Origin: upstream, commit: r38003
+Last-Update: 2014-07-24
+---
+
+--- gnustep-gui-0.24.0.orig/Source/NSBox.m
++++ gnustep-gui-0.24.0/Source/NSBox.m
+@@ -572,6 +572,10 @@
+
+ [self setBorderType: borderType];
+ }
++ else
++ {
++ _border_type = NSGrooveBorder;
++ }
+ if ([aDecoder containsValueForKey: @"NSTitlePosition"])
+ {
+ NSTitlePosition titlePosition = [aDecoder decodeIntForKey:
+@@ -579,6 +583,10 @@
+
+ [self setTitlePosition: titlePosition];
+ }
++ else
++ {
++ _title_position = NSAtTop;
++ }
+ if ([aDecoder containsValueForKey: @"NSTransparent"])
+ {
+ // On Apple this is always NO, we keep it for old GNUstep archives
+@@ -598,12 +606,27 @@
+
+ ASSIGN(_cell, titleCell);
+ }
++ else
++ {
++ _cell = [[NSCell alloc] initTextCell: @"Title"];
++ [_cell setAlignment: NSCenterTextAlignment];
++ [_cell setBordered: NO];
++ [_cell setEditable: NO];
++ [self setTitleFont: [NSFont systemFontOfSize:
++ [NSFont smallSystemFontSize]]];
++ }
+ if ([aDecoder containsValueForKey: @"NSContentView"])
+ {
+ NSView *contentView = [aDecoder decodeObjectForKey: @"NSContentView"];
+
+ [self setContentView: contentView];
+ }
++ else
++ {
++ NSView *cv = [NSView new];
++ [self setContentView: cv];
++ RELEASE(cv);
++ }
+ }
+ else
+ {
+@@ -662,6 +685,12 @@
+ return r;
+ }
+
++ // Don't try to compute anything while the title cell hasn't been set.
++ if (_cell == nil)
++ {
++ return r;
++ }
++
+ switch (_title_position)
+ {
+ case NSNoTitle:
+--- gnustep-gui-0.24.0.orig/Source/NSMenu.m
++++ gnustep-gui-0.24.0/Source/NSMenu.m
+@@ -501,11 +501,14 @@
+ }
+ }
+
+- origin = NSMakePoint(0, [[_aWindow screen] visibleFrame].size.height
+- - [_aWindow frame].size.height);
++ if ((_aWindow != nil) && ([_aWindow screen] != nil))
++ {
++ origin = NSMakePoint(0, [[_aWindow screen] visibleFrame].size.height
++ - [_aWindow frame].size.height);
+
+- [_aWindow setFrameOrigin: origin];
+- [_bWindow setFrameOrigin: origin];
++ [_aWindow setFrameOrigin: origin];
++ [_bWindow setFrameOrigin: origin];
++ }
+ }
+ }
+
Reply to: