From 635baa6fbfaf9e0b8a716921ff651b60850f0421 Mon Sep 17 00:00:00 2001 From: spectranator Date: Sun, 28 Apr 2024 22:12:42 +0200 Subject: [PATCH] Updated files, paths and URLs for Torzu --- .github/ISSUE_TEMPLATE/crash-report.yml | 2 +- .github/workflows/merge.js | 8 +++--- ...mu.yuzu.json => onion.torzu_emu.torzu.json | 26 +++++++------------ ....xml => onion.torzu_emu.torzu.metainfo.xml | 4 +-- ..._emu.yuzu.svg => onion.torzu_emu.torzu.svg | 0 yuzu-launcher.sh | 2 +- 6 files changed, 18 insertions(+), 24 deletions(-) rename org.yuzu_emu.yuzu.json => onion.torzu_emu.torzu.json (92%) rename org.yuzu_emu.yuzu.metainfo.xml => onion.torzu_emu.torzu.metainfo.xml (99%) rename org.yuzu_emu.yuzu.svg => onion.torzu_emu.torzu.svg (100%) diff --git a/.github/ISSUE_TEMPLATE/crash-report.yml b/.github/ISSUE_TEMPLATE/crash-report.yml index 71588a7..0a6bbc5 100644 --- a/.github/ISSUE_TEMPLATE/crash-report.yml +++ b/.github/ISSUE_TEMPLATE/crash-report.yml @@ -35,7 +35,7 @@ body: attributes: label: Logs and Backtraces description: | - If possible, please attach the yuzu log file and/or debugger backtrace file here ([how to obtain them](https://github.com/flathub/org.yuzu_emu.yuzu/blob/master/README.md#obtaining-necessary-information-for-bug-reports)) + If possible, please attach the yuzu log file and/or debugger backtrace file here ([how to obtain them](http://y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion/torzu-emu/onion.torzu_emu.torzu/src/branch/master#obtaining-a-debugger-trace-as-the-crash-happens)) Please **avoid pasting the log** into this box. Instead, use the __file upload__ function to attach the file. validations: required: false diff --git a/.github/workflows/merge.js b/.github/workflows/merge.js index a942591..3fce00e 100644 --- a/.github/workflows/merge.js +++ b/.github/workflows/merge.js @@ -34,14 +34,14 @@ async function closePullRequests(should_close, github) { } async function incrementVersion() { - const manifest = fs.readFileSync("org.yuzu_emu.yuzu.json", { + const manifest = fs.readFileSync("onion.torzu_emu.torzu.json", { encoding: "utf8", }); const version = /mainline-0-(\d+)/.exec(manifest)[1]; const new_manifest = manifest .replace(/-DDISPLAY_VERSION=\d+/, `-DDISPLAY_VERSION=${version}`) .replace(/-DBUILD_TAG=mainline-\d+/, `-DBUILD_TAG=mainline-${version}`); - fs.writeFileSync("org.yuzu_emu.yuzu.json", new_manifest); + fs.writeFileSync("onion.torzu_emu.torzu.json", new_manifest); } async function mergeChanges(branch, execa) { @@ -53,7 +53,7 @@ async function mergeChanges(branch, execa) { "user.email", "yuzu\x40yuzu-emu\x2eorg", // prevent email harvesters from scraping the address ]); - await execa("git", ["add", "org.yuzu_emu.yuzu.json"]); + await execa("git", ["add", "onion.torzu_emu.torzu.json"]); // amend the commit to include the version change const p1 = execa("git", ["commit", "--amend", "-C", "HEAD"]); p1.stdout.pipe(process.stdout); @@ -64,7 +64,7 @@ async function mergeChanges(branch, execa) { const p = await execa("git", [ "status", "--porcelain", - "org.yuzu_emu.yuzu.json", + "onion.torzu_emu.torzu.json", ]); if (p.stdout.length > 20) { console.info("Version was bumped by this script."); diff --git a/org.yuzu_emu.yuzu.json b/onion.torzu_emu.torzu.json similarity index 92% rename from org.yuzu_emu.yuzu.json rename to onion.torzu_emu.torzu.json index b4306c2..e19e8fd 100644 --- a/org.yuzu_emu.yuzu.json +++ b/onion.torzu_emu.torzu.json @@ -1,5 +1,5 @@ { - "app-id": "org.yuzu_emu.yuzu", + "app-id": "onion.torzu_emu.torzu", "runtime": "org.kde.Platform", "runtime-version": "5.15-23.08", "sdk": "org.kde.Sdk", @@ -267,18 +267,14 @@ "-DCMAKE_BUILD_TYPE=RelWithDebInfo", "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON", "-DENABLE_QT_TRANSLATION=ON", - "-DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON", - "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF", "-DYUZU_USE_QT_WEB_ENGINE=ON", "-DYUZU_USE_BUNDLED_FFMPEG=ON", - "-DDISPLAY_VERSION=1734", - "-DBUILD_TAG=mainline-1734", - "-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline" + "-DBUILD_REPOSITORY=torzu-emu/torzu" ], "build-options": { "env": { - "TITLEBARFORMATIDLE": "yuzu {}", - "TITLEBARFORMATRUNNING": "yuzu {} | {}" + "TITLEBARFORMATIDLE": "Torzu {}", + "TITLEBARFORMATRUNNING": "Torzu {} | {}" }, "arch": { "aarch64": { @@ -294,17 +290,15 @@ ], "post-install": [ "install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher", - "install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml /app/share/metainfo/org.yuzu_emu.yuzu.metainfo.xml", - "install -Dm644 ../org.yuzu_emu.yuzu.svg /app/share/icons/hicolor/scalable/apps/org.yuzu_emu.yuzu.svg", - "desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key Exec --set-value yuzu-launcher /app/share/applications/org.yuzu_emu.yuzu.desktop", + "install -Dm644 ../onion.torzu_emu.torzu.metainfo.xml /app/share/metainfo/onion.torzu_emu.torzu.metainfo.xml", + "install -Dm644 ../onion.torzu_emu.torzu.svg /app/share/icons/hicolor/scalable/apps/onion.torzu_emu.torzu.svg", + "desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key Exec --set-value yuzu-launcher /app/share/applications/onion.torzu_emu.torzu.desktop", "rm -rf /app/share/appdata" ], "sources": [ { "type": "git", - "url": "https://github.com/yuzu-emu/yuzu-mainline.git", - "tag": "mainline-0-1734", - "commit": "537296095ab24eddcb196b5ef98004f91de9c8c2", + "url": "https://github.com/litucks/torzu.git", "disable-shallow-clone": true, "x-checker-data": { "type": "git", @@ -313,11 +307,11 @@ }, { "type": "file", - "path": "org.yuzu_emu.yuzu.metainfo.xml" + "path": "onion.torzu_emu.torzu.metainfo.xml" }, { "type": "file", - "path": "org.yuzu_emu.yuzu.svg" + "path": "onion.torzu_emu.torzu.svg" }, { "type": "file", diff --git a/org.yuzu_emu.yuzu.metainfo.xml b/onion.torzu_emu.torzu.metainfo.xml similarity index 99% rename from org.yuzu_emu.yuzu.metainfo.xml rename to onion.torzu_emu.torzu.metainfo.xml index 2881367..9670284 100644 --- a/org.yuzu_emu.yuzu.metainfo.xml +++ b/onion.torzu_emu.torzu.metainfo.xml @@ -1,6 +1,6 @@ - org.yuzu_emu.yuzu + onion.torzu_emu.torzu CC0-1.0 yuzu Nintendo Switch emulator @@ -27,7 +27,7 @@ https://community.citra-emu.org/ https://github.com/yuzu-emu/yuzu/ https://github.com/yuzu-emu/yuzu/wiki/Contributing#contributing - org.yuzu_emu.yuzu.desktop + onion.torzu_emu.torzu.desktop yuzu yuzu-cmd diff --git a/org.yuzu_emu.yuzu.svg b/onion.torzu_emu.torzu.svg similarity index 100% rename from org.yuzu_emu.yuzu.svg rename to onion.torzu_emu.torzu.svg diff --git a/yuzu-launcher.sh b/yuzu-launcher.sh index 0eeee23..ac2baec 100755 --- a/yuzu-launcher.sh +++ b/yuzu-launcher.sh @@ -3,7 +3,7 @@ report_error() { read -r -d '|' MESSAGE <https://github.com/flathub/org.yuzu_emu.yuzu/issues. +We kindly ask you to submit a bug report to http://y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion/torzu-emu/onion.torzu_emu.torzu/issues. When submitting a bug report, please attach your system information and the yuzu log file. You seem to be using ${XDG_SESSION_DESKTOP} ${DESKTOP_SESSION} (${XDG_SESSION_TYPE}):