Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at 2015-12-09 19:48:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gfxboot (Old) and /work/SRC/openSUSE:Factory/.gfxboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gfxboot" Changes: -------- --- /work/SRC/openSUSE:Factory/gfxboot/gfxboot.changes 2015-11-17 14:20:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gfxboot.new/gfxboot.changes 2015-12-09 19:48:50.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 4 13:37:59 UTC 2015 - snwint@suse.com + +- fix booting from submenu (bsc#957893) +- 4.5.12 + +------------------------------------------------------------------- Old: ---- gfxboot-4.5.11.tar.xz New: ---- gfxboot-4.5.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.aJDE02/_old 2015-12-09 19:48:54.000000000 +0100 +++ /var/tmp/diff_new_pack.aJDE02/_new 2015-12-09 19:48:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: gfxboot -Version: 4.5.11 +Version: 4.5.12 Release: 0 Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX License: GPL-2.0+ ++++++ KDE.tar.xz ++++++ ++++++ SLED.tar.xz ++++++ ++++++ SLES.tar.xz ++++++ ++++++ examples.tar.xz ++++++ ++++++ gfxboot-4.5.11.tar.xz -> gfxboot-4.5.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.11/VERSION new/gfxboot-4.5.12/VERSION --- old/gfxboot-4.5.11/VERSION 2015-11-12 13:49:37.000000000 +0100 +++ new/gfxboot-4.5.12/VERSION 2015-12-04 15:37:32.000000000 +0100 @@ -1 +1 @@ -4.5.11 +4.5.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.11/changelog new/gfxboot-4.5.12/changelog --- old/gfxboot-4.5.11/changelog 2015-11-12 13:49:37.000000000 +0100 +++ new/gfxboot-4.5.12/changelog 2015-12-04 15:37:32.000000000 +0100 @@ -1,3 +1,6 @@ +2015-12-04: 4.5.12 + - fix booting from submenu (bsc #957893) + 2015-11-12: 4.5.11 - documented submenu syntax - show submenu indicator in RTL layout ++++++ openSUSE.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/common.inc new/themes/openSUSE/src/common.inc --- old/themes/openSUSE/src/common.inc 2015-11-12 13:49:37.000000000 +0100 +++ new/themes/openSUSE/src/common.inc 2015-12-04 15:37:32.000000000 +0100 @@ -207,7 +207,7 @@ pop main.recalc - main.redraw + true main.redraw "" -1 0 return } if @@ -260,7 +260,7 @@ menu.args length { /menu.entry 0 def main.recalc - main.redraw + true main.redraw } { submenu.leave submenu.build } ifelse @@ -309,7 +309,7 @@ window.action actRedraw eq { /window.action actNothing def - main.redraw + false main.redraw } if window.action actRedrawPanel eq { @@ -1076,10 +1076,7 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % ( text ) == > ( new_text ) /menuitemmap { - % drop submenu prefix, if any - dup submenu.tag strstr 1 eq { - 2 add skipnonspaces skipspaces - } if + submenu.skip_prefix translate config._2space { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/menu.inc new/themes/openSUSE/src/menu.inc --- old/themes/openSUSE/src/menu.inc 2015-11-12 13:49:37.000000000 +0100 +++ new/themes/openSUSE/src/menu.inc 2015-12-04 15:37:32.000000000 +0100 @@ -11,6 +11,8 @@ /boot.splitchar 1 def /boot.splitstr 1 string dup 0 boot.splitchar put def +/boot.update_options true def + % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Create new main window. % @@ -40,16 +42,19 @@ % Redraw main window. % (E.g. after selecting a new language.) % -% ( window ) ==> ( ) +% ( redraw_boot_options ) ==> ( ) +% +% redraw_boot_options: true|false +% redraw boot option line if true % /main.redraw { % boot.drawlabels main.drawmenu - /keepbootoptions 1 def + /boot.update_options exch def menu.entry true MenuSelect - /keepbootoptions .undef def + /boot.update_options true def panel.show } def @@ -126,7 +131,7 @@ free - config.nobootoptions menu.texts menu.entry get iselement + config.nobootoptions menu.texts menu.entry get submenu.skip_prefix iselement menu.args menu.entry get submenu.tag strstr 1 eq or { @@ -302,7 +307,7 @@ menu.status { % init boot options - keepbootoptions .undef eq { + boot.update_options { boot.input.preinit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/submenu.inc new/themes/openSUSE/src/submenu.inc --- old/themes/openSUSE/src/submenu.inc 2015-11-12 13:49:37.000000000 +0100 +++ new/themes/openSUSE/src/submenu.inc 2015-12-04 15:37:32.000000000 +0100 @@ -120,3 +120,15 @@ } if } def + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Skip submenu prefix, if any. +% +% ( string ) ==> ( string ) +% +/submenu.skip_prefix { + dup submenu.tag strstr 1 eq { + 2 add skipnonspaces skipspaces + } if +} def + ++++++ upstream.tar.xz ++++++