CVS commit: pkgsrc/inputmethod/fcitx5-gtk

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 10 12:01:44 UTC 2024

Modified Files:
        pkgsrc/inputmethod/fcitx5-gtk: Makefile PLIST distinfo
        pkgsrc/inputmethod/fcitx5-gtk/patches: patch-gtk3_utils.h
Added Files:
        pkgsrc/inputmethod/fcitx5-gtk: buildlink3.mk
Removed Files:
        pkgsrc/inputmethod/fcitx5-gtk/patches: patch-gtk3_fcitxtheme.cpp

Log Message:
inputmethod/fcitx5-gtk: Update to 5.1.1

* Add buildlink3.mk for consumers.

Changelog:
Bugfixes.
Cleanups.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/inputmethod/fcitx5-gtk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/inputmethod/fcitx5-gtk/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/fcitx5-gtk/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/inputmethod/fcitx5-gtk/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/inputmethod/fcitx5-gtk/patches/patch-gtk3_fcitxtheme.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/fcitx5-gtk/patches/patch-gtk3_utils.h

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-gtk/Makefile
diff -u pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.16 pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.17
--- pkgsrc/inputmethod/fcitx5-gtk/Makefile:1.16 Wed Dec 20 15:07:28 2023
+++ pkgsrc/inputmethod/fcitx5-gtk/Makefile      Sat Feb 10 12:01:44 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2023/12/20 15:07:28 nros Exp $
+# $NetBSD: Makefile,v 1.17 2024/02/10 12:01:44 ryoon Exp $
 
-DISTNAME=      fcitx5-gtk-5.0.4
-PKGREVISION=   8
+DISTNAME=      fcitx5-gtk-5.1.1
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://download.fcitx-im.org/fcitx5/fcitx5-gtk/
 EXTRACT_SUFX=  .tar.xz
@@ -13,7 +12,6 @@ LICENSE=      gnu-lgpl-v2.1
 
 TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
 
-USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
@@ -21,6 +19,7 @@ USE_CXX_FEATURES+=    c++17
 
 PKGCONFIG_OVERRIDE+=   fcitx-gclient/Fcitx5GClient.pc.in
 
+.include "../../devel/cmake/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../textproc/fmtlib/buildlink3.mk"

Index: pkgsrc/inputmethod/fcitx5-gtk/PLIST
diff -u pkgsrc/inputmethod/fcitx5-gtk/PLIST:1.3 pkgsrc/inputmethod/fcitx5-gtk/PLIST:1.4
--- pkgsrc/inputmethod/fcitx5-gtk/PLIST:1.3     Sat Feb 27 19:34:11 2021
+++ pkgsrc/inputmethod/fcitx5-gtk/PLIST Sat Feb 10 12:01:44 2024
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2021/02/27 19:34:11 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/02/10 12:01:44 ryoon Exp $
+bin/fcitx5-gtk2-immodule-probing
+bin/fcitx5-gtk3-immodule-probing
+bin/fcitx5-gtk4-immodule-probing
 include/Fcitx5/GClient/fcitx-gclient/fcitxgclient.h
 include/Fcitx5/GClient/fcitx-gclient/fcitxgwatcher.h
 lib/cmake/Fcitx5GClient/Fcitx5GClientConfig.cmake

Index: pkgsrc/inputmethod/fcitx5-gtk/distinfo
diff -u pkgsrc/inputmethod/fcitx5-gtk/distinfo:1.6 pkgsrc/inputmethod/fcitx5-gtk/distinfo:1.7
--- pkgsrc/inputmethod/fcitx5-gtk/distinfo:1.6  Fri Dec  2 18:06:53 2022
+++ pkgsrc/inputmethod/fcitx5-gtk/distinfo      Sat Feb 10 12:01:44 2024
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2022/12/02 18:06:53 nros Exp $
+$NetBSD: distinfo,v 1.7 2024/02/10 12:01:44 ryoon Exp $
 
-BLAKE2s (fcitx5-gtk-5.0.4.tar.xz) = 9f6c6bb56f5d9b4039f478091a9e1fe743f231d09120e3cf6b47c4626dbf8e0a
-SHA512 (fcitx5-gtk-5.0.4.tar.xz) = 9009369e19f2165bcf514f2a229db456ee8aa0d81611a133aa03f69ecd06a27689506edaf3c2d61e0f1928fc47070bb11280308ca5a4dca6ae35bb39a087a407
-Size (fcitx5-gtk-5.0.4.tar.xz) = 49044 bytes
-SHA1 (patch-gtk3_fcitxtheme.cpp) = ce6975f2ee3253d026da810b0f70abf07a82ec46
-SHA1 (patch-gtk3_utils.h) = b2b2a5ad72d2ca9767d3352f6d499ecf8b94871a
+BLAKE2s (fcitx5-gtk-5.1.1.tar.xz) = 71a01271604015c2bd4d06f99b7b8f3ee6c3c0f320da30d5eb95f173622b059f
+SHA512 (fcitx5-gtk-5.1.1.tar.xz) = 14dc84661e33435df5157127b2a4a81adc399cdc833e1c32795783d60bf10fd301fb658fc48673cad87abccfe3bccbb7b4ee0d0da74460b7ef1d6529a554a3eb
+Size (fcitx5-gtk-5.1.1.tar.xz) = 53716 bytes
+SHA1 (patch-gtk3_utils.h) = d4de3bcb2f9d3d3351b3d84c9cb94b6ad1ebcd4d

Index: pkgsrc/inputmethod/fcitx5-gtk/patches/patch-gtk3_utils.h
diff -u pkgsrc/inputmethod/fcitx5-gtk/patches/patch-gtk3_utils.h:1.1 pkgsrc/inputmethod/fcitx5-gtk/patches/patch-gtk3_utils.h:1.2
--- pkgsrc/inputmethod/fcitx5-gtk/patches/patch-gtk3_utils.h:1.1        Sun Apr 25 18:24:43 2021
+++ pkgsrc/inputmethod/fcitx5-gtk/patches/patch-gtk3_utils.h    Sat Feb 10 12:01:44 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-gtk3_utils.h,v 1.1 2021/04/25 18:24:43 nia Exp $
+$NetBSD: patch-gtk3_utils.h,v 1.2 2024/02/10 12:01:44 ryoon Exp $
 
 Include missing header for std::free. Fixes building with gcc10.
 
---- gtk3/utils.h.orig  2021-01-25 21:23:36.273540700 +0000
+--- gtk3/utils.h.orig  2023-11-25 14:07:34.909973541 +0000
 +++ gtk3/utils.h
-@@ -9,6 +9,7 @@
- 
- #include <cairo.h>
+@@ -12,6 +12,7 @@
  #include <glib-object.h>
-+#include <cstdlib>
  #include <memory>
  #include <utility>
++#include <cstdlib>
+ 
+ namespace fcitx::gtk {
  

Added files:

Index: pkgsrc/inputmethod/fcitx5-gtk/buildlink3.mk
diff -u /dev/null pkgsrc/inputmethod/fcitx5-gtk/buildlink3.mk:1.1
--- /dev/null   Sat Feb 10 12:01:44 2024
+++ pkgsrc/inputmethod/fcitx5-gtk/buildlink3.mk Sat Feb 10 12:01:44 2024
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2024/02/10 12:01:44 ryoon Exp $
+
+BUILDLINK_TREE+=       fcitx5-gtk
+
+.if !defined(FCITX5_GTK_BUILDLINK3_MK)
+FCITX5_GTK_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.fcitx5-gtk+=     fcitx5-gtk>=5.1.0
+BUILDLINK_PKGSRCDIR.fcitx5-gtk?=       ../../inputmethod/fcitx5-gtk
+
+.include "../../devel/glib2/buildlink3.mk"
+.endif # FCITX5_GTK_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -fcitx5-gtk