diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-02-05 23:29:56 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-02-05 23:31:07 -0800 |
| commit | 31e9791350a34e25d1ece43856210da3c1f6662c (patch) | |
| tree | 6b5be4b0769cc725efe6e753dab0bd5266540e49 /meta-oe/recipes-devtools/geany | |
| parent | 1ef86daeb53d37e28f9eba48ae8fdc377e7faacc (diff) | |
| download | meta-openembedded-31e9791350a34e25d1ece43856210da3c1f6662c.tar.gz | |
geany: Fix build with autotools 2.70+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/geany')
| -rw-r--r-- | meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch | 22 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/geany/geany_1.37.1.bb | 9 |
2 files changed, 25 insertions, 6 deletions
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 new file mode 100644 index 0000000000..b966847195 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany/0001-configure-Upgrade-to-a-modern-Gettext.patch @@ -0,0 +1,22 @@ +From 51e145b43e66134aa4b33c9af0319331ec8a5bce Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Feb 2021 23:15:45 -0800 +Subject: [PATCH] configure: Use AC_PROG_INTLTOOL + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/configure.ac ++++ b/configure.ac +@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux]) + 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 diff --git a/meta-oe/recipes-devtools/geany/geany_1.37.1.bb b/meta-oe/recipes-devtools/geany/geany_1.37.1.bb index 330daaace2..b361b11879 100644 --- a/meta-oe/recipes-devtools/geany/geany_1.37.1.bb +++ b/meta-oe/recipes-devtools/geany/geany_1.37.1.bb @@ -9,16 +9,13 @@ inherit features_check autotools pkgconfig perlnative gettext mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://download.geany.org/${BP}.tar.bz2" +SRC_URI = "https://download.geany.org/${BP}.tar.bz2 \ + file://0001-configure-Upgrade-to-a-modern-Gettext.patch \ + " SRC_URI[sha256sum] = "18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18" FILES_${PN} += "${datadir}/icons" EXTRA_OECONF = "--disable-html-docs" -do_configure_prepend() { - cd ${S} - intltoolize --copy --force --automake -} - RRECOMMENDS_${PN} += "source-code-pro-fonts" |