File mlterm-portability.patch of Package mlterm

Overview Repositories Revisions Requests Users Attributes Meta

File mlterm-portability.patch of Package mlterm (Revision 4e4d69b7b57d6232a92bd354d6f0d20e)

Currently displaying revision 4e4d69b7b57d6232a92bd354d6f0d20e , Show latest

Index: mlterm-3.8.2/inputmethod/canna/im_canna.c
===================================================================
--- mlterm-3.8.2.orig/inputmethod/canna/im_canna.c
+++ mlterm-3.8.2/inputmethod/canna/im_canna.c
@@ -300,6 +300,7 @@ static int delete (ui_im_t *im) {
 
 static int switch_mode(ui_im_t *im) {
   im_canna_t *canna;
+  int default_width = 60;
 
   canna = (im_canna_t*)im;
 
@@ -307,7 +308,7 @@ static int switch_mode(ui_im_t *im) {
 
   if ((canna->is_enabled = (!canna->is_enabled))) {
     preedit(canna, NULL, 0, 0, canna->key_status.mode);
-    jrKanjiControl(0, KC_SETWIDTH, 60);
+    jrKanjiControl(0, KC_SETWIDTH, &default_width);
   } else {
     preedit(canna, "", 0, 0, "");
   }
Index: mlterm-3.8.2/uitoolkit/libtype/ui_window_cairo.c
===================================================================
--- mlterm-3.8.2.orig/uitoolkit/libtype/ui_window_cairo.c
+++ mlterm-3.8.2/uitoolkit/libtype/ui_window_cairo.c
@@ -54,12 +54,12 @@ static int show_text(cairo_t *cr, cairo_
 #endif
 
 #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION
-  if (cairo_get_user_data(cr, 1) != xfont)
+  if (cairo_get_user_data(cr, (int *)1) != xfont)
 #endif
   {
     cairo_set_scaled_font(cr, xfont);
 #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION
-    cairo_set_user_data(cr, 1, xfont, NULL);
+    cairo_set_user_data(cr, (int *)1, xfont, NULL);
 #endif
   }
 
@@ -69,13 +69,13 @@ static int show_text(cairo_t *cr, cairo_
    * default one
    * (black == 0).
    */
-  if ((u_long)cairo_get_user_data(cr, 2) != fg_color->pixel)
+  if ((u_long)cairo_get_user_data(cr, (int *)2) != fg_color->pixel)
 #endif
   {
     cairo_set_source_rgba(cr, (double)fg_color->red / 255.0, (double)fg_color->green / 255.0,
                           (double)fg_color->blue / 255.0, (double)fg_color->alpha / 255.0);
 #if CAIRO_VERSION_ENCODE(1, 4, 0) <= CAIRO_VERSION
-    cairo_set_user_data(cr, 2, fg_color->pixel, NULL);
+    cairo_set_user_data(cr, (int *)2, (int *)fg_color->pixel, NULL);
 #endif
   }

Places

File mlterm-portability.patch of Package mlterm (Revision 4e4d69b7b57d6232a92bd354d6f0d20e)

Places