diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.2-gcc15-stdint.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.2-gcc15-stdint.patch
similarity index 100%
rename from dev-libs/rocr-runtime/files/rocr-runtime-6.2.2-gcc15-stdint.patch
rename to dev-libs/rocr-runtime/files/rocr-runtime-6.1.2-gcc15-stdint.patch
diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild
index 4caff8c750f22..a16005a972f1a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
 	"${FILESDIR}/${PN}-6.1.0-musl.patch"
 	"${FILESDIR}/${PN}-6.1.0-ld-lld.patch"
+	"${FILESDIR}/${PN}-6.1.2-gcc15-stdint.patch"
 )
 
 LICENSE="MIT"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild
index 0fe1225bfb408..d5f08251958d1 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ src_prepare() {
 	cd "${S}/runtime/hsa-runtime" || die
 	eapply "${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
 	eapply "${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
-	eapply "${FILESDIR}/${PN}-6.2.2-gcc15-stdint.patch"
+	eapply "${FILESDIR}/${PN}-6.1.2-gcc15-stdint.patch"
 
 	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
 	sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die