diff --git a/devel/appstream-compose/Makefile b/devel/appstream-compose/Makefile index 06b780de3734..07d24c7568f4 100644 --- a/devel/appstream-compose/Makefile +++ b/devel/appstream-compose/Makefile @@ -1,21 +1,21 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= Compose COMMENT?= AppStream Compose application and library LIB_DEPENDS= libappstream.so:devel/appstream USE_GNOME= cairo gdkpixbuf2 librsvg2 pango MESON_ARGS= -Dcompose=true MASTERDIR= ${.CURDIR}/../../devel/appstream PLIST= ${.CURDIR}/pkg-plist post-install: # remove files belonging to the master port ${XARGS} -L 1 -I % ${RM} -rf ${STAGEDIR}${PREFIX}/% < ${MASTERDIR}/pkg-plist ${FIND} ${STAGEDIR}${PREFIX} -empty -delete ${RM} -rf ${STAGEDIR}${PREFIX}/etc ${STAGEDIR}${PREFIX}/man .include "${MASTERDIR}/Makefile" diff --git a/devel/appstream/files/patch-compose_asc-utils-l10n.c b/devel/appstream/files/patch-compose_asc-utils-l10n.c new file mode 100644 index 000000000000..289b96b827f4 --- /dev/null +++ b/devel/appstream/files/patch-compose_asc-utils-l10n.c @@ -0,0 +1,15 @@ +--- compose/asc-utils-l10n.c.orig 2023-02-10 19:54:13 UTC ++++ compose/asc-utils-l10n.c +@@ -390,11 +390,7 @@ asc_l10n_search_translations_qt (AscLocaleContext *ctx + locale = g_strdup (fname + strlen (qm_root) + 1); + g_strdelimit (locale, ".", '\0'); + tmp = g_strstr_len (locale, -1, "/"); +- if (tmp != NULL) { +- /* we have the ${hint}/${locale}.qm form */ +- locale = tmp + 1; +- } +- if (!asc_l10n_parse_file_qt (ctx, unit, locale, fname, error)) ++ if (!asc_l10n_parse_file_qt (ctx, unit, tmp == NULL ? locale : tmp + 1, fname, error)) + return FALSE; + } + }