pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/inputmethod/fcitx5-configtool

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 10 10:08:26 UTC 2024

Modified Files:
        pkgsrc/inputmethod/fcitx5-configtool: Makefile PLIST distinfo
Added Files:
        pkgsrc/inputmethod/fcitx5-configtool/patches:
            patch-src_migrator_lib_CMakeLists.txt

Log Message:
inputmethod/fcitx5-configtool: Update to 5.1.3

Changelog:
Update translations.
Cleanups.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/inputmethod/fcitx5-configtool/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/fcitx5-configtool/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/inputmethod/fcitx5-configtool/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx5-configtool/patches/patch-src_migrator_lib_CMakeLists.txt

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-configtool/Makefile
diff -u pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.18 pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.19
--- pkgsrc/inputmethod/fcitx5-configtool/Makefile:1.18  Sun Nov 12 13:22:25 2023
+++ pkgsrc/inputmethod/fcitx5-configtool/Makefile       Sat Feb 10 10:08:25 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2023/11/12 13:22:25 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2024/02/10 10:08:25 ryoon Exp $
 
-DISTNAME=      fcitx5-configtool-5.0.3
-PKGREVISION=   11
+DISTNAME=      fcitx5-configtool-5.1.3
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://download.fcitx-im.org/fcitx5/fcitx5-configtool/
 EXTRACT_SUFX=  .tar.xz
@@ -11,23 +10,20 @@ HOMEPAGE=   https://github.com/fcitx/fcitx
 COMMENT=       Config tool for fcitx5
 LICENSE=       gnu-gpl-v2
 
-BROKEN+=       "Incompatible with latest extra-cmake-modules, see https://bytemeta.vip/repo/fcitx/fcitx5-configtool/issues/38";
-
-USE_CMAKE=             yes
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config
 
 TOOL_DEPENDS+=         extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
 
-OBJDIR=                        ${WRKDIR}/build
-CONFIGURE_DIRS=                ${OBJDIR}
-CMAKE_ARG_PATH=                ${WRKSRC}
-
 CMAKE_ARGS+=           -DENABLE_KCM=off
 
-pre-configure:
-       ${MKDIR} ${WRKDIR}/build
+# CMAKE_INSTALL_RPATH does not work.
+SUBST_CLASSES+=                rpath
+SUBST_STAGE.rpath=     pre-configure
+SUBST_MESSAGE.rpath=   Setting RPATH
+SUBST_FILES.rpath+=    src/migrator/lib/CMakeLists.txt
+SUBST_VARS.rpath+=     COMPILER_RPATH_FLAG PREFIX QTDIR
 
 #.include "../../devel/kcoreaddons/buildlink3.mk"
 #.include "../../devel/kdeclarative/buildlink3.mk"
@@ -42,4 +38,5 @@ pre-configure:
 #.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../x11/xkeyboard-config/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/inputmethod/fcitx5-configtool/PLIST
diff -u pkgsrc/inputmethod/fcitx5-configtool/PLIST:1.2 pkgsrc/inputmethod/fcitx5-configtool/PLIST:1.3
--- pkgsrc/inputmethod/fcitx5-configtool/PLIST:1.2      Sat Feb 27 19:43:17 2021
+++ pkgsrc/inputmethod/fcitx5-configtool/PLIST  Sat Feb 10 10:08:25 2024
@@ -1,32 +1,35 @@
-@comment $NetBSD: PLIST,v 1.2 2021/02/27 19:43:17 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/02/10 10:08:25 ryoon Exp $
 bin/fcitx5-config-qt
 bin/fcitx5-migrator
 bin/kbd-layout-viewer5
 lib/libFcitx5Migrator.so
-lib/libFcitx5Migrator.so.5
+lib/libFcitx5Migrator.so.1
 lib/libFcitx5Migrator.so.${PKGVERSION}
 share/applications/kbd-layout-viewer5.desktop
 share/applications/org.fcitx.fcitx5-config-qt.desktop
 share/applications/org.fcitx.fcitx5-migrator.desktop
 share/locale/ca/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/ca/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/ca/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/da/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/da/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/da/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/de/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/de/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/de/LC_MESSAGES/kcm_fcitx5.mo
+share/locale/es/LC_MESSAGES/kcm_fcitx5.mo
+share/locale/fr/LC_MESSAGES/fcitx5-configtool.mo
+share/locale/fr/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/he/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/he/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/he/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/ja/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/ja/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/ja/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/ko/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/ko/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/ko/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/ru/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/ru/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/ru/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/tr/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/tr/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/tr/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/vi/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/vi/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/vi/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/zh_CN/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/zh_CN/LC_MESSAGES/kcm_fcitx5.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx5-configtool.mo
-share/locale/zh_TW/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo
+share/locale/zh_TW/LC_MESSAGES/kcm_fcitx5.mo

Index: pkgsrc/inputmethod/fcitx5-configtool/distinfo
diff -u pkgsrc/inputmethod/fcitx5-configtool/distinfo:1.4 pkgsrc/inputmethod/fcitx5-configtool/distinfo:1.5
--- pkgsrc/inputmethod/fcitx5-configtool/distinfo:1.4   Tue Oct 26 10:49:31 2021
+++ pkgsrc/inputmethod/fcitx5-configtool/distinfo       Sat Feb 10 10:08:25 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:49:31 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/02/10 10:08:25 ryoon Exp $
 
-BLAKE2s (fcitx5-configtool-5.0.3.tar.xz) = 208a5a80ba6c353daa401645c7f4fcbfe23ba74b7c13e982197697a0e8fafa68
-SHA512 (fcitx5-configtool-5.0.3.tar.xz) = 3194bf810d7392792a115c5d3abcb7eb9d3f7c351abd675df123b5fbefa97fa3bb10b26e604d0116235a4e62a6a497e5c5d190e1a4cf789dd27985fbb28978ff
-Size (fcitx5-configtool-5.0.3.tar.xz) = 99532 bytes
+BLAKE2s (fcitx5-configtool-5.1.3.tar.xz) = 6484138323d53a521f7e5a22dafd6dfeca659ad5e086265cc65b593605cf1278
+SHA512 (fcitx5-configtool-5.1.3.tar.xz) = 05be9591c7e609e302f4c803d2799ee7d02fab5de5577067bdffe31fb507f28deb1d674f38d319628c2fa4b5948c4a6958704d18e19bd7c9006683cdeaed11d3
+Size (fcitx5-configtool-5.1.3.tar.xz) = 110124 bytes
+SHA1 (patch-src_migrator_lib_CMakeLists.txt) = c3bf369374200b6fd3473bd81cddf6196b0a66c3

Added files:

Index: pkgsrc/inputmethod/fcitx5-configtool/patches/patch-src_migrator_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/inputmethod/fcitx5-configtool/patches/patch-src_migrator_lib_CMakeLists.txt:1.1
--- /dev/null   Sat Feb 10 10:08:26 2024
+++ pkgsrc/inputmethod/fcitx5-configtool/patches/patch-src_migrator_lib_CMakeLists.txt  Sat Feb 10 10:08:26 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_migrator_lib_CMakeLists.txt,v 1.1 2024/02/10 10:08:26 ryoon Exp $
+
+* Do not fail to link libFcitx5Migrator.so
+  and set RPATH for libFcitx5Migrator.so.
+
+--- src/migrator/lib/CMakeLists.txt.orig       2023-09-27 17:35:40.252324600 +0000
++++ src/migrator/lib/CMakeLists.txt
+@@ -3,6 +3,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFI
+                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Fcitx5MigratorVersion.cmake"
+                         SOVERSION 1)
+ 
++set(CMAKE_SHARED_LINKER_FLAGS "-fno-lto @COMPILER_RPATH_FLAG@@QTDIR@/lib:@PREFIX@/lib")
+ add_library(Fcitx5Migrator SHARED
+     migratorfactoryplugin.cpp
+     migrator.cpp
Home | Main Index | Thread Index | Old Index