aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2019-07-11 16:28:41 +0300
committerEli Zaretskii2019-07-11 16:28:41 +0300
commit60fc771ac6f090e4e44339cb6d0232a852580ee2 (patch)
tree32b6153fc57f8b9b85771cb820214e36b6b8b4ce /lisp
parent2581513abea46d41ee97ea55b22803e78efc1459 (diff)
downloademacs-60fc771ac6f090e4e44339cb6d0232a852580ee2.tar.gz
emacs-60fc771ac6f090e4e44339cb6d0232a852580ee2.zip
Resurrect SVG support on MS-Windows
* src/image.c (syms_of_image) <Qgio> [HAVE_NTGUI]: New DEFSYM. (init_svg_functions) [LIBRSVG_CHECK_VERSION >= 2.32.0]: Load g_file_new_for_path and g_memory_input_stream_new_from_data from libgio, not from libglib. (Bug#35548) * lisp/term/w32-win.el (dynamic-library-alist): Add the libgio DLL.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/term/w32-win.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 044b82ed1e0..198182fca72 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -279,6 +279,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
279 '(svg "librsvg-2-2.dll") 279 '(svg "librsvg-2-2.dll")
280 '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll") 280 '(gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
281 '(glib "libglib-2.0-0.dll") 281 '(glib "libglib-2.0-0.dll")
282 '(gio "libgio-2.0-0.dll")
282 '(gobject "libgobject-2.0-0.dll") 283 '(gobject "libgobject-2.0-0.dll")
283 (if (>= libgnutls-version 30400) 284 (if (>= libgnutls-version 30400)
284 '(gnutls "libgnutls-30.dll") 285 '(gnutls "libgnutls-30.dll")