[Debian GNUstep maintainers] Bug#1077323: bookworm-pu: package poe.app/0.5.1-6+deb12u1

[Yavor Doganov]

Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: poe.app at packages.debian.org
Control: affects -1 + src:poe.app
User: release.debian.org at packages.debian.org
Usertags: pu

[ Reason ]
I would like to fix #1076829 in stable as currently the package is
completely unusable.  The bug was introduced during the bullseye
release cycle or even earlier when apparently some default GNUstep
behavior has changed.  I always try to test every package after every
GNUstep transition but it seems I have missed this one (or more
likely, I only checked that it started and loaded an .ogg file).
Mea culpa.

In addition to the grave bug above, the second patch fixes an
unpleasant issue with the preferences: when the user chooses which
Vorbis comments to be available for editing, nothing happens (a
gnustep-back warning is printed on stdout that drawing is not allowed
due to missing target).  This also stems from a change in GNUstep's
behavior which no longer allows arbitrary drawing operations.  I would
classify this issue as important.

[ Impact ]
The package is completely unusable without the change in
editable-cells.patch.

[ Tests ]
I tested the updated package on a bookworm machine.

[ Risks ]
Changes are pretty trivial, no risk involved AFAICT.

[ Checklist ]
  [X] *all* changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in stable
  [X] the issue is verified as fixed in unstable

[ Changes ]
* d/gbp.conf: Set debian-branch.
* d/control: Set Vcs-Git branch.
* d/patches/editable-cells.patch: Fixes RC bug #1076829.
* d/patches/preferences-draw.patch: Fix for the issue described above.
-------------- next part --------------
diff -u poe.app-0.5.1/debian/changelog poe.app-0.5.1/debian/changelog
--- poe.app-0.5.1/debian/changelog
+++ poe.app-0.5.1/debian/changelog
@@ -1,3 +1,14 @@
+poe.app (0.5.1-6+deb12u1) bookworm; urgency=medium
+
+  * debian/gbp.conf: New file.
+  * debian/control (Vcs-Git): Set branch to bookworm.
+  * debian/patches/editable-cells.patch: New; make comment cells editable
+    (Closes: #1076829).
+  * debian/patches/preferences-draw.patch: New; fix drawing when an
+    NSActionCell in the preferences is acted on to change state.
+
+ -- Yavor Doganov <yavor at gnu.org>  Sun, 28 Jul 2024 07:22:30 +0300
+
 poe.app (0.5.1-6) unstable; urgency=medium
 
   * Team upload.
diff -u poe.app-0.5.1/debian/control poe.app-0.5.1/debian/control
--- poe.app-0.5.1/debian/control
+++ poe.app-0.5.1/debian/control
@@ -9,7 +9,7 @@
 	       libvorbis-dev,
 	       imagemagick
 Standards-Version: 4.5.0
-Vcs-Git: https://salsa.debian.org/gnustep-team/poe.app.git
+Vcs-Git: https://salsa.debian.org/gnustep-team/poe.app.git -b bookworm
 Vcs-Browser: https://salsa.debian.org/gnustep-team/poe.app
 Homepage: https://www.eskimo.com/~pburns/Poe/
 
diff -u poe.app-0.5.1/debian/patches/series poe.app-0.5.1/debian/patches/series
--- poe.app-0.5.1/debian/patches/series
+++ poe.app-0.5.1/debian/patches/series
@@ -1 +1,3 @@
 link-libs.patch
+editable-cells.patch
+preferences-draw.patch
only in patch2:
unchanged:
--- poe.app-0.5.1.orig/debian/gbp.conf
+++ poe.app-0.5.1/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = bookworm
only in patch2:
unchanged:
--- poe.app-0.5.1.orig/debian/patches/editable-cells.patch
+++ poe.app-0.5.1/debian/patches/editable-cells.patch
@@ -0,0 +1,21 @@
+Description: Make comment cells editable.
+Bug-Debian: https://bugs.debian.org/1076829
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2024-07-24
+---
+
+--- poe.app.orig/EditorWindowController.m
++++ poe.app/EditorWindowController.m
+@@ -161,6 +161,11 @@
+ 					[aTableView display];
+ 		}
+     }
++  else
++    {
++      [aCell setEditable: YES];
++      [aCell setSelectable: YES];
++    }
+ 
+ //  if([[aTableColumn identifier] isEqualToString: @"value"] &&
+ //    [[[[_oggFile comments] objectAtIndex: rowIndex] objectForKey: @"tag"] 
only in patch2:
unchanged:
--- poe.app-0.5.1.orig/debian/patches/preferences-draw.patch
+++ poe.app-0.5.1/debian/patches/preferences-draw.patch
@@ -0,0 +1,52 @@
+Description: Fix drawing when a user clicks over an NSActionCell.
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2024-07-25
+---
+
+--- poe.app.orig/SwitchTableView.m
++++ poe.app/SwitchTableView.m
+@@ -120,9 +120,11 @@
+ 	  // if the mouse is within the cell
+ 	  if (NSMouseInRect(location, mouseCellFrame, YES))
+ 	    {
++	      [self lockFocus];
+ 	      [mouseCell highlight: YES 
+ 			 withFrame: mouseCellFrame 
+ 			 inView: self];
++	      [self unlockFocus];
+ 	      [_window flushWindow];
+ 	      if ([mouseCell trackMouse: e
+ 			     inRect: mouseCellFrame 
+@@ -131,9 +133,11 @@
+ 		done = mouseUp = YES;
+ 	      else
+ 		{
++		  [self lockFocus];
+ 		  [mouseCell highlight: NO 
+ 			     withFrame: mouseCellFrame
+ 			     inView: self];
++		  [self unlockFocus];
+ 		  [_window flushWindow];
+ 		}
+ 	    }
+@@ -162,9 +166,11 @@
+ 			 row: _clickedRow];
+ 
+ 	  //              [cell setState: ![cell state]];
++	  [self lockFocus];
+ 	  [mouseCell highlight: NO 
+ 		     withFrame: mouseCellFrame
+ 		     inView: self];
++	  [self unlockFocus];
+ 	  [_window flushWindow];
+ 	}
+       
+@@ -178,6 +184,7 @@
+ 	    [NSApp sendAction: theAction
+ 		   to: [mouseCell target]
+ 		   from: mouseCell];
++	  [self reloadData];
+ 	}
+       return;
+     }