Ping
On Sun, Jan 28, 2024 at 11:20:13PM +0800, Kevin Lo wrote:
>
> Hi,
>
> This is an update for libchewing to 0.6.0.
> Tested with fcitx-chewing on amd64.
>
> OK? Comments?
>
> Index: chinese/libchewing/Makefile
> ===================================================================
> RCS file: /cvs/ports/chinese/libchewing/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- chinese/libchewing/Makefile 20 Sep 2023 06:33:31 -0000 1.14
> +++ chinese/libchewing/Makefile 28 Jan 2024 15:03:10 -0000
> @@ -1,11 +1,10 @@
> COMMENT = intelligent phonetic input method library
>
> -V = 0.5.1
> +V = 0.6.0
> DISTNAME = libchewing-$V
> PKGNAME = zh-libchewing-$V
> -REVISION = 0
>
> -SHARED_LIBS = chewing 0.1 # .3.3
> +SHARED_LIBS = chewing 0.2 # .3.3.1
>
> CATEGORIES = chinese inputmethods
>
> @@ -16,19 +15,16 @@ MAINTAINER = Kevin Lo <ke...@openbsd.or
> # LGPLv2.1 only
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += m pthread sqlite3 z
> +WANTLIB += c sqlite3
>
> SITES =
> https://github.com/chewing/libchewing/releases/download/v$V/
>
> -EXTRACT_SUFX= .tar.bz2
> +EXTRACT_SUFX = .tar.xz
>
> -BUILD_DEPENDS = print/texinfo
> +MODULES = devel/cmake
> LIB_DEPENDS = databases/sqlite3
>
> -MAKE_FLAGS = MAKEINFO=${LOCALBASE}/bin/gmakeinfo
> -
> -CONFIGURE_STYLE = gnu
> -CONFIGURE_ARGS = CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib"
> +CFLAGS += -I${LOCALBASE}/include
> +MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -lc
>
> .include <bsd.port.mk>
> Index: chinese/libchewing/distinfo
> ===================================================================
> RCS file: /cvs/ports/chinese/libchewing/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- chinese/libchewing/distinfo 13 Nov 2017 13:21:35 -0000 1.5
> +++ chinese/libchewing/distinfo 28 Jan 2024 15:03:10 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libchewing-0.5.1.tar.bz2) =
> lwjGNBX6YDRDXA84EA59MNDhuskn9nvsbf6z/vAWFys=
> -SIZE (libchewing-0.5.1.tar.bz2) = 3141084
> +SHA256 (libchewing-0.6.0.tar.xz) =
> wpE77VW3/bJZQralgywlS8m8ucNl08r6ClabS3y9jwA=
> +SIZE (libchewing-0.6.0.tar.xz) = 3473564
> Index: chinese/libchewing/patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: chinese/libchewing/patches/patch-CMakeLists_txt
> diff -N chinese/libchewing/patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ chinese/libchewing/patches/patch-CMakeLists_txt 28 Jan 2024 15:03:10
> -0000
> @@ -0,0 +1,19 @@
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
> + enable_testing()
> +
> + if(UNIX)
> +- set(CMAKE_C_FLAGS "-g -O2 -Wall -fPIC ${CMAKE_C_FLAGS}")
> ++ set(CMAKE_C_FLAGS "-Wall -fPIC ${CMAKE_C_FLAGS}")
> + add_compile_definitions(UNDER_POSIX PIC)
> + endif()
> +
> +@@ -338,4 +338,4 @@ set(CPACK_PACKAGE_CHECKSUM SHA256)
> + set(CPACK_SOURCE_IGNORE_FILES "/out" "/\\\\..*")
> + set(CPACK_SOURCE_GENERATOR TXZ)
> + set(CPACK_SOURCE_PACKAGE_FILE_NAME libchewing-${CMAKE_PROJECT_VERSION})
> +-include(CPack)
> +\ No newline at end of file
> ++include(CPack)
> Index: chinese/libchewing/patches/patch-configure
> ===================================================================
> RCS file: chinese/libchewing/patches/patch-configure
> diff -N chinese/libchewing/patches/patch-configure
> --- chinese/libchewing/patches/patch-configure 11 Mar 2022 18:25:21
> -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -Index: configure
> ---- configure.orig
> -+++ configure
> -@@ -15425,7 +15425,7 @@ fi
> - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_undefined" >&5
> - $as_echo "$ac_cv_no_undefined" >&6; }
> - if test x$ac_cv_no_undefined = "xyes"; then :
> -- NO_UNDEFINED_LDFLAGS="-Wl,--no-undefined"
> -+ NO_UNDEFINED_LDFLAGS=""
> - fi
> -
> -
> Index: chinese/libchewing/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/chinese/libchewing/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST
> --- chinese/libchewing/pkg/PLIST 11 Mar 2022 18:25:21 -0000 1.5
> +++ chinese/libchewing/pkg/PLIST 28 Jan 2024 15:03:10 -0000
> @@ -4,9 +4,6 @@ include/chewing/chewing.h
> include/chewing/chewingio.h
> include/chewing/global.h
> include/chewing/mod_aux.h
> -@info info/libchewing.info
> -lib/libchewing.a
> -lib/libchewing.la
> @lib lib/libchewing.so.${LIBchewing_VERSION}
> lib/pkgconfig/chewing.pc
> share/libchewing/
>