Updated files, paths and URLs for Torzu
This commit is contained in:
parent
f7ae2a859b
commit
635baa6fbf
6 changed files with 18 additions and 24 deletions
2
.github/ISSUE_TEMPLATE/crash-report.yml
vendored
2
.github/ISSUE_TEMPLATE/crash-report.yml
vendored
|
@ -35,7 +35,7 @@ body:
|
||||||
attributes:
|
attributes:
|
||||||
label: Logs and Backtraces
|
label: Logs and Backtraces
|
||||||
description: |
|
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.
|
Please **avoid pasting the log** into this box. Instead, use the __file upload__ function to attach the file.
|
||||||
validations:
|
validations:
|
||||||
required: false
|
required: false
|
||||||
|
|
8
.github/workflows/merge.js
vendored
8
.github/workflows/merge.js
vendored
|
@ -34,14 +34,14 @@ async function closePullRequests(should_close, github) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function incrementVersion() {
|
async function incrementVersion() {
|
||||||
const manifest = fs.readFileSync("org.yuzu_emu.yuzu.json", {
|
const manifest = fs.readFileSync("onion.torzu_emu.torzu.json", {
|
||||||
encoding: "utf8",
|
encoding: "utf8",
|
||||||
});
|
});
|
||||||
const version = /mainline-0-(\d+)/.exec(manifest)[1];
|
const version = /mainline-0-(\d+)/.exec(manifest)[1];
|
||||||
const new_manifest = manifest
|
const new_manifest = manifest
|
||||||
.replace(/-DDISPLAY_VERSION=\d+/, `-DDISPLAY_VERSION=${version}`)
|
.replace(/-DDISPLAY_VERSION=\d+/, `-DDISPLAY_VERSION=${version}`)
|
||||||
.replace(/-DBUILD_TAG=mainline-\d+/, `-DBUILD_TAG=mainline-${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) {
|
async function mergeChanges(branch, execa) {
|
||||||
|
@ -53,7 +53,7 @@ async function mergeChanges(branch, execa) {
|
||||||
"user.email",
|
"user.email",
|
||||||
"yuzu\x40yuzu-emu\x2eorg", // prevent email harvesters from scraping the address
|
"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
|
// amend the commit to include the version change
|
||||||
const p1 = execa("git", ["commit", "--amend", "-C", "HEAD"]);
|
const p1 = execa("git", ["commit", "--amend", "-C", "HEAD"]);
|
||||||
p1.stdout.pipe(process.stdout);
|
p1.stdout.pipe(process.stdout);
|
||||||
|
@ -64,7 +64,7 @@ async function mergeChanges(branch, execa) {
|
||||||
const p = await execa("git", [
|
const p = await execa("git", [
|
||||||
"status",
|
"status",
|
||||||
"--porcelain",
|
"--porcelain",
|
||||||
"org.yuzu_emu.yuzu.json",
|
"onion.torzu_emu.torzu.json",
|
||||||
]);
|
]);
|
||||||
if (p.stdout.length > 20) {
|
if (p.stdout.length > 20) {
|
||||||
console.info("Version was bumped by this script.");
|
console.info("Version was bumped by this script.");
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"app-id": "org.yuzu_emu.yuzu",
|
"app-id": "onion.torzu_emu.torzu",
|
||||||
"runtime": "org.kde.Platform",
|
"runtime": "org.kde.Platform",
|
||||||
"runtime-version": "5.15-23.08",
|
"runtime-version": "5.15-23.08",
|
||||||
"sdk": "org.kde.Sdk",
|
"sdk": "org.kde.Sdk",
|
||||||
|
@ -267,18 +267,14 @@
|
||||||
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
|
"-DCMAKE_BUILD_TYPE=RelWithDebInfo",
|
||||||
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
|
"-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
|
||||||
"-DENABLE_QT_TRANSLATION=ON",
|
"-DENABLE_QT_TRANSLATION=ON",
|
||||||
"-DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON",
|
|
||||||
"-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF",
|
|
||||||
"-DYUZU_USE_QT_WEB_ENGINE=ON",
|
"-DYUZU_USE_QT_WEB_ENGINE=ON",
|
||||||
"-DYUZU_USE_BUNDLED_FFMPEG=ON",
|
"-DYUZU_USE_BUNDLED_FFMPEG=ON",
|
||||||
"-DDISPLAY_VERSION=1734",
|
"-DBUILD_REPOSITORY=torzu-emu/torzu"
|
||||||
"-DBUILD_TAG=mainline-1734",
|
|
||||||
"-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline"
|
|
||||||
],
|
],
|
||||||
"build-options": {
|
"build-options": {
|
||||||
"env": {
|
"env": {
|
||||||
"TITLEBARFORMATIDLE": "yuzu {}",
|
"TITLEBARFORMATIDLE": "Torzu {}",
|
||||||
"TITLEBARFORMATRUNNING": "yuzu {} | {}"
|
"TITLEBARFORMATRUNNING": "Torzu {} | {}"
|
||||||
},
|
},
|
||||||
"arch": {
|
"arch": {
|
||||||
"aarch64": {
|
"aarch64": {
|
||||||
|
@ -294,17 +290,15 @@
|
||||||
],
|
],
|
||||||
"post-install": [
|
"post-install": [
|
||||||
"install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher",
|
"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 ../onion.torzu_emu.torzu.metainfo.xml /app/share/metainfo/onion.torzu_emu.torzu.metainfo.xml",
|
||||||
"install -Dm644 ../org.yuzu_emu.yuzu.svg /app/share/icons/hicolor/scalable/apps/org.yuzu_emu.yuzu.svg",
|
"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/org.yuzu_emu.yuzu.desktop",
|
"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"
|
"rm -rf /app/share/appdata"
|
||||||
],
|
],
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/yuzu-emu/yuzu-mainline.git",
|
"url": "https://github.com/litucks/torzu.git",
|
||||||
"tag": "mainline-0-1734",
|
|
||||||
"commit": "537296095ab24eddcb196b5ef98004f91de9c8c2",
|
|
||||||
"disable-shallow-clone": true,
|
"disable-shallow-clone": true,
|
||||||
"x-checker-data": {
|
"x-checker-data": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -313,11 +307,11 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "org.yuzu_emu.yuzu.metainfo.xml"
|
"path": "onion.torzu_emu.torzu.metainfo.xml"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "org.yuzu_emu.yuzu.svg"
|
"path": "onion.torzu_emu.torzu.svg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "file",
|
"type": "file",
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<component type="desktop-application">
|
<component type="desktop-application">
|
||||||
<id>org.yuzu_emu.yuzu</id>
|
<id>onion.torzu_emu.torzu</id>
|
||||||
<metadata_license>CC0-1.0</metadata_license>
|
<metadata_license>CC0-1.0</metadata_license>
|
||||||
<name>yuzu</name>
|
<name>yuzu</name>
|
||||||
<summary>Nintendo Switch emulator</summary>
|
<summary>Nintendo Switch emulator</summary>
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
<url type="contact">https://community.citra-emu.org/</url>
|
<url type="contact">https://community.citra-emu.org/</url>
|
||||||
<url type="vcs-browser">https://github.com/yuzu-emu/yuzu/</url>
|
<url type="vcs-browser">https://github.com/yuzu-emu/yuzu/</url>
|
||||||
<url type="contribute">https://github.com/yuzu-emu/yuzu/wiki/Contributing#contributing</url>
|
<url type="contribute">https://github.com/yuzu-emu/yuzu/wiki/Contributing#contributing</url>
|
||||||
<launchable type="desktop-id">org.yuzu_emu.yuzu.desktop</launchable>
|
<launchable type="desktop-id">onion.torzu_emu.torzu.desktop</launchable>
|
||||||
<provides>
|
<provides>
|
||||||
<binary>yuzu</binary>
|
<binary>yuzu</binary>
|
||||||
<binary>yuzu-cmd</binary>
|
<binary>yuzu-cmd</binary>
|
Before Width: | Height: | Size: 899 B After Width: | Height: | Size: 899 B |
|
@ -3,7 +3,7 @@
|
||||||
report_error() {
|
report_error() {
|
||||||
read -r -d '|' MESSAGE <<EOF
|
read -r -d '|' MESSAGE <<EOF
|
||||||
Unfortunately, yuzu seems to have crashed.
|
Unfortunately, yuzu seems to have crashed.
|
||||||
We kindly ask you to submit a bug report to <a href="https://github.com/flathub/org.yuzu_emu.yuzu/issues">https://github.com/flathub/org.yuzu_emu.yuzu/issues</a>.
|
We kindly ask you to submit a bug report to <a href="http://y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion/torzu-emu/onion.torzu_emu.torzu/issues">http://y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion/torzu-emu/onion.torzu_emu.torzu/issues</a>.
|
||||||
|
|
||||||
When submitting a bug report, please attach your <b>system information</b> and the <b>yuzu log file</b>.
|
When submitting a bug report, please attach your <b>system information</b> and the <b>yuzu log file</b>.
|
||||||
You seem to be using ${XDG_SESSION_DESKTOP} ${DESKTOP_SESSION} (${XDG_SESSION_TYPE}):
|
You seem to be using ${XDG_SESSION_DESKTOP} ${DESKTOP_SESSION} (${XDG_SESSION_TYPE}):
|
||||||
|
|
Loading…
Reference in a new issue