Skip to content
This repository was archived by the owner on Feb 1, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [FreeBSD, Solaris]
target: [FreeBSD]
env:
TARGET: ${{ matrix.target }}
CCACHE_DIR: ${{ github.workspace }}/.ccache
Expand Down
2 changes: 1 addition & 1 deletion changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ echo "| Windows (CLANG) | [\`x86_64\`](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}
echo "| Windows (MSYS2) | [\`x86_64\`](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}-Windows-MSYS2-x86_64.zip)<br><br>\
[\`arm64\`](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}-Windows-MSYS2-arm64.zip) |" >> "$CHANGELOG_FILE"
echo "| FreeBSD | [\`amd64\`](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}-FreeBSD-amd64.tar.gz) | " >> "$CHANGELOG_FILE"
echo "| Solaris | [\`amd64\`](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}-Solaris-amd64.tar.gz) | " >> "$CHANGELOG_FILE"
# echo "| Solaris | [\`amd64\`](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}-Solaris-amd64.tar.gz) | " >> "$CHANGELOG_FILE"
echo "| MacOS | [\`arm64\`](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}-MacOS-arm64.zip) |" >> "$CHANGELOG_FILE"
echo "| Source Code | [Source](${BASE_DOWNLOAD_URL}/${TAG}/Eden-${COUNT}-Source-Code.7z) | |" >> "$CHANGELOG_FILE"
echo " - Added release table."
Expand Down
16 changes: 8 additions & 8 deletions patches/changelog.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe73f558c9..ef3fef7f6d 100644
index 147d175989..9220f5c909 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -601,6 +601,10 @@ if (ENABLE_QT)
@@ -605,6 +605,10 @@ if (ENABLE_QT)
find_package(Qt6 REQUIRED COMPONENTS Multimedia)
endif()

Expand All @@ -14,7 +14,7 @@ index fe73f558c9..ef3fef7f6d 100644
# yes Qt, we get it
set(QT_NO_PRIVATE_MODULE_WARNING ON)
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
index 23716ac5a5..20305f5d35 100644
index 23716ac5a5..4e6855ef43 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@@ -180,19 +180,57 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
Expand Down Expand Up @@ -53,7 +53,7 @@ index 23716ac5a5..20305f5d35 100644
+ .replace(Regex("\\[(.*?)\\]\\((.*?)\\)"), "<a href=\"$2\">$1</a>")
+ .replace(Regex("\\*\\*(.*?)\\*\\*"), "<b>$1</b>")
+ .replace(Regex("`(.*?)`"), "<font color='#FF4081'><tt>$1</tt></font>")
+ .replace("- Merged commit:", "• <b>Merged commit:</b>")
+ .replace("- Merged commit:", "• Merged commit:")
+ .replace("\n", "<br>")
+ .replace(Regex("^<br>+"), "")
+
Expand Down Expand Up @@ -414,7 +414,7 @@ index 957843bee0..b8f6a46cff 100644
+
} // namespace UpdateChecker
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 87d4652b07..e919eafeb9 100644
index 35c6f80e40..a3384605fe 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -391,7 +391,7 @@ elseif(WIN32)
Expand All @@ -427,7 +427,7 @@ index 87d4652b07..e919eafeb9 100644
target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)

diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp
index d44cc6f731..b106310c6b 100644
index d44cc6f731..e4a1eeb732 100644
--- a/src/yuzu/main_window.cpp
+++ b/src/yuzu/main_window.cpp
@@ -58,18 +58,26 @@
Expand Down Expand Up @@ -550,7 +550,7 @@ index d44cc6f731..b106310c6b 100644
+ QString html_changelog = changelog.toHtmlEscaped();
+
+ html_changelog.replace(QStringLiteral("- Merged commit:"),
+ QStringLiteral("&bull; <b>Merged commit:</b>"));
+ QStringLiteral("&bull; Merged commit:"));
+
+ static QRegularExpression link_re(QStringLiteral(R"(\[(.*?)\]\((.*?)\))"));
+ html_changelog.replace(link_re, QStringLiteral(R"(<a href="\2">\1</a>)"));
Expand All @@ -576,7 +576,7 @@ index d44cc6f731..b106310c6b 100644
+ log_view->setTextInteractionFlags(Qt::TextBrowserInteraction);
+
+ log_view->setMinimumHeight(200);
+ log_view->setMaximumHeight(400);
+ log_view->setMaximumHeight(500);
+ main_layout->addWidget(log_view);
+ }

Expand Down
Loading