CVS commit: pkgsrc/inputmethod/ibus-chewing

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 13:31:52 UTC 2025

Modified Files:
        pkgsrc/inputmethod/ibus-chewing: Makefile distinfo
        pkgsrc/inputmethod/ibus-chewing/patches:
            patch-Modules_ManageEnvironment.cmake
Added Files:
        pkgsrc/inputmethod/ibus-chewing/patches: patch-CMakeLists.txt

Log Message:
ibus-chewing: fix build with cmake 4.

Convert to cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/inputmethod/ibus-chewing/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/ibus-chewing/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake

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

Modified files:

Index: pkgsrc/inputmethod/ibus-chewing/Makefile
diff -u pkgsrc/inputmethod/ibus-chewing/Makefile:1.92 pkgsrc/inputmethod/ibus-chewing/Makefile:1.93
--- pkgsrc/inputmethod/ibus-chewing/Makefile:1.92       Thu Apr 24 14:14:48 2025
+++ pkgsrc/inputmethod/ibus-chewing/Makefile    Tue Aug 19 13:31:52 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2025/04/24 14:14:48 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.93 2025/08/19 13:31:52 wiz Exp $
 
 GITHUB_PROJECT=        ibus-chewing
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -16,7 +15,6 @@ LICENSE=      gnu-gpl-v2
 
 TOOL_DEPENDS+=         gob2-[0-9]*:../../devel/gob2
 
-USE_CMAKE=             yes
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            msgfmt pkg-config
@@ -24,10 +22,16 @@ TOOLS_NOOP+=                msgmerge xgettext
 
 MAKE_JOBS_SAFE=                no
 
+# generator not passed to sub-cmake calls
+CMAKE_GENERATOR_INCOMPATIBLE=  ninja
+
 BUILD_TARGET=  all translations
 
 TEST_TARGET=   test
 
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
+.include "../../devel/cmake/build.mk"
 .include "../../devel/glib2/schemas.mk"
 
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/inputmethod/ibus-chewing/distinfo
diff -u pkgsrc/inputmethod/ibus-chewing/distinfo:1.21 pkgsrc/inputmethod/ibus-chewing/distinfo:1.22
--- pkgsrc/inputmethod/ibus-chewing/distinfo:1.21       Tue Oct 26 10:49:33 2021
+++ pkgsrc/inputmethod/ibus-chewing/distinfo    Tue Aug 19 13:31:52 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 10:49:33 nia Exp $
+$NetBSD: distinfo,v 1.22 2025/08/19 13:31:52 wiz Exp $
 
 BLAKE2s (ibus-chewing-1.5.1-Source.tar.gz) = a32a8f74a0ec4f6ba3e7727cfe1d6574dd970acea239f230ae472dca5cc8a61b
 SHA512 (ibus-chewing-1.5.1-Source.tar.gz) = 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633
 Size (ibus-chewing-1.5.1-Source.tar.gz) = 177044 bytes
-SHA1 (patch-Modules_ManageEnvironment.cmake) = 213274162dca9e3fb4d54d494908a309b6819e51
+SHA1 (patch-CMakeLists.txt) = 54cc38a7f728c552853d13d1aedbf6b539c57088
+SHA1 (patch-Modules_ManageEnvironment.cmake) = 14d9c9495bb7f9f621d0e89152c465b521db6b6a
 SHA1 (patch-Modules_ManageEnvironmentCommon.cmake) = 1d8bb1e91c448df5dc8c7e5b7aa1760bb637a9d0
 SHA1 (patch-po_zh__CN.po) = c05a5f6024941a7900529e152f771cc440964531
 SHA1 (patch-src_generate-gconf-schemas.c) = e48a546d676f65c83379ed0cd35bd3529b5db4e5

Index: pkgsrc/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake
diff -u pkgsrc/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake:1.2 pkgsrc/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake:1.3
--- pkgsrc/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake:1.2   Sat Dec 13 06:33:15 2014
+++ pkgsrc/inputmethod/ibus-chewing/patches/patch-Modules_ManageEnvironment.cmake       Tue Aug 19 13:31:52 2025
@@ -1,10 +1,20 @@
-$NetBSD: patch-Modules_ManageEnvironment.cmake,v 1.2 2014/12/13 06:33:15 obache Exp $
+$NetBSD: patch-Modules_ManageEnvironment.cmake,v 1.3 2025/08/19 13:31:52 wiz Exp $
 
 * PKGLOCALEDIR support
 
---- Modules/ManageEnvironment.cmake.orig       2014-10-28 05:05:31.000000000 +0000
+--- Modules/ManageEnvironment.cmake.orig       2016-01-29 07:15:26.000000000 +0000
 +++ Modules/ManageEnvironment.cmake
-@@ -144,6 +144,7 @@ M_MSG(${M_INFO1} "CMAKE_SYSTEM_PROCESSOR
+@@ -71,9 +71,6 @@ FUNCTION(SET_COMPILE_ENV var)
+     SET(_force 0)
+     SET(_defaultValue "")
+     CMAKE_POLICY(PUSH)
+-    IF(POLICY CMP0054)
+-      CMAKE_POLICY(SET CMP0054 OLD)
+-    ENDIF()
+ 
+     FOREACH(_arg ${ARGN})
+       IF("${_arg}" STREQUAL "ENV_NAME")
+@@ -148,6 +145,7 @@ M_MSG(${M_INFO1} "CMAKE_SYSTEM_PROCESSOR
  ## Set compile flags
  SET_COMPILE_ENV(BIN_DIR)
  SET_COMPILE_ENV(DATA_DIR)

Added files:

Index: pkgsrc/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Tue Aug 19 13:31:52 2025
+++ pkgsrc/inputmethod/ibus-chewing/patches/patch-CMakeLists.txt        Tue Aug 19 13:31:52 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/08/19 13:31:52 wiz Exp $
+
+Fix build with cmake 4.
+
+--- CMakeLists.txt.orig        2025-08-19 13:28:09.657830468 +0000
++++ CMakeLists.txt
+@@ -1,12 +1,5 @@
+ cmake_minimum_required(VERSION 2.8.0)
+ 
+-# Included scripts do automatic cmake_policy PUSH and POP.
+-# OLD: CMake policy in included script will affect the invoker.
+-CMAKE_POLICY(SET CMP0011 OLD)
+-IF(POLICY CMP0065)
+-    CMAKE_POLICY(SET CMP0065 OLD)
+-ENDIF()
+-
+ ####################################################################
+ # Find cmake-fedora
+ #