Skip to content

Instantly share code, notes, and snippets.

@tsutsui

tsutsui/pkgsrc-ibus-1.5.17.diff

Last active November 3, 2017 03:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save tsutsui/5b03157baf2c9999b8764684e217e5a9 to your computer and use it in GitHub Desktop.
Save tsutsui/5b03157baf2c9999b8764684e217e5a9 to your computer and use it in GitHub Desktop.
Download ZIP
WIP: Update pkgsrc/inputmethod/ibus to 1.5.17 (which includes emoji dict support)
Raw
pkgsrc-ibus-1.5.17.diff
Index: ibus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ibus/Makefile,v
retrieving revision 1.47
diff -u -p -d -r1.47 Makefile
--- ibus/Makefile 12 Feb 2017 06:25:33 -0000 1.47
+++ ibus/Makefile 3 Nov 2017 03:39:21 -0000
@@ -1,11 +1,12 @@
# $NetBSD: Makefile,v 1.47 2017/02/12 06:25:33 ryoon Exp $
-PKGREVISION= 3
.include "Makefile.common"
COMMENT= Intelligent Input Bus
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+= cldr-emoji-annotation-[0-9]*:../../fonts/cldr-emoji-annotation
+DEPENDS+= unicode-emoji-[0-9]*:../../fonts/unicode-emoji
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -25,6 +26,8 @@ CONFIGURE_ARGS+= --enable-gtk3
CONFIGURE_ARGS+= --enable-surrounding-text
CONFIGURE_ARGS+= --enable-introspection=yes
CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
+CONFIGURE_ARGS+= --with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji
+CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations
SUBST_CLASSES+= dbus
SUBST_STAGE.dbus= post-configure
Index: ibus/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ibus/Makefile.common,v
retrieving revision 1.10
diff -u -p -d -r1.10 Makefile.common
--- ibus/Makefile.common 16 Aug 2017 21:22:12 -0000 1.10
+++ ibus/Makefile.common 3 Nov 2017 03:39:21 -0000
@@ -3,7 +3,7 @@
# used by inputmethod/ibus/Makefile
# used by inputmethod/ibus-python/Makefile
-DISTNAME= ibus-1.5.13
+DISTNAME= ibus-1.5.17
CATEGORIES= inputmethod
MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
Index: ibus/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ibus/PLIST,v
retrieving revision 1.8
diff -u -p -d -r1.8 PLIST
--- ibus/PLIST 31 Jul 2015 13:03:45 -0000 1.8
+++ ibus/PLIST 3 Nov 2017 03:39:21 -0000
@@ -10,6 +10,7 @@ include/ibus-1.0/ibuscomponent.h
include/ibus-1.0/ibusconfig.h
include/ibus-1.0/ibusconfigservice.h
include/ibus-1.0/ibusdebug.h
+include/ibus-1.0/ibusemoji.h
include/ibus-1.0/ibusengine.h
include/ibus-1.0/ibusenginedesc.h
include/ibus-1.0/ibusenginesimple.h
@@ -46,14 +47,19 @@ lib/pkgconfig/ibus-1.0.pc
libexec/ibus-dconf
libexec/ibus-engine-simple
libexec/ibus-gconf
+libexec/ibus-portal
+libexec/ibus-ui-emojier
libexec/ibus-ui-gtk3
libexec/ibus-x11
man/man1/ibus-daemon.1
man/man1/ibus-setup.1
man/man1/ibus.1
+man/man7/ibus-emoji.7
share/GConf/gsettings/ibus.convert
share/applications/ibus-setup.desktop
share/bash-completion/completions/ibus.bash
+share/dbus-1/services/org.freedesktop.IBus.service
+share/dbus-1/services/org.freedesktop.portal.IBus.service
share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
share/examples/ibus/dconf/profile/ibus
share/gconf/schemas/ibus.schemas
@@ -67,6 +73,7 @@ share/gtk-doc/html/ibus/IBusConfig.html
share/gtk-doc/html/ibus/IBusConfigService.html
share/gtk-doc/html/ibus/IBusEngine.html
share/gtk-doc/html/ibus/IBusEngineDesc.html
+share/gtk-doc/html/ibus/IBusEngineSimple.html
share/gtk-doc/html/ibus/IBusFactory.html
share/gtk-doc/html/ibus/IBusHotkeyProfile.html
share/gtk-doc/html/ibus/IBusInputContext.html
@@ -83,7 +90,6 @@ share/gtk-doc/html/ibus/IBusSerializable
share/gtk-doc/html/ibus/IBusService.html
share/gtk-doc/html/ibus/IBusText.html
share/gtk-doc/html/ibus/annotation-glossary.html
-share/gtk-doc/html/ibus/api-index-deprecated.html
share/gtk-doc/html/ibus/api-index-full.html
share/gtk-doc/html/ibus/ch01.html
share/gtk-doc/html/ibus/ch02.html
@@ -92,7 +98,6 @@ share/gtk-doc/html/ibus/ch04.html
share/gtk-doc/html/ibus/ch05.html
share/gtk-doc/html/ibus/ch06.html
share/gtk-doc/html/ibus/home.png
-share/gtk-doc/html/ibus/IBusEngineSimple.html
share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
share/gtk-doc/html/ibus/ibus-ibusdebug.html
share/gtk-doc/html/ibus/ibus-ibuserror.html
@@ -105,7 +110,6 @@ share/gtk-doc/html/ibus/ibus-ibusversion
share/gtk-doc/html/ibus/ibus-ibusxml.html
share/gtk-doc/html/ibus/ibus.devhelp2
share/gtk-doc/html/ibus/index.html
-share/gtk-doc/html/ibus/index.sgml
share/gtk-doc/html/ibus/left-insensitive.png
share/gtk-doc/html/ibus/left.png
share/gtk-doc/html/ibus/right-insensitive.png
@@ -117,12 +121,98 @@ share/ibus/component/dconf.xml
share/ibus/component/gconf.xml
share/ibus/component/gtkpanel.xml
share/ibus/component/simple.xml
+share/ibus/dicts/emoji-af.dict
+share/ibus/dicts/emoji-am.dict
+share/ibus/dicts/emoji-ar.dict
+share/ibus/dicts/emoji-as.dict
+share/ibus/dicts/emoji-az.dict
+share/ibus/dicts/emoji-be.dict
+share/ibus/dicts/emoji-bg.dict
+share/ibus/dicts/emoji-bn.dict
+share/ibus/dicts/emoji-bs.dict
+share/ibus/dicts/emoji-ca.dict
+share/ibus/dicts/emoji-cs.dict
+share/ibus/dicts/emoji-cy.dict
+share/ibus/dicts/emoji-da.dict
+share/ibus/dicts/emoji-de.dict
+share/ibus/dicts/emoji-de_CH.dict
+share/ibus/dicts/emoji-el.dict
+share/ibus/dicts/emoji-en.dict
+share/ibus/dicts/emoji-en_001.dict
+share/ibus/dicts/emoji-es.dict
+share/ibus/dicts/emoji-es_419.dict
+share/ibus/dicts/emoji-et.dict
+share/ibus/dicts/emoji-eu.dict
+share/ibus/dicts/emoji-fa.dict
+share/ibus/dicts/emoji-fi.dict
+share/ibus/dicts/emoji-fil.dict
+share/ibus/dicts/emoji-fr.dict
+share/ibus/dicts/emoji-ga.dict
+share/ibus/dicts/emoji-gl.dict
+share/ibus/dicts/emoji-gu.dict
+share/ibus/dicts/emoji-he.dict
+share/ibus/dicts/emoji-hi.dict
+share/ibus/dicts/emoji-hr.dict
+share/ibus/dicts/emoji-hu.dict
+share/ibus/dicts/emoji-hy.dict
+share/ibus/dicts/emoji-id.dict
+share/ibus/dicts/emoji-is.dict
+share/ibus/dicts/emoji-it.dict
+share/ibus/dicts/emoji-ja.dict
+share/ibus/dicts/emoji-ka.dict
+share/ibus/dicts/emoji-kk.dict
+share/ibus/dicts/emoji-km.dict
+share/ibus/dicts/emoji-kn.dict
+share/ibus/dicts/emoji-ko.dict
+share/ibus/dicts/emoji-ky.dict
+share/ibus/dicts/emoji-lo.dict
+share/ibus/dicts/emoji-lt.dict
+share/ibus/dicts/emoji-lv.dict
+share/ibus/dicts/emoji-mk.dict
+share/ibus/dicts/emoji-ml.dict
+share/ibus/dicts/emoji-mn.dict
+share/ibus/dicts/emoji-mr.dict
+share/ibus/dicts/emoji-ms.dict
+share/ibus/dicts/emoji-my.dict
+share/ibus/dicts/emoji-nb.dict
+share/ibus/dicts/emoji-ne.dict
+share/ibus/dicts/emoji-nl.dict
+share/ibus/dicts/emoji-or.dict
+share/ibus/dicts/emoji-pa.dict
+share/ibus/dicts/emoji-pl.dict
+share/ibus/dicts/emoji-pt.dict
+share/ibus/dicts/emoji-pt_PT.dict
+share/ibus/dicts/emoji-ro.dict
+share/ibus/dicts/emoji-root.dict
+share/ibus/dicts/emoji-ru.dict
+share/ibus/dicts/emoji-si.dict
+share/ibus/dicts/emoji-sk.dict
+share/ibus/dicts/emoji-sl.dict
+share/ibus/dicts/emoji-sq.dict
+share/ibus/dicts/emoji-sr.dict
+share/ibus/dicts/emoji-sr_Latn.dict
+share/ibus/dicts/emoji-sv.dict
+share/ibus/dicts/emoji-sw.dict
+share/ibus/dicts/emoji-ta.dict
+share/ibus/dicts/emoji-te.dict
+share/ibus/dicts/emoji-th.dict
+share/ibus/dicts/emoji-tr.dict
+share/ibus/dicts/emoji-uk.dict
+share/ibus/dicts/emoji-ur.dict
+share/ibus/dicts/emoji-uz.dict
+share/ibus/dicts/emoji-vi.dict
+share/ibus/dicts/emoji-zh.dict
+share/ibus/dicts/emoji-zh_Hant.dict
+share/ibus/dicts/emoji-zu.dict
share/ibus/keymaps/common
share/ibus/keymaps/in
share/ibus/keymaps/jp
share/ibus/keymaps/kr
share/ibus/keymaps/modifiers
share/ibus/keymaps/us
+share/ibus/setup/emojilang.py
+share/ibus/setup/emojilang.pyc
+share/ibus/setup/emojilang.pyo
share/ibus/setup/engineabout.py
share/ibus/setup/engineabout.pyc
share/ibus/setup/engineabout.pyo
@@ -163,6 +253,7 @@ share/locale/bg/LC_MESSAGES/ibus10.mo
share/locale/bn/LC_MESSAGES/ibus10.mo
share/locale/bn_IN/LC_MESSAGES/ibus10.mo
share/locale/ca/LC_MESSAGES/ibus10.mo
+share/locale/cs/LC_MESSAGES/ibus10.mo
share/locale/da/LC_MESSAGES/ibus10.mo
share/locale/de/LC_MESSAGES/ibus10.mo
share/locale/en_GB/LC_MESSAGES/ibus10.mo
@@ -170,6 +261,7 @@ share/locale/es/LC_MESSAGES/ibus10.mo
share/locale/et/LC_MESSAGES/ibus10.mo
share/locale/eu/LC_MESSAGES/ibus10.mo
share/locale/fa/LC_MESSAGES/ibus10.mo
+share/locale/fi/LC_MESSAGES/ibus10.mo
share/locale/fr/LC_MESSAGES/ibus10.mo
share/locale/gu/LC_MESSAGES/ibus10.mo
share/locale/he/LC_MESSAGES/ibus10.mo
@@ -182,6 +274,7 @@ share/locale/kn/LC_MESSAGES/ibus10.mo
share/locale/ko/LC_MESSAGES/ibus10.mo
share/locale/lv/LC_MESSAGES/ibus10.mo
share/locale/ml/LC_MESSAGES/ibus10.mo
+share/locale/mn/LC_MESSAGES/ibus10.mo
share/locale/mr/LC_MESSAGES/ibus10.mo
share/locale/nb/LC_MESSAGES/ibus10.mo
share/locale/nl/LC_MESSAGES/ibus10.mo
@@ -190,8 +283,10 @@ share/locale/pa/LC_MESSAGES/ibus10.mo
share/locale/pl/LC_MESSAGES/ibus10.mo
share/locale/pt_BR/LC_MESSAGES/ibus10.mo
share/locale/ru/LC_MESSAGES/ibus10.mo
+share/locale/sq/LC_MESSAGES/ibus10.mo
share/locale/sr/LC_MESSAGES/ibus10.mo
share/locale/sr@latin/LC_MESSAGES/ibus10.mo
+share/locale/sv/LC_MESSAGES/ibus10.mo
share/locale/ta/LC_MESSAGES/ibus10.mo
share/locale/te/LC_MESSAGES/ibus10.mo
share/locale/tg/LC_MESSAGES/ibus10.mo
Index: ibus/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ibus/distinfo,v
retrieving revision 1.17
diff -u -p -d -r1.17 distinfo
--- ibus/distinfo 2 Mar 2016 22:59:00 -0000 1.17
+++ ibus/distinfo 3 Nov 2017 03:39:21 -0000
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.17 2016/03/02 22:59:00 ryoon Exp $
-SHA1 (ibus-1.5.13.tar.gz) = 054a5a884329f2d3295d8f992566e7db72cf283b
-RMD160 (ibus-1.5.13.tar.gz) = 0c8177a9e66e31589bd070caf285797fef1da062
-SHA512 (ibus-1.5.13.tar.gz) = bffb3cecf984ec6e383a111b4e62506390f083476f59404e2e9b90251e6e06853d7f1dc06194456ab5064b5d375820510be1ab12ebd29b966d6a7f5b8aca07ab
-Size (ibus-1.5.13.tar.gz) = 2194054 bytes
-SHA1 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
-SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a
+SHA1 (ibus-1.5.17.tar.gz) = 2e2039757d7e8e60f4101b8d197b6fb972f2e787
+RMD160 (ibus-1.5.17.tar.gz) = cc622a536cc3cce572c16f751203f87c8ed5ba08
+SHA512 (ibus-1.5.17.tar.gz) = 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
+Size (ibus-1.5.17.tar.gz) = 2522960 bytes
+SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
+SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
Index: ibus/patches/patch-client_gtk2_ibusimcontext.c
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c,v
retrieving revision 1.1
diff -u -p -d -r1.1 patch-client_gtk2_ibusimcontext.c
--- ibus/patches/patch-client_gtk2_ibusimcontext.c 12 Nov 2013 02:57:43 -0000 1.1
+++ ibus/patches/patch-client_gtk2_ibusimcontext.c 3 Nov 2017 03:39:21 -0000
@@ -3,9 +3,9 @@ $NetBSD: patch-client_gtk2_ibusimcontext
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
---- client/gtk2/ibusimcontext.c~ 2013-09-20 03:15:51.000000000 +0000
+--- client/gtk2/ibusimcontext.c.orig 2017-10-22 10:31:49.000000000 +0000
+++ client/gtk2/ibusimcontext.c
-@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -559,6 +559,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
@@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says:
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
-@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
+@@ -642,10 +645,7 @@ ibus_im_context_class_init (IBusIMContex
/* always install snooper */
if (_key_snooper_id == 0) {
@@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says:
}
_daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
+@@ -656,21 +656,22 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
Index: ibus/patches/patch-client_gtk3_ibusimcontext.c
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c,v
retrieving revision 1.1
diff -u -p -d -r1.1 patch-client_gtk3_ibusimcontext.c
--- ibus/patches/patch-client_gtk3_ibusimcontext.c 12 Nov 2013 02:57:43 -0000 1.1
+++ ibus/patches/patch-client_gtk3_ibusimcontext.c 3 Nov 2017 03:39:21 -0000
@@ -3,9 +3,9 @@ $NetBSD: patch-client_gtk3_ibusimcontext
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
---- client/gtk3/ibusimcontext.c~ 2013-09-20 03:15:51.000000000 +0000
+--- client/gtk3/ibusimcontext.c.orig 2017-10-22 10:31:49.000000000 +0000
+++ client/gtk3/ibusimcontext.c
-@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -559,6 +559,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
@@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says:
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
-@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
+@@ -642,10 +645,7 @@ ibus_im_context_class_init (IBusIMContex
/* always install snooper */
if (_key_snooper_id == 0) {
@@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says:
}
_daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
+@@ -656,21 +656,22 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
Index: ibus-python/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ibus-python/Makefile,v
retrieving revision 1.11
diff -u -p -d -r1.11 Makefile
--- ibus-python/Makefile 1 Jan 2017 14:43:44 -0000 1.11
+++ ibus-python/Makefile 3 Nov 2017 03:39:21 -0000
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+= --disable-nls
CONFIGURE_ARGS+= --disable-libnotify
CONFIGURE_ARGS+= --disable-engine
CONFIGURE_ARGS+= --disable-surround-text
+CONFIGURE_ARGS+= --disable-emoji-dict
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment