pyrox.dev / nixpkgs
lol
fork atom

uim: removed gtk and qt plugin update logic

Eric Sagnes 2dac18aa 52dd5337

+45 -236
unified split
+39
pkgs/tools/inputmethods/uim/data-hook.patch
···
··· 1 + --- a/gtk2/immodule/Makefile.in 2015-11-24 16:21:08.967087208 +0900 2 + +++ b/gtk2/immodule/Makefile.in 2015-11-24 16:22:53.316095150 +0900 3 + @@ -806,7 +806,6 @@ 4 + 5 + install-data-am: install-moduleLTLIBRARIES 6 + @$(NORMAL_INSTALL) 7 + - $(MAKE) $(AM_MAKEFLAGS) install-data-hook 8 + install-dvi: install-dvi-am 9 + 10 + install-dvi-am: 11 + @@ -861,7 +860,7 @@ 12 + ctags distclean distclean-compile distclean-generic \ 13 + distclean-libtool distclean-tags distdir dvi dvi-am html \ 14 + html-am info info-am install install-am install-data \ 15 + - install-data-am install-data-hook install-dvi install-dvi-am \ 16 + + install-data-am install-dvi install-dvi-am \ 17 + install-exec install-exec-am install-html install-html-am \ 18 + install-info install-info-am install-man \ 19 + install-moduleLTLIBRARIES install-pdf install-pdf-am \ 20 + 21 + --- a/gtk3/immodule/Makefile.in 2015-11-24 16:21:08.971087209 +0900 22 + +++ b/gtk3/immodule/Makefile.in 2015-11-24 16:23:28.251097832 +0900 23 + @@ -824,7 +824,6 @@ 24 + 25 + install-data-am: install-moduleLTLIBRARIES 26 + @$(NORMAL_INSTALL) 27 + - $(MAKE) $(AM_MAKEFLAGS) install-data-hook 28 + install-dvi: install-dvi-am 29 + 30 + install-dvi-am: 31 + @@ -879,7 +878,7 @@ 32 + ctags distclean distclean-compile distclean-generic \ 33 + distclean-libtool distclean-tags distdir dvi dvi-am html \ 34 + html-am info info-am install install-am install-data \ 35 + - install-data-am install-data-hook install-dvi install-dvi-am \ 36 + + install-data-am install-dvi install-dvi-am \ 37 + install-exec install-exec-am install-html install-html-am \ 38 + install-info install-info-am install-man \ 39 + install-moduleLTLIBRARIES install-pdf install-pdf-am
+6 -5
pkgs/tools/inputmethods/uim/default.nix
··· 19 m17n_db 20 ]; 21 22 - patches = [ ./immodules_cache.patch ]; 23 24 configureFlags = [ 25 "--with-gtk2" ··· 41 sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; 42 }; 43 44 - meta = { 45 - homepage = "http://code.google.com/p/uim/"; 46 description = "A multilingual input method framework"; 47 - license = stdenv.lib.licenses.bsd3; 48 - platforms = stdenv.lib.platforms.linux; 49 }; 50 }
··· 19 m17n_db 20 ]; 21 22 + patches = [ ./data-hook.patch ]; 23 24 configureFlags = [ 25 "--with-gtk2" ··· 41 sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; 42 }; 43 44 + meta = with stdenv.lib; { 45 + homepage = "http://code.google.com/p/uim/"; 46 description = "A multilingual input method framework"; 47 + license = stdenv.lib.licenses.bsd3; 48 + platforms = stdenv.lib.platforms.linux; 49 + maintainers = with maintainers; [ ericsagnes ]; 50 }; 51 }
-231
pkgs/tools/inputmethods/uim/immodules_cache.patch
··· 1 - diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am 2 - --- uim-1.8.6.orig/gtk2/immodule/Makefile.am 2013-06-30 13:26:09.000000000 +0900 3 - +++ uim-1.8.6/gtk2/immodule/Makefile.am 2014-07-13 21:51:26.538400004 +0900 4 - @@ -1,5 +1,5 @@ 5 - uim_gtk_im_module_path = $(libdir)/gtk-2.0 6 - -uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules 7 - +uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache 8 - 9 - moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules 10 - 11 - @@ -38,48 +38,12 @@ 12 - 13 - install-data-hook: gtk-rc-get-immodule-file 14 - if test -z $(DESTDIR); then \ 15 - - if test $(libdir) = $(GTK_LIBDIR); then \ 16 - - if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 17 - - $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ 18 - - echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ 19 - - else \ 20 - - echo "********************** Warning ***********************"; \ 21 - - echo " $(QUERY_COMMAND) not found"; \ 22 - - echo " Please make sure to update"; \ 23 - - echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ 24 - - echo " manually."; \ 25 - - echo "******************************************************"; \ 26 - - fi \ 27 - - else \ 28 - - if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 29 - - $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ 30 - - GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 31 - - echo "******************************************************"; \ 32 - - echo " You need to set"; \ 33 - - echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ 34 - - echo " environment variable to use this module."; \ 35 - - echo "******************************************************"; \ 36 - - else \ 37 - - echo "********************** Warning ***********************"; \ 38 - - echo " $(QUERY_COMMAND) not found"; \ 39 - - echo " Please make sure to update"; \ 40 - - echo " \"$(uim_gtk_im_module_file)\""; \ 41 - - echo " manually, and set"; \ 42 - - echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ 43 - - echo " environment variable to use this module."; \ 44 - - echo "******************************************************"; \ 45 - - fi \ 46 - - fi \ 47 - + $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ 48 - + GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 49 - fi 50 - uninstall-hook: 51 - if test -z $(DESTDIR); then \ 52 - - if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 53 - - if test $(libdir) = $(GTK_LIBDIR); then \ 54 - - $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ 55 - - else \ 56 - - GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 57 - - fi \ 58 - - fi \ 59 - + GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 60 - fi 61 - else 62 - install-data-hook: 63 - diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in 64 - --- uim-1.8.6.orig/gtk2/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 65 - +++ uim-1.8.6/gtk2/immodule/Makefile.in 2014-07-13 22:12:27.947595507 +0900 66 - @@ -434,7 +434,7 @@ 67 - top_srcdir = @top_srcdir@ 68 - uim_pixmapsdir = @uim_pixmapsdir@ 69 - uim_gtk_im_module_path = $(libdir)/gtk-2.0 70 - -uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules 71 - +uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache 72 - moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules 73 - @GTK2_TRUE@im_uim_la = im-uim.la 74 - @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) 75 - @@ -875,48 +875,12 @@ 76 - 77 - @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file 78 - @GTK2_TRUE@ if test -z $(DESTDIR); then \ 79 - -@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ 80 - -@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 81 - -@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ 82 - -@GTK2_TRUE@ echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ 83 - -@GTK2_TRUE@ else \ 84 - -@GTK2_TRUE@ echo "********************** Warning ***********************"; \ 85 - -@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ 86 - -@GTK2_TRUE@ echo " Please make sure to update"; \ 87 - -@GTK2_TRUE@ echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ 88 - -@GTK2_TRUE@ echo " manually."; \ 89 - -@GTK2_TRUE@ echo "******************************************************"; \ 90 - -@GTK2_TRUE@ fi \ 91 - -@GTK2_TRUE@ else \ 92 - -@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 93 - -@GTK2_TRUE@ $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ 94 - -@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 95 - -@GTK2_TRUE@ echo "******************************************************"; \ 96 - -@GTK2_TRUE@ echo " You need to set"; \ 97 - -@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ 98 - -@GTK2_TRUE@ echo " environment variable to use this module."; \ 99 - -@GTK2_TRUE@ echo "******************************************************"; \ 100 - -@GTK2_TRUE@ else \ 101 - -@GTK2_TRUE@ echo "********************** Warning ***********************"; \ 102 - -@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ 103 - -@GTK2_TRUE@ echo " Please make sure to update"; \ 104 - -@GTK2_TRUE@ echo " \"$(uim_gtk_im_module_file)\""; \ 105 - -@GTK2_TRUE@ echo " manually, and set"; \ 106 - -@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ 107 - -@GTK2_TRUE@ echo " environment variable to use this module."; \ 108 - -@GTK2_TRUE@ echo "******************************************************"; \ 109 - -@GTK2_TRUE@ fi \ 110 - -@GTK2_TRUE@ fi \ 111 - +@GTK2_TRUE@ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ 112 - +@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 113 - @GTK2_TRUE@ fi 114 - @GTK2_TRUE@uninstall-hook: 115 - @GTK2_TRUE@ if test -z $(DESTDIR); then \ 116 - -@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 117 - -@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ 118 - -@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ 119 - -@GTK2_TRUE@ else \ 120 - -@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 121 - -@GTK2_TRUE@ fi \ 122 - -@GTK2_TRUE@ fi \ 123 - +@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ 124 - @GTK2_TRUE@ fi 125 - @GTK2_FALSE@install-data-hook: 126 - 127 - diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am 128 - --- uim-1.8.6.orig/gtk3/immodule/Makefile.am 2013-06-30 13:26:20.000000000 +0900 129 - +++ uim-1.8.6/gtk3/immodule/Makefile.am 2014-07-13 21:55:38.114246503 +0900 130 - @@ -45,42 +45,11 @@ 131 - 132 - install-data-hook: gtk3-rc-get-immodule-file 133 - if test -z $(DESTDIR); then \ 134 - - if test $(libdir) = $(GTK3_LIBDIR); then \ 135 - - if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 136 - - $(QUERY_COMMAND) --update-cache; \ 137 - - echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ 138 - - else \ 139 - - echo "********************** Warning ***********************"; \ 140 - - echo " $(QUERY_COMMAND) not found"; \ 141 - - echo " Please make sure to update"; \ 142 - - echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ 143 - - echo " manually."; \ 144 - - echo "******************************************************"; \ 145 - - fi \ 146 - - else \ 147 - - if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 148 - - GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ 149 - - else \ 150 - - echo "********************** Warning ***********************"; \ 151 - - echo " $(QUERY_COMMAND) not found"; \ 152 - - echo " Please make sure to update"; \ 153 - - echo " immodules.cache"; \ 154 - - echo " manually, and set"; \ 155 - - echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ 156 - - echo " environment variable to use this module."; \ 157 - - echo "******************************************************"; \ 158 - - fi \ 159 - - fi \ 160 - + GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ 161 - fi 162 - uninstall-hook: 163 - if test -z $(DESTDIR); then \ 164 - - if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 165 - - if test $(libdir) = $(GTK3_LIBDIR); then \ 166 - - $(QUERY_COMMAND) --update-cache; \ 167 - - else \ 168 - - GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ 169 - - fi \ 170 - - fi \ 171 - + GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ 172 - fi 173 - else 174 - install-data-hook: 175 - diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in 176 - --- uim-1.8.6.orig/gtk3/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 177 - +++ uim-1.8.6/gtk3/immodule/Makefile.in 2014-07-13 21:56:11.531225832 +0900 178 - @@ -893,42 +893,11 @@ 179 - 180 - @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file 181 - @GTK3_TRUE@ if test -z $(DESTDIR); then \ 182 - -@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ 183 - -@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 184 - -@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ 185 - -@GTK3_TRUE@ echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ 186 - -@GTK3_TRUE@ else \ 187 - -@GTK3_TRUE@ echo "********************** Warning ***********************"; \ 188 - -@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ 189 - -@GTK3_TRUE@ echo " Please make sure to update"; \ 190 - -@GTK3_TRUE@ echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ 191 - -@GTK3_TRUE@ echo " manually."; \ 192 - -@GTK3_TRUE@ echo "******************************************************"; \ 193 - -@GTK3_TRUE@ fi \ 194 - -@GTK3_TRUE@ else \ 195 - -@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 196 - -@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ 197 - -@GTK3_TRUE@ else \ 198 - -@GTK3_TRUE@ echo "********************** Warning ***********************"; \ 199 - -@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ 200 - -@GTK3_TRUE@ echo " Please make sure to update"; \ 201 - -@GTK3_TRUE@ echo " immodules.cache"; \ 202 - -@GTK3_TRUE@ echo " manually, and set"; \ 203 - -@GTK3_TRUE@ echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ 204 - -@GTK3_TRUE@ echo " environment variable to use this module."; \ 205 - -@GTK3_TRUE@ echo "******************************************************"; \ 206 - -@GTK3_TRUE@ fi \ 207 - -@GTK3_TRUE@ fi \ 208 - +@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ 209 - @GTK3_TRUE@ fi 210 - @GTK3_TRUE@uninstall-hook: 211 - @GTK3_TRUE@ if test -z $(DESTDIR); then \ 212 - -@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ 213 - -@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ 214 - -@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ 215 - -@GTK3_TRUE@ else \ 216 - -@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ 217 - -@GTK3_TRUE@ fi \ 218 - -@GTK3_TRUE@ fi \ 219 - +@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ 220 - @GTK3_TRUE@ fi 221 - @GTK3_FALSE@install-data-hook: 222 - 223 - diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in 224 - --- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in 2013-06-30 13:26:20.000000000 +0900 225 - +++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in 2014-03-09 11:31:19.388085048 +0900 226 - @@ -35,4 +35,4 @@ 227 - 228 - TARGET = uiminputcontextplugin 229 - 230 - -target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods 231 - +target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods
···