Drop the patch that was for geany 2.0 and is now applied upstream in 2.1. Signed-off-by: Khem Raj <[email protected]> --- .../geany/geany/geany-2.0-gcc15.patch | 146 ------------------ .../geany/{geany_2.0.bb => geany_2.1.bb} | 3 +- 2 files changed, 1 insertion(+), 148 deletions(-) delete mode 100644 meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch rename meta-oe/recipes-devtools/geany/{geany_2.0.bb => geany_2.1.bb} (82%)
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 deleted file mode 100644 index 2886b73d22..0000000000 --- a/meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch +++ /dev/null @@ -1,146 +0,0 @@ -Fix build with GCC-15 - -Upstream-Status: Backport [https://sourceforge.net/p/scintilla/code/ci/c7ffad21b23dfad4e8e9f36bb587acc2f6e84fee/] -Signed-off-by: Khem Raj <[email protected]> - ---- 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 <[email protected]> - // 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 <[email protected]> - // 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 <[email protected]> - // 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_2.0.bb b/meta-oe/recipes-devtools/geany/geany_2.1.bb similarity index 82% rename from meta-oe/recipes-devtools/geany/geany_2.0.bb rename to meta-oe/recipes-devtools/geany/geany_2.1.bb index 4b51195e08..2a0c4e5b5b 100644 --- a/meta-oe/recipes-devtools/geany/geany_2.0.bb +++ b/meta-oe/recipes-devtools/geany/geany_2.1.bb @@ -11,9 +11,8 @@ 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] = "565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92" +SRC_URI[sha256sum] = "6b96a8844463300c10b9692a0a5edad8236eec9e84342f575f83d4fc89331228" FILES:${PN} += "${datadir}/icons"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127850): https://lists.openembedded.org/g/openembedded-devel/message/127850 Mute This Topic: https://lists.openembedded.org/mt/120013647/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
