pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/inputmethod/ibus
Module Name: pkgsrc
Committed By: tsutsui
Date: Thu Feb 23 15:01:01 UTC 2023
Modified Files:
pkgsrc/inputmethod/ibus: Makefile Makefile.common PLIST distinfo
Added Files:
pkgsrc/inputmethod/ibus/patches: patch-configure patch-configure.ac
Log Message:
ibus: update to 1.5.28.
pkgsrc changes:
- explicitly use updated unicode-character-database 15.0.0 and
unicode-emoji 15.0
- remove -ldl workaround since pull request has been applied in upstream
https://github.com/ibus/ibus/pull/2442
- fix endianness check in configure
https://github.com/ibus/ibus/pull/2477
- workaround X11 locale Compose directory problem (${PREFIX}/lib/X11/locale
vs ${PREFIX}/share/X11/locale) on NetBSD native X11
https://github.com/ibus/ibus/pull/2478
Upstream changes:
https://github.com/ibus/ibus/releases/tag/1.5.28
1.5.28
* Implement new process_key_event for ibus-x11 506ac99
* Convert internal EN compose table to GResource 19ca106 ae69635 bf8848e
* Enhance surrounding text 8d0abbc 781119b ddead51 2a235c8
* Enhance CI 2719e93 2555fa9 a3a9bd3 f3a7772
* Update ibusunicodegen.h with Unicode 15.0.0 8f00d67
* Update simple.xml with xkeyboard-config 2.38-1 594ec48 3c51582
* Fix SEGVs cd621f8 ecfae16
* Release 1.5.28 bc065f8
Code Contributors:
* tools: Check libdl for dlclose() properly in configure (Izumi Tsutsui)
babad78
* configure: Fix texts for surrounding text (Eberhard Beilharz) d190bc3
* Add active-surrounding-text property to IBusEngine (Philippe Rouquier)
bd24be4
Translation Contributors:
* po: Update translation (Georgian) (Temuri Doghonadze) 382c034
* po: Update translation (Spanish) (Emilio Herrera) 8abf3eb
* po: Update translation (Turkish) (Oguz Ersen) f3a9983
* po: Update translation (Russian) (Alexey Rubtsov) 4b0e4c5
* po: Update translation (Korean) (simmon) 41e33c2
* po: Update translation (French) (Julien Humbert) 2f897b5
* po: Update translation (Italian) (Luis Pixeltux) f6eabce
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/inputmethod/ibus/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/inputmethod/ibus/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/inputmethod/ibus/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/inputmethod/ibus/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/inputmethod/ibus/patches/patch-configure
cvs rdiff -u -r0 -r1.3 pkgsrc/inputmethod/ibus/patches/patch-configure.ac
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/Makefile
diff -u pkgsrc/inputmethod/ibus/Makefile:1.93 pkgsrc/inputmethod/ibus/Makefile:1.94
--- pkgsrc/inputmethod/ibus/Makefile:1.93 Sun Jan 29 21:16:54 2023
+++ pkgsrc/inputmethod/ibus/Makefile Thu Feb 23 15:01:00 2023
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.93 2023/01/29 21:16:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2023/02/23 15:01:00 tsutsui Exp $
-PKGREVISION= 2
.include "Makefile.common"
COMMENT= Intelligent Input Bus
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
BUILD_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation
-BUILD_DEPENDS+= unicode-character-database>=14.0.0:../../textproc/unicode-character-database
-BUILD_DEPENDS+= unicode-emoji>=14.0:../../textproc/unicode-emoji
+BUILD_DEPENDS+= unicode-character-database>=15.0.0:../../textproc/unicode-character-database
+BUILD_DEPENDS+= unicode-emoji>=15.0:../../textproc/unicode-emoji
PYTHON_VERSIONS_INCOMPATIBLE= 27
@@ -34,16 +33,24 @@ CONFIGURE_ARGS+= --with-unicode-emoji-di
CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations
CONFIGURE_ARGS+= --with-ucd-dir=${PREFIX}/share/unicode/ucd
+.include "../../mk/bsd.prefs.mk"
+
+# Workaround X11_LOCALEDATADIR for NetBSD etc.
+# https://github.com/ibus/ibus/pull/2478
+.if ${OPSYS} == "NetBSD" && ${X11_TYPE} == "native"
+SUBST_CLASSES+= xlocale
+SUBST_STAGE.xlocale= pre-configure
+SUBST_FILES.xlocale= src/gencomposetable.c \
+ src/ibuscomposetable.c \
+ src/ibusenginesimple.c src/tests/ibus-compose.c
+SUBST_SED.xlocale= -e 's,/share/X11/locale,/lib/X11/locale,g'
+.endif
+
SUBST_CLASSES+= dbus
SUBST_STAGE.dbus= post-configure
SUBST_FILES.dbus= src/ibusshare.c
SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/lib/dbus/machine-id,g'
-# Workaround for unconditional -ldl for ubuntu
-# https://github.com/ibus/ibus/pull/2442
-.include "../../mk/dlopen.buildlink3.mk"
-BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
-
BUILD_DEFS+= PKG_SYSCONFBASE VARBASE
MANCOMPRESSED= yes
Index: pkgsrc/inputmethod/ibus/Makefile.common
diff -u pkgsrc/inputmethod/ibus/Makefile.common:1.20 pkgsrc/inputmethod/ibus/Makefile.common:1.21
--- pkgsrc/inputmethod/ibus/Makefile.common:1.20 Sat Sep 3 14:14:41 2022
+++ pkgsrc/inputmethod/ibus/Makefile.common Thu Feb 23 15:01:00 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.20 2022/09/03 14:14:41 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.21 2023/02/23 15:01:00 tsutsui Exp $
#
# used by inputmethod/ibus/Makefile
# used by inputmethod/ibus-python/Makefile
-DISTNAME= ibus-1.5.27
+DISTNAME= ibus-1.5.28
CATEGORIES= inputmethod
MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
Index: pkgsrc/inputmethod/ibus/PLIST
diff -u pkgsrc/inputmethod/ibus/PLIST:1.21 pkgsrc/inputmethod/ibus/PLIST:1.22
--- pkgsrc/inputmethod/ibus/PLIST:1.21 Tue Mar 15 13:13:36 2022
+++ pkgsrc/inputmethod/ibus/PLIST Thu Feb 23 15:01:00 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2022/03/15 13:13:36 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.22 2023/02/23 15:01:00 tsutsui Exp $
bin/ibus
bin/ibus-daemon
bin/ibus-setup
@@ -318,6 +318,7 @@ share/locale/ia/LC_MESSAGES/ibus10.mo
share/locale/id/LC_MESSAGES/ibus10.mo
share/locale/it/LC_MESSAGES/ibus10.mo
share/locale/ja/LC_MESSAGES/ibus10.mo
+share/locale/ka/LC_MESSAGES/ibus10.mo
share/locale/kn/LC_MESSAGES/ibus10.mo
share/locale/ko/LC_MESSAGES/ibus10.mo
share/locale/lv/LC_MESSAGES/ibus10.mo
Index: pkgsrc/inputmethod/ibus/distinfo
diff -u pkgsrc/inputmethod/ibus/distinfo:1.30 pkgsrc/inputmethod/ibus/distinfo:1.31
--- pkgsrc/inputmethod/ibus/distinfo:1.30 Sat Sep 3 14:14:41 2022
+++ pkgsrc/inputmethod/ibus/distinfo Thu Feb 23 15:01:00 2023
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.30 2022/09/03 14:14:41 tsutsui Exp $
+$NetBSD: distinfo,v 1.31 2023/02/23 15:01:00 tsutsui Exp $
-BLAKE2s (ibus-1.5.27.tar.gz) = 8022af9343424988c6fa94445f50f2202f782d9ee7249c5a002bde56121c4e97
-SHA512 (ibus-1.5.27.tar.gz) = b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4
-Size (ibus-1.5.27.tar.gz) = 3779541 bytes
+BLAKE2s (ibus-1.5.28.tar.gz) = e3015b374c1f966694b96f72a92202e999c45bcadf45a7fff80bdb68eaf0d610
+SHA512 (ibus-1.5.28.tar.gz) = 5bfb9158a5810d38af900775ed30406823872c431ef4772b476afa7b58c120ef508a51b961620ea6003549f1f49cf05484992beee8677b138f1162afc73ab247
+Size (ibus-1.5.28.tar.gz) = 3871246 bytes
SHA1 (patch-client_gtk2_ibusimcontext.c) = bb957fb47fa7144f0a6cdd0252653aeb0da9ad92
SHA1 (patch-client_gtk3_ibusimcontext.c) = c3fff3e8d7431ae4b7302026e9fd9f092ec46d88
+SHA1 (patch-configure) = 26a73d9572f4f5a933c6ddc67fa4e4e394ac6bc4
+SHA1 (patch-configure.ac) = e06f2b295562c7ec53d719e3960cceadbcdeaf76
SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650
SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4
Added files:
Index: pkgsrc/inputmethod/ibus/patches/patch-configure
diff -u /dev/null pkgsrc/inputmethod/ibus/patches/patch-configure:1.6
--- /dev/null Thu Feb 23 15:01:01 2023
+++ pkgsrc/inputmethod/ibus/patches/patch-configure Thu Feb 23 15:01:00 2023
@@ -0,0 +1,284 @@
+$NetBSD: patch-configure,v 1.6 2023/02/23 15:01:00 tsutsui Exp $
+
+- use proper endianness check
+ https://github.com/ibus/ibus/pull/2477
+
+--- configure.orig 2023-02-21 02:58:53.000000000 +0000
++++ configure
+@@ -17077,59 +17077,204 @@ fi
+ # Check endianness.
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system endianness" >&5
+ printf %s "checking build system endianness... " >&6; }
+-ENDIAN=unknown
+-if test "$cross_compiling" = yes
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
++printf %s "checking whether byte ordering is bigendian... " >&6; }
++if test ${ac_cv_c_bigendian+y}
+ then :
+- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++ printf %s "(cached) " >&6
+ else $as_nop
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ ac_cv_c_bigendian=unknown
++ # See if we're dealing with a universal compiler.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#ifndef __APPLE_CC__
++ not a universal capable compiler
++ #endif
++ typedef int dummy;
+
+- #include <endian.h>
+- #if __BYTE_ORDER != __LITTLE_ENDIAN
+- #error
+- #endif
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"
++then :
+
++ # Check for potential -arch flags. It is not universal unless
++ # there are at least two -arch flags with different values.
++ ac_arch=
++ ac_prev=
++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++ if test -n "$ac_prev"; then
++ case $ac_word in
++ i?86 | x86_64 | ppc | ppc64)
++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++ ac_arch=$ac_word
++ else
++ ac_cv_c_bigendian=universal
++ break
++ fi
++ ;;
++ esac
++ ac_prev=
++ elif test "x$ac_word" = "x-arch"; then
++ ac_prev=arch
++ fi
++ done
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
++ if test $ac_cv_c_bigendian = unknown; then
++ # See if sys/param.h defines the BYTE_ORDER macro.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++ #include <sys/param.h>
+
+ int
+ main (void)
+ {
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
++ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
++ && LITTLE_ENDIAN)
++ bogus endian macros
++ #endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"
++if ac_fn_c_try_compile "$LINENO"
+ then :
+- ENDIAN=little
++ # It does; now see whether it defined to BIG_ENDIAN or not.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++ #include <sys/param.h>
+
++int
++main (void)
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++ #endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"
++then :
++ ac_cv_c_bigendian=yes
++else $as_nop
++ ac_cv_c_bigendian=no
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
++ fi
++ if test $ac_cv_c_bigendian = unknown; then
++ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <limits.h>
+
+-if test "$cross_compiling" = yes
++int
++main (void)
++{
++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
++ bogus endian macros
++ #endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"
+ then :
+- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else $as_nop
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ # It does; now see whether it defined to _BIG_ENDIAN or not.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#include <limits.h>
+
+- #include <endian.h>
+- #if __BYTE_ORDER != __BIG_ENDIAN
+- #error
+- #endif
++int
++main (void)
++{
++#ifndef _BIG_ENDIAN
++ not big endian
++ #endif
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"
++then :
++ ac_cv_c_bigendian=yes
++else $as_nop
++ ac_cv_c_bigendian=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
++ fi
++ if test $ac_cv_c_bigendian = unknown; then
++ # Compile a test program.
++ if test "$cross_compiling" = yes
++then :
++ # Try to guess by grepping values from an object file.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++unsigned short int ascii_mm[] =
++ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++ unsigned short int ascii_ii[] =
++ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++ int use_ascii (int i) {
++ return ascii_mm[i] + ascii_ii[i];
++ }
++ unsigned short int ebcdic_ii[] =
++ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++ unsigned short int ebcdic_mm[] =
++ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++ int use_ebcdic (int i) {
++ return ebcdic_mm[i] + ebcdic_ii[i];
++ }
++ extern int foo;
+
+ int
+ main (void)
+ {
++return use_ascii (foo) == use_ebcdic (foo);
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"
++then :
++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
++ ac_cv_c_bigendian=yes
++ fi
++ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++ if test "$ac_cv_c_bigendian" = unknown; then
++ ac_cv_c_bigendian=no
++ else
++ # finding both strings is unlikely to happen, but who knows?
++ ac_cv_c_bigendian=unknown
++ fi
++ fi
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
++else $as_nop
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++$ac_includes_default
++int
++main (void)
++{
++
++ /* Are we little or big endian? From Harbison&Steele. */
++ union
++ {
++ long int l;
++ char c[sizeof (long int)];
++ } u;
++ u.l = 1;
++ return u.c[sizeof (long int) - 1] == 1;
+
+ ;
+ return 0;
+@@ -17137,15 +17282,34 @@ main (void)
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"
+ then :
+- ENDIAN=big
+-
++ ac_cv_c_bigendian=no
++else $as_nop
++ ac_cv_c_bigendian=yes
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
++ fi
++fi
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
++printf "%s\n" "$ac_cv_c_bigendian" >&6; }
++ case $ac_cv_c_bigendian in #(
++ yes)
++ ENDIAN=big;; #(
++ no)
++ ENDIAN=little ;; #(
++ universal)
++
++printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
++
++ ;; #(
++ *)
++ ENDIAN=unknown ;;
++ esac
++
+ if test x"$ENDIAN" != xlittle -a x"$ENDIAN" != xbig; then
+- as_fn_error $? "Cannot deermine endianness without endian.h" "$LINENO" 5
++ as_fn_error $? "Cannot determine endianness" "$LINENO" 5
+ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ENDIAN" >&5
+ printf "%s\n" "$ENDIAN" >&6; }
+@@ -22655,6 +22819,7 @@ if test -z "${am__fastdepCC_TRUE}" && te
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++
+ if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
Index: pkgsrc/inputmethod/ibus/patches/patch-configure.ac
diff -u /dev/null pkgsrc/inputmethod/ibus/patches/patch-configure.ac:1.3
--- /dev/null Thu Feb 23 15:01:01 2023
+++ pkgsrc/inputmethod/ibus/patches/patch-configure.ac Thu Feb 23 15:01:00 2023
@@ -0,0 +1,41 @@
+$NetBSD: patch-configure.ac,v 1.3 2023/02/23 15:01:00 tsutsui Exp $
+
+- use proper endianness check
+ https://github.com/ibus/ibus/pull/2477
+
+--- configure.ac.orig 2023-02-21 02:57:44.000000000 +0000
++++ configure.ac
+@@ -153,31 +153,9 @@ AC_SUBST(LIBDL)
+
+ # Check endianness.
+ AC_MSG_CHECKING([build system endianness])
+-ENDIAN=unknown
+-AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[
+- #include <endian.h>
+- #if __BYTE_ORDER != __LITTLE_ENDIAN
+- #error
+- #endif
+- ]]
+- )],
+- [ENDIAN=little]
+-)
+-AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[
+- #include <endian.h>
+- #if __BYTE_ORDER != __BIG_ENDIAN
+- #error
+- #endif
+- ]]
+- )],
+- [ENDIAN=big]
+-)
++AC_C_BIGENDIAN([ENDIAN=big],[ENDIAN=little],[ENDIAN=unknown],[])
+ if test x"$ENDIAN" != xlittle -a x"$ENDIAN" != xbig; then
+- AC_MSG_ERROR([Cannot deermine endianness without endian.h])
++ AC_MSG_ERROR([Cannot determine endianness])
+ fi
+ AC_MSG_RESULT($ENDIAN)
+ AC_SUBST(ENDIAN)
Home |
Main Index |
Thread Index |
Old Index