diff options
author | Eric Sagnes <eric.sagnes@gmail.com> | 2016-02-16 22:46:17 +0900 |
---|---|---|
committer | Eric Sagnes <eric.sagnes@gmail.com> | 2016-02-17 20:44:29 +0900 |
commit | 2dac18aa01303be95dcf56cf4e0fa01ff30af05f (patch) | |
tree | 6d6c87534a71378c9049878dc0aa5fe2e2953210 /pkgs/tools/inputmethods/uim | |
parent | 52dd53373f7fa134b0e697a0f102490f3f4ade87 (diff) |
uim: removed gtk and qt plugin update logic
Diffstat (limited to 'pkgs/tools/inputmethods/uim')
-rw-r--r-- | pkgs/tools/inputmethods/uim/data-hook.patch | 39 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/uim/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/uim/immodules_cache.patch | 231 |
3 files changed, 45 insertions, 236 deletions
diff --git a/pkgs/tools/inputmethods/uim/data-hook.patch b/pkgs/tools/inputmethods/uim/data-hook.patch new file mode 100644 index 0000000000000..07fdf87331697 --- /dev/null +++ b/pkgs/tools/inputmethods/uim/data-hook.patch @@ -0,0 +1,39 @@ +--- a/gtk2/immodule/Makefile.in 2015-11-24 16:21:08.967087208 +0900 ++++ b/gtk2/immodule/Makefile.in 2015-11-24 16:22:53.316095150 +0900 +@@ -806,7 +806,6 @@ + + install-data-am: install-moduleLTLIBRARIES + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-am + + install-dvi-am: +@@ -861,7 +860,7 @@ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-hook install-dvi install-dvi-am \ ++ install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-moduleLTLIBRARIES install-pdf install-pdf-am \ + +--- a/gtk3/immodule/Makefile.in 2015-11-24 16:21:08.971087209 +0900 ++++ b/gtk3/immodule/Makefile.in 2015-11-24 16:23:28.251097832 +0900 +@@ -824,7 +824,6 @@ + + install-data-am: install-moduleLTLIBRARIES + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-am + + install-dvi-am: +@@ -879,7 +878,7 @@ + ctags distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ +- install-data-am install-data-hook install-dvi install-dvi-am \ ++ install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-moduleLTLIBRARIES install-pdf install-pdf-am diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 19de302e7b1fd..99a415407c172 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { m17n_db ]; - patches = [ ./immodules_cache.patch ]; + patches = [ ./data-hook.patch ]; configureFlags = [ "--with-gtk2" @@ -41,10 +41,11 @@ stdenv.mkDerivation rec { sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; }; - meta = { - homepage = "http://code.google.com/p/uim/"; + meta = with stdenv.lib; { + homepage = "http://code.google.com/p/uim/"; description = "A multilingual input method framework"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/pkgs/tools/inputmethods/uim/immodules_cache.patch b/pkgs/tools/inputmethods/uim/immodules_cache.patch deleted file mode 100644 index c2d08b661e38d..0000000000000 --- a/pkgs/tools/inputmethods/uim/immodules_cache.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am ---- uim-1.8.6.orig/gtk2/immodule/Makefile.am 2013-06-30 13:26:09.000000000 +0900 -+++ uim-1.8.6/gtk2/immodule/Makefile.am 2014-07-13 21:51:26.538400004 +0900 -@@ -1,5 +1,5 @@ - uim_gtk_im_module_path = $(libdir)/gtk-2.0 --uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules -+uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache - - moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules - -@@ -38,48 +38,12 @@ - - install-data-hook: gtk-rc-get-immodule-file - if test -z $(DESTDIR); then \ -- if test $(libdir) = $(GTK_LIBDIR); then \ -- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ -- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ -- echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ -- else \ -- echo "********************** Warning ***********************"; \ -- echo " $(QUERY_COMMAND) not found"; \ -- echo " Please make sure to update"; \ -- echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ -- echo " manually."; \ -- echo "******************************************************"; \ -- fi \ -- else \ -- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ -- $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ -- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ -- echo "******************************************************"; \ -- echo " You need to set"; \ -- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ -- echo " environment variable to use this module."; \ -- echo "******************************************************"; \ -- else \ -- echo "********************** Warning ***********************"; \ -- echo " $(QUERY_COMMAND) not found"; \ -- echo " Please make sure to update"; \ -- echo " \"$(uim_gtk_im_module_file)\""; \ -- echo " manually, and set"; \ -- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ -- echo " environment variable to use this module."; \ -- echo "******************************************************"; \ -- fi \ -- fi \ -+ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ -+ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ - fi - uninstall-hook: - if test -z $(DESTDIR); then \ -- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ -- if test $(libdir) = $(GTK_LIBDIR); then \ -- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ -- else \ -- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ -- fi \ -- fi \ -+ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ - fi - else - install-data-hook: -diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in ---- uim-1.8.6.orig/gtk2/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 -+++ uim-1.8.6/gtk2/immodule/Makefile.in 2014-07-13 22:12:27.947595507 +0900 -@@ -434,7 +434,7 @@ - top_srcdir = @top_srcdir@ - uim_pixmapsdir = @uim_pixmapsdir@ - uim_gtk_im_module_path = $(libdir)/gtk-2.0 --uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules -+uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache - moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules - @GTK2_TRUE@im_uim_la = im-uim.la - @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -@@ -875,48 +875,12 @@ - - @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file - @GTK2_TRUE@ if test -z $(DESTDIR); then \ --@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ --@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ --@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ --@GTK2_TRUE@ echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ --@GTK2_TRUE@ else \ --@GTK2_TRUE@ echo "********************** Warning ***********************"; \ --@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ --@GTK2_TRUE@ echo " Please make sure to update"; \ --@GTK2_TRUE@ echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ --@GTK2_TRUE@ echo " manually."; \ --@GTK2_TRUE@ echo "******************************************************"; \ --@GTK2_TRUE@ fi \ --@GTK2_TRUE@ else \ --@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ --@GTK2_TRUE@ $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ --@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ --@GTK2_TRUE@ echo "******************************************************"; \ --@GTK2_TRUE@ echo " You need to set"; \ --@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ --@GTK2_TRUE@ echo " environment variable to use this module."; \ --@GTK2_TRUE@ echo "******************************************************"; \ --@GTK2_TRUE@ else \ --@GTK2_TRUE@ echo "********************** Warning ***********************"; \ --@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ --@GTK2_TRUE@ echo " Please make sure to update"; \ --@GTK2_TRUE@ echo " \"$(uim_gtk_im_module_file)\""; \ --@GTK2_TRUE@ echo " manually, and set"; \ --@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ --@GTK2_TRUE@ echo " environment variable to use this module."; \ --@GTK2_TRUE@ echo "******************************************************"; \ --@GTK2_TRUE@ fi \ --@GTK2_TRUE@ fi \ -+@GTK2_TRUE@ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ -+@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ - @GTK2_TRUE@ fi - @GTK2_TRUE@uninstall-hook: - @GTK2_TRUE@ if test -z $(DESTDIR); then \ --@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ --@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ --@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ --@GTK2_TRUE@ else \ --@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ --@GTK2_TRUE@ fi \ --@GTK2_TRUE@ fi \ -+@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ - @GTK2_TRUE@ fi - @GTK2_FALSE@install-data-hook: - -diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am ---- uim-1.8.6.orig/gtk3/immodule/Makefile.am 2013-06-30 13:26:20.000000000 +0900 -+++ uim-1.8.6/gtk3/immodule/Makefile.am 2014-07-13 21:55:38.114246503 +0900 -@@ -45,42 +45,11 @@ - - install-data-hook: gtk3-rc-get-immodule-file - if test -z $(DESTDIR); then \ -- if test $(libdir) = $(GTK3_LIBDIR); then \ -- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ -- $(QUERY_COMMAND) --update-cache; \ -- echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ -- else \ -- echo "********************** Warning ***********************"; \ -- echo " $(QUERY_COMMAND) not found"; \ -- echo " Please make sure to update"; \ -- echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ -- echo " manually."; \ -- echo "******************************************************"; \ -- fi \ -- else \ -- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ -- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ -- else \ -- echo "********************** Warning ***********************"; \ -- echo " $(QUERY_COMMAND) not found"; \ -- echo " Please make sure to update"; \ -- echo " immodules.cache"; \ -- echo " manually, and set"; \ -- echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ -- echo " environment variable to use this module."; \ -- echo "******************************************************"; \ -- fi \ -- fi \ -+ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ - fi - uninstall-hook: - if test -z $(DESTDIR); then \ -- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ -- if test $(libdir) = $(GTK3_LIBDIR); then \ -- $(QUERY_COMMAND) --update-cache; \ -- else \ -- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ -- fi \ -- fi \ -+ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ - fi - else - install-data-hook: -diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in ---- uim-1.8.6.orig/gtk3/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 -+++ uim-1.8.6/gtk3/immodule/Makefile.in 2014-07-13 21:56:11.531225832 +0900 -@@ -893,42 +893,11 @@ - - @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file - @GTK3_TRUE@ if test -z $(DESTDIR); then \ --@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ --@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ --@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ --@GTK3_TRUE@ echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ --@GTK3_TRUE@ else \ --@GTK3_TRUE@ echo "********************** Warning ***********************"; \ --@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ --@GTK3_TRUE@ echo " Please make sure to update"; \ --@GTK3_TRUE@ echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ --@GTK3_TRUE@ echo " manually."; \ --@GTK3_TRUE@ echo "******************************************************"; \ --@GTK3_TRUE@ fi \ --@GTK3_TRUE@ else \ --@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ --@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ --@GTK3_TRUE@ else \ --@GTK3_TRUE@ echo "********************** Warning ***********************"; \ --@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ --@GTK3_TRUE@ echo " Please make sure to update"; \ --@GTK3_TRUE@ echo " immodules.cache"; \ --@GTK3_TRUE@ echo " manually, and set"; \ --@GTK3_TRUE@ echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ --@GTK3_TRUE@ echo " environment variable to use this module."; \ --@GTK3_TRUE@ echo "******************************************************"; \ --@GTK3_TRUE@ fi \ --@GTK3_TRUE@ fi \ -+@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ - @GTK3_TRUE@ fi - @GTK3_TRUE@uninstall-hook: - @GTK3_TRUE@ if test -z $(DESTDIR); then \ --@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ --@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ --@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ --@GTK3_TRUE@ else \ --@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ --@GTK3_TRUE@ fi \ --@GTK3_TRUE@ fi \ -+@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ - @GTK3_TRUE@ fi - @GTK3_FALSE@install-data-hook: - -diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in ---- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in 2013-06-30 13:26:20.000000000 +0900 -+++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in 2014-03-09 11:31:19.388085048 +0900 -@@ -35,4 +35,4 @@ - - TARGET = uiminputcontextplugin - --target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods -+target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods |