CVS commit: pkgsrc/inputmethod/fcitx5

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 27 13:17:34 UTC 2022

Modified Files:
        pkgsrc/inputmethod/fcitx5: Makefile PLIST

Log Message:
fcitx5: handle xdg autostart .desktop file correctly. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/inputmethod/fcitx5/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/fcitx5/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/fcitx5/Makefile
diff -u pkgsrc/inputmethod/fcitx5/Makefile:1.4 pkgsrc/inputmethod/fcitx5/Makefile:1.5
--- pkgsrc/inputmethod/fcitx5/Makefile:1.4      Wed Dec  8 16:05:12 2021
+++ pkgsrc/inputmethod/fcitx5/Makefile  Sun Mar 27 13:17:34 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2021/12/08 16:05:12 adam Exp $
+# $NetBSD: Makefile,v 1.5 2022/03/27 13:17:34 tnn Exp $
 
 DISTNAME=      fcitx5-5.0.5
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://download.fcitx-im.org/fcitx5/fcitx5/
 EXTRACT_SUFX=  .tar.xz
@@ -47,6 +47,16 @@ PKGCONFIG_OVERRIDE+= src/lib/fcitx-utils
 PKGCONFIG_OVERRIDE+=   src/lib/fcitx/Fcitx5Core.pc.in
 PKGCONFIG_OVERRIDE+=   src/modules/Fcitx5Module.pc.in
 
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       pre-configure
+SUBST_MESSAGE.xdg=     Fix desktop autostart file installation
+SUBST_FILES.xdg=       data/CMakeLists.txt
+SUBST_SED.xdg=         -e 's,{CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart,{CMAKE_INSTALL_PREFIX}/share/examples/fcitx5,'
+
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/autostart
+CONF_FILES+=   ${PREFIX}/share/examples/fcitx5/org.fcitx.Fcitx5.desktop        \
+               ${PKG_SYSCONFDIR}/xdg/autostart/org.fcitx.Fcitx5.desktop
+
 pre-configure:
        ${LN} -s ${DISTDIR}/en_dict-20121020.tar.gz \
                ${WRKSRC}/src/modules/spell/dict
@@ -61,6 +71,7 @@ pre-configure:
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/cldr-emoji-annotation/buildlink3.mk"
 .include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"

Index: pkgsrc/inputmethod/fcitx5/PLIST
diff -u pkgsrc/inputmethod/fcitx5/PLIST:1.1 pkgsrc/inputmethod/fcitx5/PLIST:1.2
--- pkgsrc/inputmethod/fcitx5/PLIST:1.1 Wed Feb 17 15:16:25 2021
+++ pkgsrc/inputmethod/fcitx5/PLIST     Sun Mar 27 13:17:34 2022
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2021/02/17 15:16:25 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/03/27 13:17:34 tnn Exp $
 bin/fcitx5
 bin/fcitx5-configtool
 bin/fcitx5-diagnose
 bin/fcitx5-remote
-etc/xdg/autostart/org.fcitx.Fcitx5.desktop
 include/Fcitx5/Config/fcitx-config/configuration.h
 include/Fcitx5/Config/fcitx-config/dbushelper.h
 include/Fcitx5/Config/fcitx-config/enum.h
@@ -169,6 +168,7 @@ lib/pkgconfig/Fcitx5Utils.pc
 share/applications/fcitx5-configtool.desktop
 share/applications/org.fcitx.Fcitx5.desktop
 share/dbus-1/services/org.fcitx.Fcitx5.service
+share/examples/fcitx5/org.fcitx.Fcitx5.desktop
 share/fcitx5/addon/classicui.conf
 share/fcitx5/addon/clipboard.conf
 share/fcitx5/addon/dbus.conf