Hello community, here is the log from the commit of package mlterm for openSUSE:Factory checked in at 2019-12-21 12:30:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlterm (Old) and /work/SRC/openSUSE:Factory/.mlterm.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mlterm" Sat Dec 21 12:30:21 2019 rev:46 rq:758149 version:3.8.9 Changes: -------- --- /work/SRC/openSUSE:Factory/mlterm/mlterm.changes 2019-01-08 12:28:45.944253351 +0100 +++ /work/SRC/openSUSE:Factory/.mlterm.new.6675/mlterm.changes 2019-12-21 12:30:38.163341971 +0100 @@ -1,0 +2,62 @@ +Thu Dec 19 10:15:25 UTC 2019 - [email protected] + +- version update to 3.8.9 + * Support zmodem. (See doc/en/README.tarnsfer) + * Add "send_file" and "zmodem_start" to OSC 5379. + * Add receive_directory / --recvdir option. + * Support xdg-shell-v6 (unstable) on wayland. + * Support copy&paste via X11 primary selection on wayland. + * Hide the mouse cursor in inputting keys by default on xlib and win32. + * ~/.mlterm/font accepts UTF-8 on windows. + * Change the default value of "font_size_range" option from 1-100 to 1-10000. + * Clear a window and scroll out all lines on resizing only if + the value of --sr / "scroll_on_resizing" option is true. + * Set _NET_WM_PID property. + * Revive -N/"app_name" option which sets WM_CLASS property. + (WM_CLASS was disabled at 3.8.6) + * Add a percent or number argument without '+' and '-' to "vresize_screen" and + "hresize_screen" of OSC 5379. + * Add "RESET" (which resets the parser of mlterm) as a shortcut key. + * Add vte 0.58 API symbols to libvte compatible library. + * Merge patches: + https://bitbucket.org/arakiken/mlterm/pull-requests/5/fix-for-wscons-framebuffer/diff + https://sourceforge.net/p/mlterm/patches/24/ + * Bug fixes: + Fix memory leaks of libptymosh.so + Fix https://sourceforge.net/p/mlterm/mailman/message/36633222/ (Enbugged at 3.8.8) + Fix segfault of mlterm for java by race condition. + Fix unexpected invalidation of --mdi=false option. (Enbugged at 3.8.8) + Fix uninitialized memory access of mlimgloader.exe for win32. + Fix broken images of some sixel graphics. (Enbugged at 3.8.5) + * Support Haiku OS. (Experimental) + (Execute ./configure with --with-gui=beos option.) (See doc/en/README.beos) + * Support "[font family]:style=..." format in aafont or font-fb config file. + * Support mosh. (Experimental) (See doc/en/README.mosh) + (Don't distribute libptymosh in binary format.) + * Clear a window and scroll out all lines if the size of a window decreases + and some characters in it disappear. + * Support "%s" (replaced by selected strings) in "exesel:..." in ~/.mlterm/key. + * Add local_echo_wait / --lew option. + * Remove libind_tamil.so because it is very buggy. + * Change the default shortcut key of INSERT_SELECTION from Shift+Insert to + Command+v on MacOSX and iOS. + * Skip \r in configuration files. + * Start scp by Shift+Drag&Drop on not only xlib and win32 but also wayland, sdl2 + and cocoa. (Command+Drag&Drop on cocoa.) + * Change the default value of "font_size_range" option from 6-30 to 1-100. + * Add vte 0.56.0 API symbols to libvte compatible library. + * Bug fixes: + Fix https://sourceforge.net/p/mlterm/mailman/message/36472061/ + Fix https://sourceforge.net/p/mlterm/mailman/message/36513313/ + Fix https://sourceforge.net/p/mlterm/bugs/79/ + Fix segfault in processing illegal sixel sequence. + Fix invalidation of DECDWL on cairo. (Enbugged at 3.8.6) + Fix handling ISCII fonts on cairo and xft. (Improve showing bengali characters.) + Fix screen corruption (http://twitter.com/Cj_bc_sd/status/1088111309223161857) + on MacOSX 10.14. (Thanks to @Cj_bc_sd) + Fix segfault in showing an input method window. (Thanks to @isaki68k) +- modified patches + % etc.patch (refreshed) + % mlterm-cast.patch (refreshed) + +------------------------------------------------------------------- Old: ---- mlterm-3.8.7.tar.gz New: ---- mlterm-3.8.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlterm.spec ++++++ --- /var/tmp/diff_new_pack.kYRNal/_old 2019-12-21 12:30:39.419342568 +0100 +++ /var/tmp/diff_new_pack.kYRNal/_new 2019-12-21 12:30:39.431342574 +0100 @@ -1,7 +1,7 @@ # # spec file for package mlterm # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: mlterm -Version: 3.8.7 +Version: 3.8.9 Release: 0 Summary: Multilingual Terminal Emulator for X License: BSD-3-Clause Group: System/X11/Terminals -Url: http://mlterm.sourceforge.net/ +URL: http://mlterm.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/mlterm/01release/%{name}-%{version}/%{name}-%{version}.tar.gz Source10: %{name}.desktop Patch0: etc.patch @@ -141,6 +141,7 @@ rm -rf doc/{en,ja}/*win32 %build +export INSTALL_OPT='-m 755' %configure \ --disable-static \ --libexecdir=%{_libdir}/mlterm \ @@ -219,12 +220,12 @@ %{_libdir}/mlterm/libind_malayalam.so %{_libdir}/mlterm/libind_oriya.so %{_libdir}/mlterm/libind_punjabi.so -%{_libdir}/mlterm/libind_tamil.so %{_libdir}/mlterm/libind_telugu.so %{_libdir}/mlterm/libotl.so %{_libdir}/mlterm/libpixmap_engine.so %{_libdir}/mlterm/libptyssh.so %{_libdir}/mlterm/libtype_cairo.so +%{_libdir}/mlterm/libzmodem.so %{_libdir}/mlterm/mlterm/mlimgloader %{_libdir}/mlterm/mlterm/mlconfig %{_libdir}/mlterm/mlterm/mlmenu ++++++ etc.patch ++++++ --- /var/tmp/diff_new_pack.kYRNal/_old 2019-12-21 12:30:39.503342608 +0100 +++ /var/tmp/diff_new_pack.kYRNal/_new 2019-12-21 12:30:39.507342609 +0100 @@ -8,10 +8,10 @@ etc/xim | 13 ++++++++--- 7 files changed, 161 insertions(+), 72 deletions(-) -Index: mlterm-3.8.7/etc/aafont +Index: mlterm-3.8.9/etc/aafont =================================================================== ---- mlterm-3.8.7.orig/etc/aafont 2018-10-27 16:29:17.000000000 +0200 -+++ mlterm-3.8.7/etc/aafont 2018-12-28 19:34:29.226868067 +0100 +--- mlterm-3.8.9.orig/etc/aafont 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/etc/aafont 2019-12-19 10:22:29.451439014 +0100 @@ -1,42 +1,39 @@ #DEFAULT=Kochi Gothic @@ -86,12 +86,12 @@ -# Simplified Chinese speakers may want to enable the following setting. -#ISO10646_UCS4_1_FULLWIDTH=AR PL SungtiL GB - #ISCII_ASSAMESE = AS-TTDurga 26 + ISCII_ASSAMESE = AS-TTDurga 26 ISCII_BENGALI = BN-TTDurga 26 -Index: mlterm-3.8.7/etc/font +Index: mlterm-3.8.9/etc/font =================================================================== ---- mlterm-3.8.7.orig/etc/font 2018-10-27 16:29:17.000000000 +0200 -+++ mlterm-3.8.7/etc/font 2018-12-28 19:34:29.226868067 +0100 +--- mlterm-3.8.9.orig/etc/font 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/etc/font 2019-12-19 10:22:29.451439014 +0100 @@ -1,7 +1,7 @@ #DEFAULT = -kochi-mincho-medium-r-*--%d-*- #DEFAULT_ITALIC = -mona-gothic-medium-i-*--%d-*- @@ -101,38 +101,12 @@ #ISO8859_1_BOLD = 10,a10B;14,7x14bold; #JISX0201_KATA = 10,r10;12,r12;14,r14;16,r16; #JISX0201_KATA_BOLD = 10,r10; -@@ -13,3 +13,25 @@ - ISCII_BENGALI = -freetype-bn ttdurga-medium-r-normal--17-120-100-100-p-57-iso10646-1 - ISCII_HINDI = -freetype-dv ttyogesh-medium-r-normal--17-120-100-100-p-63-iso10646-1 - ISCII_TAMIL = -freetype-tm ttvalluvar-medium-r-normal--17-120-100-100-p-107-iso10646-1 -+ -+US_ASCII = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso8859-1;10,-b&h-lucidatypewriter-medium-r-normal-*-10-*-iso8859-1;11,-b&h-lucidatypewriter-medium-r-normal-*-11-*-iso8859-1;12,-b&h-lucidatypewriter-medium-r-normal-*-12-*-iso8859-1;14,-b&h-lucidatypewriter-medium-r-normal-*-14-*-iso8859-1;16,-sony-fixed-medium-r-*--16-*-*-*-c-*-iso8859-1;17,-b&h-lucidatypewriter-medium-r-normal-*-17-*-iso8859-1;18,-b&h-lucidatypewriter-medium-r-normal-*-18-*-iso8859-1;19,-b&h-lucidatypewriter-medium-r-normal-*-19-*-iso8859-1;20,-*-fixed-medium-r-*--20-*-iso8859-1;24,-sony-fixed-medium-r-*--24-*-*-*-c-*-iso8859-1;25,-b&h-lucidatypewriter-medium-r-normal-*-25-*-iso8859-1;26,-b&h-lucidatypewriter-medium-r-normal-*-26-*-iso8859-1;34,-b&h-lucidatypewriter-medium-r-normal-*-34-*-iso8859-1; -+ -+ISO8859_1 = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso8859-1;10,-b&h-lucidatypewriter-medium-r-normal-*-10-*-iso8859-1;11,-b&h-lucidatypewriter-medium-r-normal-*-11-*-iso8859-1;12,-b&h-lucidatypewriter-medium-r-normal-*-12-*-iso8859-1;14,-b&h-lucidatypewriter-medium-r-normal-*-14-*-iso8859-1;16,-sony-fixed-medium-r-*--16-*-*-*-c-*-iso8859-1;17,-b&h-lucidatypewriter-medium-r-normal-*-17-*-iso8859-1;18,-b&h-lucidatypewriter-medium-r-normal-*-18-*-iso8859-1;19,-b&h-lucidatypewriter-medium-r-normal-*-19-*-iso8859-1;20,-*-fixed-medium-r-*--20-*-iso8859-1;24,-sony-fixed-medium-r-*--24-*-*-*-c-*-iso8859-1;25,-b&h-lucidatypewriter-medium-r-normal-*-25-*-iso8859-1;26,-b&h-lucidatypewriter-medium-r-normal-*-26-*-iso8859-1;34,-b&h-lucidatypewriter-medium-r-normal-*-34-*-iso8859-1; -+ -+ISO8859_2 = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso8859-2;10,-b&h-lucidatypewriter-medium-r-normal-*-10-*-iso8859-2;11,-b&h-lucidatypewriter-medium-r-normal-*-11-*-iso8859-2;12,-b&h-lucidatypewriter-medium-r-normal-*-12-*-iso8859-2;14,-b&h-lucidatypewriter-medium-r-normal-*-14-*-iso8859-2;16,-*-fixed-medium-r-*--16-*-*-*-c-*-iso8859-2;17,-b&h-lucidatypewriter-medium-r-normal-*-17-*-iso8859-2;18,-b&h-lucidatypewriter-medium-r-normal-*-18-*-iso8859-2;19,-b&h-lucidatypewriter-medium-r-normal-*-19-*-iso8859-2;20,-*-fixed-medium-r-*--20-*-iso8859-2;24,-*-fixed-medium-r-*--24-*-*-*-c-*-iso8859-2;25,-b&h-lucidatypewriter-medium-r-normal-*-25-*-iso8859-2;26,-b&h-lucidatypewriter-medium-r-normal-*-26-*-iso8859-2;34,-b&h-lucidatypewriter-medium-r-normal-*-34-*-iso8859-2; -+ -+ISO8859_7 = -grinet-greekcourier-medium-r-normal-*-%d-*-*-*-m-*-iso8859-7;12,-adobe-couriergr-medium-r-normal--12-120-75-75-m-70-iso8859-7;14,-adobe-couriergr-medium-r-normal--14-140-75-75-m-90-iso8859-7;16,-adobe-couriergr-medium-r-normal--16-160-75-75-m-105-iso8859-7; -+ -+ISO8859_9 = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso8859-9;10,-b&h-lucidatypewriter-medium-r-normal-*-10-*-iso8859-9;11,-b&h-lucidatypewriter-medium-r-normal-*-11-*-iso8859-9;12,-b&h-lucidatypewriter-medium-r-normal-*-12-*-iso8859-9;14,-b&h-lucidatypewriter-medium-r-normal-*-14-*-iso8859-9;16,-*-fixed-medium-r-*--16-*-*-*-c-*-iso8859-9;17,-b&h-lucidatypewriter-medium-r-normal-*-17-*-iso8859-9;18,-b&h-lucidatypewriter-medium-r-normal-*-18-*-iso8859-9;19,-b&h-lucidatypewriter-medium-r-normal-*-19-*-iso8859-9;20,-*-fixed-medium-r-*--20-*-iso8859-9;24,-*-fixed-medium-r-*--24-*-*-*-c-*-iso8859-9;25,-b&h-lucidatypewriter-medium-r-normal-*-25-*-iso8859-9;26,-b&h-lucidatypewriter-medium-r-normal-*-26-*-iso8859-9;34,-b&h-lucidatypewriter-medium-r-normal-*-34-*-iso8859-9; -+ -+ISO8859_15 = -b&h-luxi mono-medium-r-normal-*-%d-*-*-*-m-*-iso8859-15;10,-b&h-lucidatypewriter-medium-r-normal-*-10-*-iso8859-15;11,-b&h-lucidatypewriter-medium-r-normal-*-11-*-iso8859-15;12,-b&h-lucidatypewriter-medium-r-normal-*-12-*-iso8859-15;14,-b&h-lucidatypewriter-medium-r-normal-*-14-*-iso8859-15;16,-efont-fixed-medium-r-normal--16-160-75-75-c-80-iso8859-15;17,-b&h-lucidatypewriter-medium-r-normal-*-17-*-iso8859-15;18,-b&h-lucidatypewriter-medium-r-normal-*-18-*-iso8859-15;19,-b&h-lucidatypewriter-medium-r-normal-*-19-*-iso8859-15;20,-*-fixed-medium-r-*--20-*-iso8859-15;24,-b&h-lucidatypewriter-medium-r-normal-*-24-*-iso8859-15;25,-b&h-lucidatypewriter-medium-r-normal-*-25-*-iso8859-15;26,-b&h-lucidatypewriter-medium-r-normal-*-26-*-iso8859-15;34,-b&h-lucidatypewriter-medium-r-normal-*-34-*-iso8859-15; -+ -+JISX0208_1983 = -misc-ipagothic-medium-r-normal-*-%d-*-*-*-*-*-jisx0208.1983-0;10,-*-fixed-medium-r-*--10-*-*-*-c-*-jisx0208*-0;12,-*-fixed-medium-r-normal--12-*-*-*-c-*-jisx0208*-0;14,-*-fixed-medium-r-*--14-*-*-*-c-*-jisx0208*-0;16,-jis-fixed-medium-r-*--16-*-*-*-c-160-jisx0208*-0;18,-misc-fixed-medium-r-*--18-*-*-*-c-*-jisx0208*-0;20,-*-fixed-medium-r-*--20-*-*-*-c-200-jisx0208*-0;24,-*-fixed-medium-r-normal--24-*-*-*-c-*-jisx0208*-0 -+ -+JISX0208_1990 = -misc-ipagothic-medium-r-normal-*-%d-*-*-*-*-*-jisx0208.1990-0;10,-*-fixed-medium-r-*--10-*-*-*-c-*-jisx0208.1990-0;12,-*-fixed-medium-r-normal--12-*-*-*-c-*-jisx0208.1990-0;14,-*-fixed-medium-r-*--14-*-*-*-c-*-jisx0208.1990-0;16,-jis-fixed-medium-r-*--16-*-*-*-c-160-jisx0208.1990-0;18,-misc-fixed-medium-r-*--18-*-*-*-c-*-jisx0208.1990-0;20,-*-fixed-medium-r-*--20-*-*-*-c-200-jisx0208.1990-0 -+ -+# if '-baekmuk-gulim-' cannot be found, other Korean fonts will be tried automatically. -+# On a minimalistic X11 installation, at least the 'daewoo' fonts should be found. -+ -+KSX1001_1997 = -baekmukttf-gulim-medium-r-normal-*-%d-*-*-*-*-*-ksx1001.1997-0;10,-baekmuk-gulim-medium-r-normal--10-100-75-75-m-100-ksx1001.1997-0;12,-baekmuk-gulim-medium-r-normal--12-120-75-75-m-120-ksx1001.1997-0;14,-baekmuk-gulim-medium-r-normal--14-140-75-75-m-140-ksx1001.1997-0;16,-baekmuk-gulim-medium-r-normal--16-160-75-75-m-160-ksx1001.1997-0;18,-baekmuk-gulim-medium-r-normal--18-180-75-75-m-180-ksx1001.1997-0;20,-baekmuk-gulim-medium-r-normal--20-200-75-75-m-200-ksx1001.1997-0;24,-baekmuk-gulim-medium-r-normal--24-240-75-75-m-240-ksx1001.1997-0; -+ -Index: mlterm-3.8.7/etc/key +Index: mlterm-3.8.9/etc/key =================================================================== ---- mlterm-3.8.7.orig/etc/key 2018-10-27 16:29:17.000000000 +0200 -+++ mlterm-3.8.7/etc/key 2018-12-28 19:34:29.226868067 +0100 -@@ -39,3 +39,9 @@ - # Button3="exesel:explorer.exe microsoft-edge:" +--- mlterm-3.8.9.orig/etc/key 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/etc/key 2019-12-19 10:22:29.451439014 +0100 +@@ -43,3 +43,9 @@ + # Shift+Button3="exesel:explorer.exe microsoft-edge:\"%s\"" # Button4="\x1bOA\x1bOA" # Button5="\x1bOB\x1bOB" + @@ -141,10 +115,10 @@ +Shift+KP_Subtract="proto:fontsize=smaller" +KP_Begin="\e[E" + -Index: mlterm-3.8.7/etc/main +Index: mlterm-3.8.9/etc/main =================================================================== ---- mlterm-3.8.7.orig/etc/main 2018-10-27 16:29:17.000000000 +0200 -+++ mlterm-3.8.7/etc/main 2018-12-28 19:34:29.226868067 +0100 +--- mlterm-3.8.9.orig/etc/main 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/etc/main 2019-12-19 10:22:29.451439014 +0100 @@ -2,6 +2,32 @@ # Copy to ~/.mlterm/main # @@ -178,10 +152,10 @@ # -- Window -- # display = -Index: mlterm-3.8.7/etc/xim +Index: mlterm-3.8.9/etc/xim =================================================================== ---- mlterm-3.8.7.orig/etc/xim 2018-10-27 16:29:17.000000000 +0200 -+++ mlterm-3.8.7/etc/xim 2018-12-28 19:34:29.226868067 +0100 +--- mlterm-3.8.9.orig/etc/xim 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/etc/xim 2019-12-19 10:22:29.451439014 +0100 @@ -1,6 +1,13 @@ -Ami=ko_KR.eucKR kinput2=ja_JP.eucJP @@ -199,10 +173,10 @@ +uim=ja_JP.UTF-8 + -Index: mlterm-3.8.7/etc/vaafont +Index: mlterm-3.8.9/etc/vaafont =================================================================== ---- mlterm-3.8.7.orig/etc/vaafont 2018-10-27 16:29:17.000000000 +0200 -+++ mlterm-3.8.7/etc/vaafont 2018-12-28 19:34:29.226868067 +0100 +--- mlterm-3.8.9.orig/etc/vaafont 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/etc/vaafont 2019-12-19 10:22:29.451439014 +0100 @@ -1,37 +1,36 @@ #DEFAULT=Kochi Gothic ++++++ mlterm-3.8.7.tar.gz -> mlterm-3.8.9.tar.gz ++++++ ++++ 44378 lines of diff (skipped) ++++++ mlterm-cast.patch ++++++ --- /var/tmp/diff_new_pack.kYRNal/_old 2019-12-21 12:30:42.083343834 +0100 +++ /var/tmp/diff_new_pack.kYRNal/_new 2019-12-21 12:30:42.115343850 +0100 @@ -1,7 +1,7 @@ -Index: mlterm-3.8.6/inputmethod/canna/im_canna.c +Index: mlterm-3.8.9/inputmethod/canna/im_canna.c =================================================================== ---- mlterm-3.8.6.orig/inputmethod/canna/im_canna.c 2018-06-12 15:52:01.000000000 +0200 -+++ mlterm-3.8.6/inputmethod/canna/im_canna.c 2018-08-24 11:30:32.422504971 +0200 +--- mlterm-3.8.9.orig/inputmethod/canna/im_canna.c 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/inputmethod/canna/im_canna.c 2019-12-19 12:11:37.352782126 +0100 @@ -305,7 +305,7 @@ static int switch_mode(ui_im_t *im) { if ((canna->is_enabled = (!canna->is_enabled))) { @@ -11,10 +11,10 @@ } else { preedit(canna, "", 0, 0, ""); } -Index: mlterm-3.8.6/uitoolkit/libtype/ui_window_cairo.c +Index: mlterm-3.8.9/uitoolkit/libtype/ui_window_cairo.c =================================================================== ---- mlterm-3.8.6.orig/uitoolkit/libtype/ui_window_cairo.c 2018-06-12 15:52:00.000000000 +0200 -+++ mlterm-3.8.6/uitoolkit/libtype/ui_window_cairo.c 2018-08-24 11:34:10.895619792 +0200 +--- mlterm-3.8.9.orig/uitoolkit/libtype/ui_window_cairo.c 2019-11-22 17:32:07.000000000 +0100 ++++ mlterm-3.8.9/uitoolkit/libtype/ui_window_cairo.c 2019-12-19 12:19:03.215351521 +0100 @@ -54,9 +54,9 @@ static void adjust_glyphs(ui_font_t *fon static void flush_glyphs(cairo_t *cr) { @@ -27,7 +27,36 @@ cairo_set_source_rgba(cr, (double)((pixel >> 16) & 0xff) / 255.0, (double)((pixel >> 8) & 0xff) / 255.0, -@@ -96,7 +96,7 @@ static int show_text(cairo_t *cr, cairo_ +@@ -95,22 +95,22 @@ static int show_iscii(cairo_t *cr, cairo + FT_Face face; + int drawn_x; + +- if (cairo_get_user_data(cr, 1) != xfont) { ++ if (cairo_get_user_data(cr, (cairo_user_data_key_t*)1) != xfont) { + flush_glyphs(cr); +- cairo_set_user_data(cr, 1, xfont, NULL); ++ cairo_set_user_data(cr, (cairo_user_data_key_t*)1, xfont, NULL); + } + + /* + * If cairo_get_user_data() returns NULL, it means that source rgb value is + * default one (black == 0). + */ +- if ((u_long)cairo_get_user_data(cr, 2) != ++ if ((u_long)cairo_get_user_data(cr, (cairo_user_data_key_t*)2) != + (u_long)((fg_color->red << 16) | (fg_color->green << 8) | + (fg_color->blue) | (fg_color->alpha << 24))) { + flush_glyphs(cr); +- cairo_set_user_data(cr, 2, +- (u_long)((fg_color->red << 16) | (fg_color->green << 8) | +- (fg_color->blue) | (fg_color->alpha << 24)), ++ cairo_set_user_data(cr, (cairo_user_data_key_t*)2, ++ (void*)((fg_color->red << 16) | (fg_color->green << 8) | ++ (fg_color->blue) | (fg_color->alpha << 24)), + NULL); + } + +@@ -170,7 +170,7 @@ static int show_text(cairo_t *cr, cairo_ #endif #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION @@ -36,7 +65,7 @@ #endif { #if CAIRO_VERSION_ENCODE(1, 8, 0) > CAIRO_VERSION -@@ -105,7 +105,7 @@ static int show_text(cairo_t *cr, cairo_ +@@ -179,7 +179,7 @@ static int show_text(cairo_t *cr, cairo_ flush_glyphs(cr); #endif #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION @@ -45,16 +74,16 @@ #endif } -@@ -115,7 +115,7 @@ static int show_text(cairo_t *cr, cairo_ - * default one - * (black == 0). +@@ -188,7 +188,7 @@ static int show_text(cairo_t *cr, cairo_ + * If cairo_get_user_data() returns NULL, it means that source rgb value is + * default one (black == 0). */ - if ((u_long)cairo_get_user_data(cr, 2) != + if ((u_long)cairo_get_user_data(cr, (cairo_user_data_key_t*)2) != (u_long)((fg_color->red << 16) | (fg_color->green << 8) | (fg_color->blue) | (fg_color->alpha << 24))) #endif -@@ -128,9 +128,9 @@ static int show_text(cairo_t *cr, cairo_ +@@ -201,9 +201,9 @@ static int show_text(cairo_t *cr, cairo_ #endif #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION
