diff options
author | tsutsui <tsutsui@pkgsrc.org> | 2014-03-14 17:42:17 +0000 |
---|---|---|
committer | tsutsui <tsutsui@pkgsrc.org> | 2014-03-14 17:42:17 +0000 |
commit | 546b63e68fdf29d524e412cd0fd7e768dd717482 (patch) | |
tree | 540959e09332fcc22be6c10e18b4d50e03894c17 /x11 | |
parent | 09703f0b650d0a28bab18376116ffed5e28b1ffe (diff) | |
download | pkgsrc-546b63e68fdf29d524e412cd0fd7e768dd717482.tar.gz |
Pull more post-3.3.3 fixes from upstream.
https://bitbucket.org/arakiken/mlterm/commits/1b9ecfa74b0f305c89cff60310f671aef7479246#chg-xwindow/x_screen.c
- x_color_cache and x_color_manager are reloaded after loading a wall
picture on NetBSD/OpenBSD 4bpp framebuffer.
https://bitbucket.org/arakiken/mlterm/commits/fa6c82190cc62d356285d7dde71e49a9f671b132#chg-xwindow/x_screen.c
- update mouse cursor fg and bg colors after loading a wall picture
on NetBSD/OpenBSD 4bpp framebuffer.
https://bitbucket.org/arakiken/mlterm/commits/097ac4f2b78e1dea5a53a55fa070007655d85add#chg-xwindow/fb/x_display_x68kgrf.c
- Also allow non-privileged users to use Text VRAM by --multivram=true option
on NetBSD/x68k
Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/mlterm/Makefile | 4 | ||||
-rw-r--r-- | x11/mlterm/distinfo | 6 | ||||
-rw-r--r-- | x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c | 22 | ||||
-rw-r--r-- | x11/mlterm/patches/patch-xwindow_x__screen.c | 57 |
4 files changed, 73 insertions, 16 deletions
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index d0efed0c6e7..98113612293 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.100 2014/03/07 18:22:50 tsutsui Exp $ +# $NetBSD: Makefile,v 1.101 2014/03/14 17:42:17 tsutsui Exp $ DISTNAME= mlterm-3.3.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 0539db563e1..dd1350d4f76 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2014/03/07 18:22:50 tsutsui Exp $ +$NetBSD: distinfo,v 1.42 2014/03/14 17:42:17 tsutsui Exp $ SHA1 (mlterm-3.3.3.tar.gz) = 9d5befee155e5e514874b45c46b1b7fe2fdf3dbd RMD160 (mlterm-3.3.3.tar.gz) = 9c669c523aa2e8b7e48420a58ab74b851cea3dfe @@ -6,6 +6,6 @@ Size (mlterm-3.3.3.tar.gz) = 3578266 bytes SHA1 (patch-configure) = 950194a8be2ebd7f3ed22c9ebaba545def6c7351 SHA1 (patch-etc_font-fb) = 7ded1dbee083df4d78b6ebf42964f50262feb318 SHA1 (patch-inputmethod_uim_im__uim.c) = c61931c6d6ca5295e16a68c2b4fa89641817ee58 -SHA1 (patch-xwindow_fb_x__display__x68kgrf.c) = b652023b7acbd9049672178569731ba583505a93 +SHA1 (patch-xwindow_fb_x__display__x68kgrf.c) = b4e106db5530c57010b811f0c15a4dd4bdc233a6 SHA1 (patch-xwindow_x__main__config.c) = 501dbde1484e93066fdaa652853679468a6ce78a -SHA1 (patch-xwindow_x__screen.c) = 3395037aa436a3136a6bd75f8eebc03c282ed997 +SHA1 (patch-xwindow_x__screen.c) = 4b09a17ad85c47d30f03b742994f09131994dc36 diff --git a/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c b/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c index 3f2b507e85b..a2a6f9b7085 100644 --- a/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c +++ b/x11/mlterm/patches/patch-xwindow_fb_x__display__x68kgrf.c @@ -1,10 +1,13 @@ -$NetBSD: patch-xwindow_fb_x__display__x68kgrf.c,v 1.3 2014/03/07 18:22:50 tsutsui Exp $ +$NetBSD: patch-xwindow_fb_x__display__x68kgrf.c,v 1.4 2014/03/14 17:42:17 tsutsui Exp $ Pull fixes for NetBSD/x68k framebuffer from upstream: https://bitbucket.org/arakiken/mlterm/commits/f32b4ef020ab4ce25ab46166efac5c02f5e692eb - Allow non-privileged users to use mlterm-fb - The default resolution is changed to 768x512x4 +https://bitbucket.org/arakiken/mlterm/commits/097ac4f2b78e1dea5a53a55fa070007655d85add#chg-xwindow/fb/x_display_x68kgrf.c + - Also allow non-privileged users to use Text VRAM by --multivram=true option + --- xwindow/fb/x_display_x68kgrf.c.orig 2014-02-21 16:51:44.000000000 +0000 +++ xwindow/fb/x_display_x68kgrf.c @@ -72,10 +72,10 @@ typedef struct fb_reg_conf @@ -40,3 +43,20 @@ https://bitbucket.org/arakiken/mlterm/commits/f32b4ef020ab4ce25ab46166efac5c02f5 { kik_msg_printf( "Couldn't open %s.\n" , dev ? dev : "/dev/grf1") ; +@@ -663,7 +670,15 @@ x68k_tvram_set_wall_picture( + { + struct grfinfo vinfo ; + +- if( image && ( grf0_fd = open( "/dev/grf0" , O_RDWR)) >= 0) ++ kik_priv_restore_euid() ; ++ kik_priv_restore_egid() ; ++ ++ grf0_fd = open( "/dev/grf0" , O_RDWR) ; ++ ++ kik_priv_change_euid( kik_getuid()) ; ++ kik_priv_change_egid( kik_getgid()) ; ++ ++ if( grf0_fd >= 0) + { + kik_file_set_cloexec( grf0_fd) ; + diff --git a/x11/mlterm/patches/patch-xwindow_x__screen.c b/x11/mlterm/patches/patch-xwindow_x__screen.c index bfe0e2d2e09..5eb8f1ab677 100644 --- a/x11/mlterm/patches/patch-xwindow_x__screen.c +++ b/x11/mlterm/patches/patch-xwindow_x__screen.c @@ -1,12 +1,49 @@ -$NetBSD: patch-xwindow_x__screen.c,v 1.5 2014/03/07 18:22:50 tsutsui Exp $ +$NetBSD: patch-xwindow_x__screen.c,v 1.6 2014/03/14 17:42:17 tsutsui Exp $ Pull mlterm-3.3.3-fixes.patch from upstream: http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3-fixes.patch/download - Fix the bug which disabled to start mlconfig +https://bitbucket.org/arakiken/mlterm/commits/1b9ecfa74b0f305c89cff60310f671aef7479246#chg-xwindow/x_screen.c + - x_color_cache and x_color_manager are reloaded after loading a wall + picture on NetBSD/OpenBSD 4bpp framebuffer. + +https://bitbucket.org/arakiken/mlterm/commits/fa6c82190cc62d356285d7dde71e49a9f671b132#chg-xwindow/x_screen.c + - update mouse cursor fg and bg colors after loading a wall picture + on NetBSD/OpenBSD 4bpp framebuffer. + --- xwindow/x_screen.c.orig 2014-02-21 16:51:45.000000000 +0000 +++ xwindow/x_screen.c -@@ -5268,11 +5268,13 @@ change_im( +@@ -1275,6 +1275,28 @@ set_wall_picture( + return 0 ; + } + ++#if defined(USE_FRAMEBUFFER) && (defined(__NetBSD__) || defined(__OpenBSD__)) ++ if( screen->window.disp->depth == 4 && strstr( screen->pic_file_path , "six")) ++ { ++ /* ++ * Color pallette of x_display can be changed by x_acquire_bg_picture(). ++ * (see x_display_set_cmap() called from fb/x_imagelib.c.) ++ */ ++ x_color_cache_unload( screen->color_man->color_cache) ; ++ ++ x_color_manager_reload( screen->color_man) ; ++ x_window_set_fg_color( &screen->window , ++ x_get_xcolor( screen->color_man , ML_FG_COLOR)) ; ++ x_xic_fg_color_changed( &screen->window) ; ++ /* XXX should change scrollbar fg color */ ++ ++ x_window_set_bg_color( &screen->window , ++ x_get_xcolor( screen->color_man , ML_BG_COLOR)) ; ++ x_xic_bg_color_changed( &screen->window) ; ++ /* XXX should change scrollbar bg color */ ++ } ++#endif ++ + if( ! x_window_set_wall_picture( &screen->window , pic->pixmap)) + { + x_release_picture( pic) ; +@@ -5268,11 +5290,13 @@ change_im( * Callbacks of x_config_event_listener_t events. */ @@ -22,7 +59,7 @@ http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3 ) { ml_term_t * term ; -@@ -5285,7 +5287,7 @@ get_config_intern( +@@ -5285,7 +5309,7 @@ get_config_intern( if( ( term = (*screen->system_listener->get_pty)( screen->system_listener->self , dev)) == NULL) { @@ -31,7 +68,7 @@ http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3 } } else -@@ -5829,7 +5831,34 @@ get_config_intern( +@@ -5829,7 +5853,34 @@ get_config_intern( } } @@ -67,7 +104,7 @@ http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3 } static void -@@ -5840,31 +5869,7 @@ get_config( +@@ -5840,31 +5891,7 @@ get_config( int to_menu ) { @@ -100,16 +137,16 @@ http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3 } static void -@@ -8286,18 +8291,21 @@ x_screen_set_config( +@@ -8286,18 +8313,21 @@ x_screen_set_config( } else if( strcmp( value , "switch") == 0) { - char * val ; + int flag ; -+ -+ get_config_intern( screen , /* dev */ NULL , key , -1 , &flag) ; - if( ( val = get_config_intern( screen , /* dev */ NULL , key))) ++ get_config_intern( screen , /* dev */ NULL , key , -1 , &flag) ; ++ + if( flag == 1) { - if( strcmp( val , "true") == 0) @@ -132,7 +169,7 @@ http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3 } } -@@ -8312,7 +8320,7 @@ x_screen_set_config( +@@ -8312,7 +8342,7 @@ x_screen_set_config( if( ( term = (*screen->system_listener->get_pty)( screen->system_listener->self , dev)) == NULL) { @@ -141,7 +178,7 @@ http://sourceforge.net/projects/mlterm/files/01release/mlterm-3.3.3/mlterm-3.3.3 } } else -@@ -8838,7 +8846,7 @@ x_screen_set_config( +@@ -8838,7 +8868,7 @@ x_screen_set_config( } else { |