diff --git a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
index b966847195..e6db688974 100644
--- a/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
+++ b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch
@@ -11,12 +11,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
+@@ -9,6 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
  AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects])
  AC_CONFIG_HEADERS([config.h])
--
-+AC_PROG_INTLTOOL
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
  
- GEANY_PREFIX
++AC_PROG_INTLTOOL
+ # Silence "AC_LINK_IFELSE before AC_USE_SYSTEM_EXTENSIONS" warnings
+ # Note: Enables _GNU_SOURCE on Linux
+ AC_USE_SYSTEM_EXTENSIONS
diff --git a/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch
new file mode 100644
index 0000000000..2886b73d22
--- /dev/null
+++ b/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch
@@ -0,0 +1,146 @@
+Fix build with GCC-15
+
+Upstream-Status: Backport [https://sourceforge.net/p/scintilla/code/ci/c7ffad21b23dfad4e8e9f36bb587acc2f6e84fee/]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/scintilla/gtk/PlatGTK.cxx
++++ b/scintilla/gtk/PlatGTK.cxx
+@@ -5,6 +5,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+ #include <cstdio>
+ #include <cmath>
+--- a/scintilla/src/AutoComplete.cxx
++++ b/scintilla/src/AutoComplete.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/CallTip.cxx
++++ b/scintilla/src/CallTip.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/CellBuffer.cxx
++++ b/scintilla/src/CellBuffer.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/ChangeHistory.cxx
++++ b/scintilla/src/ChangeHistory.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ 
+ #include <stdexcept>
+--- a/scintilla/src/Decoration.cxx
++++ b/scintilla/src/Decoration.cxx
+@@ -6,6 +6,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+ #include <cstdio>
+ #include <cstdarg>
+--- a/scintilla/src/Document.cxx
++++ b/scintilla/src/Document.cxx
+@@ -7,6 +7,7 @@
+ 
+ #include <cstddef>
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cstdio>
+--- a/scintilla/src/Indicator.cxx
++++ b/scintilla/src/Indicator.cxx
+@@ -5,6 +5,7 @@
+ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
++#include <cstdint>
+ #include <cmath>
+ 
+ #include <stdexcept>
+--- a/scintilla/src/KeyMap.cxx
++++ b/scintilla/src/KeyMap.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstdlib>
++#include <cstdint>
+ 
+ #include <stdexcept>
+ #include <string_view>
+--- a/scintilla/src/LineMarker.cxx
++++ b/scintilla/src/LineMarker.cxx
+@@ -5,6 +5,7 @@
+ // Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <cmath>
+ 
+--- a/scintilla/src/PerLine.cxx
++++ b/scintilla/src/PerLine.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ 
+--- a/scintilla/src/Style.cxx
++++ b/scintilla/src/Style.cxx
+@@ -5,6 +5,8 @@
+ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
++#include <cstdint>
++
+ #include <stdexcept>
+ #include <string_view>
+ #include <vector>
+--- a/scintilla/src/ViewStyle.cxx
++++ b/scintilla/src/ViewStyle.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstddef>
++#include <cstdint>
+ #include <cassert>
+ #include <cstring>
+ #include <cmath>
+--- a/scintilla/src/XPM.cxx
++++ b/scintilla/src/XPM.cxx
+@@ -6,6 +6,7 @@
+ // The License.txt file describes the conditions under which this software may be distributed.
+ 
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+ #include <climits>
+ 
diff --git a/meta-oe/recipes-devtools/geany/geany_1.38.bb b/meta-oe/recipes-devtools/geany/geany_2.0.bb
similarity index 82%
rename from meta-oe/recipes-devtools/geany/geany_1.38.bb
rename to meta-oe/recipes-devtools/geany/geany_2.0.bb
index d75e3b57fb..4b51195e08 100644
--- a/meta-oe/recipes-devtools/geany/geany_1.38.bb
+++ b/meta-oe/recipes-devtools/geany/geany_2.0.bb
@@ -11,8 +11,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \
            file://0001-configure-Upgrade-to-a-modern-Gettext.patch \
+           file://geany-2.0-gcc15.patch \
           "
-SRC_URI[sha256sum] = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546"
+SRC_URI[sha256sum] = "565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92"
 
 FILES:${PN} += "${datadir}/icons"