[BACK]Return to patch-configure CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / inputmethod / ibus / patches

File: [cvs.NetBSD.org] / pkgsrc / inputmethod / ibus / patches / Attic / patch-configure (download)

Revision 1.2, Sun Aug 12 10:45:03 2018 UTC (21 months, 2 weeks ago) by tsutsui
Branch: MAIN
CVS Tags: pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3
Changes since 1.1: +73 -9 lines

ibus, ibus-python: update to 1.5.19.

pkgsrc changes:
- pull upstream fixes for issue #2035 (check wayland during configure)
- explicitly require cldr-emoji-annotation 33.1.0.0 or higher to sync
  emoji dict files in ibus/PLIST

Upstream changes (from https://github.com/ibus/ibus/releases):

1.5.19

This release moves typing emoji annotation on the emoji dialog to the pre-edit
on each application and also isolates Ctrl-Shift-u from Ctrl-Shift-e again upon
the several requests. The shortcut keys can be customized with ibus-setup
utility.
Also pre-edit of compose keys are now enabled.
Also IBUS_DISCARD_PASSWORD environment variable is now available as the
workaround of password popup in firefox and chrome.

env IBUS_DISCARD_PASSWORD=1 firefox
or
export IBUS_DISCARD_PASSWORD_APPS='firefox,.*chrome.*'

can discard typing characters on the password entries.

Emoji features:
Move input focus on Emojier to engines' preedit 5ee3f48
ui/gtk3: Show previous emojis with "history" annotation dc5e7ee
ui/gtk3: Add num pad Enter, Down, Up, Left, Right on Emojier c6439d7
ui/gtk3: Get PangoAttrList of auxiliary text from IBusText a1f91b2
up/gtk3: Emoji misc updats 3280848 d8f901f cf4e2f1 7cef5bf caffeae
src: Fix SEGV in IBusEngine if no emoji shortcut keys 886ad36

Compose key features:
ibusenginesimple: Enable preedit for compose keys f9e3035 3a68ded

Test cases:
src: Add ibus-keypress test case 196216a
tests: Added an automation testing on console 32f2f2b
configure: Add --disable-python2 option 8d4c473
tools: Add ibus read-config --engine-id option for engine schemas ddc2284
data/dconf: Add man pages of 00-upstream-settings(5) and ibus(5) 5f44e73

Bug fixes:
client/gtk2: Add IBUS_DISCARD_PASSWORD for firefox and chrome f328fd6
Fix build errors 75a6667 68e162a b184861 c360cbd 68bd269 7bc160f 10cc30e
 37aa95f 8d302c8 428e64e 2695708 5db6e7b b94e8f2 8ab0b60
Fix ucd directory override (Jeremy Bicha) 5788be8
src: Make the call to chmod in ibus_bus_init conditional (Olivier Tilloy)
 28d0c1d
Remove a misleading "const" modifier of a return value (Takuro Ashie) 6b47e41
bus: warn deprecated --mem-profile option (Kentaro Hayashi) 0dde239
option --monitor-timeout should be removed (Ryutaroh Matsumoto) be7554c

New release:
Update translations c8a9994 999aee3
Release 1.5.19 fd9d4a9

$NetBSD: patch-configure,v 1.2 2018/08/12 10:45:03 tsutsui Exp $

- pull upstream wayland fix:
 https://github.com/ibus/ibus/commit/aa0f4252ff965729b871c91b4ed089bf98963c0b

--- configure.orig	2018-08-08 08:30:56.000000000 +0000
+++ configure
@@ -814,6 +814,8 @@ WAYLAND_CFLAGS
 X11_PREFIX
 X11_LIBS
 X11_CFLAGS
+ENABLE_GDK3_WAYLAND_FALSE
+ENABLE_GDK3_WAYLAND_TRUE
 GTK3_LIBS
 GTK3_CFLAGS
 GTK2_LIBS
@@ -17187,13 +17189,36 @@ else
 $as_echo "yes" >&6; }
 
 fi
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-wayland-3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gdk-wayland-3.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  enable_gdk3_wayland=yes
+else
+  enable_gdk3_wayland=no
+
+fi
 
     gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
     GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules
 else
     enable_gtk3="no (disabled, use --enable-gtk3 to enable)"
+    enable_gdk3_wayland=no
+fi
+if test x"$enable_gdk3_wayland" != x"yes"; then
+    enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)"
+fi
+ if test x"$enable_gdk3_wayland" = x"yes"; then
+  ENABLE_GDK3_WAYLAND_TRUE=
+  ENABLE_GDK3_WAYLAND_FALSE='#'
+else
+  ENABLE_GDK3_WAYLAND_TRUE='#'
+  ENABLE_GDK3_WAYLAND_FALSE=
 fi
 
+
 if test x"$enable_xim" = x"yes"; then
     # Check for x11
 
@@ -20656,6 +20681,10 @@ if test -z "${ENABLE_APPINDICATOR_TRUE}"
   as_fn_error $? "conditional \"ENABLE_APPINDICATOR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_GDK3_WAYLAND_TRUE}" && test -z "${ENABLE_GDK3_WAYLAND_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_GDK3_WAYLAND\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_APPINDICATOR_ENGINE_ICON_TRUE}" && test -z "${ENABLE_APPINDICATOR_ENGINE_ICON_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_APPINDICATOR_ENGINE_ICON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22993,6 +23022,7 @@ Build options:
   Build gtk3 immodule           $enable_gtk3
   Build XIM agent server        $enable_xim
   Build wayland support         $enable_wayland
+  Build gdk3 wayland support    $enable_gdk3_wayland
   Build appindicator support    $enable_appindicator
   Build appindicator engine icon $enable_appindicator_engine_icon
   Build python library          $enable_python_library
@@ -23033,6 +23063,7 @@ Build options:
   Build gtk3 immodule           $enable_gtk3
   Build XIM agent server        $enable_xim
   Build wayland support         $enable_wayland
+  Build gdk3 wayland support    $enable_gdk3_wayland
   Build appindicator support    $enable_appindicator
   Build appindicator engine icon $enable_appindicator_engine_icon
   Build python library          $enable_python_library