From d576fa2ab4bd5dd2d8df457dee52c361cffbc219 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 3 May 2025 01:40:37 -0700 Subject: geany: Upgrade to 2.0 release Signed-off-by: Khem Raj --- ...001-configure-Upgrade-to-a-modern-Gettext.patch | 11 +- .../geany/geany/geany-2.0-gcc15.patch | 146 +++++++++++++++++++++ meta-oe/recipes-devtools/geany/geany_1.38.bb | 21 --- meta-oe/recipes-devtools/geany/geany_2.0.bb | 22 ++++ 4 files changed, 173 insertions(+), 27 deletions(-) create mode 100644 meta-oe/recipes-devtools/geany/geany/geany-2.0-gcc15.patch delete mode 100644 meta-oe/recipes-devtools/geany/geany_1.38.bb create mode 100644 meta-oe/recipes-devtools/geany/geany_2.0.bb (limited to 'meta-oe/recipes-devtools') 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 --- 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 + +--- a/scintilla/gtk/PlatGTK.cxx ++++ b/scintilla/gtk/PlatGTK.cxx +@@ -5,6 +5,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/AutoComplete.cxx ++++ b/scintilla/src/AutoComplete.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/CallTip.cxx ++++ b/scintilla/src/CallTip.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/CellBuffer.cxx ++++ b/scintilla/src/CellBuffer.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/ChangeHistory.cxx ++++ b/scintilla/src/ChangeHistory.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + + #include +--- a/scintilla/src/Decoration.cxx ++++ b/scintilla/src/Decoration.cxx +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/Document.cxx ++++ b/scintilla/src/Document.cxx +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + #include + #include +--- a/scintilla/src/Indicator.cxx ++++ b/scintilla/src/Indicator.cxx +@@ -5,6 +5,7 @@ + // Copyright 1998-2001 by Neil Hodgson + // The License.txt file describes the conditions under which this software may be distributed. + ++#include + #include + + #include +--- 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 ++#include + + #include + #include +--- a/scintilla/src/LineMarker.cxx ++++ b/scintilla/src/LineMarker.cxx +@@ -5,6 +5,7 @@ + // Copyright 1998-2011 by Neil Hodgson + // The License.txt file describes the conditions under which this software may be distributed. + ++#include + #include + #include + +--- 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 ++#include + #include + #include + +--- a/scintilla/src/Style.cxx ++++ b/scintilla/src/Style.cxx +@@ -5,6 +5,8 @@ + // Copyright 1998-2001 by Neil Hodgson + // The License.txt file describes the conditions under which this software may be distributed. + ++#include ++ + #include + #include + #include +--- 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 ++#include + #include + #include + #include +--- 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 ++#include + #include + #include + diff --git a/meta-oe/recipes-devtools/geany/geany_1.38.bb b/meta-oe/recipes-devtools/geany/geany_1.38.bb deleted file mode 100644 index d75e3b57fb..0000000000 --- a/meta-oe/recipes-devtools/geany/geany_1.38.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A fast and lightweight IDE" -HOMEPAGE = "http://www.geany.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" - -DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native" - -inherit features_check autotools pkgconfig perlnative gettext mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ - file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ - " -SRC_URI[sha256sum] = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546" - -FILES:${PN} += "${datadir}/icons" - -EXTRA_OECONF = "--disable-html-docs" - -RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-oe/recipes-devtools/geany/geany_2.0.bb b/meta-oe/recipes-devtools/geany/geany_2.0.bb new file mode 100644 index 0000000000..4b51195e08 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany_2.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "A fast and lightweight IDE" +HOMEPAGE = "http://www.geany.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" + +DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native" + +inherit features_check autotools pkgconfig perlnative gettext mime-xdg + +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" + +FILES:${PN} += "${datadir}/icons" + +EXTRA_OECONF = "--disable-html-docs" + +RRECOMMENDS:${PN} += "source-code-pro-fonts" -- cgit v1.2.3-54-g00ecf