diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-18 15:12:36 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 15:34:32 +0200 |
| commit | 767bfd8586734190229e5946f62f9e72b22de274 (patch) | |
| tree | 5c899e484829e5276c99048e64862159f9ea68b4 | |
| parent | 895bc428e93fa0ca4bbd36c4067bcc45bbb8bc0d (diff) | |
| download | meta-openembedded-767bfd8586734190229e5946f62f9e72b22de274.tar.gz | |
gnome-themes: drop localedir override from configure to fix locale installation
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch | 22 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb | 4 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch b/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch new file mode 100644 index 0000000000..e37482b97b --- /dev/null +++ b/meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch @@ -0,0 +1,22 @@ +Causes locale file to be installed in /usr/locale instead of /usr/share/locale + +Apply the same fix as in evolution-data-server: +https://git.gnome.org/browse/evolution-data-server/commit/configure.ac?id=ec46c763e9342f604b7228c660623d271dfeb101 + +Upstream-Status: Pending + +diff -uNr gnome-themes-2.32.1.orig/configure.in gnome-themes-2.32.1/configure.in +--- gnome-themes-2.32.1.orig/configure.in 2015-09-18 15:01:25.152055729 +0200 ++++ gnome-themes-2.32.1/configure.in 2015-09-18 15:09:03.312072156 +0200 +@@ -19,11 +19,6 @@ + + AM_GLIB_GNU_GETTEXT + +-# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME +-# this is the directory where the *.{mo,gmo} files are installed +-localedir='${prefix}/${DATADIRNAME}/locale' +-AC_SUBST(localedir) +- + # Workaround to make aclocal get the right flags + AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") + diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb index 90bc63c2af..df50684b1f 100644 --- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb +++ b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb @@ -25,7 +25,9 @@ FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist" FILES_${PN} += "${datadir}/themes ${datadir}/icons" -SRC_URI += "file://iconpath-option.patch" +SRC_URI += "file://iconpath-option.patch \ + file://drop-localedir-override.patch \ +" SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1" SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a" GNOME_COMPRESS_TYPE="bz2" |