diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-12-31 19:27:33 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-01-02 09:40:19 -0800 |
| commit | ea69b5d5bbf660fc12cd727a05f030d4473d7d5d (patch) | |
| tree | fcb75c644770161eca814f90be173f4fd6e57c1d | |
| parent | c12ae71c8d398a91492ebf09812260ef58221586 (diff) | |
| download | meta-openembedded-ea69b5d5bbf660fc12cd727a05f030d4473d7d5d.tar.gz | |
gtkperf: Fix build with latest gettext 0.20.x
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch b/meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch new file mode 100644 index 0000000000..4a727d3c06 --- /dev/null +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf/gettext.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | Fix build with gettext 0.20.x | ||
| 2 | |||
| 3 | Upstream-Status: Pending | ||
| 4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 5 | |||
| 6 | --- a/Makefile.am | ||
| 7 | +++ b/Makefile.am | ||
| 8 | @@ -3,7 +3,7 @@ | ||
| 9 | ## If you don't want it to overwrite it, | ||
| 10 | ## Please disable it in the Anjuta project configuration | ||
| 11 | |||
| 12 | -SUBDIRS = intl po src pixmaps | ||
| 13 | +SUBDIRS = po src pixmaps | ||
| 14 | |||
| 15 | gtkperfdocdir = ${prefix}/doc/gtkperf | ||
| 16 | gtkperfdoc_DATA = \ | ||
| 17 | --- a/configure.in | ||
| 18 | +++ b/configure.in | ||
| 19 | @@ -31,8 +31,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE | ||
| 20 | |||
| 21 | dnl Languages which your application supports | ||
| 22 | ALL_LINGUAS="" | ||
| 23 | -AM_GNU_GETTEXT | ||
| 24 | -AM_GNU_GETTEXT_VERSION(0.10.40) | ||
| 25 | +AM_GNU_GETTEXT([external]) | ||
| 26 | |||
| 27 | dnl Set PACKAGE_LOCALE_DIR in config.h. | ||
| 28 | if test "x${prefix}" = "xNONE"; then | ||
| 29 | @@ -100,7 +99,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, " | ||
| 30 | |||
| 31 | AC_OUTPUT([ | ||
| 32 | Makefile | ||
| 33 | -intl/Makefile | ||
| 34 | po/Makefile.in | ||
| 35 | src/Makefile | ||
| 36 | pixmaps/Makefile | ||
diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 6fe258271d..b4d94ff6a2 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb | |||
| @@ -7,6 +7,7 @@ SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BPN}_${PV}.tar.gz \ | |||
| 7 | file://Makevars \ | 7 | file://Makevars \ |
| 8 | file://0001-Include-stdlib.h-for-exit-API.patch \ | 8 | file://0001-Include-stdlib.h-for-exit-API.patch \ |
| 9 | file://0002-timing.c-Fix-format-security-errors.patch \ | 9 | file://0002-timing.c-Fix-format-security-errors.patch \ |
| 10 | file://gettext.patch \ | ||
| 10 | " | 11 | " |
| 11 | 12 | ||
| 12 | SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53" | 13 | SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53" |
