Bug#1111808: trixie-pu: package dolphin-emu/2503+dfsg-1+deb13u1

[Jordi Mallach]

Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: dolphin-emu at packages.debian.org
Control: affects -1 + src:dolphin-emu
User: release.debian.org at packages.debian.org
Usertags: pu

[ Reason ]

This update fixes two quite visible bugs in Dolphin, both caused
by packaging issues.

- Adding "+dfsg" to the internal version string made the version
  check in the achievements feature fail, making it unusable on
  Debian builds.
- We install game data in /usr/share/games as mandated by policy,
  but the code was assuming locale files would be under that
  datadir as well, which isn't true. Added a patch to make it
  search for locale data in $datarootdir instead.

[ Impact ]

The popular achievements feature won't work in Debian builds at all
with our builds.

Also, Dolphin won't be able to use the available translations, and
will always show up in English.

[ Tests ]

I have manually tested that translations work again after this
change. I have not tested the achievements fix, but it is reasonable
to expect the simple fix of changing the internal version string to
what Dolphin expects will have fixed it.

[ Risks ]

Minimal: the achievements fix is basically changing a string in
debian/rules from "2503+dfsg" to just "2503".
The other fix consists in a trivial 3-liner patch that only defines
and uses a new variable that points to /usr/share instead of
/usr/share/games. This change does not affect any other place in the
codebase.

[ 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 (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]

- A change in debian/rules to change the version string to just
  what upstream expects, without debian suffixes
- A new 3-liner patch that defines a new variable and uses it
- A change in debian/gbp.conf to point to the new trixie branch
-------------- next part --------------
diff -Nru dolphin-emu-2503+dfsg/debian/changelog dolphin-emu-2503+dfsg/debian/changelog
--- dolphin-emu-2503+dfsg/debian/changelog	2025-04-07 22:42:34.000000000 +0200
+++ dolphin-emu-2503+dfsg/debian/changelog	2025-08-21 14:00:17.000000000 +0200
@@ -1,3 +1,11 @@
+dolphin-emu (2503+dfsg-1+deb13u1) trixie; urgency=medium
+
+  * Remove the dfsg repack suffix from DOLPHIN_WC_DESCRIBE (closes: #1094989).
+  * Look for locale files in the correct directory (closes: #1108687).
+  * Switch debian-branch to trixie.
+
+ -- Jordi Mallach <jordi at debian.org>  Thu, 21 Aug 2025 14:00:17 +0200
+
 dolphin-emu (2503+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru dolphin-emu-2503+dfsg/debian/gbp.conf dolphin-emu-2503+dfsg/debian/gbp.conf
--- dolphin-emu-2503+dfsg/debian/gbp.conf	2025-04-07 22:36:28.000000000 +0200
+++ dolphin-emu-2503+dfsg/debian/gbp.conf	2025-08-21 13:59:53.000000000 +0200
@@ -1,2 +1,3 @@
 [DEFAULT]
+debian-branch = trixie
 pristine-tar = True
diff -Nru dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch
--- dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch	1970-01-01 01:00:00.000000000 +0100
+++ dolphin-emu-2503+dfsg/debian/patches/locale_search_path.patch	2025-08-21 13:59:08.000000000 +0200
@@ -0,0 +1,34 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: define DATA_ROOT_DIR and use it to look for locale files
+ If DATA_DIR was modified at build time, locale files won't be picked
+ up, as they are installed into the localedir, not the full datadir
+ (which is correct). Instead, modify the lookup path.
+Forwarded: yes
+
+Index: dolphin-emu/CMakeLists.txt
+===================================================================
+--- dolphin-emu.orig/CMakeLists.txt
++++ dolphin-emu/CMakeLists.txt
+@@ -178,7 +178,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS
+ 
+ # Set up paths
+ set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/dolphin-emu CACHE PATH "datadir")
++set(datarootdir ${CMAKE_INSTALL_FULL_DATAROOTDIR} CACHE PATH "datarootdir")
+ add_definitions(-DDATA_DIR="${datadir}/")
++add_definitions(-DDATA_ROOT_DIR="${datarootdir}/")
+ 
+ if(CMAKE_SYSROOT)
+   # If we should use a sysroot, tell pkg-config to search for packages in there, not on the host
+Index: dolphin-emu/Source/Core/DolphinQt/Translation.cpp
+===================================================================
+--- dolphin-emu.orig/Source/Core/DolphinQt/Translation.cpp
++++ dolphin-emu/Source/Core/DolphinQt/Translation.cpp
+@@ -284,7 +284,7 @@ static bool TryInstallTranslator(const Q
+ #elif defined LINUX_LOCAL_DEV
+         fmt::format("{}/../Source/Core/DolphinQt/{}/dolphin-emu.mo", File::GetExeDirectory(), lang)
+ #else
+-        fmt::format("{}/../locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_DIR, lang)
++        fmt::format("{}/locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_ROOT_DIR, lang)
+ #endif
+         ;
+ 
diff -Nru dolphin-emu-2503+dfsg/debian/patches/series dolphin-emu-2503+dfsg/debian/patches/series
--- dolphin-emu-2503+dfsg/debian/patches/series	2025-04-07 22:38:25.000000000 +0200
+++ dolphin-emu-2503+dfsg/debian/patches/series	2025-08-21 13:59:08.000000000 +0200
@@ -5,3 +5,4 @@
 mgba_videosize.patch
 use_system_tinygltf.patch
 fix_minizip_include.patch
+locale_search_path.patch
diff -Nru dolphin-emu-2503+dfsg/debian/rules dolphin-emu-2503+dfsg/debian/rules
--- dolphin-emu-2503+dfsg/debian/rules	2025-04-07 22:42:34.000000000 +0200
+++ dolphin-emu-2503+dfsg/debian/rules	2025-08-21 13:57:46.000000000 +0200
@@ -22,7 +22,7 @@
 	-DENABLE_TESTS=1 \
 	-DGTEST_DIR=/usr/src/gtest \
 	-DDOLPHIN_WC_BRANCH=master \
-	-DDOLPHIN_WC_DESCRIBE=2503+dfsg \
+	-DDOLPHIN_WC_DESCRIBE=2503 \
 	-DDOLPHIN_WC_REVISION=9763c0a1e2b9db0c3861d25bc2f5a0ace6a15ee3
 
 %: