diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
| commit | ddbe9191ef1549e7695e5e02e545b1b3db46edb4 (patch) | |
| tree | 90e8f4e8bf5c4410b351229cdc637333bae88024 /pkgs/tools/inputmethods/uim/data-hook.patch | |
| parent | 16b6f53910f19b84c5d8c5fb58a8ce958fc8a7d3 (diff) | |
| parent | f3fcf1b0a9b0398620b5fa9b40268ef651aa373e (diff) | |
| download | nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.gz nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.bz2 nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.lz nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.xz nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.zst nixlib-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS hack because we don't need it!
Diffstat (limited to 'pkgs/tools/inputmethods/uim/data-hook.patch')
| -rw-r--r-- | pkgs/tools/inputmethods/uim/data-hook.patch | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/pkgs/tools/inputmethods/uim/data-hook.patch b/pkgs/tools/inputmethods/uim/data-hook.patch index 07fdf8733169..be80962527ba 100644 --- a/pkgs/tools/inputmethods/uim/data-hook.patch +++ b/pkgs/tools/inputmethods/uim/data-hook.patch @@ -1,6 +1,6 @@ --- 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 @@ +@@ -928,7 +928,6 @@ install-data-am: install-moduleLTLIBRARIES @$(NORMAL_INSTALL) @@ -8,19 +8,18 @@ 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 \ - +@@ -993,7 +992,7 @@ + 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-exec \ ++ 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 install-ps install-ps-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 @@ +@@ -896,7 +896,6 @@ install-data-am: install-moduleLTLIBRARIES @$(NORMAL_INSTALL) @@ -28,12 +27,12 @@ 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 +@@ -959,7 +958,7 @@ + cscopelist-am ctags ctags-am 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-data 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 \ |