summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2018-01-04 05:07:57 +0200
committerMart Raudsepp <leio@gentoo.org>2018-01-04 19:18:10 +0200
commitca64147aee7b81492dcf304a919938630672b0d5 (patch)
tree0f943f744cefe8a21f325a83ebf0c1ffe0090c32
parentx11-libs/wxGTK: don't eautoreconf or rename configure.in files (diff)
downloadgentoo-ca64147aee7b81492dcf304a919938630672b0d5.tar.gz
gentoo-ca64147aee7b81492dcf304a919938630672b0d5.tar.bz2
gentoo-ca64147aee7b81492dcf304a919938630672b0d5.zip
x11-libs/wxGTK: fix translation installation and usage for SLOT=3.0-gtk3
Properly sed the .mo versioning and patch wxTranslations::AddStdCatalog to use the slotted translation domain. Closes: https://bugs.gentoo.org/618624 Package-Manager: Portage-2.3.19, Repoman-2.3.6
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch13
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild8
2 files changed, 19 insertions, 2 deletions
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch b/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch
new file mode 100644
index 000000000000..3b449baedb47
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0-gtk3-translation-domain.patch
@@ -0,0 +1,13 @@
+Modify AddStdCatalog to use the versioned wxstd30-gtk3.mo.
+
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+
+ bool wxTranslations::AddStdCatalog()
+ {
+- if ( !AddCatalog(wxS("wxstd")) )
++ if ( !AddCatalog(wxS("wxstd30-gtk3")) )
+ return false;
+
+ // there may be a catalog with toolkit specific overrides, it is not
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
index 6605d6d4ac86..0c69eb6d8c12 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
@@ -64,6 +64,10 @@ LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
S="${WORKDIR}/wxWidgets-${PV}"
+PATCHES=(
+ "${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
+)
+
src_prepare() {
default
@@ -73,8 +77,8 @@ src_prepare() {
-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
- -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
- -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
+ -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
+ -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
Makefile.in || die
sed -i \