From e49ac15049340156ea6dca54b8243e2049e416b3 Mon Sep 17 00:00:00 2001
From: spectranator
 <spectranator@y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion>
Date: Sun, 28 Apr 2024 23:23:39 +0200
Subject: [PATCH] Updated logo and name in preparation for flatpak

---
 CMakeLists.txt                                |  8 +--
 ....desktop => onion.torzu_emu.torzu.desktop} |  6 +-
 dist/onion.torzu_emu.torzu.metainfo.xml       | 46 ++++++++++++++
 ...emu.yuzu.xml => onion.torzu_emu.torzu.xml} |  8 +--
 dist/org.yuzu_emu.yuzu.metainfo.xml           | 62 -------------------
 src/yuzu/about_dialog.cpp                     |  2 +-
 src/yuzu/main.cpp                             |  2 +-
 7 files changed, 59 insertions(+), 75 deletions(-)
 rename dist/{org.yuzu_emu.yuzu.desktop => onion.torzu_emu.torzu.desktop} (87%)
 create mode 100644 dist/onion.torzu_emu.torzu.metainfo.xml
 rename dist/{org.yuzu_emu.yuzu.xml => onion.torzu_emu.torzu.xml} (86%)
 delete mode 100644 dist/org.yuzu_emu.yuzu.metainfo.xml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d0399022..b5f26af54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -712,13 +712,13 @@ endif()
 # https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html
 # https://www.freedesktop.org/software/appstream/docs/
 if(ENABLE_QT AND UNIX AND NOT APPLE)
-    install(FILES "dist/org.yuzu_emu.yuzu.desktop"
+    install(FILES "dist/onion.torzu_emu.torzu.desktop"
             DESTINATION "share/applications")
     install(FILES "dist/yuzu.svg"
             DESTINATION "share/icons/hicolor/scalable/apps"
-            RENAME "org.yuzu_emu.yuzu.svg")
-    install(FILES "dist/org.yuzu_emu.yuzu.xml"
+            RENAME "onion.torzu_emu.torzu.svg")
+    install(FILES "dist/onion.torzu_emu.torzu.xml"
             DESTINATION "share/mime/packages")
-    install(FILES "dist/org.yuzu_emu.yuzu.metainfo.xml"
+    install(FILES "dist/onion.torzu_emu.torzu.metainfo.xml"
             DESTINATION "share/metainfo")
 endif()
diff --git a/dist/org.yuzu_emu.yuzu.desktop b/dist/onion.torzu_emu.torzu.desktop
similarity index 87%
rename from dist/org.yuzu_emu.yuzu.desktop
rename to dist/onion.torzu_emu.torzu.desktop
index 51e191a8e..55b389d80 100644
--- a/dist/org.yuzu_emu.yuzu.desktop
+++ b/dist/onion.torzu_emu.torzu.desktop
@@ -4,13 +4,13 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=yuzu
+Name=torzu
 GenericName=Switch Emulator
 Comment=Nintendo Switch video game console emulator
-Icon=org.yuzu_emu.yuzu
+Icon=onion.torzu_emu.torzu
 TryExec=yuzu
 Exec=yuzu %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
 Keywords=Nintendo;Switch;
-StartupWMClass=yuzu
+StartupWMClass=torzu
diff --git a/dist/onion.torzu_emu.torzu.metainfo.xml b/dist/onion.torzu_emu.torzu.metainfo.xml
new file mode 100644
index 000000000..baecbff0b
--- /dev/null
+++ b/dist/onion.torzu_emu.torzu.metainfo.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+SPDX-License-Identifier: CC0-1.0
+-->
+
+<component type="desktop-application">
+  <id>onion.torzu_emu.torzu</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>Torzu</name>
+  <summary>Nintendo Switch emulator</summary>
+  <description>
+    <p>yuzu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.</p>
+    <p>The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.</p>
+  </description>
+  <categories>
+    <category>Game</category>
+    <category>Emulator</category>
+  </categories>
+  <keywords>
+    <keyword>switch</keyword>
+    <keyword>emulator</keyword>
+  </keywords>
+  <url type="bugtracker">http://y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion/torzu-emu/torzu/issues</url>
+  <url type="vcs-browser">http://y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion/torzu-emu/torzu</url>
+  <launchable type="desktop-id">onion.torzu_emu.torzu.desktop</launchable>
+  <provides>
+    <binary>yuzu</binary>
+    <binary>yuzu-cmd</binary>
+  </provides>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>gamepad</control>
+  </supports>
+  <requires>
+    <memory>8192</memory>
+  </requires>
+  <recommends>
+    <memory>16384</memory>
+  </recommends>
+  <project_license>GPL-3.0-or-later</project_license>
+  <developer_name>yuzu Emulator Team</developer_name>
+  <content_rating type="oars-1.0"/>
+</component>
diff --git a/dist/org.yuzu_emu.yuzu.xml b/dist/onion.torzu_emu.torzu.xml
similarity index 86%
rename from dist/org.yuzu_emu.yuzu.xml
rename to dist/onion.torzu_emu.torzu.xml
index b774eb0c4..6e38c7e08 100644
--- a/dist/org.yuzu_emu.yuzu.xml
+++ b/dist/onion.torzu_emu.torzu.xml
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <mime-type type="application/x-nx-nro">
         <comment>Nintendo Switch homebrew executable</comment>
         <acronym>NRO</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="onion.torzu_emu.torzu"/>
         <glob pattern="*.nro"/>
         <magic><match value="NRO" type="string" offset="16"/></magic>
     </mime-type>
@@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <mime-type type="application/x-nx-nso">
         <comment>Nintendo Switch homebrew executable</comment>
         <acronym>NSO</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="onion.torzu_emu.torzu"/>
         <glob pattern="*.nso"/>
         <magic><match value="NSO" type="string" offset="0"/></magic>
     </mime-type>
@@ -25,7 +25,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <mime-type type="application/x-nx-nsp">
         <comment>Nintendo Switch Package</comment>
         <acronym>NSP</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="onion.torzu_emu.torzu"/>
         <glob pattern="*.nsp"/>
         <magic><match value="PFS" type="string" offset="0"/></magic>
     </mime-type>
@@ -33,7 +33,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <mime-type type="application/x-nx-xci">
         <comment>Nintendo Switch Card Image</comment>
         <acronym>XCI</acronym>
-        <icon name="org.yuzu_emu.yuzu"/>
+        <icon name="onion.torzu_emu.torzu"/>
         <glob pattern="*.xci"/>
     </mime-type>
 </mime-info>
diff --git a/dist/org.yuzu_emu.yuzu.metainfo.xml b/dist/org.yuzu_emu.yuzu.metainfo.xml
deleted file mode 100644
index cfd174174..000000000
--- a/dist/org.yuzu_emu.yuzu.metainfo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-SPDX-FileCopyrightText: 2021 yuzu Emulator Project
-SPDX-License-Identifier: CC0-1.0
--->
-
-<component type="desktop-application">
-  <id>org.yuzu_emu.yuzu</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>yuzu</name>
-  <summary>Nintendo Switch emulator</summary>
-  <description>
-    <p>yuzu is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of Citra.</p>
-    <p>The emulator is capable of running most commercial games at full speed, provided you meet the necessary hardware requirements.</p>
-    <p>For a full list of games yuzu support, please visit our Compatibility page.</p>
-    <p>Check out our website for the latest news on exciting features, monthly progress reports, and more!</p>
-  </description>
-  <categories>
-    <category>Game</category>
-    <category>Emulator</category>
-  </categories>
-  <keywords>
-    <keyword>switch</keyword>
-    <keyword>emulator</keyword>
-  </keywords>
-  <url type="homepage">https://yuzu-emu.org/</url>
-  <url type="bugtracker">https://github.com/yuzu-emu/yuzu/issues</url>
-  <url type="faq">https://yuzu-emu.org/wiki/faq/</url>
-  <url type="help">https://yuzu-emu.org/wiki/home/</url>
-  <url type="donation">https://yuzu-emu.org/donate/</url>
-  <url type="translate">https://www.transifex.com/projects/p/yuzu</url>
-  <url type="contact">https://community.citra-emu.org/</url>
-  <url type="vcs-browser">https://github.com/yuzu-emu/yuzu</url>
-  <url type="contribute">https://yuzu-emu.org/wiki/contributing/</url>
-  <launchable type="desktop-id">org.yuzu_emu.yuzu.desktop</launchable>
-  <provides>
-    <binary>yuzu</binary>
-    <binary>yuzu-cmd</binary>
-  </provides>
-  <supports>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <control>gamepad</control>
-  </supports>
-  <requires>
-    <memory>8192</memory>
-  </requires>
-  <recommends>
-    <memory>16384</memory>
-  </recommends>
-  <project_license>GPL-3.0-or-later</project_license>
-  <developer_name>yuzu Emulator Team</developer_name>
-  <content_rating type="oars-1.0"/>
-  <screenshots>
-    <screenshot type="default"><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/001-Super%20Mario%20Odyssey%20.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/004-The%20Legend%20of%20Zelda%20Skyward%20Sword%20HD.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/007-Pokemon%20Sword.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/010-Hyrule%20Warriors%20Age%20of%20Calamity.png</image></screenshot>
-    <screenshot><image>https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png</image></screenshot>
-  </screenshots>
-</component>
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp
index eeff54359..61a6efc7c 100644
--- a/src/yuzu/about_dialog.cpp
+++ b/src/yuzu/about_dialog.cpp
@@ -20,7 +20,7 @@ AboutDialog::AboutDialog(QWidget* parent)
 
     ui->setupUi(this);
     // Try and request the icon from Qt theme (Linux?)
-    const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("org.yuzu_emu.yuzu"));
+    const QIcon yuzu_logo = QIcon::fromTheme(QStringLiteral("onion.torzu_emu.torzu"));
     if (!yuzu_logo.isNull()) {
         ui->labelLogo->setPixmap(yuzu_logo.pixmap(200));
     }
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 3d38fb258..62114aa57 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -5292,7 +5292,7 @@ int main(int argc, char* argv[]) {
 
     // Fix the Wayland appId. This needs to match the name of the .desktop file without the .desktop
     // suffix.
-    QGuiApplication::setDesktopFileName(QStringLiteral("org.yuzu_emu.yuzu"));
+    QGuiApplication::setDesktopFileName(QStringLiteral("onion.torzu_emu.torzu"));
 #endif
 
     SetHighDPIAttributes();