Bug#1033213: unblock: darktable/4.2.1-4

[David Bremner]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: darktable at packages.debian.org
Control: affects -1 + src:darktable

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Please unblock package darktable

[ Reason ]
This upload fixes bug #1033001

[ Impact ]

Although the bug is arguably cosmetic (it relates to whether GNOME
displays the correct icon in certain places), it does affect all
darktable users on Wayland, who will presumably be a large fraction of
it's users, as darktable is widely used by non-programmers.

[ Tests ]

I have installed the new package in a clean Bookworm VM and verified
it fixes the bug as claimed.  I also installed it on my development
machine (not running GNOME) and verified basic functionality.

[ Risks ]

darktable is a leaf package. The change introduced by this file is a
single line added to a .desktop file

[ 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 testing

[ Other info ]

The one line upstream change is a bit hard to spot in the debdiff (at
least for me), so I will also attach the actual patch.

unblock darktable/4.2.1-4


-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEkiyHYXwaY0SiY6fqA0U5G1WqFSEFAmQXlNMACgkQA0U5G1Wq
FSG4axAArjJPzP+ohn9w4KUWe4b2WyW//Pxvu6SdEWKSLB+Q3v/UXVgYD7/C1cY0
NTQ9D4opqSh3ihgvvFRkq1UwnJ/qxOfQMeuvf2d5LCUyuuxfp6kKXCHmCuGWxc9T
vIkjfemZkqI4F0TlNEjdL3DP64f+zonkJNo2oRDmmyQoesSHwP5MI08B+TMiV8N6
mi1zxY5rS1EyOEpXOIvEazSWe94TqcjHNHQzinQ3qU7kEBvfiRPUcuTWSD9+uBE/
mr5VhFBHVQSXW7TfTn4IIqB9m25SXHNBcoHlPr0R1oVNgOgdoSkWru3A9NFCfxq8
UyWRZmuZLLLHOrwU5aYWP6LpiuLCY/brhvyq98kaf7O5gIrNp9zP+WQbsgCUO8df
dQx4O63UBpAxT8UiEw6fDraO7uc+dpnL5sRZr5xSfuk7fyorhHt0VB9t44iLESn5
Ca1Rp0A5/XpmiuWO4hA3cDNpM8PTxq5WnmIOXkVZPV9HykgYe+WHi/im+/ZMOHX8
tr7J3SjyWHO6Qf3EvUSxEu9b9onqwsnt324VF37c7dusCmdI2nxjKyVRphPMrkyB
wiVV1ka1s9L48xaEAp8KaQmdaVG+GohAAucfs/4K6p05PfURwvhT9Gof5lSswvmp
JBMQv/a3ZvukqivKb28qPosZV5N72ORQ9z3tppFwyaB4mnqDId4=
=atQJ
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -Nru darktable-4.2.1/debian/changelog darktable-4.2.1/debian/changelog
--- darktable-4.2.1/debian/changelog	2023-02-27 08:03:27.000000000 -0400
+++ darktable-4.2.1/debian/changelog	2023-03-19 14:10:18.000000000 -0300
@@ -1,3 +1,10 @@
+darktable (4.2.1-4) unstable; urgency=medium
+
+  * Cherry-pick upstream commit 385aacf61e55903bb064e0fe99a1d138645f697c:
+    add StartupWMClass=darktable to .desktop file. (Closes: #1033001).
+
+ -- David Bremner <bremner at debian.org>  Sun, 19 Mar 2023 14:10:18 -0300
+
 darktable (4.2.1-3) unstable; urgency=medium
 
   * Bug fix: "AVIF support is missing in Darktable", thanks to Guy
diff -Nru darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch
--- darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch	1969-12-31 20:00:00.000000000 -0400
+++ darktable-4.2.1/debian/patches/0001-Fix-missing-application-icon-in-Wayland.patch	2023-03-19 14:10:18.000000000 -0300
@@ -0,0 +1,21 @@
+From: Victor Forsiuk <vvforce at gmail.com>
+Date: Sat, 18 Mar 2023 13:03:48 +0200
+Subject: Fix missing application icon in Wayland
+
+(cherry picked from commit 385aacf61e55903bb064e0fe99a1d138645f697c)
+---
+ data/org.darktable.darktable.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/org.darktable.darktable.desktop.in b/data/org.darktable.darktable.desktop.in
+index 23bf16c..4d8895b 100644
+--- a/data/org.darktable.darktable.desktop.in
++++ b/data/org.darktable.darktable.desktop.in
+@@ -20,6 +20,7 @@ StartupNotify=true
+ MimeType=application/x-darktable;image/x-dcraw;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crw;image/x-fuji-raf;image/x-kodak-dcr;image/x-kodak-kdc;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-rw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-portable-floatmap;image/vnd.radiance;${DESKTOP_MIME_TYPES}
+ 
+ Icon=darktable
++StartupWMClass=darktable
+ 
+ X-Unity-IconBackgroundColor=#252525
+ 
diff -Nru darktable-4.2.1/debian/patches/series darktable-4.2.1/debian/patches/series
--- darktable-4.2.1/debian/patches/series	1969-12-31 20:00:00.000000000 -0400
+++ darktable-4.2.1/debian/patches/series	2023-03-19 14:10:18.000000000 -0300
@@ -0,0 +1 @@
+0001-Fix-missing-application-icon-in-Wayland.patch
-------------- next part --------------
commit 6d62433d6ef413116b0ce834798a694427019891
Author: Victor Forsiuk <vvforce at gmail.com>
Date:   Sat Mar 18 13:03:48 2023 +0200

    Fix missing application icon in Wayland
    
    (cherry picked from commit 385aacf61e55903bb064e0fe99a1d138645f697c)

diff --git a/data/org.darktable.darktable.desktop.in b/data/org.darktable.darktable.desktop.in
index 23bf16c543..4d8895b234 100644
--- a/data/org.darktable.darktable.desktop.in
+++ b/data/org.darktable.darktable.desktop.in
@@ -20,6 +20,7 @@ StartupNotify=true
 MimeType=application/x-darktable;image/x-dcraw;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crw;image/x-fuji-raf;image/x-kodak-dcr;image/x-kodak-kdc;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-rw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-portable-floatmap;image/vnd.radiance;${DESKTOP_MIME_TYPES}
 
 Icon=darktable
+StartupWMClass=darktable
 
 X-Unity-IconBackgroundColor=#252525