Standard gettext should be used over glib's glue these days. AM_GLIB_GNU_GETTEXT and glib-gettextize are deprecated. This helps possible meson build (no concrete plans yet) as well as working with intltool is harder over there. gettext, on the other hand, is supported out of the box in meson.
Beware, autopoint is a new dependency when building from git, should not affect tarballs. Also, it's already required by Geany core.
Additionally, autogen.sh follows Geany's autogen.sh more closely, allowing for out-of-tree builds.
You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany-plugins/pull/1183
-- Commit Summary --
* Use standard gettext, following Geany core. * Fix issues found by standard gettext * Update po files after gettext transition.
-- File Changes --
M .github/workflows/build.yml (1) M .gitignore (7) M autogen.sh (11) M build/common.m4 (1) M build/i18n.m4 (10) M configure.ac (8) A po/LINGUAS (1) A po/Makevars (82) M po/POTFILES.in (8) M po/be.po (710) M po/ca.po (771) M po/da.po (697) M po/de.po (966) M po/el.po (690) M po/es.po (952) M po/fr.po (950) M po/gl.po (780) M po/it.po (847) M po/ja.po (770) M po/kk.po (720) M po/nl.po (812) M po/pt.po (0) M po/pt_BR.po (0) M po/ru.po (0) M po/tr.po (0) M po/uk.po (0) M po/zh_CN.po (0) M treebrowser/src/treebrowser.c (0)
-- Patch Links --
https://github.com/geany/geany-plugins/pull/1183.patch https://github.com/geany/geany-plugins/pull/1183.diff
@eht16 commented on this pull request.
GETTEXT_PACKAGE=geany-plugins
AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED( - [GETTEXT_PACKAGE], + o [GETTEXT_PACKAGE],
Is this a typo or some special M4 syntax?
@eht16 commented on this pull request.
@@ -16,9 +16,11 @@ AM_PROG_CC_C_O
AC_DISABLE_STATIC AC_PROG_LIBTOOL
-dnl i18n -IT_PROG_INTLTOOL([0.35.0]) -GP_I18N
If we don't call `GP_I18N` here anymore, couldn't we remove `build/i18n.m4` completely?
If so, we probably need to declare `LOCALEDIR` here or still use `GP_I18N`.
Apart from the comments above, LGBI. I would test it on Linux and Windows when my questions are answered.
@kugel- commented on this pull request.
GETTEXT_PACKAGE=geany-plugins
AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED( - [GETTEXT_PACKAGE], + o [GETTEXT_PACKAGE],
typo, file will be removed
@kugel- commented on this pull request.
@@ -16,9 +16,11 @@ AM_PROG_CC_C_O
AC_DISABLE_STATIC AC_PROG_LIBTOOL
-dnl i18n -IT_PROG_INTLTOOL([0.35.0]) -GP_I18N
Sorry for the delay. Yes, you're right, we can remove the file.
For LOCALEDIR, it seems we only use it really in C code, and we already have a `-DLOCALEDIR=xxx` in place. So I don't even think we need AC_SUBST anymore.
Alright. Roughly tested on Linux and seems to work.
@kugel- could you remove the `build/i18n.m4` file and fix the merge conflicts?
I think then we can merge.
github-comments@lists.geany.org