From a418219b36c200ec0d7294a49ddd8d5deb4d8842 Mon Sep 17 00:00:00 2001
From: dimstar <>
Date: Mar 25 2025 21:31:40 +0000
Subject: Update geany to version 2.0 / rev 44 via SR 1255575
https://build.opensuse.org/request/show/1255575
by user dimstar + anag+factory
- Add geany-2.0-gcc15.patch: Fix build with gcc 15 (patch lifted
from gentoo). (forwarded request 1254849 from iznogood)
---
diff --git a/.files b/.files
index 29ad7ec..a87a53b 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index bd0f39d..941a33d 100644
--- a/.rev
+++ b/.rev
@@ -521,4 +521,13 @@
<comment></comment>
<requestid>1170052</requestid>
</revision>
+ <revision rev="44" vrev="3">
+ <srcmd5>ea945ab4e908c63fd6c3932b25fb8ab6</srcmd5>
+ <version>2.0</version>
+ <time>1742936882</time>
+ <user>anag+factory</user>
+ <comment>- Add geany-2.0-gcc15.patch: Fix build with gcc 15 (patch lifted
+ from gentoo). (forwarded request 1254849 from iznogood)</comment>
+ <requestid>1255575</requestid>
+ </revision>
</revisionlist>
diff --git a/geany-2.0-gcc15.patch b/geany-2.0-gcc15.patch
new file mode 100644
index 0000000..259bea2
--- /dev/null
+++ b/geany-2.0-gcc15.patch
@@ -0,0 +1,86 @@
+# https://sourceforge.net/p/scintilla/code/ci/c7ffad21b23dfad4e8e9f36bb587acc2f6e84fee/
+--- a/scintilla/gtk/PlatGTK.cxx
++++ b/scintilla/gtk/PlatGTK.cxx
+@@ -7,2 +7,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+--- a/scintilla/src/AutoComplete.cxx
++++ b/scintilla/src/AutoComplete.cxx
+@@ -9,2 +9,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+--- a/scintilla/src/CallTip.cxx
++++ b/scintilla/src/CallTip.cxx
+@@ -9,2 +9,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+--- a/scintilla/src/CellBuffer.cxx
++++ b/scintilla/src/CellBuffer.cxx
+@@ -9,2 +9,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+--- a/scintilla/src/ChangeHistory.cxx
++++ b/scintilla/src/ChangeHistory.cxx
+@@ -9,2 +9,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+--- a/scintilla/src/Decoration.cxx
++++ b/scintilla/src/Decoration.cxx
+@@ -8,2 +8,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
+--- a/scintilla/src/Document.cxx
++++ b/scintilla/src/Document.cxx
+@@ -9,2 +9,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cassert>
+--- a/scintilla/src/Indicator.cxx
++++ b/scintilla/src/Indicator.cxx
+@@ -7,2 +7,3 @@
+
++#include <cstdint>
+ #include <cmath>
+--- a/scintilla/src/KeyMap.cxx
++++ b/scintilla/src/KeyMap.cxx
+@@ -8,2 +8,3 @@
+ #include <cstdlib>
++#include <cstdint>
+
+--- a/scintilla/src/LineMarker.cxx
++++ b/scintilla/src/LineMarker.cxx
+@@ -7,2 +7,3 @@
+
++#include <cstdint>
+ #include <cstring>
+--- a/scintilla/src/PerLine.cxx
++++ b/scintilla/src/PerLine.cxx
+@@ -8,2 +8,3 @@
+ #include <cstddef>
++#include <cstdint>
+ #include <cassert>
+--- a/scintilla/src/Style.cxx
++++ b/scintilla/src/Style.cxx
+@@ -7,2 +7,4 @@
+
++#include <cstdint>
++
+ #include <stdexcept>
+--- a/scintilla/src/ViewStyle.cxx
++++ b/scintilla/src/ViewStyle.cxx
+@@ -8,2 +8,3 @@
+ #include <cstddef>
++#include <cstdint>
+ #include <cassert>
+--- a/scintilla/src/XPM.cxx
++++ b/scintilla/src/XPM.cxx
+@@ -8,2 +8,3 @@
+ #include <cstdlib>
++#include <cstdint>
+ #include <cstring>
diff --git a/geany.changes b/geany.changes
index 755234d..f755410 100644
--- a/geany.changes
+++ b/geany.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Mar 20 21:44:43 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add geany-2.0-gcc15.patch: Fix build with gcc 15 (patch lifted
+ from gentoo).
+
+-------------------------------------------------------------------
Wed Apr 24 06:08:56 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
- Add reproducible.patch to make glfw build deterministic
diff --git a/geany.spec b/geany.spec
index e9690bb..7e0a1b9 100644
--- a/geany.spec
+++ b/geany.spec
@@ -1,7 +1,7 @@
#
# spec file for package geany
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,9 +25,14 @@ Group: Development/Tools/IDE
URL: https://geany.org
Source0: https://download.geany.org/%{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
+
# PATCH-FIX-UPSTREAM geany-appstream.patch gh#geany/geany#1142 badshah400@gmail.com -- Downstream created appstream file, submitted upstream
Patch1: geany-appstream.patch
+# PATCH-FIX-UPSTREAM reproducible.patch -- Make the build reproducible
Patch2: reproducible.patch
+# PATCH-FIX-UPSTREAM geany-2.0-gcc15.patch -- Fix build with gcc 15
+Patch3: geany-2.0-gcc15.patch
+
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docutils